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

@@ -1,12 +1,11 @@
 package se.su.dsv.scipro.report;
 
-import jakarta.persistence.GenerationType;
+import jakarta.persistence.Column;
-import se.su.dsv.scipro.system.DomainObject;
-
-import jakarta.persistence.Basic;
 import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
+import se.su.dsv.scipro.system.DomainObject;
 import se.su.dsv.scipro.system.Language;
 
 import java.io.Serializable;
@@ -19,13 +18,13 @@ public abstract class AbstractCriterion extends DomainObject {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Basic(optional = false)
+    @Column(name = "title_sv", nullable = false)
     private String title;
 
-    @Basic(optional = false)
+    @Column(name = "title_en", nullable = false)
     private String titleEn;
 
-    @Basic(optional = false)
+    @Column(name = "sort_order", nullable = false)
     private Integer sortOrder;
 
     protected AbstractCriterion() {

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

@@ -1,12 +1,13 @@
 package se.su.dsv.scipro.report;
 
 import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
 import jakarta.persistence.MappedSuperclass;
 
 @MappedSuperclass
 public abstract class AbstractGradingCriterion extends AbstractCriterion {
 
-    @Basic(optional = false)
+    @Column(name = "points_required_to_pass", nullable = false)
     protected int pointsRequiredToPass;
 
     @Basic

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

@@ -1,12 +1,17 @@
 package se.su.dsv.scipro.report;
 
+import java.util.Objects;
+
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 import se.su.dsv.scipro.system.DomainObject;
 
-import jakarta.persistence.*;
 import se.su.dsv.scipro.system.Language;
 
-import java.util.Objects;
-
 @MappedSuperclass
 public abstract class AbstractGradingCriterionPoint extends DomainObject implements Comparable<AbstractGradingCriterionPoint> {
     public static final int DESCRIPTION_LENGTH = 600;
@@ -18,11 +23,11 @@ public abstract class AbstractGradingCriterionPoint extends DomainObject impleme
     private Integer point;
 
     @Basic
-    @Column(length = DESCRIPTION_LENGTH)
+    @Column(name = "description_sv", length = DESCRIPTION_LENGTH)
     private String description;
 
     @Basic
-    @Column(length = DESCRIPTION_LENGTH)
+    @Column(name = "description_en", length = DESCRIPTION_LENGTH)
     private String descriptionEn;
 
     public AbstractGradingCriterionPoint() {

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

@@ -1,8 +1,10 @@
 package se.su.dsv.scipro.report;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+
 import java.util.Objects;
 
 @Entity
@@ -10,6 +12,7 @@ import java.util.Objects;
 public class GradingCriterionPointTemplate extends AbstractGradingCriterionPoint {
 
     @ManyToOne(optional = false)
+    @JoinColumn(name = "grading_criterion_template_id", nullable = false)
     private GradingCriterionTemplate gradingCriterionTemplate;
 
     @Override

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

@@ -1,18 +1,29 @@
 package se.su.dsv.scipro.report;
 
-import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
 @Entity
 @DiscriminatorColumn(name = "type", length = GradingCriterionTemplate.LENGTH)
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @Table(name = "grading_criterion_template")
 public abstract class GradingCriterionTemplate extends AbstractGradingCriterion {
     public static final int LENGTH = 64;
+
     @ManyToOne(optional = false)
+    @JoinColumn(name = "grading_report_template_id")
     private GradingReportTemplate gradingReportTemplate;
 
     @OneToMany(mappedBy = "gradingCriterionTemplate", orphanRemoval = true, cascade = CascadeType.ALL)

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

@@ -802,8 +802,58 @@ alter table `grading_report_template` drop key `FK_qovbb9ql33oaxprfr01w7ss9u`;
 
 alter table `grading_report_template` rename column `projectType_id` to `project_type_id`;
 
--- activate following later
+-- fix table GradingCriterionPoint (partially, only rename two columns since this table and grading_criterion_pint_template
-/*
+-- shares same MappedSuperclass AbstractGradingCriterionPoint. JPA-mapping is defined at AbstractGradingCriterionPoint
+
+alter table `GradingCriterionPoint` rename column `description` to `description_sv`;
+alter table `GradingCriterionPoint` rename column `descriptionEn` to `description_en`;
+
+-- fix table grading_criterion_point_template
+
+alter table `grading_criterion_point_template` drop foreign key `FK_gradingCriterionTemplate_id`;
+
+alter table `grading_criterion_point_template` rename column `description` to `description_sv`;
+alter table `grading_criterion_point_template` rename column `descriptionEn` to `description_en`;
+alter table `grading_criterion_point_template` rename column `gradingCriterionTemplate_id` to `grading_criterion_template_id`;
+
+alter table `grading_criterion_point_template`
+    add constraint fk_gc_pt_grading_criterion_template_id
+        foreign key(grading_criterion_template_id) references grading_criterion_template(id)
+        on delete cascade on update cascade;
+
+-- fix table criterion (partially, only rename three columns, since this table criterion shares same
+-- JPA MappedSuperclass AbstractCriterion
+
+alter table `criterion` rename column `title` to `title_sv`;
+alter table `criterion` rename column `titleEn` to `title_en`;
+alter table `criterion` rename column `sortOrder` to `sort_order`;
+
+-- fix table GradingCriterion (partially, only rename four columns, since this table GradingCriterion shares same
+-- JPA MappedSuperclass AbstractCriterion and AbstractGradingCriterion.
+
+alter table `GradingCriterion` rename column `title` to `title_sv`;
+alter table `GradingCriterion` rename column `titleEn` to `title_en`;
+alter table `GradingCriterion` rename column `sortOrder` to `sort_order`;
+alter table `GradingCriterion` rename column `pointsRequiredToPass` to `points_required_to_pass`;
+
+-- fix table grading_criterion_template
+
+alter table `grading_criterion_template` drop foreign key `FK_b37xw6uyfj98ff2tsn5t8x5q`;
+alter table `grading_criterion_template` drop key `FK_b37xw6uyfj98ff2tsn5t8x5q`;
+
+alter table `grading_criterion_template` rename column `title` to `title_sv`;
+alter table `grading_criterion_template` rename column `titleEn` to `title_en`;
+alter table `grading_criterion_template` rename column `sortOrder` to `sort_order`;
+alter table `grading_criterion_template` rename column `pointsRequiredToPass` to `points_required_to_pass`;
+alter table `grading_criterion_template` rename column `gradingReportTemplate_id` to `grading_report_template_id`;
+
+alter table `grading_criterion_template`
+    add constraint fk_gct_grading_report_template_id
+        foreign key(grading_report_template_id) references grading_report_template(id)
+        on delete cascade on update cascade;
+
+
+/*  Activate following later
 
 -- fix table ProjectType
 
@@ -812,13 +862,13 @@ alter table `grading_report_template` rename column `projectType_id` to `project
 alter table `grading_report_template`
     add constraint fk_grading_report_template_project_type_id
         foreign key(project_type_id) references project_type(id)
-            on delete cascade on update cascade;
+        on delete cascade on update cascade;
 
 -- add foreign key reference from project_type_settings to project_type
 alter table `project_type_settings`
     add constraint fk_project_type_settings_project_type_id
         foreign key(project_type_id) references project_type(id)
-            on delete cascade on update cascade;
+        on delete cascade on update cascade;
 
 -- add foreign key reference from project_type_project_module to project_type
 alter table `project_type_project_module`