From 55ab7d5316d8823f7e61942e77ee76caa186f581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=A7=84?= <4mj.eo@dsm.hs.kr> Date: Mon, 30 Sep 2024 17:20:22 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20(#777)=20volunteer=5Fservice=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/aliens/dms/domain/school/dto/SchoolResponse.kt | 3 ++- .../team/aliens/dms/domain/school/model/AvailableFeature.kt | 4 +++- .../domain/school/usecase/QueryAvailableFeaturesUseCase.kt | 3 ++- .../persistence/school/entity/AvailableFeatureJpaEntity.kt | 3 +++ .../dms/persistence/school/mapper/AvailableFeatureMapper.kt | 6 ++++-- 5 files changed, 14 insertions(+), 5 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 index 9373c1bfa..9b310c66e 100644 --- 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 index 0e7971a8b..307ef1a8e 100644 --- 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/dms-core/src/main/kotlin/team/aliens/dms/domain/school/usecase/QueryAvailableFeaturesUseCase.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/school/usecase/QueryAvailableFeaturesUseCase.kt index d2ee93684..399b88572 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/school/usecase/QueryAvailableFeaturesUseCase.kt +++ b/dms-core/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-persistence/src/main/kotlin/team/aliens/dms/persistence/school/entity/AvailableFeatureJpaEntity.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/school/entity/AvailableFeatureJpaEntity.kt index 81e993f83..9327c1a9b 100644 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/school/entity/AvailableFeatureJpaEntity.kt +++ b/dms-persistence/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/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/school/mapper/AvailableFeatureMapper.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/school/mapper/AvailableFeatureMapper.kt index 5a69f1439..e0884a383 100644 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/school/mapper/AvailableFeatureMapper.kt +++ b/dms-persistence/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 ) } } From d939affcfad47775b696ab8067dbc71f96e99512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=A7=84?= <4mj.eo@dsm.hs.kr> Date: Mon, 30 Sep 2024 17:20:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20(#777)=20=EC=BB=AC=EB=9F=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V7__add_column_in_tbl_available_feature.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 dms-infrastructure/src/main/resources/db/migration/V7__add_column_in_tbl_available_feature.sql diff --git a/dms-infrastructure/src/main/resources/db/migration/V7__add_column_in_tbl_available_feature.sql b/dms-infrastructure/src/main/resources/db/migration/V7__add_column_in_tbl_available_feature.sql new file mode 100644 index 000000000..85cd5bbec --- /dev/null +++ b/dms-infrastructure/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; \ No newline at end of file From d4539b6d2b87a838e3cd8c7bcd06a8b342b38b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=A7=84?= <4mj.eo@dsm.hs.kr> Date: Mon, 30 Sep 2024 19:41:44 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20(#777)=20stub=EA=B0=9D=EC=B2=B4?= =?UTF-8?q?=EC=97=90=20volunteerService=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/aliens/dms/domain/school/stub/SchoolStub.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 index ed765ce0f..d359a5e25 100644 --- 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,7 +33,8 @@ 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, @@ -40,5 +42,6 @@ internal fun createAvailableFeatureStub( remainService = remainService, pointService = pointService, noticeService = noticeService, - outingService = outingService + outingService = outingService, + volunteerService = volunteerService )