Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge: (#777) volunteer service 추가 #778

Merged
merged 4 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ data class AvailableFeature(

val remainService: Boolean,

val outingService: Boolean
val outingService: Boolean,

val volunteerService: Boolean

)
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class QueryAvailableFeaturesUseCase(
pointService = availableFeatures.pointService,
studyRoomService = availableFeatures.studyRoomService,
remainService = availableFeatures.remainService,
outingService = availableFeatures.outingService
outingService = availableFeatures.outingService,
volunteerService = availableFeatures.volunteerService
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alter table tbl_available_feature add column volunteer_service tinyint(1) not null;
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ class AvailableFeatureJpaEntity(
@Column(columnDefinition = "TINYINT(1)", nullable = false)
val outingService: Boolean,

@Column(columnDefinition = "TINYINT(1)", nullable = false)
val volunteerService: Boolean

)
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class AvailableFeatureMapper(
pointService = entity.pointService,
studyRoomService = entity.studyRoomService,
remainService = entity.remainService,
outingService = entity.outingService
outingService = entity.outingService,
volunteerService = entity.volunteerService
)
}
}
Expand All @@ -37,7 +38,8 @@ class AvailableFeatureMapper(
pointService = domain.pointService,
studyRoomService = domain.studyRoomService,
remainService = domain.remainService,
outingService = domain.outingService
outingService = domain.outingService,
volunteerService = domain.volunteerService
)
}
}
Loading