core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplate.java

@@ -30,7 +30,7 @@ public class GradingReportTemplate extends DomainObject {
     private Long id;
 
     @OneToOne(optional = false)
-    @JoinColumn(name = "proejct_type_id")
+    @JoinColumn(name = "project_type_id")
     private ProjectType projectType;
 
     @OneToMany(mappedBy = "gradingReportTemplate", cascade = {CascadeType.ALL})

core/src/main/resources/db/migration/V389__harmonize_table_attribute_name.sql

@@ -1220,6 +1220,35 @@ alter table `user_profile_project_type`
         foreign key (project_type_id) references project_type (id)
             on delete cascade on update cascade;
 
+/*
+ * Step 7: checklist related tables
+ */
+
+
+
+
+
+/*
+ * Step X: Many-to-Many tables between project and user.
+ */
+
+-- table: project_user_note (new changes from develop branch)
+
+alter table `project_user_note` drop foreign key `FK_project_user_note_user`;
+alter table `project_user_note` drop foreign key `FK_project_user_note_project`;
+alter table `project_user_note` drop key `FK_project_user_note_user`;
+
+alter table `project_user_note`
+    add constraint fk_project_user_note_project_id
+        foreign key (project_id) references project (id)
+            on delete cascade on update cascade;
+
+alter table `project_user_note`
+    add constraint fk_project_user_note_user_id
+        foreign key (user_id) references user (id)
+            on delete cascade on update cascade;
+
+
 
 /* Useful SQL