From e91029f66e0974301725050b1f406f2285b2a84d Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:06:31 -0400 Subject: [PATCH] [F] Fix merge conflicts --- .../GetGameMapAreaConditionHandler.java | 4 +-- .../handler/GetUserCMissionHandler.java | 4 +-- .../GetUserNetBattleRankingInfoHandler.java | 4 +-- .../chusan/model/userdata/UserCMission.java | 2 +- .../model/userdata/UserCMissionProgress.java | 3 +- ... => V256__add_chusan_luminous_support.sql} | 20 +++++-------- .../V262__add_chusan_luminous_support.sql | 28 ------------------- ... => V256__add_chusan_luminous_support.sql} | 0 8 files changed, 15 insertions(+), 50 deletions(-) rename src/main/resources/db/migration/mariadb/{V262__add_chusan_luminous_support.sql => V256__add_chusan_luminous_support.sql} (50%) delete mode 100644 src/main/resources/db/migration/mysql/V262__add_chusan_luminous_support.sql rename src/main/resources/db/migration/sqlite/{V262__add_chusan_luminous_support.sql => V256__add_chusan_luminous_support.sql} (100%) diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameMapAreaConditionHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameMapAreaConditionHandler.java index fa882563..e31755af 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameMapAreaConditionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameMapAreaConditionHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCMissionHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCMissionHandler.java index b4d991ec..eea7f3bc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCMissionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCMissionHandler.java @@ -1,12 +1,12 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCMissionProgressRepository; import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCMissionRepository; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.data.UserCMissionProgressResp; import icu.samnyan.aqua.sega.chusan.model.response.data.UserCMissionResp; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCMission; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleRankingInfoHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleRankingInfoHandler.java index d2943d81..95b6e667 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleRankingInfoHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleRankingInfoHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java index b72e21b4..bf0151dd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java index a107169e..3ff182eb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java @@ -1,12 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.*; - @Entity(name = "ChusanUserCMissionProgress") @Table(name = "chusan_user_cmission_progress", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "mission_id", "order"})}) @Data diff --git a/src/main/resources/db/migration/mariadb/V262__add_chusan_luminous_support.sql b/src/main/resources/db/migration/mariadb/V256__add_chusan_luminous_support.sql similarity index 50% rename from src/main/resources/db/migration/mariadb/V262__add_chusan_luminous_support.sql rename to src/main/resources/db/migration/mariadb/V256__add_chusan_luminous_support.sql index 0c6c3cfb..3e5f9fbc 100644 --- a/src/main/resources/db/migration/mariadb/V262__add_chusan_luminous_support.sql +++ b/src/main/resources/db/migration/mariadb/V256__add_chusan_luminous_support.sql @@ -1,15 +1,13 @@ CREATE TABLE chusan_user_cmission ( id BIGINT AUTO_INCREMENT NOT NULL, - user_id BIGINT NULL, + user_id BIGINT NOT NULL , mission_id INT NULL, point INT NULL, - CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id) + CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id), + CONSTRAINT fku_chusan_user_cmission FOREIGN KEY (user_id) REFERENCES chusan_user_data (id) ON DELETE CASCADE ON UPDATE CASCADE ); -ALTER TABLE chusan_user_cmission - ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id); - CREATE TABLE chusan_user_cmission_progress ( id BIGINT AUTO_INCREMENT NOT NULL, @@ -18,11 +16,7 @@ CREATE TABLE chusan_user_cmission_progress `order` INT NOT NULL, stage INT NULL, progress INT NULL, - CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id) -); - -ALTER TABLE chusan_user_cmission_progress - ADD CONSTRAINT uc_6ab791e9e8fee2b3fab35d3d2 UNIQUE (user_id, mission_id, `order`); - -ALTER TABLE chusan_user_cmission_progress - ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_PROGRESS_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id); \ No newline at end of file + CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id), + CONSTRAINT fku_chusan_user_cmission_progress FOREIGN KEY (user_id) REFERENCES chusan_user_data (id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT unque_chusan_user_cmission_progress UNIQUE (user_id, mission_id, `order`) +); \ No newline at end of file diff --git a/src/main/resources/db/migration/mysql/V262__add_chusan_luminous_support.sql b/src/main/resources/db/migration/mysql/V262__add_chusan_luminous_support.sql deleted file mode 100644 index 0c6c3cfb..00000000 --- a/src/main/resources/db/migration/mysql/V262__add_chusan_luminous_support.sql +++ /dev/null @@ -1,28 +0,0 @@ -CREATE TABLE chusan_user_cmission -( - id BIGINT AUTO_INCREMENT NOT NULL, - user_id BIGINT NULL, - mission_id INT NULL, - point INT NULL, - CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id) -); - -ALTER TABLE chusan_user_cmission - ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id); - -CREATE TABLE chusan_user_cmission_progress -( - id BIGINT AUTO_INCREMENT NOT NULL, - user_id BIGINT NULL, - mission_id INT NULL, - `order` INT NOT NULL, - stage INT NULL, - progress INT NULL, - CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id) -); - -ALTER TABLE chusan_user_cmission_progress - ADD CONSTRAINT uc_6ab791e9e8fee2b3fab35d3d2 UNIQUE (user_id, mission_id, `order`); - -ALTER TABLE chusan_user_cmission_progress - ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_PROGRESS_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id); \ No newline at end of file diff --git a/src/main/resources/db/migration/sqlite/V262__add_chusan_luminous_support.sql b/src/main/resources/db/migration/sqlite/V256__add_chusan_luminous_support.sql similarity index 100% rename from src/main/resources/db/migration/sqlite/V262__add_chusan_luminous_support.sql rename to src/main/resources/db/migration/sqlite/V256__add_chusan_luminous_support.sql