🔀 :: (#188) 외출 복귀 시 외출증 조회 안되게 수정 (#117)

DSM-PICK · Jul 8, 2023 · dedd170 · dedd170
1 parent de9c807
commit dedd170
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.../pickserverspring/domain/application/persistence/adapter/ApplicationPersistenceAdapter.kt b/.../pickserverspring/domain/application/persistence/adapter/ApplicationPersistenceAdapter.kt
@@ -35,7 +35,10 @@ class ApplicationPersistenceAdapter(
             .selectFrom(applicationEntity)
             .innerJoin(applicationEntity.statusEntity, statusEntity)
             .on(applicationEntity.statusEntity.id.eq(statusId))
-            .where(statusEntity.studentId.eq(studentId))
+            .where(
+                statusEntity.studentId.eq(studentId),
+                applicationEntity.isReturn.eq(false),
+            )
             .fetchFirst()
             ?.let(applicationMapper::entityToDomain)
 }
diff --git a/...ckdsm/pickserverspring/domain/application/persistence/adapter/StatusPersistenceAdapter.kt b/...ckdsm/pickserverspring/domain/application/persistence/adapter/StatusPersistenceAdapter.kt
@@ -99,10 +99,13 @@ class StatusPersistenceAdapter(
     override fun queryPicnicStudentByStudentIdAndToday(studentId: UUID): Status? =
         jpaQueryFactory
             .selectFrom(statusEntity)
+            .join(applicationEntity)
+            .on(statusEntity.id.eq(applicationEntity.statusEntity.id))
             .where(
                 statusEntity.studentId.eq(studentId),
                 statusEntity.type.eq(StatusType.PICNIC),
                 statusEntity.date.eq(LocalDate.now()),
+                applicationEntity.isReturn.eq(false),
             )
             .fetchFirst()
             ?.let(statusMapper::entityToDomain)