Feature/64 set kafka logic

casper-application-domain/src/main/kotlin/hs/kr/entrydsm/domain/application/aggregates/Application.kt

@@ -22,7 +22,6 @@ data class Application(
     val birthDate: String?,
     val applicationType: ApplicationType,
     val educationalStatus: EducationalStatus,
-    val status: ApplicationStatus,
     val streetAddress: String?,
     val submittedAt: LocalDateTime,
     val reviewedAt: LocalDateTime?,

casper-application-domain/src/main/kotlin/hs/kr/entrydsm/domain/application/interfaces/ApplicationContract.kt

@@ -8,7 +8,5 @@ interface ApplicationContract : QueryAllFirstRoundPassedApplicationContract {
 
     fun getApplicationByReceiptCode(receiptCode: Long): Application?
 
-    fun updateApplicationStatus(receiptCode: Long, status: hs.kr.entrydsm.domain.status.values.ApplicationStatus)
-
     fun delete(application: Application)
 }

casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/ApplicationPersistenceAdapter.kt

@@ -75,22 +75,6 @@ class ApplicationPersistenceAdapter(
             .orElse(null)
     }
 
-    /**
-     * 원서 상태를 업데이트합니다.
-     *
-     * @param receiptCode 접수번호
-     * @param status 변경할 상태
-     */
-    override fun updateApplicationStatus(
-        receiptCode: Long,
-        status: hs.kr.entrydsm.domain.status.values.ApplicationStatus,
-    ) {
-        applicationJpaRepository.findByReceiptCode(receiptCode).ifPresent { applicationEntity ->
-            applicationEntity.status = status
-            applicationJpaRepository.save(applicationEntity)
-        }
-    }
-
     override fun delete(application: Application) {
         applicationJpaRepository.delete(applicationMapper.toEntity(application))
     }

casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/entity/ApplicationJpaEntity.kt

@@ -29,7 +29,6 @@ import java.util.UUID
     indexes = [
         Index(name = "idx_user_id", columnList = "user_id"),
         Index(name = "idx_receipt_code", columnList = "receipt_code"),
-        Index(name = "idx_status", columnList = "status"),
         Index(name = "idx_application_type", columnList = "application_type"),
         Index(name = "idx_submitted_at", columnList = "submitted_at"),
     ],
@@ -57,13 +56,8 @@ class ApplicationJpaEntity(
     @Enumerated(EnumType.STRING)
     @Column(name = "educational_status", nullable = false, length = 50)
     val educationalStatus: EducationalStatus,
-    @Enumerated(EnumType.STRING)
-    @Column(name = "status", nullable = false, length = 20)
-    var status: ApplicationStatus,
     @Column(name = "is_daejeon", nullable = false)
     val isDaejeon: Boolean,
-    @Column(name = "is_arrived", nullable = false)
-    var isArrived: Boolean = false,
     // ===== 보호자 및 주소 정보 =====
     @Column(name = "parent_name", length = 100)
     val parentName: String?,
@@ -125,9 +119,7 @@ class ApplicationJpaEntity(
         birthDate = null,
         applicationType = ApplicationType.COMMON,
         educationalStatus = EducationalStatus.PROSPECTIVE_GRADUATE,
-        status = ApplicationStatus.SUBMITTED,
         isDaejeon = false,
-        isArrived = false,
         parentName = null,
         parentTel = null,
         parentRelation = null,

casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/mapper/ApplicationMapper.kt

@@ -87,9 +87,7 @@ class ApplicationMapper(
             birthDate = model.birthDate,
             applicationType = model.applicationType,
             educationalStatus = model.educationalStatus,
-            status = model.status,
             isDaejeon = model.isDaejeon ?: false,
-            isArrived = false,
             parentName = model.parentName,
             parentTel = model.parentTel,
             parentRelation = model.parentRelation,
@@ -134,7 +132,6 @@ class ApplicationMapper(
             birthDate = entity.birthDate,
             applicationType = entity.applicationType,
             educationalStatus = entity.educationalStatus,
-            status = entity.status,
             streetAddress = null,
             submittedAt = entity.submittedAt,
             reviewedAt = entity.reviewedAt,

casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/domain/repository/ApplicationJpaRepository.kt

@@ -71,11 +71,6 @@ interface ApplicationJpaRepository : JpaRepository<ApplicationJpaEntity, UUID> {
         isDaejeon: Boolean,
     ): List<ApplicationJpaEntity>
 
-    /**
-     * 상태별 원서 목록 조회
-     */
-    fun findAllByStatus(status: ApplicationStatus): List<ApplicationJpaEntity>
-
     /**
      * 수험번호로 원서 조회
      */

casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/presentation/ApplicationQueryController.kt

@@ -27,7 +27,6 @@ import java.util.UUID
 class ApplicationQueryController(
     private val applicationQueryUseCase: ApplicationQueryUseCase,
     private val applicationPdfGenerator: ApplicationPdfGenerator,
-    private val updateApplicationArrivalUseCase: UpdateApplicationArrivalUseCase,
     private val getPreviewApplicationPdfUseCase: GetPreviewApplicationPdfUseCase,
 ) : ApplicationQueryApiDocument {
     @GetMapping("/applications/{applicationId}")
@@ -91,29 +90,30 @@ class ApplicationQueryController(
             .body(pdfBytes)
     }
 
-    @PatchMapping("/applications/{applicationId}/arrival")
-    override fun updateArrivalStatus(
-        @PathVariable applicationId: String,
-        @RequestParam isArrived: Boolean,
-    ): ResponseEntity<UpdateApplicationArrivalResponse> {
-        if (applicationId.isBlank()) {
-            throw ApplicationValidationException("원서 ID가 필요합니다")
-        }
-
-        val uuid =
-            try {
-                UUID.fromString(applicationId)
-            } catch (e: IllegalArgumentException) {
-                throw ApplicationValidationException("올바르지 않은 원서 ID 형식입니다")
-            }
-
-        updateApplicationArrivalUseCase.updateArrivalStatus(uuid, isArrived)
-
-        return ResponseEntity.ok(
-            UpdateApplicationArrivalResponse(
-                success = true,
-                message = "학교 도착 여부가 업데이트되었습니다.",
-            ),
-        )
-    }
+    // 이거 status에서 해줌
+//    @PatchMapping("/applications/{applicationId}/arrival")
+//    override fun updateArrivalStatus(
+//        @PathVariable applicationId: String,
+//        @RequestParam isArrived: Boolean,
+//    ): ResponseEntity<UpdateApplicationArrivalResponse> {
+//        if (applicationId.isBlank()) {
+//            throw ApplicationValidationException("원서 ID가 필요합니다")
+//        }
+//
+//        val uuid =
+//            try {
+//                UUID.fromString(applicationId)
+//            } catch (e: IllegalArgumentException) {
+//                throw ApplicationValidationException("올바르지 않은 원서 ID 형식입니다")
+//            }
+//
+//        updateApplicationArrivalUseCase.updateArrivalStatus(uuid, isArrived)
+//
+//        return ResponseEntity.ok(
+//            UpdateApplicationArrivalResponse(
+//                success = true,
+//                message = "학교 도착 여부가 업데이트되었습니다.",
+//            ),
+//        )
+//    }
 }

casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationPersistenceService.kt

@@ -99,7 +99,6 @@ class ApplicationPersistenceService(
                 birthDate = extractStringValue(applicationData, "birthDate"),
                 applicationType = applicationType,
                 educationalStatus = educationalStatus,
-                status = ApplicationStatus.SUBMITTED,
                 isDaejeon = extractBooleanValue(applicationData, "isDaejeon") ?: false,
                 parentName = extractStringValue(applicationData, "parentName"),
                 parentTel = extractStringValue(applicationData, "parentTel"),

casper-application-infrastructure/src/main/kotlin/hs/kr/entrydsm/application/domain/application/usecase/ApplicationQueryUseCase.kt

@@ -46,8 +46,8 @@ class ApplicationQueryUseCase(
             applicationRepository.findById(uuid)
                 .orElseThrow { ApplicationNotFoundException("원서를 찾을 수 없습니다: $applicationId") }
 
-//        val status = applicationQueryStatusContract.queryStatusByReceiptCode(application.receiptCode)
-//            ?: throw StatusExceptions.StatusNotFoundException()
+        val status = applicationQueryStatusContract.queryStatusByReceiptCode(application.receiptCode)
+            ?: throw StatusExceptions.StatusNotFoundException()
 
         val photoPath = photoJpaRepository.findByUserId(application.userId)?.photo
 
@@ -65,7 +65,7 @@ class ApplicationQueryUseCase(
                     birthDate = application.birthDate,
                     applicationType = application.applicationType.name,
                     educationalStatus = application.educationalStatus.name,
-                    status = application.status.name,
+                    status = status.applicationStatus.name,
                     submittedAt = application.submittedAt,
                     reviewedAt = application.reviewedAt,
                     createdAt = application.createdAt,
@@ -158,12 +158,11 @@ class ApplicationQueryUseCase(
                                 applicantName = app.applicantName,
                                 applicationType = app.applicationType.name,
                                 educationalStatus = app.educationalStatus.name,
-                                status = app.status.toString(),
+                                status = getApplicationStatus(app),
                                 submittedAt = app.submittedAt,
                                 isDaejeon = app.isDaejeon,
                                 isSubmitted = true,
-                                isArrived = false // 임시 하드 코딩
-//                                isArrived = isArrivedDocuments(app),
+                                isArrived = isArrivedDocuments(app),
                             )
                         },
                     total = totalElements,
@@ -174,37 +173,6 @@ class ApplicationQueryUseCase(
         )
     }
 
-    fun getUserApplications(userId: String): ApplicationListResponse {
-        val uuid = UUID.fromString(userId)
-        val applications = applicationRepository.findAllByUserId(uuid)
-
-        return ApplicationListResponse(
-            success = true,
-            data =
-                ApplicationListResponse.ApplicationListData(
-                    applications =
-                        applications.map { app ->
-                            ApplicationListResponse.ApplicationSummary(
-                                applicationId = app.applicationId.toString(),
-                                receiptCode = app.receiptCode,
-                                applicantName = app.applicantName,
-                                applicationType = app.applicationType.name,
-                                educationalStatus = app.educationalStatus.name,
-                                status = app.status.toString(),
-                                submittedAt = app.submittedAt,
-                                isDaejeon = app.isDaejeon,
-                                isSubmitted = true,
-                                isArrived = app.isArrived,
-                            )
-                        },
-                    total = applications.size,
-                    page = 0,
-                    size = applications.size,
-                    totalPages = 1,
-                ),
-        )
-    }
-
     fun getApplicationScores(applicationId: String): ApplicationScoresResponse {
         val uuid = UUID.fromString(applicationId)
         val application =
@@ -289,7 +257,6 @@ class ApplicationQueryUseCase(
             birthDate = entity.birthDate,
             applicationType = entity.applicationType,
             educationalStatus = entity.educationalStatus,
-            status = entity.status,
             streetAddress = scores["streetAddress"] as? String,
             submittedAt = entity.submittedAt ?: entity.createdAt,
             reviewedAt = entity.reviewedAt,
@@ -370,4 +337,11 @@ class ApplicationQueryUseCase(
             else -> false
         }
     }
+
+    private fun getApplicationStatus(application: ApplicationJpaEntity): String {
+        val status = applicationQueryStatusContract.queryStatusByReceiptCode(application.receiptCode)
+            ?: throw StatusExceptions.StatusNotFoundException()
+
+        return status.applicationStatus.name
+    }
 }