Merge pull request #88 from swyp-app-team-4/feat#61-search-api

chltmdgh522 · web-flow · commit 07912c61e015 · 2025-09-05T18:03:10.000+09:00
Feat#61 API 오류 개선
diff --git a/src/main/java/boombimapi/domain/member/presentation/controller/AdminController.java b/src/main/java/boombimapi/domain/member/presentation/controller/AdminController.java
@@ -45,7 +45,7 @@ public ResponseEntity<LoginToken> adminLogin(@Valid @RequestBody AdminLoginReq r
     }
 
 
-    @PostMapping("/join")
+    //@PostMapping("/join")
     public void adminJoin(@Valid @RequestBody AdminLoginReq req) {
         Member admin = Member.builder()
                 .id(UUID.randomUUID().toString())
diff --git a/src/main/java/boombimapi/domain/search/application/impl/SearchServiceImpl.java b/src/main/java/boombimapi/domain/search/application/impl/SearchServiceImpl.java
@@ -181,9 +181,6 @@ private List<SearchRes> sortedCongestion(List<MemberPlace> memberPlaceEntities,
             if (latestMember != null) {
                 result.add(SearchRes.of(memberPlace.getId(), memberPlace.getName(), latestMember.getCreatedAt(),
                         latestMember.getCongestionLevel().getName(), memberPlace.getAddress(), memberPlace.getImageUrl(), PlaceType.MEMBER_PLACE, favoriteFlag));
-            }else{
-                result.add(SearchRes.of(memberPlace.getId(), memberPlace.getName(), memberPlace.getCreatedAt(),
-                        "여유", memberPlace.getAddress(), memberPlace.getImageUrl(), PlaceType.MEMBER_PLACE, favoriteFlag));
             }
         }
 
diff --git a/src/main/java/boombimapi/domain/vote/application/service/impl/VoteServiceImpl.java b/src/main/java/boombimapi/domain/vote/application/service/impl/VoteServiceImpl.java
@@ -70,16 +70,18 @@ public class VoteServiceImpl implements VoteService {
     @Transactional(noRollbackFor = BoombimException.class)
     public void registerVote(String userId, VoteRegisterReq req) {
         Member user = userRepository.findById(userId).orElse(null);
-        if (user == null)
-            throw new BoombimException(ErrorCode.USER_NOT_EXIST);
+        if (user == null) throw new BoombimException(ErrorCode.USER_NOT_EXIST);
+
+        //위도 경도 100m 맞는지 true면 있음 false면 없음 ==> 이제부터 300m로 통일 == > 이거 기능 날라감 ㅜㅜㅜ
+        /**
+         *         boolean result = isWithin300Meters(
+         *                 req.posLatitude(), req.posLongitude(),
+         *                 req.userLatitude(), req.userLongitude()
+         *         );
+         *         if (!result) throw new BoombimException(ErrorCode.OUT_OF_300M_RADIUS);
+         *
+         * */
 
-        //위도 경도 100m 맞는지 true면 있음 false면 없음 ==> 이제부터 300m로 통일
-        boolean result = isWithin300Meters(
-            req.posLatitude(), req.posLongitude(),
-            req.userLatitude(), req.userLongitude()
-        );
-        if (!result)
-            throw new BoombimException(ErrorCode.OUT_OF_300M_RADIUS);
 
         // 중복 검사인지 확인
         Vote vote = voteRepository.findByPosIdAndIsVoteActivateTrue(req.posId()).orElse(null);
@@ -105,32 +107,32 @@ public void registerVote(String userId, VoteRegisterReq req) {
             throw new BoombimException(ErrorCode.DUPLICATE_POS_ID);
         }
 
-        String posImage = getPosImage(req.posName());
+        // String posImage = getPosImage(req.posName());
 
-        log.info(posImage);
+        String posImage = "https://gamehackspring.s3.ap-northeast-2.amazonaws.com/appicon.png";
 
         // 공식 장소 테이블 추가
         ResolveMemberPlaceResponse resolveMemberPlaceResponse =
-            memberPlaceService
-                .resolveMemberPlace(
-                    ResolveMemberPlaceRequest.of(
-                        req.posId(),
-                        req.posName(),
-                        req.address(),
-                        req.posLatitude(),
-                        req.posLongitude(),
-                        posImage));
+                memberPlaceService
+                        .resolveMemberPlace(
+                                ResolveMemberPlaceRequest.of(
+                                        req.posId(),
+                                        req.posName(),
+                                        req.address(),
+                                        req.posLatitude(),
+                                        req.posLongitude(),
+                                        posImage));
         MemberPlace memberPlace = memberPlaceRepository.findById(resolveMemberPlaceResponse.memberPlaceId())
-            .orElseThrow(() -> new BoombimException(MEMBER_PLACE_NOT_FOUND));
+                .orElseThrow(() -> new BoombimException(MEMBER_PLACE_NOT_FOUND));
 
         Vote vb = Vote.builder()
-            .member(user)
-            .memberPlace(memberPlace)
-            .posId(req.posId())
-            .posImage(posImage)
-            .posName(req.posName())
-            .latitude(req.posLatitude())
-            .longitude(req.posLongitude()).build();
+                .member(user)
+                .memberPlace(memberPlace)
+                .posId(req.posId())
+                .posImage(posImage)
+                .posName(req.posName())
+                .latitude(req.posLatitude())
+                .longitude(req.posLongitude()).build();
         voteRepository.save(vb);
 
         vb.updateEndTime(30);
@@ -146,28 +148,26 @@ public void registerVote(String userId, VoteRegisterReq req) {
     @Override
     public void answerVote(String userId, VoteAnswerReq req) {
         Member user = userRepository.findById(userId).orElse(null);
-        if (user == null)
-            throw new BoombimException(ErrorCode.USER_NOT_EXIST);
+        if (user == null) throw new BoombimException(ErrorCode.USER_NOT_EXIST);
 
         Vote vote = voteRepository.findById(req.voteId()).orElse(null);
-        if (vote == null)
-            throw new BoombimException(ErrorCode.VOTE_NOT_EXIST);
+        if (vote == null) throw new BoombimException(ErrorCode.VOTE_NOT_EXIST);
 
         // 투표 종료됐는데 투표할려고 할때
-        if (!vote.isVoteActivate())
-            throw new BoombimException(ErrorCode.VOTE_ALREADY_CLOSED);
+        if (!vote.isVoteActivate()) throw new BoombimException(ErrorCode.VOTE_ALREADY_CLOSED);
+
+        // 본인 투표 막기 즉 본인이 올린거 투표 못하게 해야됨
+        if(vote.getMember().getId().equals(user.getId())) throw new BoombimException(ErrorCode.SELF_VOTE_NOT_ALLOWED);
 
         // 같은 투표 중복자 막기
         VoteAnswer voteAnswer = voteAnswerRepository.findByMemberAndVote(user, vote).orElse(null);
-        if (voteAnswer != null)
-            throw new BoombimException(ErrorCode.DUPLICATE_VOTE_USER);
+        if (voteAnswer != null) throw new BoombimException(ErrorCode.DUPLICATE_VOTE_USER);
 
-        log.info(String.valueOf(req.voteAnswerType()));
         // 투표 완료
         voteAnswerRepository.save(VoteAnswer.builder()
-            .member(user)
-            .vote(vote)
-            .answerType(req.voteAnswerType()).build());
+                .member(user)
+                .vote(vote)
+                .answerType(req.voteAnswerType()).build());
 
         // =======
         // 여기서 혼잡도 정보한테도 넘겨야됨
@@ -229,9 +229,9 @@ private List<VoteRes> voteList(Member user, double latitude, double longitude) {
             boolean voteFlag = voteUsercheck(vote, user);
 
             voteResList.add(
-                VoteRes.of(vote.getId(), profileTopThree(vote), (long) vote.getVoteDuplications().size(), vote.getCreatedAt(), vote.getPosName(),
-                    vote.getPosImage(),
-                    voteAnswer.get(0), voteAnswer.get(1), voteAnswer.get(2), voteAnswer.get(3), "투표하기", voteFlag));
+                    VoteRes.of(vote.getId(), profileTopThree(vote), (long) vote.getVoteDuplications().size(), vote.getCreatedAt(), vote.getPosName(),
+                            vote.getPosImage(),
+                            voteAnswer.get(0), voteAnswer.get(1), voteAnswer.get(2), voteAnswer.get(3), "투표하기", voteFlag));
         }
 
         return voteResList;
@@ -246,9 +246,9 @@ private List<MyVoteRes> myVoteList(Member user) {
             List<Long> voteAnswer = voteAnswerCnt(vote);
             boolean voteFlag = voteUsercheck(vote, user);
             myVoteRes.add(
-                MyVoteRes.of(vote.getId(), profileTopThree(vote), (long) vote.getVoteDuplications().size(), vote.getCreatedAt(), vote.getPosName(),
-                    voteAnswer.get(0), voteAnswer.get(1), voteAnswer.get(2), voteAnswer.get(3),
-                    "내 질문", vote.getVoteStatus(), voteFlag));
+                    MyVoteRes.of(vote.getId(), profileTopThree(vote), (long) vote.getVoteDuplications().size(), vote.getCreatedAt(), vote.getPosName(),
+                            voteAnswer.get(0), voteAnswer.get(1), voteAnswer.get(2), voteAnswer.get(3),
+                            "내 질문", vote.getVoteStatus(), voteFlag));
         }
 
         /// 투표 중복꺼 가져오기 즉 중속
@@ -261,16 +261,16 @@ private List<MyVoteRes> myVoteList(Member user) {
             List<Long> voteAnswer = voteAnswerCnt(vote);
             boolean voteFlag = voteUsercheck(vote, user);
             myVoteRes.add(
-                MyVoteRes.of(vote.getId(), profileTopThree(vote), (long) vote.getVoteDuplications().size(), vote.getCreatedAt(), vote.getPosName(),
-                    voteAnswer.get(0), voteAnswer.get(1), voteAnswer.get(2), voteAnswer.get(3), "내 질문", vote.getVoteStatus(), voteFlag));
+                    MyVoteRes.of(vote.getId(), profileTopThree(vote), (long) vote.getVoteDuplications().size(), vote.getCreatedAt(), vote.getPosName(),
+                            voteAnswer.get(0), voteAnswer.get(1), voteAnswer.get(2), voteAnswer.get(3), "내 질문", vote.getVoteStatus(), voteFlag));
         }
 
         return myVoteRes;
     }
 
     // 허버사인 공식 500m 반경 파악
     public boolean isWithin300Meters(double posLatitude, double posLongitude,
-        double userLatitude, double userLongitude) {
+                                     double userLatitude, double userLongitude) {
 
         final double EARTH_RADIUS = 6371000; // 지구 반지름 (m)
 
@@ -280,8 +280,8 @@ public boolean isWithin300Meters(double posLatitude, double posLongitude,
 
         // Haversine 공식
         double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-            Math.cos(Math.toRadians(posLatitude)) * Math.cos(Math.toRadians(userLatitude)) *
-                Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                Math.cos(Math.toRadians(posLatitude)) * Math.cos(Math.toRadians(userLatitude)) *
+                        Math.sin(dLon / 2) * Math.sin(dLon / 2);
 
         double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
 
@@ -294,7 +294,7 @@ public boolean isWithin300Meters(double posLatitude, double posLongitude,
     public List<Long> voteAnswerCnt(Vote vote) {
         List<VoteAnswer> voteAnswer = voteAnswerRepository.findByVote(vote);
         Map<VoteAnswerType, Long> counts = voteAnswer.stream()
-            .collect(Collectors.groupingBy(VoteAnswer::getAnswerType, Collectors.counting()));
+                .collect(Collectors.groupingBy(VoteAnswer::getAnswerType, Collectors.counting()));
 
         long relaxedCount = counts.getOrDefault(VoteAnswerType.RELAXED, 0L);
         long commonlyCount = counts.getOrDefault(VoteAnswerType.COMMONLY, 0L);
@@ -328,9 +328,9 @@ private List<Vote> calculate300(double latitude, double longitude) {
 
         // 3) 하버사인으로 500m 이내만 남기고, 거리 기준 정렬
         List<Vote> within300m = candidates.stream()
-            .filter(v -> distanceMeters(latitude, longitude, v.getLatitude(), v.getLongitude()) <= RADIUS_M)
-            .sorted(Comparator.comparingDouble(v -> distanceMeters(latitude, longitude, v.getLatitude(), v.getLongitude())))
-            .toList();
+                .filter(v -> distanceMeters(latitude, longitude, v.getLatitude(), v.getLongitude()) <= RADIUS_M)
+                .sorted(Comparator.comparingDouble(v -> distanceMeters(latitude, longitude, v.getLatitude(), v.getLongitude())))
+                .toList();
 
         return within300m;
     }
@@ -341,8 +341,8 @@ private static double distanceMeters(double lat1, double lon1, double lat2, doub
         double dLat = Math.toRadians(lat2 - lat1);
         double dLon = Math.toRadians(lon2 - lon1);
         double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
-            + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
-            * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+                * Math.sin(dLon / 2) * Math.sin(dLon / 2);
         double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
         return R * c;
     }
@@ -363,21 +363,21 @@ private boolean voteUsercheck(Vote vote, Member user) {
     // 상위 3건 유저 프로필 이미지 링크
     public List<String> profileTopThree(Vote vote) {
         return vote.getVoteAnswers().stream()
-            .map(voteAnswer -> voteAnswer.getMember().getProfile()) // Member의 프로필 URL 추출
-            .filter(Objects::nonNull)                               // null 값 제거 (안전)
-            .limit(3)                                               // 최대 3개만
-            .toList();
+                .map(voteAnswer -> voteAnswer.getMember().getProfile()) // Member의 프로필 URL 추출
+                .filter(Objects::nonNull)                               // null 값 제거 (안전)
+                .limit(3)                                               // 최대 3개만
+                .toList();
     }
 
     private String getPosImage(String posName) {
         try {
             // 네이버 이미지 검색 API 호출
             NaverImageSearchRes response = naverImageClient.searchImages(
-                posName + " 전경",   // 검색어 보정 (예: "부평남초등학교 전경")
-                10,                 // 여러 개 가져오기
-                1,
-                "sim",              // 정확도순
-                "large"             // 큰 이미지 우선
+                    posName + " 전경",   // 검색어 보정 (예: "부평남초등학교 전경")
+                    10,                 // 여러 개 가져오기
+                    1,
+                    "sim",              // 정확도순
+                    "large"             // 큰 이미지 우선
             );
 
             if (response.items() == null || response.items().isEmpty()) {
@@ -387,13 +387,13 @@ private String getPosImage(String posName) {
 
             // 후보 중에서 "급식/식단/메뉴" 같은 거 제외하고 첫 번째 반환
             return response.items().stream()
-                .filter(item -> !item.title().contains("급식"))
-                .filter(item -> !item.title().contains("식단"))
-                .filter(item -> !item.title().contains("메뉴"))
-                .filter(item -> !item.title().contains("사람"))
-                .findFirst()
-                .map(NaverImageSearchRes.Item::link)   // DTO 맞게 수정
-                .orElse(response.items().get(0).link());
+                    .filter(item -> !item.title().contains("급식"))
+                    .filter(item -> !item.title().contains("식단"))
+                    .filter(item -> !item.title().contains("메뉴"))
+                    .filter(item -> !item.title().contains("사람"))
+                    .findFirst()
+                    .map(NaverImageSearchRes.Item::link)   // DTO 맞게 수정
+                    .orElse(response.items().get(0).link());
 
         } catch (FeignException e) {
             log.error("❌ 네이버 이미지 API 호출 실패: {}", e.getMessage(), e);
@@ -410,7 +410,7 @@ private void createCongestion(Vote vote, VoteAnswerType answerType, String userI
             throw new BoombimException(ErrorCode.CONGESTION_LEVEL_NOT_FOUND);
 
         memberCongestionService.createMemberCongestion(userId,
-            CreateMemberCongestionRequest.of(vote.getMemberPlace().getId(), congestionLevel.getId(), "", vote.getLatitude(), vote.getLongitude()));
+                CreateMemberCongestionRequest.of(vote.getMemberPlace().getId(), congestionLevel.getId(), "", vote.getLatitude(), vote.getLongitude()));
     }
 
 
diff --git a/src/main/java/boombimapi/global/infra/exception/error/ErrorCode.java b/src/main/java/boombimapi/global/infra/exception/error/ErrorCode.java
@@ -72,6 +72,8 @@ public enum ErrorCode {
     DUPLICATE_VOTE_USER(-504, "이미 투표했습니다.", 409),
     NO_PERMISSION_TO_CLOSE_VOTE(-505, "투표 종료 권한이 없습니다.", 403),
     VOTE_ALREADY_CLOSED(-506, "종료된 투표입니다.", 400),
+    SELF_VOTE_NOT_ALLOWED(-507, "본인이 생성한 투표에는 참여할 수 없습니다.", 409),
+
 
     // member place & member congestion
     MEMBER_PLACE_NOT_FOUND(-600, "해당 장소가 등록되지 않았습니다.", 406),
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
@@ -12,7 +12,7 @@ spring:
     password: ${DB_PASSWORD}
   jpa:
     hibernate:
-      ddl-auto: create
+      ddl-auto: none
     properties:
       hibernate:
         default_schema: root        # 기본 스키마

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public ResponseEntity<LoginToken> adminLogin(@Valid @RequestBody AdminLoginReq r`
`45`	`45`	`}`
`46`	`46`
`47`	`47`
`48`		`- @PostMapping("/join")`
	`48`	`+ //@PostMapping("/join")`
`49`	`49`	`public void adminJoin(@Valid @RequestBody AdminLoginReq req) {`
`50`	`50`	`Member admin = Member.builder()`
`51`	`51`	`.id(UUID.randomUUID().toString())`
Original file line number	Diff line number	Diff line change
`@@ -181,9 +181,6 @@ private List<SearchRes> sortedCongestion(List<MemberPlace> memberPlaceEntities,`
`181`	`181`	`if (latestMember != null) {`
`182`	`182`	`result.add(SearchRes.of(memberPlace.getId(), memberPlace.getName(), latestMember.getCreatedAt(),`
`183`	`183`	`latestMember.getCongestionLevel().getName(), memberPlace.getAddress(), memberPlace.getImageUrl(), PlaceType.MEMBER_PLACE, favoriteFlag));`
`184`		`- }else{`
`185`		`- result.add(SearchRes.of(memberPlace.getId(), memberPlace.getName(), memberPlace.getCreatedAt(),`
`186`		`- "여유", memberPlace.getAddress(), memberPlace.getImageUrl(), PlaceType.MEMBER_PLACE, favoriteFlag));`
`187`	`184`	`}`
`188`	`185`	`}`
`189`	`186`