merge: (#614) available feature에 outingService 추가

team-aliens · Apr 25, 2024 · c1a2ef8 · c1a2ef8
2 parents ea5387d + 78dab4a
commit c1a2ef8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/school/dto/SchoolResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/school/dto/SchoolResponse.kt
@@ -30,7 +30,8 @@ data class AvailableFeaturesResponse(
     val noticeService: Boolean,
     val pointService: Boolean,
     val studyRoomService: Boolean,
-    val remainService: Boolean
+    val remainService: Boolean,
+    val outingService: Boolean
 )
 
 data class NeisSchoolResponse(

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/school/model/AvailableFeature.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/school/model/AvailableFeature.kt
@@ -16,6 +16,8 @@ data class AvailableFeature(
 
     val studyRoomService: Boolean,
 
-    val remainService: Boolean
+    val remainService: Boolean,
+
+    val outingService: Boolean
 
 )
diff --git a/...re/src/main/kotlin/team/aliens/dms/domain/school/usecase/QueryAvailableFeaturesUseCase.kt b/...re/src/main/kotlin/team/aliens/dms/domain/school/usecase/QueryAvailableFeaturesUseCase.kt
@@ -20,7 +20,8 @@ class QueryAvailableFeaturesUseCase(
             noticeService = availableFeatures.noticeService,
             pointService = availableFeatures.pointService,
             studyRoomService = availableFeatures.studyRoomService,
-            remainService = availableFeatures.remainService
+            remainService = availableFeatures.remainService,
+            outingService = availableFeatures.outingService
         )
     }
 }
diff --git a/dms-core/src/test/kotlin/team/aliens/dms/domain/school/stub/SchoolStub.kt b/dms-core/src/test/kotlin/team/aliens/dms/domain/school/stub/SchoolStub.kt
@@ -32,11 +32,13 @@ internal fun createAvailableFeatureStub(
     remainService: Boolean = true,
     pointService: Boolean = true,
     noticeService: Boolean = true,
+    outingService: Boolean = true
 ) = AvailableFeature(
     schoolId = schoolId,
     mealService = mealService,
     studyRoomService = studyRoomService,
     remainService = remainService,
     pointService = pointService,
-    noticeService = noticeService
+    noticeService = noticeService,
+    outingService = outingService
 )
diff --git a/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/...src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt
@@ -15,7 +15,6 @@ import team.aliens.dms.persistence.outing.entity.QOutingApplicationJpaEntity.out
 import team.aliens.dms.persistence.outing.entity.QOutingCompanionJpaEntity.outingCompanionJpaEntity
 import team.aliens.dms.persistence.outing.entity.QOutingTypeJpaEntity.outingTypeJpaEntity
 import team.aliens.dms.persistence.outing.mapper.OutingApplicationMapper
-import team.aliens.dms.persistence.outing.mapper.OutingCompanionMapper
 import team.aliens.dms.persistence.outing.repository.OutingApplicationJpaRepository
 import team.aliens.dms.persistence.outing.repository.OutingCompanionJpaRepository
 import team.aliens.dms.persistence.outing.repository.vo.QQueryCurrentOutingApplicationVO
@@ -153,7 +152,8 @@ class OutingApplicationPersistenceAdapter(
 
     override fun deleteOutingApplication(outingApplication: OutingApplication) {
         outingCompanionsRepository.deleteAllByOutingApplication(
-                outingApplicationMapper.toEntity(outingApplication))
+            outingApplicationMapper.toEntity(outingApplication)
+        )
 
         outingApplicationRepository.delete(
             outingApplicationMapper.toEntity(outingApplication)

diff --git a/...ce/src/main/kotlin/team/aliens/dms/persistence/school/entity/AvailableFeatureJpaEntity.kt b/...ce/src/main/kotlin/team/aliens/dms/persistence/school/entity/AvailableFeatureJpaEntity.kt
@@ -35,6 +35,9 @@ class AvailableFeatureJpaEntity(
     val studyRoomService: Boolean,
 
     @Column(columnDefinition = "TINYINT(1)", nullable = false)
-    val remainService: Boolean
+    val remainService: Boolean,
+
+    @Column(columnDefinition = "TINYINT(1)", nullable = false)
+    val outingService: Boolean,
 
 )
diff --git a/...tence/src/main/kotlin/team/aliens/dms/persistence/school/mapper/AvailableFeatureMapper.kt b/...tence/src/main/kotlin/team/aliens/dms/persistence/school/mapper/AvailableFeatureMapper.kt
@@ -20,7 +20,8 @@ class AvailableFeatureMapper(
                 noticeService = entity.noticeService,
                 pointService = entity.pointService,
                 studyRoomService = entity.studyRoomService,
-                remainService = entity.remainService
+                remainService = entity.remainService,
+                outingService = entity.outingService
             )
         }
     }
@@ -35,7 +36,8 @@ class AvailableFeatureMapper(
             noticeService = domain.noticeService,
             pointService = domain.pointService,
             studyRoomService = domain.studyRoomService,
-            remainService = domain.remainService
+            remainService = domain.remainService,
+            outingService = domain.outingService
         )
     }
 }