From 65879b275c0224e1fdfce64295192eac69724a6a Mon Sep 17 00:00:00 2001 From: haedoang Date: Wed, 8 Nov 2023 22:22:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=20[location-refact]=20=EC=A7=80=EC=97=AD?= =?UTF-8?q?=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - refact: UpperLocation 데이터 추가 --- .../api/location/application/dto/LocationResponse.java | 4 ++-- src/main/java/com/koliving/api/my/ui/MyController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/koliving/api/location/application/dto/LocationResponse.java b/src/main/java/com/koliving/api/location/application/dto/LocationResponse.java index 89f65901..b063d705 100644 --- a/src/main/java/com/koliving/api/location/application/dto/LocationResponse.java +++ b/src/main/java/com/koliving/api/location/application/dto/LocationResponse.java @@ -4,13 +4,13 @@ import com.koliving.api.location.domain.LocationType; -public record LocationResponse(Long id, Long upperLocationId, String name, String displayName, +public record LocationResponse(Long id, LocationResponse upperLocation, String name, String displayName, LocationType locationType) { public static LocationResponse valueOf(Location entity) { return new LocationResponse( entity.getId(), - entity.getUpperLocationId(), + entity.getLocationType().isTopLocation() ? null : LocationResponse.valueOf(entity.getUpperLocation()), entity.getName(), entity.displayName(), entity.getLocationType() diff --git a/src/main/java/com/koliving/api/my/ui/MyController.java b/src/main/java/com/koliving/api/my/ui/MyController.java index 8d2b12fd..79971807 100644 --- a/src/main/java/com/koliving/api/my/ui/MyController.java +++ b/src/main/java/com/koliving/api/my/ui/MyController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; -@Tag(name = "MY API", description = "MY API") +@Tag(name = "마이페이지 API", description = "MY API") @RestController @RequestMapping("api/v1/my") @RequiredArgsConstructor From 7de5d72a5ad439fbceb39f7cec5c13ef7c9fd708 Mon Sep 17 00:00:00 2001 From: haedoang Date: Tue, 21 Nov 2023 22:27:42 +0900 Subject: [PATCH 2/3] fix bug --- src/main/java/com/koliving/api/user/application/UserService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/koliving/api/user/application/UserService.java b/src/main/java/com/koliving/api/user/application/UserService.java index dd156c4f..1e14031d 100644 --- a/src/main/java/com/koliving/api/user/application/UserService.java +++ b/src/main/java/com/koliving/api/user/application/UserService.java @@ -46,6 +46,7 @@ public User save(User user) { } @Override + @Transactional public void setPassword(User user, String password) { String encodedPassword = passwordEncoder.encode(password); user.setPassword(encodedPassword); From bca21f06bd9d5142e0d7fcafa678bf13dd0ea96b Mon Sep 17 00:00:00 2001 From: haedoang Date: Wed, 22 Nov 2023 21:39:45 +0900 Subject: [PATCH 3/3] template update --- .../api/room/application/RoomService.java | 3 +- .../templates/contact-email-template.html | 240 ++++++++++++++---- 2 files changed, 197 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/koliving/api/room/application/RoomService.java b/src/main/java/com/koliving/api/room/application/RoomService.java index 8bb2dea9..c967b03b 100644 --- a/src/main/java/com/koliving/api/room/application/RoomService.java +++ b/src/main/java/com/koliving/api/room/application/RoomService.java @@ -159,10 +159,9 @@ public void contact(RoomContactRequest request, User user) { final Room room = getRoom(request.roomId()); final Notification notification = Notification.of(user, room.getUser()); room.getUser().addReceivedNotification(notification); - emailService.sendRoomContact("haedoang@naver.com", request.contactInfo(), request.message(), user, getRoomDetailUrl(room.getId())); + emailService.sendRoomContact(room.getUser().getEmail(), request.contactInfo(), request.message(), user, getRoomDetailUrl(room.getId())); } - public String getRoomDetailUrl(Long roomId) { return String.format("%s/room/%d", frontProperties.getOrigin(), roomId); } diff --git a/src/main/resources/templates/contact-email-template.html b/src/main/resources/templates/contact-email-template.html index 226e20c8..73410431 100644 --- a/src/main/resources/templates/contact-email-template.html +++ b/src/main/resources/templates/contact-email-template.html @@ -1,52 +1,204 @@ - - - - + + + + - - - -
-
-

-
-
- -
-
- -