118 fea 조회 성능 최적화 및 인기 게더링 조회

src/main/java/com/palettee/PaletteApplication.java

@@ -4,6 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableJpaAuditing

src/main/java/com/palettee/gathering/controller/GatheringController.java

@@ -3,9 +3,10 @@
 import com.palettee.gathering.controller.dto.Request.GatheringCommonRequest;
 import com.palettee.gathering.controller.dto.Response.GatheringCommonResponse;
 import com.palettee.gathering.controller.dto.Response.GatheringDetailsResponse;
+import com.palettee.gathering.repository.GatheringRedisRepository;
 import com.palettee.gathering.service.GatheringService;
 import com.palettee.global.security.validation.UserUtils;
-import com.palettee.portfolio.controller.dto.response.CustomSliceResponse;
+import com.palettee.gathering.controller.dto.Response.CustomSliceResponse;
 import com.palettee.user.domain.User;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -23,11 +24,14 @@ public class GatheringController {
 
     private final GatheringService gatheringService;
 
+    private final GatheringRedisRepository redisRepository;
+
 
     @PostMapping()
     public GatheringCommonResponse create(@RequestBody @Valid GatheringCommonRequest request) {
 
         GatheringCommonResponse gathering = gatheringService.createGathering(request, UserUtils.getContextUser());
+        redisRepository.addGatheringInRedis(gathering.gatheringId());
 
         return gathering;
     }
@@ -44,8 +48,7 @@ public CustomSliceResponse findAll(
             @RequestParam(required = false, defaultValue = "0") int personnel,
             Pageable pageable
     ) {
-        log.info("positions.size = {}", positions.size());
-        return gatheringService.findAll(sort, subject, period, contact, positions, status, personnel, gatheringId, pageable);
+        return gatheringService.findAll(sort, subject, period, contact, positions, status, personnel, gatheringId, pageable, isFirstTrue(gatheringId, sort, subject, period, contact, status, positions, personnel));
     }
 
     @GetMapping("/{gatheringId}")
@@ -60,6 +63,8 @@ public GatheringCommonResponse update(
     ) {
         GatheringCommonResponse gatheringCommonResponse = gatheringService.updateGathering(gatheringId, request, UserUtils.getContextUser());
 
+        redisRepository.updateGatheringInRedis(gatheringCommonResponse.gatheringId());
+
         return gatheringCommonResponse;
     }
 
@@ -88,4 +93,11 @@ public CustomSliceResponse findLike(
         return gatheringService.findLikeList(pageable, contextUser.getId(), likeId);
     }
 
+    private static boolean isFirstTrue(Long gatheringId, String sort, String subject, String period, String contact,String status ,List<String> positions, int personnel) {
+        if(gatheringId != null || sort != null || subject != null || period != null || contact != null || !status.equals("모집중") || !positions.isEmpty() || personnel > 0){
+            return false;
+        }
+        return true;
+    }
+
 }

src/main/java/com/palettee/gathering/controller/dto/Response/CustomSliceResponse.java

@@ -0,0 +1,14 @@
+package com.palettee.gathering.controller.dto.Response;
+
+import java.util.List;
+
+public record CustomSliceResponse(
+        List<GatheringResponse> content,
+        boolean hasNext,
+        Long nextId
+) {
+
+    public static  CustomSliceResponse toDTO(List<GatheringResponse> content, boolean hasNext, Long nextLikeId) {
+        return new CustomSliceResponse (content, hasNext, nextLikeId);
+    }
+}

src/main/java/com/palettee/gathering/controller/dto/Response/GatheringResponse.java

@@ -1,8 +1,15 @@
 package com.palettee.gathering.controller.dto.Response;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.palettee.gathering.domain.Gathering;
+import com.palettee.gathering.domain.Sort;
+import com.palettee.gathering.domain.Subject;
+import com.palettee.global.exception.InvalidCategoryException;
 
-import java.time.format.DateTimeFormatter;
+import java.time.LocalDateTime;
 import java.util.List;
 
 public record GatheringResponse(
@@ -14,6 +21,9 @@ public record GatheringResponse(
         String title,
         String deadLine,
         String username,
+        @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+        @JsonSerialize(using = LocalDateTimeSerializer.class)
+        LocalDateTime createDateTime,
         List<String> tags,
         List<String> positions
 
@@ -31,17 +41,31 @@ public static GatheringResponse toDto(Gathering gathering) {
         return new GatheringResponse(
                 gathering.getId(),
                 gathering.getUser().getId(),
-                gathering.getSort().getSort(),
+                getSort(gathering.getSort()),
                 gathering.getPersonnel(),
-                gathering.getSubject().getSubject(),
+                getSubject(gathering.getSubject()),
                 gathering.getTitle(),
                 deadLine,
                 gathering.getUser().getName(),
+                gathering.getCreateAt(),
                 gatheringTagList,
                 positions
         );
     }
 
+    private static String getSort(Sort sort) {
+        if(sort!= null){
+            return sort.getSort();
+        }
+        throw  InvalidCategoryException.EXCEPTION;
+    }
+
+    private static String getSubject(Subject subject) {
+        if(subject != null){
+            return subject.getSubject();
+        }
+        throw  InvalidCategoryException.EXCEPTION;
+    }
 
     private static List<String> checkGatheringTag(Gathering gathering) {
         if(gathering.getGatheringTagList() != null && !gathering.getGatheringTagList().isEmpty()){

src/main/java/com/palettee/gathering/domain/Contact.java

@@ -1,6 +1,8 @@
 package com.palettee.gathering.domain;
 
+import com.palettee.global.exception.InvalidCategoryException;
 import lombok.RequiredArgsConstructor;
+import org.webjars.NotFoundException;
 
 import java.util.Arrays;
 
@@ -23,7 +25,7 @@ public static Contact findContact(final String input) {
         return Arrays.stream(Contact.values())
                 .filter(it -> it.contact.equals(input))
                 .findFirst()
-                .orElse(null);
+                .orElseThrow(()-> InvalidCategoryException.EXCEPTION);
     }
 
 

src/main/java/com/palettee/gathering/domain/Gathering.java

@@ -55,6 +55,8 @@ public class Gathering extends BaseEntity {
     @JoinColumn(name = "user_id")
     private User user;
 
+    private int hits;
+
     @OneToMany(mappedBy = "gathering", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<GatheringTag> gatheringTagList = new ArrayList<>();
 
@@ -91,6 +93,7 @@ public Gathering(
         this.title = title;
         this.content = content;
         this.user = user;
+        this.hits = 0;
         user.addGathering(this);
        setGatheringTagList(gatheringTagList);
        setGatheringImages(gatheringImages);

src/main/java/com/palettee/gathering/domain/Position.java

@@ -9,6 +9,7 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name = "positions")
 public class Position {
 
     @Id

src/main/java/com/palettee/gathering/domain/PositionContent.java

@@ -1,5 +1,6 @@
 package com.palettee.gathering.domain;
 
+import com.palettee.global.exception.InvalidCategoryException;
 import lombok.RequiredArgsConstructor;
 
 import java.util.Arrays;
@@ -23,6 +24,6 @@ public static  PositionContent findPosition(String input) {
         return Arrays.stream(PositionContent.values())
                 .filter(it -> it.position.equals(input))
                 .findFirst()
-                .orElse(null);
+                .orElseThrow(()-> InvalidCategoryException.EXCEPTION);
     }
 }

src/main/java/com/palettee/gathering/repository/GatheringRedisRepository.java

@@ -0,0 +1,70 @@
+package com.palettee.gathering.repository;
+
+import com.palettee.gathering.controller.dto.Response.GatheringResponse;
+import com.palettee.gathering.domain.Gathering;
+import com.palettee.gathering.service.GatheringService;
+import com.palettee.global.redis.utils.TypeConverter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Set;
+
+import static com.palettee.global.Const.gathering_Page_Size;
+
+
+@Repository
+@Slf4j
+@RequiredArgsConstructor
+public class GatheringRedisRepository {
+
+    public final static String RedisConstKey_Gathering = "cache:firstPage:gatherings";
+
+    private final RedisTemplate<String, GatheringResponse> redisTemplate;
+    private final GatheringService gatheringService;
+
+    @Transactional(readOnly = true)
+    public void addGatheringInRedis(Long gatheringId) {
+        log.info("저장 이벤트");
+        Set<GatheringResponse> range = redisTemplate.opsForZSet().range(RedisConstKey_Gathering, 0, -1);
+        if(!range.isEmpty()){
+            Gathering gathering = gatheringService.getGathering(gatheringId);
+
+            if(range.size() == gathering_Page_Size){
+                log.info("내부 캐시 삭제");
+                //맨 마지막 요소 빼기 즉 score가 가장 낮은애를 빼줌
+                redisTemplate.opsForZSet().removeRange(RedisConstKey_Gathering, 0, 0);
+            }
+            GatheringResponse gatheringResponse = GatheringResponse.toDto(gathering);
+            redisTemplate.opsForZSet().add(RedisConstKey_Gathering, gatheringResponse, TypeConverter.LocalDateTimeToDouble(gatheringResponse.createDateTime()));
+        }
+
+    }
+
+    @Transactional(readOnly = true)
+    public void updateGatheringInRedis(Long gatheringId){
+        log.info("수정 이벤트");
+        Set<String> keys = redisTemplate.keys(RedisConstKey_Gathering);
+
+        if(!keys.isEmpty()){
+            Gathering gathering = gatheringService.getGathering(gatheringId);
+
+            GatheringResponse gatheringResponse = GatheringResponse.toDto(gathering);
+
+            Double score = TypeConverter.LocalDateTimeToDouble(gatheringResponse.createDateTime());
+
+            Long removeCount = redisTemplate.opsForZSet().removeRangeByScore(RedisConstKey_Gathering, score, score);
+
+            if(removeCount != 0){
+                log.info("캐시 수정으로 인한 새로운 값 재캐싱");
+                redisTemplate.opsForZSet().add(RedisConstKey_Gathering, gatheringResponse, TypeConverter.LocalDateTimeToDouble(gatheringResponse.createDateTime()));
+            }
+        }
+    }
+
+
+
+
+}

src/main/java/com/palettee/gathering/repository/GatheringRepositoryCustom.java

@@ -1,6 +1,6 @@
 package com.palettee.gathering.repository;
 
-import com.palettee.portfolio.controller.dto.response.*;
+import com.palettee.gathering.controller.dto.Response.CustomSliceResponse;
 import com.palettee.user.controller.dto.response.users.*;
 import java.util.*;
 import org.springframework.data.domain.*;

src/main/java/com/palettee/gathering/repository/GatheringRepositoryImpl.java

@@ -10,7 +10,6 @@
 import com.palettee.gathering.domain.Sort;
 import com.palettee.gathering.domain.*;
 import com.palettee.likes.domain.*;
-import com.palettee.portfolio.controller.dto.response.*;
 import com.palettee.user.controller.dto.response.users.*;
 import com.querydsl.core.*;
 import com.querydsl.core.types.dsl.*;
@@ -47,7 +46,7 @@ public CustomSliceResponse pageGathering(
         List<Gathering> result = queryFactory
                 .selectFrom(gathering)
                 .join(gathering.user, user).fetchJoin()
-                .join(gathering.positions, position).fetchJoin()
+                .leftJoin(gathering.positions, position).fetchJoin()
                 .where(
                         sortEq(sort),
                         subjectEq(subject),
@@ -58,7 +57,7 @@ public CustomSliceResponse pageGathering(
                         positionIn(positions),
                         pageIdLoe(gatheringId)
                         )
-                .orderBy(gathering.id.desc())
+                .orderBy(gathering.createAt.desc())
                 .limit(pageable.getPageSize() + 1)
                 .fetch();