From 2fd0afd2bb054a13cbe06e3c2b70ad422fb894f6 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Sun, 7 Apr 2024 22:27:25 +0900 Subject: [PATCH 01/11] delete :: all api --- .../domain/attendance/domain/Attendance.kt | 2 +- .../port/in/SaveAllAttendanceUseCase.kt | 5 --- .../presentation/AttendanceController.kt | 10 ------ .../SaveAllAttendanceSaveAllUserService.kt | 35 +++++++++---------- 4 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 src/main/kotlin/dsm/pick2024/domain/attendance/port/in/SaveAllAttendanceUseCase.kt diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt index d68cf991..7f4960cb 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt @@ -1,7 +1,7 @@ package dsm.pick2024.domain.attendance.domain import dsm.pick2024.domain.afterschool.enums.Status -import java.util.* +import java.util.UUID data class Attendance( val id: UUID? = null, diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/port/in/SaveAllAttendanceUseCase.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/port/in/SaveAllAttendanceUseCase.kt deleted file mode 100644 index 04ab706f..00000000 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/port/in/SaveAllAttendanceUseCase.kt +++ /dev/null @@ -1,5 +0,0 @@ -package dsm.pick2024.domain.attendance.port.`in` - -interface SaveAllAttendanceUseCase { - fun saveAll(key: String) -} diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt index a262507a..d3e827df 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt @@ -1,29 +1,19 @@ package dsm.pick2024.domain.attendance.presentation import dsm.pick2024.domain.attendance.port.`in`.ChangeAttendanceUseCase -import dsm.pick2024.domain.attendance.port.`in`.SaveAllAttendanceUseCase import dsm.pick2024.domain.attendance.presentation.dto.request.ChangeAttendanceRequest import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag import org.springframework.web.bind.annotation.PatchMapping -import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestMapping -import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @Tag(name = "attendance API") @RestController @RequestMapping("/attendance") class AttendanceController( - private val saveAllAttendanceUseCase: SaveAllAttendanceUseCase, private val changeAttendanceUseCase: ChangeAttendanceUseCase ) { - - @Operation(summary = "데이터 저장 api") - @PostMapping("/all") - fun all(@RequestParam(name = "key") key: String) = - saveAllAttendanceUseCase.saveAll(key) - @Operation(summary = "자습 or 방과후 상태관리") @PatchMapping("/modify") fun changeAttendance(changeAttendanceRequest: List) = diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt index 603e8977..b9fa7c83 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt @@ -2,7 +2,6 @@ package dsm.pick2024.domain.attendance.service import dsm.pick2024.domain.afterschool.enums.Status import dsm.pick2024.domain.attendance.domain.Attendance -import dsm.pick2024.domain.attendance.port.`in`.SaveAllAttendanceUseCase import dsm.pick2024.domain.attendance.port.out.SaveAll import dsm.pick2024.infrastructure.feign.client.XquareFeignClient import org.springframework.stereotype.Service @@ -13,26 +12,26 @@ class SaveAllAttendanceSaveAllUserService( private val saveAll: SaveAll, private val xquareFeignClient: XquareFeignClient ) : SaveAllAttendanceUseCase { - @Transactional override fun saveAll(key: String) { val xquare = xquareFeignClient.userAll(key) - val entity = xquare.map { - it -> - Attendance( - userId = it.id, - name = it.name, - grade = it.grade, - classNum = it.classNum, - num = it.num, - club = it.club, - period6 = Status.ATTENDANCE, - period7 = Status.ATTENDANCE, - period8 = Status.ATTENDANCE, - period9 = Status.ATTENDANCE, - period10 = Status.ATTENDANCE - ) - }.toMutableList() + val entity = + xquare.map { + it -> + Attendance( + userId = it.id, + name = it.name, + grade = it.grade, + classNum = it.classNum, + num = it.num, + club = it.club, + period6 = Status.ATTENDANCE, + period7 = Status.ATTENDANCE, + period8 = Status.ATTENDANCE, + period9 = Status.ATTENDANCE, + period10 = Status.ATTENDANCE + ) + }.toMutableList() saveAll.saveAll(entity) } } From 111afd95027e312d8322cd36fb95eb72ece7c060 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Sun, 7 Apr 2024 22:41:03 +0900 Subject: [PATCH 02/11] delete :: saveAllService --- .../SaveAllAttendanceSaveAllUserService.kt | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt deleted file mode 100644 index b9fa7c83..00000000 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/service/SaveAllAttendanceSaveAllUserService.kt +++ /dev/null @@ -1,37 +0,0 @@ -package dsm.pick2024.domain.attendance.service - -import dsm.pick2024.domain.afterschool.enums.Status -import dsm.pick2024.domain.attendance.domain.Attendance -import dsm.pick2024.domain.attendance.port.out.SaveAll -import dsm.pick2024.infrastructure.feign.client.XquareFeignClient -import org.springframework.stereotype.Service -import org.springframework.transaction.annotation.Transactional - -@Service -class SaveAllAttendanceSaveAllUserService( - private val saveAll: SaveAll, - private val xquareFeignClient: XquareFeignClient -) : SaveAllAttendanceUseCase { - @Transactional - override fun saveAll(key: String) { - val xquare = xquareFeignClient.userAll(key) - val entity = - xquare.map { - it -> - Attendance( - userId = it.id, - name = it.name, - grade = it.grade, - classNum = it.classNum, - num = it.num, - club = it.club, - period6 = Status.ATTENDANCE, - period7 = Status.ATTENDANCE, - period8 = Status.ATTENDANCE, - period9 = Status.ATTENDANCE, - period10 = Status.ATTENDANCE - ) - }.toMutableList() - saveAll.saveAll(entity) - } -} From ebbab7e0f831b3cc2495a78375bee2fa3a559129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=8F=84=EA=B2=BD?= Date: Sun, 7 Apr 2024 22:53:32 +0900 Subject: [PATCH 03/11] add :: request body --- .../domain/attendance/presentation/AttendanceController.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt index a262507a..973ec401 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag import org.springframework.web.bind.annotation.PatchMapping import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @@ -26,6 +27,7 @@ class AttendanceController( @Operation(summary = "자습 or 방과후 상태관리") @PatchMapping("/modify") - fun changeAttendance(changeAttendanceRequest: List) = + fun changeAttendance( + @RequestBody changeAttendanceRequest: List) = changeAttendanceUseCase.changeAttendance(changeAttendanceRequest) } From fd43c745a656f48fdf9603074088bc9cba77c6d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=8F=84=EA=B2=BD?= Date: Sun, 7 Apr 2024 22:54:37 +0900 Subject: [PATCH 04/11] . --- dump.rdb | Bin 0 -> 1085 bytes .../presentation/AttendanceController.kt | 4 ---- src/main/resources/application.yaml | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 dump.rdb diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000000000000000000000000000000000000..fd03a33f504a54d2a6c2af6205b0192db42a4c64 GIT binary patch literal 1085 zcmeH_%}%R86vwfOUr`f{J_aLDw6&|MwUH{I6e@IM_!#W8P%1OE(8R=zJDj$eFGDB=ln9~XV|Mi*wY(N(8+K;zq&6 z0hcdy8djTx!9)hR^aq(dc6S&!7 zwqSdl5Pv=^tgYwr8~L2T@mZP-dGQt|6&4zsNI{jPepFBDh8!AM^~~aHT@m$=c@($B zW{9d~DUmf3d52&ylGuFg53$b5;_zABX!HhsUoPo_tZgPz--)HBF6?htI;L@ml;%!W z(nMC#2E1R}0A(fOst3YWSv32+XDaqVi`ilVyjGPeDz{s67{ZrM*I6mnUr$%}MvCUY zDEd{SFHik9vamo=)EIR+`YG?3#V@7`$c@K}cc1Jd`oa%Le)$L9{4I%h3I1taUp?Rd E10N-GQ2+n{ literal 0 HcmV?d00001 diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt index 54394106..958da25e 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt @@ -5,11 +5,7 @@ import dsm.pick2024.domain.attendance.presentation.dto.request.ChangeAttendanceR import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag import org.springframework.web.bind.annotation.PatchMapping -<<<<<<< HEAD -import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody -======= ->>>>>>> 111afd95027e312d8322cd36fb95eb72ece7c060 import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 7f23da5b..a58b43d8 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: import: "optional:configserver:" datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ${DB_URL} + url: jdbc:mysql://mysql.xquare.app:3306/stag_new_pick username: ${DB_USERNAME} password: ${DB_PASSWORD} hikari: From 1f60508e396dc7432b3173bfae9b2aaa5e4c497e Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 8 Apr 2024 01:20:29 +0900 Subject: [PATCH 05/11] modify :: attendance --- .../kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt | 2 +- .../dsm/pick2024/domain/attendance/mapper/AttendanceMapper.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt index 7f4960cb..bbf59428 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/domain/Attendance.kt @@ -10,7 +10,7 @@ data class Attendance( val classNum: Int, val num: Int, val name: String, - val club: String, + val club: String? = null, val period6: Status, val period7: Status, val period8: Status, diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/mapper/AttendanceMapper.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/mapper/AttendanceMapper.kt index f886a4ad..2fea9b08 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/mapper/AttendanceMapper.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/mapper/AttendanceMapper.kt @@ -34,7 +34,7 @@ class AttendanceMapper : GenericMapper { classNum = classNum, num = num, name = name, - club = club!!, + club = club, period6 = period6, period7 = period7, period8 = period8, From 06e18b9ff29e77caa56a5a4106520450eb3ed6d4 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 8 Apr 2024 01:21:54 +0900 Subject: [PATCH 06/11] add :: fun queryClassAttendance --- .../persistence/AttendancePersistenceAdapter.kt | 16 ++++++++++++++++ .../port/in/QueryClassAttendanceUseCase.kt | 10 ++++++++++ .../domain/attendance/port/out/AttendancePort.kt | 3 ++- .../port/out/QueryClassAttendancePort.kt | 10 ++++++++++ .../dto/response/QueryAttendanceResponse.kt | 15 +++++++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/main/kotlin/dsm/pick2024/domain/attendance/port/in/QueryClassAttendanceUseCase.kt create mode 100644 src/main/kotlin/dsm/pick2024/domain/attendance/port/out/QueryClassAttendancePort.kt create mode 100644 src/main/kotlin/dsm/pick2024/domain/attendance/presentation/dto/response/QueryAttendanceResponse.kt diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt index cf4df06c..30b5734d 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/persistence/AttendancePersistenceAdapter.kt @@ -2,6 +2,7 @@ package dsm.pick2024.domain.attendance.persistence import com.querydsl.jpa.impl.JPAQueryFactory import dsm.pick2024.domain.attendance.domain.Attendance +import dsm.pick2024.domain.attendance.entity.QAttendanceJpaEntity import dsm.pick2024.domain.attendance.mapper.AttendanceMapper import dsm.pick2024.domain.attendance.persistence.repository.AttendanceRepository import dsm.pick2024.domain.attendance.port.out.AttendancePort @@ -21,4 +22,19 @@ class AttendancePersistenceAdapter( override fun findByUserId(userId: UUID) = attendanceJpaRepository.findByUserId(userId).let { attendanceMapper.toDomain(it) } + + override fun findByGradeAndClassNum( + grade: Int, + classNum: Int + ) = jpaQueryFactory + .selectFrom(QAttendanceJpaEntity.attendanceJpaEntity) + .where( + QAttendanceJpaEntity.attendanceJpaEntity.grade.eq(grade), + QAttendanceJpaEntity.attendanceJpaEntity.classNum.eq(classNum) + ) + .orderBy( + QAttendanceJpaEntity.attendanceJpaEntity.num.asc() + ) + .fetch() + .map { attendanceMapper.toDomain(it) } } diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/port/in/QueryClassAttendanceUseCase.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/port/in/QueryClassAttendanceUseCase.kt new file mode 100644 index 00000000..0308cdd4 --- /dev/null +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/port/in/QueryClassAttendanceUseCase.kt @@ -0,0 +1,10 @@ +package dsm.pick2024.domain.attendance.port.`in` + +import dsm.pick2024.domain.attendance.presentation.dto.response.QueryAttendanceResponse + +interface QueryClassAttendanceUseCase { + fun queryClassAttendance( + grade: Int, + classNum: Int + ): List +} diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/port/out/AttendancePort.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/port/out/AttendancePort.kt index f3d2577a..54138f1c 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/port/out/AttendancePort.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/port/out/AttendancePort.kt @@ -2,4 +2,5 @@ package dsm.pick2024.domain.attendance.port.out interface AttendancePort : SaveAll, - FindByUserIdPort + FindByUserIdPort, + QueryClassAttendancePort diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/port/out/QueryClassAttendancePort.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/port/out/QueryClassAttendancePort.kt new file mode 100644 index 00000000..bbd664bc --- /dev/null +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/port/out/QueryClassAttendancePort.kt @@ -0,0 +1,10 @@ +package dsm.pick2024.domain.attendance.port.out + +import dsm.pick2024.domain.attendance.domain.Attendance + +interface QueryClassAttendancePort { + fun findByGradeAndClassNum( + grade: Int, + classNum: Int + ): List +} diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/dto/response/QueryAttendanceResponse.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/dto/response/QueryAttendanceResponse.kt new file mode 100644 index 00000000..a380c89e --- /dev/null +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/dto/response/QueryAttendanceResponse.kt @@ -0,0 +1,15 @@ +package dsm.pick2024.domain.attendance.presentation.dto.response + +import dsm.pick2024.domain.afterschool.enums.Status +import java.util.UUID + +data class QueryAttendanceResponse( + val id: UUID, + val username: String, + val grade: Int, + val classNum: Int, + val num: Int, + val status8: Status, + val status9: Status, + val status10: Status +) From 11aeddbac826c044b11d52695564178adaf8ce35 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 8 Apr 2024 01:22:07 +0900 Subject: [PATCH 07/11] add :: queryClassAttendance api --- .../presentation/AttendanceController.kt | 17 +++++++++-- .../service/QueryClassAttendanceService.kt | 28 +++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 src/main/kotlin/dsm/pick2024/domain/attendance/service/QueryClassAttendanceService.kt diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt index 958da25e..174cee91 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt @@ -1,23 +1,34 @@ package dsm.pick2024.domain.attendance.presentation import dsm.pick2024.domain.attendance.port.`in`.ChangeAttendanceUseCase +import dsm.pick2024.domain.attendance.port.`in`.QueryClassAttendanceUseCase import dsm.pick2024.domain.attendance.presentation.dto.request.ChangeAttendanceRequest import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag +import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PatchMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @Tag(name = "attendance API") @RestController @RequestMapping("/attendance") class AttendanceController( - private val changeAttendanceUseCase: ChangeAttendanceUseCase + private val changeAttendanceUseCase: ChangeAttendanceUseCase, + private val queryClassAttendanceUseCase: QueryClassAttendanceUseCase ) { @Operation(summary = "자습 or 방과후 상태관리") @PatchMapping("/modify") fun changeAttendance( - @RequestBody changeAttendanceRequest: List) = - changeAttendanceUseCase.changeAttendance(changeAttendanceRequest) + @RequestBody changeAttendanceRequest: List + ) = changeAttendanceUseCase.changeAttendance(changeAttendanceRequest) + + @Operation(summary = "자습 교실 별 조회 api") + @GetMapping("/grade") + fun queryClassAttendance( + @RequestParam(name = "grade") grade: Int, + @RequestParam(name = "class_num") classNum: Int + ) = queryClassAttendanceUseCase.queryClassAttendance(grade, classNum) } diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/service/QueryClassAttendanceService.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/service/QueryClassAttendanceService.kt new file mode 100644 index 00000000..1a4d5c41 --- /dev/null +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/service/QueryClassAttendanceService.kt @@ -0,0 +1,28 @@ +package dsm.pick2024.domain.attendance.service + +import dsm.pick2024.domain.attendance.port.`in`.QueryClassAttendanceUseCase +import dsm.pick2024.domain.attendance.port.out.QueryClassAttendancePort +import dsm.pick2024.domain.attendance.presentation.dto.response.QueryAttendanceResponse +import org.springframework.stereotype.Service + +@Service +class QueryClassAttendanceService( + private val queryClassAttendancePort: QueryClassAttendancePort +) : QueryClassAttendanceUseCase { + override fun queryClassAttendance( + grade: Int, + classNum: Int + ) = queryClassAttendancePort.findByGradeAndClassNum(grade, classNum) + .map { it -> + QueryAttendanceResponse( + id = it.userId, + username = it.name, + grade = it.grade, + classNum = it.classNum, + num = it.num, + status8 = it.period8, + status9 = it.period9, + status10 = it.period10 + ) + } +} From 448241d530dbe8ecd8d87c6758014bf1a2710b43 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Mon, 8 Apr 2024 08:06:38 +0900 Subject: [PATCH 08/11] modify :: swagger --- .../domain/attendance/presentation/AttendanceController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt index 174cee91..7d07777b 100644 --- a/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt +++ b/src/main/kotlin/dsm/pick2024/domain/attendance/presentation/AttendanceController.kt @@ -19,7 +19,7 @@ class AttendanceController( private val changeAttendanceUseCase: ChangeAttendanceUseCase, private val queryClassAttendanceUseCase: QueryClassAttendanceUseCase ) { - @Operation(summary = "자습 or 방과후 상태관리") + @Operation(summary = "자습 or 동아리 상태관리") @PatchMapping("/modify") fun changeAttendance( @RequestBody changeAttendanceRequest: List From e2f9e8228d84e3e967fc32b6310e6e51769a500d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=8F=84=EA=B2=BD?= Date: Mon, 8 Apr 2024 09:24:05 +0900 Subject: [PATCH 09/11] modify :: config --- .xquare/config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.xquare/config.yaml b/.xquare/config.yaml index 9d6200ff..f902cf50 100644 --- a/.xquare/config.yaml +++ b/.xquare/config.yaml @@ -3,3 +3,6 @@ config: prefix: "/dsm-pick" service_type: be port: 8080 +domain: + prod: new-pick.xquare.app/dsm-pick + stag: new-pick.stag.xquare.app/dsm-pick From 74149477bc3f65476d2408acbdceda3e87bd4132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=8F=84=EA=B2=BD?= Date: Mon, 8 Apr 2024 09:26:56 +0900 Subject: [PATCH 10/11] . --- .xquare/config.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.xquare/config.yaml b/.xquare/config.yaml index f902cf50..9d6200ff 100644 --- a/.xquare/config.yaml +++ b/.xquare/config.yaml @@ -3,6 +3,3 @@ config: prefix: "/dsm-pick" service_type: be port: 8080 -domain: - prod: new-pick.xquare.app/dsm-pick - stag: new-pick.stag.xquare.app/dsm-pick From 9e4c67386e5f4271a683a0fdaa230bbd25eedc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=8F=84=EA=B2=BD?= Date: Mon, 8 Apr 2024 10:23:49 +0900 Subject: [PATCH 11/11] modify :: config --- .github/workflows/klint-check.yml | 33 ++++++++++++++++++------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/klint-check.yml b/.github/workflows/klint-check.yml index e5ef1ddb..5e779391 100644 --- a/.github/workflows/klint-check.yml +++ b/.github/workflows/klint-check.yml @@ -1,27 +1,32 @@ -name: ktlint +name: Ktlint Ci -on: - pull_request: - branches: - - main +on: [pull_request] jobs: ktlint: name: Check Code Quality runs-on: ubuntu-latest + strategy: + matrix: + os: [ ubuntu-latest ] + java-version: [ 17 ] steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: ${{ matrix.java-version }} + distribution: 'zulu' + - name: Clone repo - uses: actions/checkout@v2 + uses: actions/checkout@master with: fetch-depth: 1 - - name: Setup JDK - uses: actions/setup-java@v2 + - name: ktlint + uses: ScaCap/action-ktlint@master with: - java-version: '17' - distribution: 'adopt' - - - name: Run ktlint - run: | - ./gradlew ktlintCheck --daemon --parallel --configure-on-demand + github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + reporter: github-pr-check # Change review + fail_on_error: true