From f4dea653e4e3a5f69cb182d91d602a87ef3151ba Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 10:52:08 +0900 Subject: [PATCH 01/20] =?UTF-8?q?add=20::=20endpoint=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/attendance/presentation/AttendanceController.kt | 7 +++++++ .../kotlin/com/msg/gcms/global/security/SecurityConfig.kt | 1 + 2 files changed, 8 insertions(+) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt index c3beae0d..d2bc0e7f 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt @@ -5,6 +5,7 @@ import com.msg.gcms.domain.attendance.presentation.data.dto.UserAttendanceStatus import com.msg.gcms.domain.attendance.presentation.data.request.CreateScheduleRequestDto import com.msg.gcms.domain.attendance.presentation.data.request.UpdateAttendanceStatusBatchRequestDto import com.msg.gcms.domain.attendance.presentation.data.request.UpdateAttendanceStatusRequestDto +import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto import com.msg.gcms.domain.attendance.service.* import com.msg.gcms.domain.attendance.util.AttendanceConverter import com.msg.gcms.domain.attendance.util.ScheduleConverter @@ -27,6 +28,7 @@ class AttendanceController( private val updateAttendanceStatusService: UpdateAttendanceStatusService, private val updateAttendanceStatusBatchService: UpdateAttendanceStatusBatchService, private val clubAttendanceStatusExcelService: ClubAttendanceStatusExcelService, + private val findAttendSelfCheckService: FindAttendSelfCheckService, private val scheduleConverter: ScheduleConverter, private val attendanceConverter: AttendanceConverter ) { @@ -71,4 +73,9 @@ class AttendanceController( response.setHeader("Content-Disposition", "attachment; filename=${URLEncoder.encode("$currentDate 출석부", "UTF-8").replace("+", "%20")}.xlsx") return clubAttendanceStatusExcelService.execute(currentDate) } + + @GetMapping("/{club_id}/my") + fun findAttendSelfCheck(@PathVariable("club_id") id: Long): ResponseEntity = + findAttendSelfCheckService.execute(id) + .let { ResponseEntity.ok(it) } } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/global/security/SecurityConfig.kt b/src/main/kotlin/com/msg/gcms/global/security/SecurityConfig.kt index 77052a19..030ccbdd 100644 --- a/src/main/kotlin/com/msg/gcms/global/security/SecurityConfig.kt +++ b/src/main/kotlin/com/msg/gcms/global/security/SecurityConfig.kt @@ -45,6 +45,7 @@ class SecurityConfig( .antMatchers(HttpMethod.PATCH, "/attend/batch").authenticated() .antMatchers(HttpMethod.PATCH, "/attend").authenticated() .antMatchers(HttpMethod.GET, "/attend/excel").hasRole("ADMIN") + .antMatchers(HttpMethod.GET, "/attend/{club_id}/my").hasAnyRole("STUDENT") .antMatchers(HttpMethod.POST, "/notification/{club_id}").authenticated() .antMatchers(HttpMethod.GET, "/notification/{id}").authenticated() From 208353cd99e19c950c337d2ac216d4708cfe3cfc Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 10:52:25 +0900 Subject: [PATCH 02/20] add :: AttendSelfCheckResponseDto --- .../data/response/AttendSelfCheckResponseDto.kt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt new file mode 100644 index 00000000..d00a2c94 --- /dev/null +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt @@ -0,0 +1,7 @@ +package com.msg.gcms.domain.attendance.presentation.data.response + +import com.msg.gcms.domain.attendance.domain.enums.AttendanceStatus + +data class AttendSelfCheckResponseDto( + val attendanceStatus: AttendanceStatus +) From 6f37a6d6b7a88c000bfa1c207e66a7fd628f7012 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 10:52:56 +0900 Subject: [PATCH 03/20] =?UTF-8?q?add=20::=20AttendanceConverter=20?= =?UTF-8?q?=EC=B6=94=EC=83=81=ED=99=94=20=EB=B0=8F=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msg/gcms/domain/attendance/util/AttendanceConverter.kt | 3 +++ .../domain/attendance/util/impl/AttendanceConverterImpl.kt | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/util/AttendanceConverter.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/util/AttendanceConverter.kt index 49f7cc99..868e1b97 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/util/AttendanceConverter.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/util/AttendanceConverter.kt @@ -9,6 +9,7 @@ import com.msg.gcms.domain.attendance.presentation.data.dto.AttendanceDto.Attend import com.msg.gcms.domain.attendance.presentation.data.dto.UserAttendanceStatusListDto import com.msg.gcms.domain.attendance.presentation.data.request.UpdateAttendanceStatusBatchRequestDto import com.msg.gcms.domain.attendance.presentation.data.request.UpdateAttendanceStatusRequestDto +import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto import com.msg.gcms.domain.user.domain.entity.User interface AttendanceConverter { @@ -23,4 +24,6 @@ interface AttendanceConverter { fun toDto(attendanceStatusDto: UpdateAttendanceStatusBatchRequestDto): AttendanceBatchDto fun toDto(user: User, attendance: Attendance): UserAttendanceStatusListDto.UserAttendanceStatusDto fun toListDto(attendances: List): UserAttendanceStatusListDto + + fun toDto(attendance: Attendance): AttendSelfCheckResponseDto } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt index e47518d3..3e5c9df5 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt @@ -9,6 +9,7 @@ import com.msg.gcms.domain.attendance.presentation.data.dto.AttendanceDto.Attend import com.msg.gcms.domain.attendance.presentation.data.dto.UserAttendanceStatusListDto import com.msg.gcms.domain.attendance.presentation.data.request.UpdateAttendanceStatusBatchRequestDto import com.msg.gcms.domain.attendance.presentation.data.request.UpdateAttendanceStatusRequestDto +import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto import com.msg.gcms.domain.attendance.util.AttendanceConverter import com.msg.gcms.domain.user.domain.entity.User import org.springframework.stereotype.Component @@ -39,6 +40,11 @@ class AttendanceConverterImpl : AttendanceConverter { number = user.number, attendanceStatus = attendance.attendanceStatus ) + + override fun toDto(attendance: Attendance): AttendSelfCheckResponseDto = AttendSelfCheckResponseDto( + attendanceStatus = attendance.attendanceStatus + ) + override fun toDto(attendanceStatusDto: UpdateAttendanceStatusRequestDto): AttendanceDto = AttendanceDto( id = attendanceStatusDto.attendanceId, attendanceStatus = attendanceStatusDto.attendanceStatus From 77dc7c3a913375ba49f2ef1297fa34d907a1eefa Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 10:53:36 +0900 Subject: [PATCH 04/20] add :: AttendanceRepository --- .../gcms/domain/attendance/repository/AttendanceRepository.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt index 04b92480..09ceb0b6 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt @@ -3,6 +3,7 @@ package com.msg.gcms.domain.attendance.repository import com.msg.gcms.domain.attendance.domain.entity.Attendance import com.msg.gcms.domain.attendance.domain.entity.Schedule import com.msg.gcms.domain.attendance.domain.enums.Period +import com.msg.gcms.domain.user.domain.entity.User import org.springframework.data.jpa.repository.EntityGraph import org.springframework.data.repository.CrudRepository @@ -12,4 +13,6 @@ interface AttendanceRepository : CrudRepository, CustomAttenda fun findAllByIdIn(ids: List): List @EntityGraph(attributePaths = ["user"]) fun findAllBySchedule(schedule: Schedule): List + + fun findByPeriodAndUser (period: Period, user: User): Attendance } \ No newline at end of file From 466a44dee3abe666453b5597e48834a4178fa2b8 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 10:53:52 +0900 Subject: [PATCH 05/20] add :: FindAttendSelfCheckService --- .../attendance/service/FindAttendSelfCheckService.kt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt new file mode 100644 index 00000000..2cf058c4 --- /dev/null +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt @@ -0,0 +1,7 @@ +package com.msg.gcms.domain.attendance.service + +import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto + +interface FindAttendSelfCheckService { + fun execute(id : Long) : AttendSelfCheckResponseDto +} \ No newline at end of file From cb8dfa76ce39b92db8eb798a76e863c8bef50502 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 10:53:58 +0900 Subject: [PATCH 06/20] add :: FindAttendSelfCheckServiceImpl --- .../impl/FindAttendSelfCheckServiceImpl.kt | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt new file mode 100644 index 00000000..f7142d70 --- /dev/null +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt @@ -0,0 +1,48 @@ +package com.msg.gcms.domain.attendance.service.impl + +import com.msg.gcms.domain.attendance.domain.enums.Period +import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto +import com.msg.gcms.domain.attendance.repository.AttendanceRepository +import com.msg.gcms.domain.attendance.service.FindAttendSelfCheckService +import com.msg.gcms.domain.attendance.util.AttendanceConverter +import com.msg.gcms.domain.club.domain.repository.ClubRepository +import com.msg.gcms.domain.club.exception.ClubNotFoundException +import com.msg.gcms.domain.club.exception.NotClubMemberException +import com.msg.gcms.global.annotation.ServiceWithReadOnlyTransaction +import com.msg.gcms.global.util.UserUtil +import org.springframework.data.repository.findByIdOrNull + +@ServiceWithReadOnlyTransaction +class FindAttendSelfCheckServiceImpl ( + private val userUtil: UserUtil, + private val attendanceRepository: AttendanceRepository, + private val clubRepository: ClubRepository, + private val attendanceConverter: AttendanceConverter +): FindAttendSelfCheckService { + override fun execute(id: Long): AttendSelfCheckResponseDto { + val user = userUtil.fetchCurrentUser() + val club = clubRepository.findByIdOrNull(id) + ?: throw ClubNotFoundException() + + if (club.user != user) { + throw NotClubMemberException() + } + + val period = getCurrentPeriod() + val attend = attendanceRepository.findByPeriodAndUser(period, user) + + return attendanceConverter.toDto(attend) + } + + fun getCurrentPeriod(): Period { + val currentTime = java.time.LocalTime.now() + + Period.values().reversed().map { + if(currentTime.isAfter(it.time)) + return it + } + + return Period.ELEVENTH + } + +} \ No newline at end of file From 9b28ac5dd3bb82172c74eed2cd57d23015576a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=83=9C=EC=97=B0?= <132069501+ta2ye0n@users.noreply.github.com> Date: Fri, 26 Apr 2024 11:28:37 +0900 Subject: [PATCH 07/20] Update src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 김태오 <103710151+KimTaeO@users.noreply.github.com> --- .../service/impl/FindAttendSelfCheckServiceImpl.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt index f7142d70..fbc04d3b 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt @@ -35,13 +35,10 @@ class FindAttendSelfCheckServiceImpl ( } fun getCurrentPeriod(): Period { - val currentTime = java.time.LocalTime.now() - - Period.values().reversed().map { - if(currentTime.isAfter(it.time)) + Period.values().reversed().forEach { + if (LocalTime.now().isAfter(it.time)) return it - } - + } return Period.ELEVENTH } From 2bb95fe60477ffcdfe0defe9abf3674f5ffebced Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 11:48:33 +0900 Subject: [PATCH 08/20] =?UTF-8?q?add=20::=20import=EB=AC=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendance/service/impl/FindAttendSelfCheckServiceImpl.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt index fbc04d3b..b3be2969 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt @@ -11,6 +11,7 @@ import com.msg.gcms.domain.club.exception.NotClubMemberException import com.msg.gcms.global.annotation.ServiceWithReadOnlyTransaction import com.msg.gcms.global.util.UserUtil import org.springframework.data.repository.findByIdOrNull +import java.time.LocalTime @ServiceWithReadOnlyTransaction class FindAttendSelfCheckServiceImpl ( From ac7ee87c8dff9efe925f8dce32db02699f66f47b Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 14:03:12 +0900 Subject: [PATCH 09/20] =?UTF-8?q?refactor=20::=20=ED=95=B4=EB=8B=B9=20?= =?UTF-8?q?=EB=8F=99=EC=95=84=EB=A6=AC=EC=9D=98=20=EC=86=8C=EC=86=8D?= =?UTF-8?q?=EC=9D=B4=20=EC=95=84=EB=8B=90=20=EB=95=8C=20=EC=98=88=EC=99=B8?= =?UTF-8?q?=20=EB=B0=9C=EC=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FindAttendSelfCheckServiceImpl.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt index b3be2969..fea601c1 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt @@ -8,6 +8,7 @@ import com.msg.gcms.domain.attendance.util.AttendanceConverter import com.msg.gcms.domain.club.domain.repository.ClubRepository import com.msg.gcms.domain.club.exception.ClubNotFoundException import com.msg.gcms.domain.club.exception.NotClubMemberException +import com.msg.gcms.domain.clubMember.domain.repository.ClubMemberRepository import com.msg.gcms.global.annotation.ServiceWithReadOnlyTransaction import com.msg.gcms.global.util.UserUtil import org.springframework.data.repository.findByIdOrNull @@ -18,16 +19,16 @@ class FindAttendSelfCheckServiceImpl ( private val userUtil: UserUtil, private val attendanceRepository: AttendanceRepository, private val clubRepository: ClubRepository, - private val attendanceConverter: AttendanceConverter + private val attendanceConverter: AttendanceConverter, + private val clubMemberRepository: ClubMemberRepository ): FindAttendSelfCheckService { override fun execute(id: Long): AttendSelfCheckResponseDto { val user = userUtil.fetchCurrentUser() val club = clubRepository.findByIdOrNull(id) ?: throw ClubNotFoundException() - if (club.user != user) { - throw NotClubMemberException() - } + clubMemberRepository.findByUserAndClub(user, club) + ?: throw NotClubMemberException() val period = getCurrentPeriod() val attend = attendanceRepository.findByPeriodAndUser(period, user) From 47647bce290eca17e7b098c13b1ee8961063be7e Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 14:04:23 +0900 Subject: [PATCH 10/20] =?UTF-8?q?refactor=20::=20schedule=20=EC=B0=BE?= =?UTF-8?q?=EB=8A=94=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FindAttendSelfCheckServiceImpl.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt index fea601c1..fc2ee691 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt @@ -1,8 +1,10 @@ package com.msg.gcms.domain.attendance.service.impl import com.msg.gcms.domain.attendance.domain.enums.Period +import com.msg.gcms.domain.attendance.exception.ScheduleNotFoundException import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto import com.msg.gcms.domain.attendance.repository.AttendanceRepository +import com.msg.gcms.domain.attendance.repository.ScheduleRepository import com.msg.gcms.domain.attendance.service.FindAttendSelfCheckService import com.msg.gcms.domain.attendance.util.AttendanceConverter import com.msg.gcms.domain.club.domain.repository.ClubRepository @@ -12,6 +14,7 @@ import com.msg.gcms.domain.clubMember.domain.repository.ClubMemberRepository import com.msg.gcms.global.annotation.ServiceWithReadOnlyTransaction import com.msg.gcms.global.util.UserUtil import org.springframework.data.repository.findByIdOrNull +import java.time.LocalDate import java.time.LocalTime @ServiceWithReadOnlyTransaction @@ -20,7 +23,8 @@ class FindAttendSelfCheckServiceImpl ( private val attendanceRepository: AttendanceRepository, private val clubRepository: ClubRepository, private val attendanceConverter: AttendanceConverter, - private val clubMemberRepository: ClubMemberRepository + private val clubMemberRepository: ClubMemberRepository, + private val scheduleRepository: ScheduleRepository ): FindAttendSelfCheckService { override fun execute(id: Long): AttendSelfCheckResponseDto { val user = userUtil.fetchCurrentUser() @@ -31,9 +35,11 @@ class FindAttendSelfCheckServiceImpl ( ?: throw NotClubMemberException() val period = getCurrentPeriod() - val attend = attendanceRepository.findByPeriodAndUser(period, user) - return attendanceConverter.toDto(attend) + scheduleRepository.findByClubAndDate(club, LocalDate.now())?.let { + val attend = attendanceRepository.findByPeriodAndUser(period, user) + return attendanceConverter.toDto(attend) + } ?: throw ScheduleNotFoundException() } fun getCurrentPeriod(): Period { From 21e2e6a6a346d8b07861b015fe403fff3f2e6ded Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 14:07:02 +0900 Subject: [PATCH 11/20] =?UTF-8?q?refactor=20::=20=EB=93=A4=EC=97=AC?= =?UTF-8?q?=EC=93=B0=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendance/presentation/AttendanceController.kt | 4 ++-- .../data/response/AttendSelfCheckResponseDto.kt | 2 +- .../service/impl/FindAttendSelfCheckServiceImpl.kt | 12 ++++++------ .../attendance/util/impl/AttendanceConverterImpl.kt | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt index d2bc0e7f..2a74575b 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt @@ -76,6 +76,6 @@ class AttendanceController( @GetMapping("/{club_id}/my") fun findAttendSelfCheck(@PathVariable("club_id") id: Long): ResponseEntity = - findAttendSelfCheckService.execute(id) - .let { ResponseEntity.ok(it) } + findAttendSelfCheckService.execute(id) + .let { ResponseEntity.ok(it) } } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt index d00a2c94..a96732e6 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/data/response/AttendSelfCheckResponseDto.kt @@ -3,5 +3,5 @@ package com.msg.gcms.domain.attendance.presentation.data.response import com.msg.gcms.domain.attendance.domain.enums.AttendanceStatus data class AttendSelfCheckResponseDto( - val attendanceStatus: AttendanceStatus + val attendanceStatus: AttendanceStatus ) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt index fc2ee691..435c987a 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt @@ -19,12 +19,12 @@ import java.time.LocalTime @ServiceWithReadOnlyTransaction class FindAttendSelfCheckServiceImpl ( - private val userUtil: UserUtil, - private val attendanceRepository: AttendanceRepository, - private val clubRepository: ClubRepository, - private val attendanceConverter: AttendanceConverter, - private val clubMemberRepository: ClubMemberRepository, - private val scheduleRepository: ScheduleRepository + private val userUtil: UserUtil, + private val attendanceRepository: AttendanceRepository, + private val clubRepository: ClubRepository, + private val attendanceConverter: AttendanceConverter, + private val clubMemberRepository: ClubMemberRepository, + private val scheduleRepository: ScheduleRepository ): FindAttendSelfCheckService { override fun execute(id: Long): AttendSelfCheckResponseDto { val user = userUtil.fetchCurrentUser() diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt index 3e5c9df5..013ff747 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/util/impl/AttendanceConverterImpl.kt @@ -42,7 +42,7 @@ class AttendanceConverterImpl : AttendanceConverter { ) override fun toDto(attendance: Attendance): AttendSelfCheckResponseDto = AttendSelfCheckResponseDto( - attendanceStatus = attendance.attendanceStatus + attendanceStatus = attendance.attendanceStatus ) override fun toDto(attendanceStatusDto: UpdateAttendanceStatusRequestDto): AttendanceDto = AttendanceDto( From 056775c32a431ec54df58685e95a2b9a8c9e7c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=83=9C=EC=97=B0?= <132069501+ta2ye0n@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:10:21 +0900 Subject: [PATCH 12/20] Update src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 노현주 <106813267+ani2689@users.noreply.github.com> --- .../domain/attendance/service/FindAttendSelfCheckService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt index 2cf058c4..29dd6f7d 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt @@ -3,5 +3,5 @@ package com.msg.gcms.domain.attendance.service import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto interface FindAttendSelfCheckService { - fun execute(id : Long) : AttendSelfCheckResponseDto + fun execute(id: Long) : AttendSelfCheckResponseDto } \ No newline at end of file From ccc2fa7ea557c141b335252b19887c8d73542e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=83=9C=EC=97=B0?= <132069501+ta2ye0n@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:10:44 +0900 Subject: [PATCH 13/20] Update src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 노현주 <106813267+ani2689@users.noreply.github.com> --- .../gcms/domain/attendance/presentation/AttendanceController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt index 2a74575b..b32cf5e7 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt @@ -75,7 +75,7 @@ class AttendanceController( } @GetMapping("/{club_id}/my") - fun findAttendSelfCheck(@PathVariable("club_id") id: Long): ResponseEntity = + fun findAttendSelfCheck(@PathVariable("club_id") clubId: Long): ResponseEntity = findAttendSelfCheckService.execute(id) .let { ResponseEntity.ok(it) } } \ No newline at end of file From 27da25937864f23178a42b611c2972839b9f3cb4 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 14:14:44 +0900 Subject: [PATCH 14/20] =?UTF-8?q?refactor=20::=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gcms/domain/attendance/presentation/AttendanceController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt index b32cf5e7..a8a96357 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt @@ -76,6 +76,6 @@ class AttendanceController( @GetMapping("/{club_id}/my") fun findAttendSelfCheck(@PathVariable("club_id") clubId: Long): ResponseEntity = - findAttendSelfCheckService.execute(id) + findAttendSelfCheckService.execute(clubId) .let { ResponseEntity.ok(it) } } \ No newline at end of file From adf3a6463d805c0715c434adb1110c92c1970bc8 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 15:57:15 +0900 Subject: [PATCH 15/20] =?UTF-8?q?refactor=20::=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/AttendanceController.kt | 20 +++++++++---------- ...e.kt => FindCurrentAttendStautsService.kt} | 2 +- ... => FindCurrentAttendStautsServiceImpl.kt} | 6 +++--- 3 files changed, 13 insertions(+), 15 deletions(-) rename src/main/kotlin/com/msg/gcms/domain/attendance/service/{FindAttendSelfCheckService.kt => FindCurrentAttendStautsService.kt} (82%) rename src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/{FindAttendSelfCheckServiceImpl.kt => FindCurrentAttendStautsServiceImpl.kt} (93%) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt index a8a96357..935b174e 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt @@ -14,23 +14,21 @@ import org.springframework.format.annotation.DateTimeFormat import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import java.net.URL import java.net.URLEncoder import java.time.LocalDate -import java.util.* import javax.servlet.http.HttpServletResponse import javax.validation.Valid @RequestController("/attend") class AttendanceController( - private val createScheduleService: CreateScheduleService, - private val queryCurrentAttendConditionService: QueryCurrentAttendConditionService, - private val updateAttendanceStatusService: UpdateAttendanceStatusService, - private val updateAttendanceStatusBatchService: UpdateAttendanceStatusBatchService, - private val clubAttendanceStatusExcelService: ClubAttendanceStatusExcelService, - private val findAttendSelfCheckService: FindAttendSelfCheckService, - private val scheduleConverter: ScheduleConverter, - private val attendanceConverter: AttendanceConverter + private val createScheduleService: CreateScheduleService, + private val queryCurrentAttendConditionService: QueryCurrentAttendConditionService, + private val updateAttendanceStatusService: UpdateAttendanceStatusService, + private val updateAttendanceStatusBatchService: UpdateAttendanceStatusBatchService, + private val clubAttendanceStatusExcelService: ClubAttendanceStatusExcelService, + private val findCurrentAttendSelfCheckService: FindCurrentAttendStautsService, + private val scheduleConverter: ScheduleConverter, + private val attendanceConverter: AttendanceConverter ) { @PostMapping("/{club_id}/club") fun createSchedule( @@ -76,6 +74,6 @@ class AttendanceController( @GetMapping("/{club_id}/my") fun findAttendSelfCheck(@PathVariable("club_id") clubId: Long): ResponseEntity = - findAttendSelfCheckService.execute(clubId) + findCurrentAttendSelfCheckService.execute(clubId) .let { ResponseEntity.ok(it) } } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindCurrentAttendStautsService.kt similarity index 82% rename from src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt rename to src/main/kotlin/com/msg/gcms/domain/attendance/service/FindCurrentAttendStautsService.kt index 29dd6f7d..5e51e6db 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindAttendSelfCheckService.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindCurrentAttendStautsService.kt @@ -2,6 +2,6 @@ package com.msg.gcms.domain.attendance.service import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto -interface FindAttendSelfCheckService { +interface FindCurrentAttendStautsService { fun execute(id: Long) : AttendSelfCheckResponseDto } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt similarity index 93% rename from src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt rename to src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt index 435c987a..744c01bb 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindAttendSelfCheckServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt @@ -5,7 +5,7 @@ import com.msg.gcms.domain.attendance.exception.ScheduleNotFoundException import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto import com.msg.gcms.domain.attendance.repository.AttendanceRepository import com.msg.gcms.domain.attendance.repository.ScheduleRepository -import com.msg.gcms.domain.attendance.service.FindAttendSelfCheckService +import com.msg.gcms.domain.attendance.service.FindCurrentAttendStautsService import com.msg.gcms.domain.attendance.util.AttendanceConverter import com.msg.gcms.domain.club.domain.repository.ClubRepository import com.msg.gcms.domain.club.exception.ClubNotFoundException @@ -18,14 +18,14 @@ import java.time.LocalDate import java.time.LocalTime @ServiceWithReadOnlyTransaction -class FindAttendSelfCheckServiceImpl ( +class FindCurrentAttendStautsServiceImpl ( private val userUtil: UserUtil, private val attendanceRepository: AttendanceRepository, private val clubRepository: ClubRepository, private val attendanceConverter: AttendanceConverter, private val clubMemberRepository: ClubMemberRepository, private val scheduleRepository: ScheduleRepository -): FindAttendSelfCheckService { +): FindCurrentAttendStautsService { override fun execute(id: Long): AttendSelfCheckResponseDto { val user = userUtil.fetchCurrentUser() val club = clubRepository.findByIdOrNull(id) From 672b04e64b9e3d58456696a91123ea12ca14c27b Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 19:42:02 +0900 Subject: [PATCH 16/20] =?UTF-8?q?refactor=20::=20exists=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FindCurrentAttendStautsServiceImpl.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt index 744c01bb..a3a54095 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt @@ -31,8 +31,9 @@ class FindCurrentAttendStautsServiceImpl ( val club = clubRepository.findByIdOrNull(id) ?: throw ClubNotFoundException() - clubMemberRepository.findByUserAndClub(user, club) - ?: throw NotClubMemberException() + if (clubMemberRepository.existsByUserAndClub(user, club)) { + throw NotClubMemberException() + } val period = getCurrentPeriod() From 677b10e91358f15b09860cf3a8094f668bf2407e Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 19:45:12 +0900 Subject: [PATCH 17/20] =?UTF-8?q?refactor=20::=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/attendance/presentation/AttendanceController.kt | 4 ++-- ...dStautsService.kt => QueryCurrentAttendStatusService.kt} | 2 +- ...erviceImpl.kt => QueryCurrentAttendStatusServiceImpl.kt} | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/main/kotlin/com/msg/gcms/domain/attendance/service/{FindCurrentAttendStautsService.kt => QueryCurrentAttendStatusService.kt} (81%) rename src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/{FindCurrentAttendStautsServiceImpl.kt => QueryCurrentAttendStatusServiceImpl.kt} (93%) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt index 935b174e..f4b7f0c4 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/presentation/AttendanceController.kt @@ -26,7 +26,7 @@ class AttendanceController( private val updateAttendanceStatusService: UpdateAttendanceStatusService, private val updateAttendanceStatusBatchService: UpdateAttendanceStatusBatchService, private val clubAttendanceStatusExcelService: ClubAttendanceStatusExcelService, - private val findCurrentAttendSelfCheckService: FindCurrentAttendStautsService, + private val queryCurrentAttendStatusService: QueryCurrentAttendStatusService, private val scheduleConverter: ScheduleConverter, private val attendanceConverter: AttendanceConverter ) { @@ -74,6 +74,6 @@ class AttendanceController( @GetMapping("/{club_id}/my") fun findAttendSelfCheck(@PathVariable("club_id") clubId: Long): ResponseEntity = - findCurrentAttendSelfCheckService.execute(clubId) + queryCurrentAttendStatusService.execute(clubId) .let { ResponseEntity.ok(it) } } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindCurrentAttendStautsService.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/QueryCurrentAttendStatusService.kt similarity index 81% rename from src/main/kotlin/com/msg/gcms/domain/attendance/service/FindCurrentAttendStautsService.kt rename to src/main/kotlin/com/msg/gcms/domain/attendance/service/QueryCurrentAttendStatusService.kt index 5e51e6db..253f156f 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/FindCurrentAttendStautsService.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/QueryCurrentAttendStatusService.kt @@ -2,6 +2,6 @@ package com.msg.gcms.domain.attendance.service import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto -interface FindCurrentAttendStautsService { +interface QueryCurrentAttendStatusService { fun execute(id: Long) : AttendSelfCheckResponseDto } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt similarity index 93% rename from src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt rename to src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt index a3a54095..08aff84c 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/FindCurrentAttendStautsServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt @@ -5,7 +5,7 @@ import com.msg.gcms.domain.attendance.exception.ScheduleNotFoundException import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto import com.msg.gcms.domain.attendance.repository.AttendanceRepository import com.msg.gcms.domain.attendance.repository.ScheduleRepository -import com.msg.gcms.domain.attendance.service.FindCurrentAttendStautsService +import com.msg.gcms.domain.attendance.service.QueryCurrentAttendStatusService import com.msg.gcms.domain.attendance.util.AttendanceConverter import com.msg.gcms.domain.club.domain.repository.ClubRepository import com.msg.gcms.domain.club.exception.ClubNotFoundException @@ -18,14 +18,14 @@ import java.time.LocalDate import java.time.LocalTime @ServiceWithReadOnlyTransaction -class FindCurrentAttendStautsServiceImpl ( +class QueryCurrentAttendStatusServiceImpl ( private val userUtil: UserUtil, private val attendanceRepository: AttendanceRepository, private val clubRepository: ClubRepository, private val attendanceConverter: AttendanceConverter, private val clubMemberRepository: ClubMemberRepository, private val scheduleRepository: ScheduleRepository -): FindCurrentAttendStautsService { +): QueryCurrentAttendStatusService { override fun execute(id: Long): AttendSelfCheckResponseDto { val user = userUtil.fetchCurrentUser() val club = clubRepository.findByIdOrNull(id) From 594c3092a6579eb0f6d5a0c7d06833cf672b27c7 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 20:03:43 +0900 Subject: [PATCH 18/20] =?UTF-8?q?refactor=20::=20=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QueryCurrentAttendStatusServiceImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt index 08aff84c..43481102 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt @@ -31,7 +31,7 @@ class QueryCurrentAttendStatusServiceImpl ( val club = clubRepository.findByIdOrNull(id) ?: throw ClubNotFoundException() - if (clubMemberRepository.existsByUserAndClub(user, club)) { + if (!clubMemberRepository.existsByUserAndClub(user, club)) { throw NotClubMemberException() } From c72c19db6e645c27ca4d0f21b782fd5b4d9c09bf Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 21:56:51 +0900 Subject: [PATCH 19/20] =?UTF-8?q?refactor=20::=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendance/repository/AttendanceRepository.kt | 2 +- .../impl/QueryCurrentAttendStatusServiceImpl.kt | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt index 09ceb0b6..97727699 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/repository/AttendanceRepository.kt @@ -14,5 +14,5 @@ interface AttendanceRepository : CrudRepository, CustomAttenda @EntityGraph(attributePaths = ["user"]) fun findAllBySchedule(schedule: Schedule): List - fun findByPeriodAndUser (period: Period, user: User): Attendance + fun findByScheduleAndPeriodAndUser (schedule: Schedule, period: Period, user: User): Attendance? } \ No newline at end of file diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt index 43481102..eb82ffb2 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt @@ -1,6 +1,7 @@ package com.msg.gcms.domain.attendance.service.impl import com.msg.gcms.domain.attendance.domain.enums.Period +import com.msg.gcms.domain.attendance.exception.AttendanceNotFoundException import com.msg.gcms.domain.attendance.exception.ScheduleNotFoundException import com.msg.gcms.domain.attendance.presentation.data.response.AttendSelfCheckResponseDto import com.msg.gcms.domain.attendance.repository.AttendanceRepository @@ -37,10 +38,11 @@ class QueryCurrentAttendStatusServiceImpl ( val period = getCurrentPeriod() - scheduleRepository.findByClubAndDate(club, LocalDate.now())?.let { - val attend = attendanceRepository.findByPeriodAndUser(period, user) - return attendanceConverter.toDto(attend) - } ?: throw ScheduleNotFoundException() + val schedule = scheduleRepository.findByClubAndDate(club, LocalDate.now()) ?: throw ScheduleNotFoundException() + + val attend = attendanceRepository.findByScheduleAndPeriodAndUser(schedule, period, user) ?: throw AttendanceNotFoundException() + + return attendanceConverter.toDto(attend); } fun getCurrentPeriod(): Period { From a71b777c64b302362983555e9568ded61a88df0a Mon Sep 17 00:00:00 2001 From: taeyeon Date: Fri, 26 Apr 2024 22:00:50 +0900 Subject: [PATCH 20/20] =?UTF-8?q?refactor=20::=20=EA=B0=9C=ED=96=89=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 --- .../service/impl/QueryCurrentAttendStatusServiceImpl.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt index eb82ffb2..07bee071 100644 --- a/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt +++ b/src/main/kotlin/com/msg/gcms/domain/attendance/service/impl/QueryCurrentAttendStatusServiceImpl.kt @@ -38,9 +38,11 @@ class QueryCurrentAttendStatusServiceImpl ( val period = getCurrentPeriod() - val schedule = scheduleRepository.findByClubAndDate(club, LocalDate.now()) ?: throw ScheduleNotFoundException() + val schedule = scheduleRepository.findByClubAndDate(club, LocalDate.now()) + ?: throw ScheduleNotFoundException() - val attend = attendanceRepository.findByScheduleAndPeriodAndUser(schedule, period, user) ?: throw AttendanceNotFoundException() + val attend = attendanceRepository.findByScheduleAndPeriodAndUser(schedule, period, user) + ?: throw AttendanceNotFoundException() return attendanceConverter.toDto(attend); }