Merge pull request #180 from Strong-Potato/#179-Change-vote-api-spec

[Feat] 투표 Api Response Spec 수정
Strong-Potato · Jan 24, 2024 · f36ae28 · f36ae28
2 parents 15bbef0 + 5abc631
commit f36ae28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/fc/be/app/domain/vote/repository/VoteRepository.java b/app/src/main/java/fc/be/app/domain/vote/repository/VoteRepository.java
@@ -8,7 +8,6 @@
 
 public interface VoteRepository extends JpaRepository<Vote, Long>, VoteRepositoryCustom {
 
-    @Query(value = "select v from Vote v where v.space.id in (select jm.space.id from JoinedMember jm where jm.member.id = :memberId) and v.space.id not in (" +
-            "select vrm.spaceId from VoteResultMember vrm where vrm.memberId = :memberId)", nativeQuery = true)
+    @Query("select v from Vote v where v.space.id in (select jm.space.id from JoinedMember jm where jm.member.id = :memberId) and v.space.id not in (select vrm.spaceId from VoteResultMember vrm where vrm.memberId = :memberId)")
     List<Vote> findMemberVotes(Long memberId);
 }
diff --git a/app/src/main/java/fc/be/app/domain/vote/service/dto/response/VoteResultResponse.java b/app/src/main/java/fc/be/app/domain/vote/service/dto/response/VoteResultResponse.java
@@ -11,14 +11,14 @@ public record VoteResultResponse(
         Long id,
         String title,
         VoteStatus voteStatus,
-        MemberProfile ownerProfile,
+        MemberProfile createdBy,
         List<CandidateResultResponse> candidatesResponses
 ) {
 
     public record CandidateResultResponse(
             Long id,
             PlaceInfo placeInfo,
-            MemberProfile ownerProfile,
+            MemberProfile createdBy,
             List<MemberProfile> votedMemberProfiles,
             String tagline,
             boolean amIVote,

diff --git a/app/src/main/java/fc/be/app/domain/vote/service/dto/response/vo/PlaceInfo.java b/app/src/main/java/fc/be/app/domain/vote/service/dto/response/vo/PlaceInfo.java
@@ -6,15 +6,17 @@ public record PlaceInfo(
         Integer placeId,
         String placeName,
         String category,
+        int areaCode,
         String placeImageUrl,
         LatLng latLng
 ) {
 
     public static PlaceInfo of(Place place) {
         return new PlaceInfo(
                 place.getId(),
-                place.getThumbnail(),
+                place.getTitle(),
                 place.getCategory(),
+                place.getLocation().getAreaCode(),
                 place.getThumbnail(),
                 new LatLng(
                         place.getLocation().getLatitude(),