From c4a5d870d3387c9d8bf15dc0cc3a702011402583 Mon Sep 17 00:00:00 2001 From: GithubKangMin <158579562+GithubKangMin@users.noreply.github.com> Date: Thu, 20 Feb 2025 20:41:00 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[refactor]=20=EB=B0=A9=20=EB=A9=A4=EB=B2=84?= =?UTF-8?q?=EC=97=90=20=EB=B0=A9=EC=9E=A5=EB=8F=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java b/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java index 4839792..91572d8 100644 --- a/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java +++ b/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java @@ -53,6 +53,7 @@ public void createRoom(CreateRoomRequest request, String userEmail) { // 방 멤버 추가 List users = userRepository.findAllById(request.getUserIds()); + users.add(master); // 방장 추가 List newRoomMembers = users.stream() .map(user -> RoomMemberConverter.fromRequest(room, user)) From 5d363325a5259c00b8946d856e6fdce26c0f781b Mon Sep 17 00:00:00 2001 From: GithubKangMin <158579562+GithubKangMin@users.noreply.github.com> Date: Thu, 20 Feb 2025 20:42:25 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[refactor]=EB=B0=A9=EC=9E=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EC=A4=91=EB=B3=B5=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/umc/yeogi_gal_lae/api/room/service/RoomService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java b/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java index 91572d8..b5734ab 100644 --- a/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java +++ b/src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java @@ -53,7 +53,11 @@ public void createRoom(CreateRoomRequest request, String userEmail) { // 방 멤버 추가 List users = userRepository.findAllById(request.getUserIds()); - users.add(master); // 방장 추가 + + // 방장 추가 + if (!users.contains(master)) { // 중복 추가 방지 + users.add(master); + } List newRoomMembers = users.stream() .map(user -> RoomMemberConverter.fromRequest(room, user)) From 8ff181e5f1c9337153d3a589b370a67c86e40241 Mon Sep 17 00:00:00 2001 From: parkmineum Date: Thu, 20 Feb 2025 22:41:26 +0900 Subject: [PATCH 3/5] =?UTF-8?q?main=20=EB=B3=80=EA=B2=BD=20=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/umc/yeogi_gal_lae/api/vote/domain/Vote.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/umc/yeogi_gal_lae/api/vote/domain/Vote.java b/src/main/java/com/umc/yeogi_gal_lae/api/vote/domain/Vote.java index fdf5f50..fe78759 100644 --- a/src/main/java/com/umc/yeogi_gal_lae/api/vote/domain/Vote.java +++ b/src/main/java/com/umc/yeogi_gal_lae/api/vote/domain/Vote.java @@ -31,6 +31,7 @@ public class Vote extends BaseEntity { @JsonIgnore private VoteRoom voteRoom; + @Enumerated(EnumType.STRING) @Column(nullable = false) private VoteType type; From 581fe405a14f229b32e62919c18dc24327d73a6a Mon Sep 17 00:00:00 2001 From: parkmineum Date: Thu, 20 Feb 2025 22:52:28 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[fix=20=EC=98=A4=EB=A5=98=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umc/yeogi_gal_lae/api/vote/repository/VoteRepository.java | 3 ++- .../com/umc/yeogi_gal_lae/api/vote/service/VoteService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/umc/yeogi_gal_lae/api/vote/repository/VoteRepository.java b/src/main/java/com/umc/yeogi_gal_lae/api/vote/repository/VoteRepository.java index 72cfc2a..e2f9edd 100644 --- a/src/main/java/com/umc/yeogi_gal_lae/api/vote/repository/VoteRepository.java +++ b/src/main/java/com/umc/yeogi_gal_lae/api/vote/repository/VoteRepository.java @@ -24,6 +24,7 @@ public interface VoteRepository extends JpaRepository { @Query("DELETE FROM Vote v WHERE v.voteRoom IN (SELECT vr FROM VoteRoom vr WHERE vr.tripPlan.user = :user)") void deleteByVoteRoomUser(@Param("user") User user); - Optional findByUserAndTripPlan(User user, TripPlan tripPlan); + @Query("SELECT v FROM Vote v WHERE v.tripPlan.id = :tripPlanId AND v.id = (SELECT u.vote.id FROM User u WHERE u.id = :userId)") + Optional findByUserIdAndTripPlanId(@Param("userId") Long userId, @Param("tripPlanId") Long tripPlanId); } diff --git a/src/main/java/com/umc/yeogi_gal_lae/api/vote/service/VoteService.java b/src/main/java/com/umc/yeogi_gal_lae/api/vote/service/VoteService.java index 2a4cb65..f42d4e6 100644 --- a/src/main/java/com/umc/yeogi_gal_lae/api/vote/service/VoteService.java +++ b/src/main/java/com/umc/yeogi_gal_lae/api/vote/service/VoteService.java @@ -88,7 +88,7 @@ public void createVote(VoteRequest.createVoteReq request, String userEmail) { } // 기존 투표 여부 확인 - Optional existingVote = voteRepository.findByUserAndTripPlan(user, tripPlan); + Optional existingVote = voteRepository.findByUserIdAndTripPlanId(user.getId(), tripPlan.getId()); if (existingVote.isPresent()) { Vote currentVote = existingVote.get(); From b3312fd7a781548972050e7eb998e64f9eec0163 Mon Sep 17 00:00:00 2001 From: margie1a <4987kk@naver.com> Date: Thu, 20 Feb 2025 22:55:27 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[refactor]:=20=EC=97=AC=ED=96=89=20?= =?UTF-8?q?=EA=B3=84=ED=9A=8D=20=EC=9C=A0=ED=98=95=20=EB=B0=98=ED=99=98=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 --- .../com/umc/yeogi_gal_lae/api/home/converter/HomeConverter.java | 1 + .../java/com/umc/yeogi_gal_lae/api/home/dto/HomeResponse.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/umc/yeogi_gal_lae/api/home/converter/HomeConverter.java b/src/main/java/com/umc/yeogi_gal_lae/api/home/converter/HomeConverter.java index fb97836..73c7679 100644 --- a/src/main/java/com/umc/yeogi_gal_lae/api/home/converter/HomeConverter.java +++ b/src/main/java/com/umc/yeogi_gal_lae/api/home/converter/HomeConverter.java @@ -46,6 +46,7 @@ public static HomeResponse.CompletedVoteRoom toCompletedVoteRoom(TripPlan tripPl tripPlan.getRoom().getName(), aiCourseId, tripPlan.getLocation(), + tripPlan.getTripPlanType(), tripPlan.getStartDate(), tripPlan.getEndDate().format(DATE_FORMATTER), tripPlan.getImageUrl() diff --git a/src/main/java/com/umc/yeogi_gal_lae/api/home/dto/HomeResponse.java b/src/main/java/com/umc/yeogi_gal_lae/api/home/dto/HomeResponse.java index 9475c76..603575f 100644 --- a/src/main/java/com/umc/yeogi_gal_lae/api/home/dto/HomeResponse.java +++ b/src/main/java/com/umc/yeogi_gal_lae/api/home/dto/HomeResponse.java @@ -39,6 +39,7 @@ public static class CompletedVoteRoom { private String roomName; private Long aiCourseId; private String location; + private TripPlanType tripPlanType; private LocalDate startDate; private String endDate; private String imageUrl;