DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 3 Actions 2 Projects 1 Wiki Activity

task/3382: Harmonisera tabellnamn #6

Merged
ansv7779 merged 104 commits from task/3382 into develop 2024-11-12 13:33:44 +01:00
Conversation 6 Commits 104 Files Changed 129 +13 -8
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ccdfe6d979 - Show all commits

13
core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTarget.java
View File

@ -1,5 +1,6 @@
package se.su.dsv.scipro.reviewing; package se.su.dsv.scipro.reviewing;
import jakarta.persistence.Basic;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;
@ -19,22 +20,26 @@ public class ReviewerTarget extends DomainObject {
@GeneratedValue(strategy = jakarta.persistence.GenerationType.IDENTITY) @GeneratedValue(strategy = jakarta.persistence.GenerationType.IDENTITY)
private Long id; private Long id;
@ManyToOne(optional = false) @Basic
@JoinColumn(name = "user_id", nullable = false)
private User reviewer;
@Column(name = "year", nullable = false) @Column(name = "year", nullable = false)
private int year; private int year;
@Basic
@Column(name = "spring", nullable = false) @Column(name = "spring", nullable = false)
private int spring; private int spring;
@Basic
@Column(name = "autumn", nullable = false) @Column(name = "autumn", nullable = false)
private int autumn; private int autumn;
@Basic
@Column(name = "note") @Column(name = "note")
private String note; private String note;
@ManyToOne(optional = false)
@JoinColumn(name = "reviewer_user_id", referencedColumnName = "id", nullable = false)
private User reviewer;
@Override @Override
public Long getId() { public Long getId() {
return id; return id;

8
core/src/main/resources/db/migration/V390__harmonize_table_attribute_name.sql
View File

@ -555,13 +555,13 @@ alter table `comment`
alter table `reviewer_target` drop foreign key `FK_ReviewerTarget_ReviewerId`; alter table `reviewer_target` drop foreign key `FK_ReviewerTarget_ReviewerId`;
alter table `reviewer_target` drop key `UK_ReviewerTarget_ReviewerId_Year`; alter table `reviewer_target` drop key `UK_ReviewerTarget_ReviewerId_Year`;
alter table `reviewer_target` rename column `reviewer_id` to `user_id`; alter table `reviewer_target` rename column `reviewer_id` to `reviewer_user_id`;
alter table `reviewer_target` add constraint uk_reviewer_target_user_id_year unique(user_id, year); alter table `reviewer_target` add constraint uk_reviewer_target_reviewer_user_id_year unique(reviewer_user_id, year);
alter table `reviewer_target` alter table `reviewer_target`
add constraint fk_reviewer_target_user_id add constraint fk_reviewer_target_reviewer_user_id
foreign key (user_id) references user (id) foreign key (reviewer_user_id) references user (id)
on delete cascade on update cascade; on delete cascade on update cascade;
-- table: notification_delivery_configuration -- table: notification_delivery_configuration