[F] Fix merge conflicts

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;

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;

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;

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;

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

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)
+    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`)
 );
-
-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);

src/main/resources/db/migration/mysql/V262__add_chusan_luminous_support.sql

@@ -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);