Merge pull request #23 from KONKUK-MAP-Service/feat-spot

✔️  [Fix]  :  장소조회시 반환 요청사항 수정 #23

Author: evergreenn

src/main/java/com/cona/KUsukKusuk/global/security/LoginFilter.java

@@ -83,7 +83,7 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
 
         String password = customUserDetails.getPassword();
         //AT : 6분
-        String accessToken = jwtUtil.createJwt(username, password, 60*60*1000L);
+        String accessToken = jwtUtil.createJwt(username, password, 60*60*100L);
         //RT : 7일
         String refreshToken = jwtUtil.createRefreshToken(username, password, 86400000*7L);
 

src/main/java/com/cona/KUsukKusuk/global/security/SecurityConfig.java

@@ -78,8 +78,10 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
         //경로별 인가 작업
         http
                 .authorizeHttpRequests((auth) -> auth
-                        .requestMatchers("/login", "/users/join","/health","/","/users/refresh").permitAll()
-                        .requestMatchers("/**").permitAll()
+                        .requestMatchers("/login", "/users/join","/health","/","/index.html","/users/refresh","/userinfo").permitAll()
+                        .requestMatchers("/users/logout").permitAll()
+                        .requestMatchers("/spot/**").permitAll()
+                        .requestMatchers("/users/find-password","/bookmark/add","/bookmark/delete").permitAll()
                         .requestMatchers( "/swagger-ui/**", "/v3/api-docs/**").permitAll()
                         //스웨거 접근권한 허용
                         .anyRequest().authenticated());

src/main/java/com/cona/KUsukKusuk/spot/dto/SpotDetailResponse.java

@@ -11,9 +11,13 @@ public record SpotDetailResponse(Long spotId,
                                  List<String> images,
                                  String longitude,
                                  String latitude,
+                                 String author,
+                                 Boolean bookmark,
+                                 Boolean like,
+
                                  String review) {
 
-    public static SpotDetailResponse fromSpot(Spot spot) {
+    public static SpotDetailResponse fromSpot(Spot spot,Boolean isBookmark, Boolean isLike) {
         return SpotDetailResponse.builder()
                 .spotId(spot.getId())
 
@@ -22,6 +26,9 @@ public static SpotDetailResponse fromSpot(Spot spot) {
                 .longitude(spot.getLongitude())
                 .latitude(spot.getLatitude())
                 .review(spot.getReview())
+                .author(spot.getUser().getNickname())
+                .bookmark(isBookmark)
+                .like(isLike)
                 .build();
     }
 

src/main/java/com/cona/KUsukKusuk/spot/dto/SpotGetResponse.java

@@ -17,17 +17,24 @@ public record SpotGetResponse(
        String longtitude,
         String latitude,
          String review,
+        String author,
+        Boolean bookmark,
+        Boolean like,
+
         LocalDateTime createDate
 ) {
-    public static SpotGetResponse of(Spot spot,Boolean bool) {
+    public static SpotGetResponse of(Spot spot,Boolean isUsersOwnSpot,Boolean isBookmark,Boolean isLike) {
         return SpotGetResponse.builder()
                 .spotId(spot.getId())
-                .isUsersOwnSpot(bool)
+                .isUsersOwnSpot(isUsersOwnSpot)
                 .spotName(spot.getSpotName())
                 .images(spot.getImageUrls())
                 .longtitude(spot.getLongitude())
                 .latitude(spot.getLatitude())
                 .review(spot.getReview())
+                .author(spot.getUser().getNickname())
+                .bookmark(isBookmark)
+                .like(isLike)
                 .createDate(spot.getCreatedDate())
                 .build();
     }

src/main/java/com/cona/KUsukKusuk/spot/service/SpotService.java

@@ -1,8 +1,12 @@
 package com.cona.KUsukKusuk.spot.service;
 
+import com.cona.KUsukKusuk.bookmark.domain.Bookmark;
+import com.cona.KUsukKusuk.bookmark.repository.BookmarkRepository;
 import com.cona.KUsukKusuk.global.exception.HttpExceptionCode;
 import com.cona.KUsukKusuk.global.response.HttpResponse;
 import com.cona.KUsukKusuk.global.s3.S3Service;
+import com.cona.KUsukKusuk.like.UserLike;
+import com.cona.KUsukKusuk.like.repository.UserLikeRepository;
 import com.cona.KUsukKusuk.spot.domain.Spot;
 import com.cona.KUsukKusuk.spot.dto.SpotDetailResponse;
 import com.cona.KUsukKusuk.spot.dto.SpotGetResponse;
@@ -37,6 +41,8 @@ public class SpotService {
     private final SpotRepository spotRepository;
     private final UserService userService;
     private final UserRepository userRepository;
+    private final BookmarkRepository bookmarkRepository;
+    private final UserLikeRepository userLikeRepository;
     private final S3Service s3Service;
 
 
@@ -68,25 +74,52 @@ public Spot uploadSpot(List<MultipartFile> images, SpotUploadRequest spotUploadR
     public List<SpotGetResponse> getAllSpots() {
         String userId = userService.getUsernameBySecurityContext();
         User user = userService.findUserByUserid(userId);
+        List<Bookmark> bookmarks = bookmarkRepository.findByUser(user);
+        List<UserLike> userLikes = userLikeRepository.findByUser(user);
 
         List<Spot> spots = spotRepository.findAll();
         return spots.stream()
-                .map(spot -> SpotGetResponse.of(spot, spot.getUser().equals(user)))
+                .map(spot -> {
+                    boolean isBookmarkedByUser = bookmarks != null && bookmarks.stream()
+                            .anyMatch(bookmark -> bookmark.getSpot().equals(spot));
+                    boolean isLikedByUser = userLikes != null && userLikes.stream()
+                            .anyMatch(like -> like.getSpot().equals(spot));
+                    return SpotGetResponse.of(spot, spot.getUser().equals(user), isBookmarkedByUser, isLikedByUser);
+                })
                 .collect(Collectors.toList());
     }
     public SpotDetailResponse getSpotDetails(Long spotId) {
+        String username = SecurityContextHolder.getContext().getAuthentication()
+                .getName();
+
+        Boolean isBookmark=false;
+        Boolean isLike=true;
 
         Spot spot = spotRepository.findById(spotId)
                 .orElseThrow(() -> new SpotNotFoundException());
 
+        if (!username.equals("anonymousUser")) {
+
+            User user = userService.findUserByUserid(username);
+            List<UserLike> userLikes = userLikeRepository.findByUser(user);
+            List<Bookmark> bookmarks = bookmarkRepository.findByUser(user);
+
+            isLike = userLikes != null && userLikes.stream().anyMatch(like -> like.getSpot().equals(spot));
+
+            isBookmark = bookmarks != null && bookmarks.stream().anyMatch(bookmark -> bookmark.getSpot().equals(spot));
+
+        }
+
+
+
         boolean isUsersOwnSpot = spot.getUser().getId().equals(false);
-        return SpotDetailResponse.fromSpot(spot);
+        return SpotDetailResponse.fromSpot(spot,isBookmark,isLike);
     }
     public List<SpotGetResponse> getAllPublicSpots() {
 
         List<Spot> spots = spotRepository.findAll();
         return spots.stream()
-                .map(spot -> SpotGetResponse.of(spot, false))
+                .map(spot -> SpotGetResponse.of(spot, false,false,false))
                 .collect(Collectors.toList());
     }
     public Spot updateSpot(Long spotId,List<MultipartFile> images, SpotUpdateRequest spotUpdateRequest) throws IOException {