task/3382: Harmonisera tabellnamn #6

Merged
ansv7779 merged 104 commits from task/3382 into develop 2024-11-12 13:33:44 +01:00
2 changed files with 80 additions and 59 deletions
Showing only changes of commit fcd0a4c8b6 - Show all commits

View File

@ -1,17 +1,30 @@
package se.su.dsv.scipro.match;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import jakarta.persistence.Basic;
import jakarta.persistence.Cacheable;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import se.su.dsv.scipro.system.DomainObject;
import se.su.dsv.scipro.system.ProjectType;
import jakarta.persistence.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.*;
@Entity
@Cacheable(true)
@Table(name="ApplicationPeriod")
@Table(name="application_period")
public class ApplicationPeriod extends DomainObject {
@Id
@ -23,17 +36,16 @@ public class ApplicationPeriod extends DomainObject {
private String name;
@Basic
@Column(name = "start_date")
private LocalDate startDate = LocalDate.now();
@Basic
@Column(name = "end_date")
private LocalDate endDate = LocalDate.now();
@Basic
@Column(name = "courseStartDate")
@Column(name = "course_start_date")
private LocalDateTime courseStartDateTime = LocalDate.now().atTime(8, 0);
@Basic
@Column(name = "course_end_date")
private LocalDate courseEndDate;
@OneToMany(fetch = FetchType.LAZY, mappedBy = "applicationPeriod", cascade=CascadeType.ALL, orphanRemoval=true)

View File

@ -425,7 +425,7 @@ alter table `general_system_settings_system_module` add primary key (general_sys
alter table `general_system_settings_system_module`
add constraint fk_general_system_settings_system_module_id
foreign key (general_system_settings_id) references general_system_settings (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: general_system_settings_supervisor_change_recipient
@ -441,7 +441,7 @@ alter table `general_system_settings_supervisor_change_recipient` add primary ke
alter table `general_system_settings_supervisor_change_recipient`
add constraint fk_general_system_settings_supervisor_change_recipient_id
foreign key (general_system_settings_id) references general_system_settings (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: general_system_settings_alarm_recipient
@ -457,7 +457,7 @@ alter table `general_system_settings_alarm_recipient` add primary key (general_s
alter table `general_system_settings_alarm_recipient`
add constraint fk_general_system_settings_alarm_recipient_id
foreign key (general_system_settings_id) references general_system_settings (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: general_system_settings
@ -509,12 +509,12 @@ alter table `program` rename column `nameEn` to `name_en`;
alter table `user_program`
add constraint fk_user_program_program_id
foreign key (program_id) references program (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
alter table `user_program`
add constraint fk_user_program_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: note
@ -524,7 +524,7 @@ alter table `note` drop key `user_id`;
alter table `note`
add constraint fk_note_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: comment and comment_thread
@ -547,12 +547,12 @@ alter table comment rename column `creator_id` to `user_id`;
alter table `comment`
add constraint fk_comment_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
alter table `comment`
add constraint fk_comment_comment_thread_id
foreign key (comment_thread_id) references comment_thread (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: reviewer_target
@ -566,7 +566,7 @@ alter table `reviewer_target` add constraint uk_reviewer_target_user_id_year uni
alter table `reviewer_target`
add constraint fk_reviewer_target_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: notification_delivery_configuration
@ -579,7 +579,7 @@ alter table `notification_delivery_configuration` add constraint uk_one_setting_
alter table `notification_delivery_configuration`
add constraint fk_notification_delivery_configuration_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: username
@ -596,7 +596,7 @@ alter table `user_name` add constraint uk_user_name unique(user_name);
alter table `user_name`
add constraint fk_user_name_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: user_role
@ -605,7 +605,7 @@ alter table `user_role` drop foreign key `user_role_user_id`;
alter table `user_role`
add constraint fk_user_role_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: user_languages
@ -617,7 +617,7 @@ rename table `user_languages` to `user_language`;
alter table `user_language`
add constraint fk_user_language_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
/*
* table: user, unit and Password
@ -656,7 +656,7 @@ alter table `unit` add constraint uk_unit_identifier unique(identifier);
alter table `user`
add constraint fk_user_unit_id
foreign key (unit_id) references unit (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: Password
@ -675,14 +675,14 @@ create index idx_password_deleted on password(deleted);
alter table `password`
add constraint fk_password_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- add FK from user till password
alter table `user`
add constraint fk_user_password_id
foreign key (password_id) references password (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: user_profile
@ -704,7 +704,7 @@ alter table `user_profile` add constraint uk_user_profile_user_id unique(user_id
alter table `user_profile`
add constraint fk_user_profile_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: user_profile_default_project_status_filter
@ -719,7 +719,7 @@ alter table `user_profile_default_project_status_filter` rename column `defaultP
alter table `user_profile_default_project_status_filter`
add constraint fk_user_profile_default_project_status_filter_user_profile_id
foreign key (user_profile_id) references user_profile (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: user_profile_default_project_team_member_roles_filter
@ -734,7 +734,7 @@ alter table `user_profile_default_project_team_member_roles_filter` rename colum
alter table `user_profile_default_project_team_member_roles_filter`
add constraint fk_up_dp_tm_roles_filter_user_profile_id
foreign key (user_profile_id) references user_profile (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
/*
* Step 6: table ProjectType and related tables.
@ -759,7 +759,7 @@ alter table `user_profile_project_type` rename column `defaultProjectTypeFilter_
alter table `user_profile_project_type`
add constraint fk_user_profile_project_type_user_profile_id
foreign key (user_profile_id) references user_profile (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: ExternalResource, except foreign key to coming table project_type
@ -869,7 +869,7 @@ alter table `grading_criterion_point_template` rename column `gradingCriterionTe
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;
on delete cascade on update cascade;
/* >>> END: */
@ -889,7 +889,7 @@ alter table `checklist_template_project_type` add primary key (checklist_templat
alter table `checklist_template_project_type`
add constraint fk_ct_pt_checklist_template_id
foreign key (checklist_template_id) references checklist_template (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: milestone_activity_template_ProjectType, except foreign key to coming table project_type
@ -908,7 +908,7 @@ alter table `milestone_activity_template_project_type` add primary key (`milesto
alter table `milestone_activity_template_project_type`
add constraint fk_ma_tpt_milestone_activity_template_id
foreign key (milestone_activity_template_id) references milestone_activity_template (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: idea, we only remove foreign key from idea to ProjectType and rename the column projectType_id here.
-- This table has many related tables and will be fixed later.
@ -964,7 +964,7 @@ alter table `target` add primary key (application_period_id, project_type_id, us
alter table `target`
add constraint fk_target_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: projectPartner, except foreign key to coming table project_type, and application_period
@ -984,7 +984,7 @@ alter table `project_partner` rename column `applicationPeriod_id` to `applicati
alter table `project_partner`
add constraint fk_project_partner_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: ApplicationPeriodProjectType, except foreign key to coming table application_period, project_type and activity_plan_template.
@ -1024,9 +1024,9 @@ alter table `activity_template` rename column `checkListTemplate_id` to `checkli
alter table `activity_template`
add constraint fk_activity_template_checklist_template_id
foreign key (checklist_template_id) references checklist_template (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- table: ActivityPlanTemplate (at this stage, no any foreign key is are referenced to ActivityPlanTemplate)
-- table: ActivityPlanTemplate (at this stage, no any foreign key is referenced to ActivityPlanTemplate)
alter table `ActivityPlanTemplate` drop foreign key `FK_rgwf80yvcy2msbb6g80bae10p`;
alter table `ActivityPlanTemplate` drop key `FK_rgwf80yvcy2msbb6g80bae10p`;
@ -1040,7 +1040,7 @@ alter table `activity_plan_template` rename column `creator_id` to `user_id`;
alter table `activity_plan_template`
add constraint fk_activity_plan_template_user_id
foreign key (user_id) references user (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- Add back all foreign key references to activity_plan_template
@ -1048,13 +1048,13 @@ alter table `activity_plan_template`
alter table `activity_template`
add constraint fk_activity_template_activity_plan_template_id
foreign key (activity_plan_template_id) references activity_plan_template (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- add foreign key reference from application_period_project_type to activity_plan_template
alter table `application_period_project_type`
add constraint fk_ap_pt_activity_plan_template_id
foreign key (activity_plan_template_id) references activity_plan_template (id)
on delete cascade on update cascade;
on delete cascade on update cascade;
-- >>> STACK POP: 2nd table group (ActivityPlanTemplate and ActivityTemplate) is done!!!
@ -1098,18 +1098,22 @@ alter table `idea` drop key `FK6E051897BEC322C1`;
alter table `idea` rename column `applicationPeriod_id` to `application_period_id`;
-- table: ApplicationPeriod, verify no foreign keys are referenced to ApplicationPeriod before fix it
-- table: ApplicationPeriod (at this stage, no any foreign key is referenced to ApplicationPeriod)
rename table `ApplicationPeriod` to `application_period`;
alter table `application_period` rename column `endDate` to `end_date`;
alter table `application_period` rename column `startDate` to `start_date`;
alter table `application_period` rename column `courseStartDate` to `course_start_date`;
alter table `application_period` rename column `courseEndDate` to `course_end_date`;
-- Add back all foreign key references to application_period, since table application_period is ready
/* Activate following later
-- **********************************************************************************
-- TODO: -- Add back all foreign key references to application_period
-- **********************************************************************************
-- add back foreign key reference from ide to application_period
alter table `idea`
add constraint fk_idea_application_period_id
foreign key (application_period_id) references application_period (id)
on delete cascade on update cascade;
-- add back foreign key reference from application_period_exemption to application_period
alter table `application_period_exemption`
@ -1117,6 +1121,8 @@ alter table `application_period_exemption`
foreign key (application_period_id) references application_period (id)
on delete cascade on update cascade;
-- >>> STACK POP: 3rd table group: ApplicationPeriod, applicationperiodexemption, idea is done!!!
-- add back foreign key reference from application_period_project_type to application_period
alter table `application_period_project_type`
add constraint fk_ap_pt_application_period_id
@ -1135,11 +1141,14 @@ alter table `target`
foreign key (application_period_id) references application_period (id)
on delete cascade on update cascade;
-- **********************************************************************************
-- TODO: fix table ProjectType, verify no foreign keys are referenced to ProjectTYpe before fix it
-- **********************************************************************************
-- table: ProjectType (finally!! at this stage, no any foreign key is referenced to ProjectType)
-- >>> STACK POP: 1st table group: target, projectPartner, ApplicationPeriodProjectType is done!!!
/* Activate following later
-- **********************************************************************************
-- TODO: -- Add back all foreign key references to project_type
-- **********************************************************************************
@ -1190,25 +1199,25 @@ alter table `checklist_template_project_type`
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 back 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 back foreign key reference from project_type_project_module to project_type
alter table `project_type_project_module`
add constraint fk_project_type_project_module_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 back foreign key reference from external_resource to project_type
alter table `external_resource`
add constraint fk_external_resource_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 back foreign key reference from user_profile_project_type to project_type.
alter table `user_profile_project_type`