Merge pull request #352 from depromeet/develop

Author: wjdwnsdnjs13

application/src/main/kotlin/core/application/session/application/exception/CohortSessionNotFoundException.kt

@@ -0,0 +1,7 @@
+package core.application.session.application.exception
+
+import core.application.common.exception.BusinessException
+
+class CohortSessionNotFoundException(
+    code: SessionExceptionCode = SessionExceptionCode.COHORT_SESSION_NOT_FOUND,
+) : BusinessException(code)

application/src/main/kotlin/core/application/session/application/exception/SessionExceptionCode.kt

@@ -14,6 +14,7 @@ enum class SessionExceptionCode(
     ALREADY_CHECKED_ATTENDANCE(HttpStatus.BAD_REQUEST, "SESSION-400-04", "이미 출석을 체크했습니다"),
     ATTENDANCE_START_TIME_DATE_MISMATCH(HttpStatus.BAD_REQUEST, "SESSION-400-05", "출석 시작 시간의 날짜가 세션의 날짜와 일치하지 않습니다"),
     SESSION_NOT_FOUND(HttpStatus.NOT_FOUND, "SESSION-404-01", "세션을 찾을 수 없습니다"),
+    COHORT_SESSION_NOT_FOUND(HttpStatus.NOT_FOUND, "SESSION-404-02", "해당 기수의 세션을 찾을 수 없습니다"),
     ;
 
     override fun getStatus(): HttpStatus = status

application/src/main/kotlin/core/application/session/application/service/SessionQueryService.kt

@@ -39,10 +39,10 @@ class SessionQueryService(
         return sessionPersistencePort.findNextSessionBy(startOfToday)
     }
 
-    fun getAllSessions(): List<Session> {
+    fun getAllCohortSessions(): List<Session> {
         val cohortId = cohortQueryUseCase.getLatestCohortId()
 
-        return sessionPersistencePort.findAllSessions(cohortId.value)
+        return sessionPersistencePort.findAllCohortSessions(cohortId.value)
     }
 
     fun getSessionById(sessionId: SessionId): Session =
@@ -60,7 +60,7 @@ class SessionQueryService(
         val cohortId = cohortQueryUseCase.getLatestCohortId()
 
         return sessionPersistencePort
-            .findAllSessions(cohortId.value)
+            .findAllCohortSessions(cohortId.value)
             .map { SessionWeekQueryModel(sessionId = it.id!!, week = it.week, date = it.date) }
     }
 

application/src/main/kotlin/core/application/session/presentation/controller/SessionQueryController.kt

@@ -39,7 +39,7 @@ class SessionQueryController(
     override fun getAllSessions(): CustomResponse<SessionListResponse> {
         val response =
             sessionQueryService
-                .getAllSessions()
+                .getAllCohortSessions()
                 .let { SessionMapper.toSessionListResponse(it) }
 
         return CustomResponse.ok(response)

domain/src/main/kotlin/core/domain/session/port/outbound/SessionPersistencePort.kt

@@ -6,7 +6,7 @@ import java.time.Instant
 interface SessionPersistencePort {
     fun findNextSessionBy(startOfToday: Instant): Session?
 
-    fun findAllSessions(cohortId: Long): List<Session>
+    fun findAllCohortSessions(cohortId: Long): List<Session>
 
     fun findSessionById(sessionId: Long): Session?
 

persistence/src/main/kotlin/core/persistence/cohort/repository/CohortJpaRepository.kt

@@ -4,5 +4,5 @@ import core.entity.cohort.CohortEntity
 import org.springframework.data.jpa.repository.JpaRepository
 
 interface CohortJpaRepository : JpaRepository<CohortEntity, Long> {
-    fun findByValue(value: String): CohortEntity
+    fun findByValue(value: String): CohortEntity?
 }

persistence/src/main/kotlin/core/persistence/cohort/repository/CohortRepository.kt

@@ -8,7 +8,5 @@ import org.springframework.stereotype.Repository
 class CohortRepository(
     private val cohortJpaRepository: CohortJpaRepository,
 ) : CohortPersistencePort {
-    override fun findByValue(value: String): Cohort? {
-        return cohortJpaRepository.findByValue(value).toDomain()
-    }
+    override fun findByValue(value: String): Cohort? = cohortJpaRepository.findByValue(value)?.toDomain()
 }

persistence/src/main/kotlin/core/persistence/session/repository/SessionRepository.kt

@@ -15,7 +15,7 @@ class SessionRepository(
     override fun findNextSessionBy(startOfToday: Instant): Session? =
         sessionJpaRepository.findFirstByDateAfterAndDeletedAtIsNullOrderByDateAsc(startOfToday)?.toDomain()
 
-    override fun findAllSessions(cohortId: Long): List<Session> =
+    override fun findAllCohortSessions(cohortId: Long): List<Session> =
         sessionJpaRepository.findAllByCohortIdAndDeletedAtIsNullOrderByIdAsc(cohortId).map { it.toDomain() }
 
     override fun findSessionById(sessionId: Long): Session? =