DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests9 Actions Projects1 Releases Wiki Activity

task/3382: Rename 'user_id' to 'creator_user_id' for checklist_template

Browse Source
This commit is contained in:
Tom Zhao 2024-11-12 11:14:41 +01:00
parent 9a8604d76a
commit 0fb9e6dbc3
2 changed files with 13 additions and 12 deletions
core/src/main
java/se/su/dsv/scipro/checklist
ChecklistTemplate.java
resources/db/migration
V390__harmonize_table_attribute_name.sql

19
core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplate.java

@ -1,11 +1,5 @@
package se.su.dsv.scipro.checklist; package se.su.dsv.scipro.checklist;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import jakarta.persistence.Basic; import jakarta.persistence.Basic;
import jakarta.persistence.CollectionTable; import jakarta.persistence.CollectionTable;
import jakarta.persistence.Column; import jakarta.persistence.Column;
@ -16,15 +10,19 @@ import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import jakarta.persistence.JoinTable; import jakarta.persistence.JoinTable;
import jakarta.persistence.Lob;
import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToMany;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import se.su.dsv.scipro.system.DomainObject; import se.su.dsv.scipro.system.DomainObject;
import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.User;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
@Entity @Entity
@Table(name = "checklist_template") @Table(name = "checklist_template")
public class ChecklistTemplate extends DomainObject { public class ChecklistTemplate extends DomainObject {
@ -35,12 +33,15 @@ public class ChecklistTemplate extends DomainObject {
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long id;
@Basic
@Column(nullable = false) @Column(nullable = false)
private String name; private String name;
@Basic(optional = true) @Basic(optional = true)
@Column(name = "description")
private String description; private String description;
@Basic
@Column(name = "template_number") @Column(name = "template_number")
private int templateNumber = DEFAULT_TEMPLATE_NUMBER; private int templateNumber = DEFAULT_TEMPLATE_NUMBER;
@ -51,7 +52,7 @@ public class ChecklistTemplate extends DomainObject {
private List<String> questions = new ArrayList<>(1); private List<String> questions = new ArrayList<>(1);
@ManyToOne(optional = false) @ManyToOne(optional = false)
@JoinColumn(name = "user_id") @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
private User creator; private User creator;
@ManyToMany @ManyToMany

6
core/src/main/resources/db/migration/V390__harmonize_table_attribute_name.sql

@ -1402,12 +1402,12 @@ alter table `checklist_template_checklist_category`
alter table `checklist_template` drop foreign key `FK14DA6F3E44F4DBE`; alter table `checklist_template` drop foreign key `FK14DA6F3E44F4DBE`;
alter table `checklist_template` drop key `FK14DA6F3E44F4DBE`; alter table `checklist_template` drop key `FK14DA6F3E44F4DBE`;
alter table `checklist_template` rename column `creator_id` to `user_id`; alter table `checklist_template` rename column `creator_id` to `creator_user_id`;
alter table `checklist_template` rename column `templateNumber` to `template_number`; alter table `checklist_template` rename column `templateNumber` to `template_number`;
alter table `checklist_template` alter table `checklist_template`
add constraint fk_checklist_template_user_id add constraint fk_checklist_template_creator_user_id
foreign key (user_id) references user (id) foreign key (creator_user_id) references user (id)
on delete cascade on update cascade; on delete cascade on update cascade;
/* /*