[배포] 홈 화면 배너 (조회수, 좋아요) 추가 및 이미지 서버 이전, Redis 설정 추가 및 홈 화면 배너 조회(2개) 글로벌 캐시 적용

.github/workflows/main-deploy.yml

@@ -41,6 +41,8 @@ jobs:
           spring.datasource.url: ${{ secrets.DB_URL }}
           spring.datasource.username: ${{ secrets.DB_USERNAME }}
           spring.datasource.password: ${{ secrets.DB_PASSWORD }}
+          spring.data.redis.host: ${{ secrets.REDIS_HOST }}
+          spring.data.redis.port: ${{ secrets.REDIS_PORT }}
           jwt.secret-key: ${{ secrets.JWT_SECRET_KEY }}
           jwt.access-token.plus-hour: ${{ secrets.JWT_ACCESS_TOKEN_PLUS_HOUR }}
           jwt.refresh-token.plus-hour: ${{ secrets.JWT_REFRESH_TOKEN_PLUS_HOUR }}

build.gradle

@@ -23,18 +23,17 @@ repositories {
 
 dependencies {
 	implementation 'org.jetbrains:annotations:24.0.0'
+	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.projectlombok:lombok'
 
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
     // https://mvnrepository.com/artifact/org.springframework.security/spring-security-core
 	implementation 'org.springframework.security:spring-security-core'
 
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
-
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	compileOnly 'org.projectlombok:lombok'
-
-
 	// https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api
 	implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
 	// https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-impl
@@ -49,7 +48,6 @@ dependencies {
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
 	runtimeOnly 'com.mysql:mysql-connector-j'
-	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'com.h2database:h2' // 테스트 실행 - H2 (임시)
 }

src/main/java/site/travellaboratory/be/article/application/service/ArticleLikeService.java

@@ -6,7 +6,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import site.travellaboratory.be.article.domain.enums.ArticleStatus;
 import site.travellaboratory.be.article.infrastructure.persistence.entity.ArticleEntity;
-import site.travellaboratory.be.article.infrastructure.persistence.entity.Bookmark;
+import site.travellaboratory.be.article.infrastructure.persistence.entity.BookmarkEntity;
 import site.travellaboratory.be.article.infrastructure.persistence.repository.ArticleJpaRepository;
 import site.travellaboratory.be.article.infrastructure.persistence.repository.BookmarkRepository;
 import site.travellaboratory.be.article.presentation.response.like.BookmarkSaveResponse;
@@ -33,17 +33,17 @@ public BookmarkSaveResponse saveBookmark(final Long userId, final Long articleId
         final ArticleEntity articleEntity = articleJpaRepository.findByIdAndStatus(articleId, ArticleStatus.ACTIVE)
                 .orElseThrow(() -> new BeApplicationException(ErrorCodes.ARTICLE_NOT_FOUND, HttpStatus.NOT_FOUND));
 
-        Bookmark bookmark = bookmarkRepository.findByArticleEntityAndUserEntity(articleEntity,
+        BookmarkEntity bookmarkEntity = bookmarkRepository.findByArticleEntityAndUserEntity(articleEntity,
             userEntity).orElse(null);
 
-        if (bookmark != null) {
-            bookmark.toggleStatus();
+        if (bookmarkEntity != null) {
+            bookmarkEntity.toggleStatus();
         } else {
-            bookmark = Bookmark.of(userEntity, articleEntity);
+            bookmarkEntity = BookmarkEntity.of(userEntity, articleEntity);
         }
 
-        final Bookmark newBookmark = bookmarkRepository.save(bookmark);
-        return BookmarkSaveResponse.from(newBookmark);
+        final BookmarkEntity newBookmarkEntity = bookmarkRepository.save(bookmarkEntity);
+        return BookmarkSaveResponse.from(newBookmarkEntity);
     }
 }
 

src/main/java/site/travellaboratory/be/article/application/service/ArticleReaderService.java

@@ -1,9 +1,11 @@
 package site.travellaboratory.be.article.application.service;
 
+import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
@@ -12,20 +14,22 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import site.travellaboratory.be.common.exception.BeApplicationException;
-import site.travellaboratory.be.common.error.ErrorCodes;
-import site.travellaboratory.be.article.infrastructure.persistence.repository.ArticleJpaRepository;
-import site.travellaboratory.be.article.infrastructure.persistence.entity.ArticleEntity;
 import site.travellaboratory.be.article.domain.enums.ArticleStatus;
-import site.travellaboratory.be.article.infrastructure.persistence.repository.BookmarkRepository;
-import site.travellaboratory.be.article.infrastructure.persistence.entity.Bookmark;
 import site.travellaboratory.be.article.domain.enums.BookmarkStatus;
-import site.travellaboratory.be.user.infrastructure.persistence.repository.UserJpaRepository;
-import site.travellaboratory.be.user.infrastructure.persistence.entity.UserEntity;
-import site.travellaboratory.be.user.domain.enums.UserStatus;
+import site.travellaboratory.be.article.infrastructure.persistence.entity.ArticleEntity;
+import site.travellaboratory.be.article.infrastructure.persistence.entity.BookmarkEntity;
+import site.travellaboratory.be.article.infrastructure.persistence.repository.ArticleJpaRepository;
+import site.travellaboratory.be.article.infrastructure.persistence.repository.ArticleViewsJpaRepository;
+import site.travellaboratory.be.article.infrastructure.persistence.repository.BookmarkRepository;
+import site.travellaboratory.be.article.presentation.response.like.BookmarkResponse;
 import site.travellaboratory.be.article.presentation.response.reader.ArticleOneResponse;
 import site.travellaboratory.be.article.presentation.response.reader.ArticleTotalResponse;
-import site.travellaboratory.be.article.presentation.response.like.BookmarkResponse;
+import site.travellaboratory.be.article.presentation.response.reader.BannerArticlesResponse;
+import site.travellaboratory.be.common.error.ErrorCodes;
+import site.travellaboratory.be.common.exception.BeApplicationException;
+import site.travellaboratory.be.user.domain.enums.UserStatus;
+import site.travellaboratory.be.user.infrastructure.persistence.entity.UserEntity;
+import site.travellaboratory.be.user.infrastructure.persistence.repository.UserJpaRepository;
 
 @Service
 @RequiredArgsConstructor
@@ -34,6 +38,7 @@ public class ArticleReaderService {
     private final ArticleJpaRepository articleJpaRepository;
     private final UserJpaRepository userJpaRepository;
     private final BookmarkRepository bookmarkRepository;
+    private final ArticleViewsJpaRepository articleViewsJpaRepository;
 
     // 내 초기 여행 계획 전체 조회
     @Transactional
@@ -133,48 +138,50 @@ public Page<ArticleTotalResponse> searchArticlesByKeyWord(
         return new PageImpl<>(articleResponses, pageable, newArticles.getTotalElements());
     }
 
-    @Transactional
-    public List<ArticleTotalResponse> getBannerNotUserArticles() {
-        List<ArticleEntity> articleJpaEntities = articleJpaRepository.findAllByStatus(ArticleStatus.ACTIVE);
+    @Transactional(readOnly = true)
+    @Cacheable(cacheNames = "weeklyLikes", key = "'getBannerWeeklyLikes'")
+    public List<BannerArticlesResponse> readBannerArticlesByWeeklyLikes() {
+        // 일 주일 전 계산
+        LocalDateTime oneWeekAgo = LocalDateTime.now().minusWeeks(1);
 
-        return articleJpaEntities.stream()
-                .map(article -> {
-                    Long bookmarkCount = bookmarkRepository.countByArticleIdAndStatus(article.getId(),
-                            BookmarkStatus.ACTIVE);
-                    boolean isBookmarked = false;
-                    boolean isEditable = false;
+        // 좋아요 수 기준으로 상위 12개의 articleId 가져오기
+        Pageable pageable = PageRequest.of(0, 12);
+        List<Long> topArticleIds = bookmarkRepository.findTopArticleIdsByLikeCount(oneWeekAgo, pageable);
 
-                    return ArticleTotalResponse.of(article, bookmarkCount, isBookmarked, isEditable);
-                })
-                .sorted((a1, a2) -> a2.bookmarkCount().compareTo(a1.bookmarkCount())) // 북마크 수 기준으로 내림차순 정렬
-                .limit(4) // 상위 4개 아티클만 가져옴
-                .collect(Collectors.toList());
+        // 해당 articleId 리스트로 게시글 조회
+        List<ArticleEntity> articles = articleJpaRepository.findActiveArticlesWithUserByIds(topArticleIds);
+        articleJpaRepository.findActiveArticlesWithLocationsByIds(topArticleIds);
+        articleJpaRepository.findActiveArticlesWithTravelStylesByIds(topArticleIds);
+
+
+        return articles.stream()
+            .map(BannerArticlesResponse::of)
+            .collect(Collectors.toList());
     }
 
-    @Transactional
-    public List<ArticleTotalResponse> getBannerUserArticles(final Long userId) {
-        userJpaRepository.findByIdAndStatus(userId, UserStatus.ACTIVE)
-                .orElseThrow(() -> new BeApplicationException(ErrorCodes.USER_NOT_FOUND, HttpStatus.NOT_FOUND));
 
-        List<ArticleEntity> articleJpaEntities = articleJpaRepository.findAllByStatus(ArticleStatus.ACTIVE);
+    @Transactional(readOnly = true)
+    @Cacheable(cacheNames = "hourlyViews", key = "'getBannerHourlyViews'")
+    public List<BannerArticlesResponse> readBannerArticlesByHourlyViews() {
+        // 3일 전부터 시간 계산
+        LocalDateTime threeDaysAgo = LocalDateTime.now().minusDays(3);
 
-        return articleJpaEntities.stream()
-                .map(article -> {
-                    Long bookmarkCount = bookmarkRepository.countByArticleIdAndStatus(article.getId(),
-                            BookmarkStatus.ACTIVE);
-                    boolean isBookmarked = bookmarkRepository.existsByUserEntityIdAndArticleEntityIdAndStatus(userId,
-                            article.getId(),
-                            BookmarkStatus.ACTIVE);
-                    boolean isEditable = userId.equals(article.getUserEntity().getId());
+        // 조회수 기준으로 상위 12개의 articleId 가져오기
+        Pageable pageable = PageRequest.of(0, 12);
+        List<Long> topArticleIdsByViewsCount = articleViewsJpaRepository.findTopArticleIdsByViewsCount(
+            threeDaysAgo, pageable);
 
-                    return ArticleTotalResponse.of(article, bookmarkCount, isBookmarked, isEditable);
-                })
-                .sorted((a1, a2) -> a2.bookmarkCount().compareTo(a1.bookmarkCount())) // 북마크 수 기준으로 내림차순 정렬
-                .limit(4) // 상위 4개 아티클만 가져옴
-                .collect(Collectors.toList());
-    }
+        // 해당 articleId 리스트로 게시글 조회
+        List<ArticleEntity> articles = articleJpaRepository.findActiveArticlesWithUserByIds(topArticleIdsByViewsCount);
+        articleJpaRepository.findActiveArticlesWithLocationsByIds(topArticleIdsByViewsCount);
+        articleJpaRepository.findActiveArticlesWithTravelStylesByIds(topArticleIdsByViewsCount);
 
 
+        return articles.stream()
+            .map(BannerArticlesResponse::of)
+            .collect(Collectors.toList());
+    }
+
     @Transactional
     public Page<BookmarkResponse> findAllBookmarkByUser(final Long loginId, final Long userId, Pageable pageable) {
         final UserEntity loginUserEntity = userJpaRepository.findByIdAndStatus(loginId, UserStatus.ACTIVE)
@@ -185,7 +192,7 @@ public Page<BookmarkResponse> findAllBookmarkByUser(final Long loginId, final Lo
             .orElseThrow(() -> new BeApplicationException(ErrorCodes.USER_NOT_FOUND,
                 HttpStatus.NOT_FOUND));
 
-        final Page<Bookmark> bookmarks = bookmarkRepository.findByUserEntityAndStatus(
+        final Page<BookmarkEntity> bookmarks = bookmarkRepository.findByUserEntityAndStatus(
                 userEntity, BookmarkStatus.ACTIVE, pageable)
             .orElseThrow(() -> new BeApplicationException(ErrorCodes.BOOKMARK_NOT_FOUND, HttpStatus.NOT_FOUND));