merge: (#777) volunteer service 추가

team-aliens · Oct 4, 2024 · 13045c9 · 13045c9
2 parents b82efef + 3973af0
commit 13045c9
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 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
@@ -31,7 +31,8 @@ data class AvailableFeaturesResponse(
     val pointService: Boolean,
     val studyRoomService: Boolean,
     val remainService: Boolean,
-    val outingService: Boolean
+    val outingService: Boolean,
+    val volunteerService: 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
@@ -18,6 +18,8 @@ data class AvailableFeature(
 
     val remainService: Boolean,
 
-    val outingService: Boolean
+    val outingService: Boolean,
+
+    val volunteerService: 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
@@ -21,7 +21,8 @@ class QueryAvailableFeaturesUseCase(
             pointService = availableFeatures.pointService,
             studyRoomService = availableFeatures.studyRoomService,
             remainService = availableFeatures.remainService,
-            outingService = availableFeatures.outingService
+            outingService = availableFeatures.outingService,
+            volunteerService = availableFeatures.volunteerService
         )
     }
 }
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
@@ -2,6 +2,7 @@ package team.aliens.dms.domain.school.stub
 
 import team.aliens.dms.domain.school.model.AvailableFeature
 import team.aliens.dms.domain.school.model.School
+import team.aliens.dms.domain.volunteer.exception.VolunteerErrorCode
 import java.time.LocalDate
 import java.util.UUID
 
@@ -32,13 +33,15 @@ internal fun createAvailableFeatureStub(
     remainService: Boolean = true,
     pointService: Boolean = true,
     noticeService: Boolean = true,
-    outingService: Boolean = true
+    outingService: Boolean = true,
+    volunteerService: Boolean = true
 ) = AvailableFeature(
     schoolId = schoolId,
     mealService = mealService,
     studyRoomService = studyRoomService,
     remainService = remainService,
     pointService = pointService,
     noticeService = noticeService,
-    outingService = outingService
+    outingService = outingService,
+    volunteerService = volunteerService
 )
diff --git a/...nfrastructure/src/main/resources/db/migration/V7__add_column_in_tbl_available_feature.sql b/...nfrastructure/src/main/resources/db/migration/V7__add_column_in_tbl_available_feature.sql
@@ -0,0 +1 @@
+alter table tbl_available_feature add column volunteer_service tinyint(1) not null;
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
@@ -40,4 +40,7 @@ class AvailableFeatureJpaEntity(
     @Column(columnDefinition = "TINYINT(1)", nullable = false)
     val outingService: Boolean,
 
+    @Column(columnDefinition = "TINYINT(1)", nullable = false)
+    val volunteerService: 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
@@ -21,7 +21,8 @@ class AvailableFeatureMapper(
                 pointService = entity.pointService,
                 studyRoomService = entity.studyRoomService,
                 remainService = entity.remainService,
-                outingService = entity.outingService
+                outingService = entity.outingService,
+                volunteerService = entity.volunteerService
             )
         }
     }
@@ -37,7 +38,8 @@ class AvailableFeatureMapper(
             pointService = domain.pointService,
             studyRoomService = domain.studyRoomService,
             remainService = domain.remainService,
-            outingService = domain.outingService
+            outingService = domain.outingService,
+            volunteerService = domain.volunteerService
         )
     }
 }