From 8140380673b43cbd8b47dce137e1895346849210 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Thu, 26 Dec 2024 06:41:58 -0500 Subject: [PATCH] [O] riik --- .../chusan/model/userdata/UserActivity.java | 40 ------------------- .../chusan/model/userdata/UserActivity.kt | 23 +++++++++++ .../chusan/model/userdata/UserCMission.java | 21 ---------- .../chusan/model/userdata/UserCMission.kt | 15 +++++++ .../model/userdata/UserCMissionProgress.java | 26 ------------ .../model/userdata/UserCMissionProgress.kt | 18 +++++++++ .../model/userdata/UserCardPrintState.java | 25 ------------ .../model/userdata/UserCardPrintState.kt | 15 +++++++ 8 files changed, 71 insertions(+), 112 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.kt diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java deleted file mode 100644 index 93b88b29..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java +++ /dev/null @@ -1,40 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import jakarta.persistence.UniqueConstraint; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChusanUserActivity") -@Table(name = "chusan_user_activity", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "kind", "activity_id"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({"kind", "id", "sortNumber", "param1", "param2", "param3", "param4"}) -public class UserActivity extends Chu3UserEntity { - private int kind; - - @JsonProperty("id") - @Column(name = "activity_id") - private int activityId; - - private int sortNumber; - - private int param1; - - private int param2; - - private int param3; - - private int param4; - - public UserActivity(Chu3UserData userData) { setUser(userData); } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.kt new file mode 100644 index 00000000..5a1f8b6c --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.kt @@ -0,0 +1,23 @@ +package icu.samnyan.aqua.sega.chusan.model.userdata + +import com.fasterxml.jackson.annotation.JsonProperty +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Table +import jakarta.persistence.UniqueConstraint + +@Entity(name = "ChusanUserActivity") +@Table(name = "chusan_user_activity", uniqueConstraints = [UniqueConstraint(columnNames = ["user_id", "kind", "activity_id"])]) +class UserActivity(user: Chu3UserData) : Chu3UserEntity() { + init { this.user = user } + + var kind = 0 + @JsonProperty("id") + @Column(name = "activity_id") + var activityId = 0 + var sortNumber = 0 + var param1 = 0 + var param2 = 0 + var param3 = 0 + var param4 = 0 +} 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 deleted file mode 100644 index 2e463806..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Entity(name = "ChusanUserCMission") -@Table(name = "chusan_user_cmission") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserCMission extends Chu3UserEntity { - @Column(name = "mission_id") - private int missionId; - - @Column(name = "point") - private int point; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.kt new file mode 100644 index 00000000..674fee72 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.kt @@ -0,0 +1,15 @@ +package icu.samnyan.aqua.sega.chusan.model.userdata + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Table + +@Entity(name = "ChusanUserCMission") +@Table(name = "chusan_user_cmission") +class UserCMission : Chu3UserEntity() { + @Column(name = "mission_id") + var missionId = 0 + + @Column(name = "point") + var point = 0 +} 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 deleted file mode 100644 index 2f21a243..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java +++ /dev/null @@ -1,26 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import jakarta.persistence.UniqueConstraint; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Entity(name = "ChusanUserCMissionProgress") -@Table(name = "chusan_user_cmission_progress", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "mission_id", "order"})}) -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserCMissionProgress extends Chu3UserEntity { - @Column(name = "mission_id") - private int missionId; - - @Column(name = "`order`") - private int order; - - private int stage; - - private int progress; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.kt new file mode 100644 index 00000000..c4f4613b --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.kt @@ -0,0 +1,18 @@ +package icu.samnyan.aqua.sega.chusan.model.userdata + +import com.fasterxml.jackson.annotation.JsonIgnore +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Table +import jakarta.persistence.UniqueConstraint + +@Entity(name = "ChusanUserCMissionProgress") +@Table(name = "chusan_user_cmission_progress", uniqueConstraints = [UniqueConstraint(columnNames = ["user_id", "mission_id", "order"])]) +class UserCMissionProgress : Chu3UserEntity() { + @Column(name = "mission_id") + @JsonIgnore + var missionId = 0 + var order = 0 + var stage = 0 + var progress = 0 +} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java deleted file mode 100644 index 09635f4b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java +++ /dev/null @@ -1,25 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata; - -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChusanUserCardPrintState") -@Table(name = "chusan_user_print_state") -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UserCardPrintState extends Chu3UserEntity { - private boolean hasCompleted; - private LocalDateTime limitDate; - private int placeId; - private int cardId; - private int gachaId; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.kt new file mode 100644 index 00000000..51759369 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.kt @@ -0,0 +1,15 @@ +package icu.samnyan.aqua.sega.chusan.model.userdata + +import jakarta.persistence.Entity +import jakarta.persistence.Table +import java.time.LocalDateTime + +@Entity(name = "ChusanUserCardPrintState") +@Table(name = "chusan_user_print_state") +class UserCardPrintState : Chu3UserEntity() { + var hasCompleted = false + var limitDate: LocalDateTime = LocalDateTime.now() + var placeId = 0 + var cardId = 0 + var gachaId = 0 +}