From 4d21f97b821674c47b84ffc79de0b0b84d6b89ad Mon Sep 17 00:00:00 2001 From: JIHO LEE <161289673+GitJIHO@users.noreply.github.com> Date: Wed, 13 Nov 2024 01:03:41 +0900 Subject: [PATCH] =?UTF-8?q?Refactor:=20=EB=8D=94=EB=AF=B8=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20Swagger?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=ED=8E=B8=EC=9D=98=EC=84=B1=EC=9D=84=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EA=B0=9C=EC=84=A0=20(#225)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: getAssignedMemberId가 null일때 nullpointException 방지 * refactor: 더미데이터 구조 변경 및 추가 * refactor: 코드 자동 리팩터링 --- .../sinitto/common/dummy/InitialData.java | 20 ++++++ .../service/GuardGuidelineService.java | 2 +- src/main/resources/static/css/header.css | 70 ++++++++++--------- src/main/resources/templates/point/login.html | 2 +- 4 files changed, 58 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/example/sinitto/common/dummy/InitialData.java b/src/main/java/com/example/sinitto/common/dummy/InitialData.java index 0a964bbb..ccbaaf09 100644 --- a/src/main/java/com/example/sinitto/common/dummy/InitialData.java +++ b/src/main/java/com/example/sinitto/common/dummy/InitialData.java @@ -356,6 +356,26 @@ protected void initial() { callbackRepository.save(new Callback(Callback.Status.COMPLETE, senior11)); callbackRepository.save(new Callback(Callback.Status.WAITING, senior11)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior12)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior13)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior14)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior15)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior16)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior17)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior18)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior19)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior20)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior21)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior22)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior23)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior24)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior25)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior26)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior27)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior28)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior29)); + callbackRepository.save(new Callback(Callback.Status.WAITING, senior30)); + //리뷰 reviewRepository.save(new Review(5, 4, 5, "테스트용 리뷰 1", guard1)); reviewRepository.save(new Review(5, 2, 2, "테스트용 리뷰 2", guard2)); diff --git a/src/main/java/com/example/sinitto/guardGuideline/service/GuardGuidelineService.java b/src/main/java/com/example/sinitto/guardGuideline/service/GuardGuidelineService.java index cdd123bc..f53a7cbd 100644 --- a/src/main/java/com/example/sinitto/guardGuideline/service/GuardGuidelineService.java +++ b/src/main/java/com/example/sinitto/guardGuideline/service/GuardGuidelineService.java @@ -61,7 +61,7 @@ public List readAllGuardGuidelinesByCategoryAndCallback( Callback callback = callbackRepository.findById(callbackId) .orElseThrow(() -> new NotFoundException("존재하지 않는 콜백입니다")); - if (!callback.getStatus().equals(Callback.Status.WAITING.name()) && !callback.getAssignedMemberId().equals(memberId)) { + if (!callback.getStatus().equals(Callback.Status.WAITING.name()) && (callback.getAssignedMemberId() == null || !callback.getAssignedMemberId().equals(memberId))) { throw new BadRequestException("해당 콜백은 대기 상태가 아니고, 배정된 시니또가 아닙니다."); } diff --git a/src/main/resources/static/css/header.css b/src/main/resources/static/css/header.css index e7da7b67..93551df2 100644 --- a/src/main/resources/static/css/header.css +++ b/src/main/resources/static/css/header.css @@ -16,39 +16,41 @@ body { justify-content: space-between; align-items: center; -.header h1 { - margin: 0; - font-size: 24px; - font-weight: 600; + .header h1 { + margin: 0; + font-size: 24px; + font-weight: 600; + } + + + nav { + display: flex; + gap: 15px; + justify-content: flex-end; + } + + button { + background-color: rgba(52, 87, 217, 0.8); + color: #ffffff; + border: none; + padding: 10px 20px; + font-size: 14px; + cursor: pointer; + border-radius: 4px; + transition: background-color 0.3s, transform 0.2s; + } + + button:hover { + background-color: rgba(52, 87, 217, 0.93); + transform: scale(1.03); + } + + button:active { + background-color: #00473c; + } + + form { + display: inline; + } } - -nav { - display: flex; - gap: 15px; - justify-content: flex-end; -} - -button { - background-color: rgba(52, 87, 217, 0.8); - color: #ffffff; - border: none; - padding: 10px 20px; - font-size: 14px; - cursor: pointer; - border-radius: 4px; - transition: background-color 0.3s, transform 0.2s; -} - -button:hover { - background-color: rgba(52, 87, 217, 0.93); - transform: scale(1.03); -} - -button:active { - background-color: #00473c; -} - -form { - display: inline; -} diff --git a/src/main/resources/templates/point/login.html b/src/main/resources/templates/point/login.html index 895b479e..eedda3a2 100644 --- a/src/main/resources/templates/point/login.html +++ b/src/main/resources/templates/point/login.html @@ -24,7 +24,7 @@

Admin Login