feat: JPA Entitiy 추가 작업 (#14)

* feat: UserTable 변경으로 인한 Entity 수정

* feat: Couple Table 수정으로 인한 Entity 수정

* feat: user couple 정보 추가

* feat: entity 수정으로 인한 변경 사항 적용

* feat: ID가 초기화 되지 않은 경우 exception 추가

* test: Add Jwt Authentication Test

* test: Test DB를 h2 로 사용하도록 변경

* feat: Game Entity Table 수정 및 생성

* style: 불필요한 라인 정리

* feat: short game entity 수정으로 인한 변경 사항 적용

* feat: short game entity 수정으로 인한 변경 사항 적용

* feat: Mission Category Table 수정으로 인한 코드 추가

* feat: Mission Content Table 수정사항 반영

* feat: Game Round Table 수정 내용 반영

* feat: 사용자 알림 정보 테이블 수정 내용 적용

* feat: user mission Table 수정 내용 적용

* feat: wish coupon Table 수정 내용 적용

* style: fix ktlint

* fix: 사용하지 않는 Dsl 코드 삭제

* fix: user Table 이름 변경

module-domain/src/main/kotlin/universe/sparkle/domain/GameType.kt

@@ -1,5 +1,10 @@
 package universe.sparkle.domain
 
 enum class GameType {
-    SHORT, LONG
+    SHORT, LONG;
+
+    companion object {
+        const val CONTRACT_SHORT = "SHORT"
+        const val CONTRACT_LONG = "LONG"
+    }
 }

module-domain/src/main/kotlin/universe/sparkle/domain/UserMissionState.kt

@@ -0,0 +1,5 @@
+package universe.sparkle.domain
+
+enum class UserMissionState {
+    SUCCESS, FAILED, UNDECIDED
+}

module-domain/src/main/kotlin/universe/sparkle/domain/model/AuthenticationToken.kt

@@ -4,4 +4,5 @@ data class AuthenticationToken(
     val id: Long,
     val nickname: String?,
     val image: String?,
+    val couple: Couple?
 )

module-domain/src/main/kotlin/universe/sparkle/domain/model/Couple.kt

@@ -0,0 +1,10 @@
+package universe.sparkle.domain.model
+
+import java.time.LocalDate
+
+data class Couple(
+    val id: Long? = null,
+    val startDate: LocalDate,
+    val heartToken: Int = 5,
+    val isDelete: Boolean = false,
+)

module-domain/src/main/kotlin/universe/sparkle/domain/model/User.kt

@@ -8,7 +8,7 @@ data class User(
     val snsAuthCode: String,
     val nickname: String? = null,
     val image: String? = null,
-    val fcmToken: String? = null,
+    val couple: Couple? = null,
 ) {
 
     init {
@@ -23,7 +23,7 @@ data class User(
             snsAuthCode = this.snsAuthCode,
             nickname = updateNickname,
             image = updateImage,
-            fcmToken = this.fcmToken,
+            couple = this.couple,
         )
     }
 
@@ -37,5 +37,6 @@ fun User.toAuthenticationToken() = this.id?.let { userId ->
         id = userId,
         nickname = this.nickname,
         image = this.image,
+        couple = this.couple,
     )
 }

module-infrastructure/build.gradle

@@ -50,7 +50,10 @@ dependencies {
     developmentOnly libs.spring.boot.devtools
 
     testRuntimeOnly libs.db.h2
-    testImplementation libs.test.spring.boot.starter
+    testImplementation(libs.test.spring.boot.starter) {
+        exclude module: 'mockito-core'
+    }
+    testImplementation libs.test.mockk
     testImplementation libs.test.spring.security
 }
 

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/config/QueryDslConfig.kt

@@ -1,6 +1,6 @@
 package universe.sparkle.infrastructure.config
 
-import com.querydsl.jpa.impl.JPAQueryFactory
+/*import com.querydsl.jpa.impl.JPAQueryFactory
 import jakarta.persistence.EntityManager
 import jakarta.persistence.PersistenceContext
 import org.springframework.beans.factory.annotation.Autowired
@@ -13,4 +13,4 @@ class QueryDslConfig @Autowired constructor(
 ) {
     @Bean
     fun jpaQueryFactory(): JPAQueryFactory = JPAQueryFactory(entityManager)
-}
+}*/

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/NotInitializedIdException.kt

@@ -0,0 +1,5 @@
+package universe.sparkle.infrastructure.persistence
+
+class NotInitializedIdException(
+    override val message: String = "ID has not been initialized yet"
+) : IllegalArgumentException(message)

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/CoupleEntity.kt

@@ -15,10 +15,11 @@ class CoupleEntity(
     id: Long? = null,
     startDate: LocalDate,
     heartToken: Int = 5,
+    isDelete: Boolean = false,
 ) {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "couple_id")
+    @Column(name = "id")
     var id: Long? = id
         protected set
 
@@ -30,4 +31,8 @@ class CoupleEntity(
     @ColumnDefault("5")
     var heartToken: Int = heartToken
         protected set
+
+    @Column(name = "is_delete", nullable = false)
+    @ColumnDefault("false")
+    var isDelete: Boolean = isDelete
 }

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/GameEntity.kt

@@ -1,6 +1,7 @@
 package universe.sparkle.infrastructure.persistence.entity
 
 import jakarta.persistence.Column
+import jakarta.persistence.Convert
 import jakarta.persistence.DiscriminatorColumn
 import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
@@ -9,33 +10,47 @@ import jakarta.persistence.Id
 import jakarta.persistence.Inheritance
 import jakarta.persistence.InheritanceType
 import jakarta.persistence.Table
-import java.time.LocalDateTime
+import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Size
+import universe.sparkle.domain.GameResult
+import universe.sparkle.infrastructure.persistence.entity.converter.GameResultAttributeConverter
+import java.time.Instant
 
 @Entity
 @Table(name = "game")
 @Inheritance(strategy = InheritanceType.JOINED)
-@DiscriminatorColumn
-open class GameEntity(
+@DiscriminatorColumn(name = "GAME_TYPE")
+class GameEntity(
     id: Long? = null,
+    finishedAt: Instant? = null,
+    result: GameResult = GameResult.UNDECIDED,
     coupleId: Long,
-    enable: Boolean = true,
-    finishedAt: LocalDateTime? = null,
+    onDelete: Boolean = false,
 ) {
+
     @Id
-    @Column(name = "game_id")
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    var id: Long? = null
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    var id: Long? = id
         protected set
 
-    @Column(name = "couple_id", nullable = false)
-    var coupleId = coupleId
+    @Column(name = "finished_at")
+    var finishedAt: Instant? = finishedAt
         protected set
 
-    @Column(name = "enable", nullable = false)
-    var enable: Boolean = enable
+    @Size(max = 10)
+    @Convert(converter = GameResultAttributeConverter::class)
+    @Column(name = "result", length = 10)
+    var result: GameResult = result
         protected set
 
-    @Column(name = "finished_at")
-    var finishedAt: LocalDateTime? = finishedAt
+    @NotNull
+    @Column(name = "couple_id", nullable = false)
+    var couple: Long = coupleId
+        protected set
+
+    @NotNull
+    @Column(name = "on_delete", nullable = false)
+    var onDelete: Boolean = onDelete
         protected set
 }

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/GameRoundEntity.kt

@@ -0,0 +1,43 @@
+package universe.sparkle.infrastructure.persistence.entity
+
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.Table
+import jakarta.validation.constraints.NotNull
+import java.time.Instant
+
+@Entity
+@Table(name = "game_round")
+class GameRoundEntity(
+    id: Long? = null,
+    gameId: Long,
+    missionCategoryId: Long,
+    winnerUserId: Long,
+    updatedAt: Instant,
+) {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    var id: Long? = id
+        protected set
+
+    @NotNull
+    @Column(name = "game_id", nullable = false)
+    var gameId: Long = gameId
+        protected set
+
+    @Column(name = "mission_category_id")
+    var missionCategoryId: Long = missionCategoryId
+        protected set
+
+    @Column(name = "winner_user_id")
+    var winnerUserId: Long = winnerUserId
+        protected set
+
+    @Column(name = "updated_at")
+    var updatedAt: Instant? = updatedAt
+        protected set
+}

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/MissionCategoryEntity.kt

@@ -7,6 +7,8 @@ import jakarta.persistence.GeneratedValue
 import jakarta.persistence.GenerationType
 import jakarta.persistence.Id
 import jakarta.persistence.Table
+import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Size
 import universe.sparkle.domain.MissionTool
 import universe.sparkle.domain.MissionType
 import universe.sparkle.infrastructure.persistence.entity.converter.MissionToolAttributeConverter
@@ -23,55 +25,72 @@ class MissionCategoryEntity(
     example: String,
     image: String,
     level: Int,
-    expectedTime: Int,
+    expectedTime: Int? = null,
     missionType: MissionType,
     missionTool: MissionTool,
 ) {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "mission_category_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
     var id: Long? = id
         protected set
 
-    @Column(name = "title", nullable = false)
+    @Size(max = 50)
+    @NotNull
+    @Column(name = "title", nullable = false, length = 50)
     var title: String = title
         protected set
 
+    @Size(max = 255)
+    @NotNull
     @Column(name = "description", nullable = false)
     var description: String = description
         protected set
 
+    @Size(max = 255)
+    @NotNull
     @Column(name = "rule", nullable = false)
     var rule: String = rule
         protected set
 
+    @Size(max = 255)
+    @NotNull
     @Column(name = "tip", nullable = false)
     var tip: String = tip
         protected set
 
+    @Size(max = 255)
+    @NotNull
     @Column(name = "example", nullable = false)
     var example: String = example
         protected set
 
+    @Size(max = 255)
+    @NotNull
     @Column(name = "image", nullable = false)
     var image: String = image
         protected set
 
+    @NotNull
     @Column(name = "level", nullable = false)
     var level: Int = level
         protected set
 
     @Column(name = "expected_time", nullable = false)
-    var expectedTime: Int = expectedTime
+    var expectedTime: Int? = expectedTime
         protected set
 
-    @Column(name = "mission_type", nullable = false)
+    @Size(max = 30)
+    @NotNull
     @Convert(converter = MissionTypeAttributeConverter::class)
+    @Column(name = "mission_type", nullable = false, length = 30)
     var missionType: MissionType = missionType
         protected set
 
-    @Column(name = "mission_tool", nullable = false)
+    @Size(max = 30)
+    @NotNull
     @Convert(converter = MissionToolAttributeConverter::class)
+    @Column(name = "mission_tool", nullable = false, length = 30)
     var missionTool: MissionTool = missionTool
         protected set
 }

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/MissionContentEntity.kt

@@ -2,34 +2,46 @@ package universe.sparkle.infrastructure.persistence.entity
 
 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.JoinColumn
+import jakarta.persistence.ManyToOne
 import jakarta.persistence.Table
+import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Size
+import org.hibernate.annotations.OnDelete
+import org.hibernate.annotations.OnDeleteAction
 
 @Entity
 @Table(name = "mission_content")
 class MissionContentEntity(
     id: Long? = null,
-    missionCategoryId: Long,
+    missionCategoryEntity: MissionCategoryEntity,
     content: String,
-    recommendTime: String,
+    recommendTime: Int? = null,
 ) {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "mission_content_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
     var id: Long? = id
         protected set
 
-    @Column(name = "mission_category_id", nullable = false)
-    var missionCategoryId: Long = missionCategoryId
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "mission_category_id", nullable = false)
+    var missionCategory: MissionCategoryEntity = missionCategoryEntity
         protected set
 
+    @Size(max = 255)
+    @NotNull
     @Column(name = "content", nullable = false)
     var content: String = content
         protected set
 
-    @Column(name = "recommend_time", nullable = false)
-    var recommendTime: String = recommendTime
+    @Column(name = "recommend_time")
+    var recommendTime: Int? = recommendTime
         protected set
 }

module-infrastructure/src/main/kotlin/universe/sparkle/infrastructure/persistence/entity/NotificationInformationEntity.kt

@@ -0,0 +1,21 @@
+package universe.sparkle.infrastructure.persistence.entity
+
+import jakarta.persistence.Column
+import jakarta.persistence.EmbeddedId
+import jakarta.persistence.Entity
+import jakarta.persistence.Table
+
+@Entity
+@Table(name = "notification_information")
+class NotificationInformationEntity(
+    id: NotificationInformationEntityId,
+    enableAllNotification: Boolean = true,
+) {
+    @EmbeddedId
+    var id: NotificationInformationEntityId = id
+        protected set
+
+    @Column(name = "enable_all_notification")
+    var enableAllNotification: Boolean = enableAllNotification
+        protected set
+}