Merge pull request #307 from CELEBIT/develop

Develop

Author: KJBig

README.md

@@ -126,7 +126,18 @@
    <summary> 본문 확인 (👈 Click)</summary>
 <br />
 
-<img width="700" alt="arch" src="https://github.com/user-attachments/assets/6435a6ff-3fa4-492d-a785-441af26d1074">
+### Service Architecture
+<br />
+<img width="700" alt="service-arch" src="https://github.com/user-attachments/assets/db2bf0c8-8c22-4439-9d6c-054fe638a159">
+
+<br />
+
+### CD Pipe-Line Architecture
+
+<br />
+<img width="700" alt="cd-arch" src="https://github.com/user-attachments/assets/a49b8077-9b1e-4cbe-a180-c39f67940561">
+
+
 
 </details>
 

build.gradle

@@ -15,12 +15,6 @@ subprojects {
     version = '0.0.1-SNAPSHOT'
     sourceCompatibility = '17'
 
-//    java {
-//        toolchain {
-//            languageVersion = JavaLanguageVersion.of(17)
-//        }
-//    }
-
     apply plugin: 'java'
     apply plugin: 'java-library'
     apply plugin: 'org.springframework.boot'

sluv-api/src/main/java/com/sluv/api/auth/controller/AuthController.java

@@ -13,7 +13,7 @@
 import com.sluv.common.annotation.CurrentUserId;
 import com.sluv.domain.auth.enums.SnsType;
 import com.sluv.domain.user.entity.User;
-import com.sluv.infra.cache.CacheService;
+import com.sluv.infra.counter.visit.VisitCounter;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -29,7 +29,7 @@ public class AuthController {
     private final GoogleUserService googleUserService;
     private final AppleUserService appleUserService;
     private final AuthService authService;
-    private final CacheService cacheService;
+    private final VisitCounter visitCounter;
 
 
     @Operation(summary = "소셜 로그인", description = "KAKAO:[AccessToken], GOOGLE, APPLE: [IdToken]")
@@ -45,7 +45,7 @@ public ResponseEntity<SuccessDataResponse<AuthResponse>> socialLogin(@RequestBod
             case APPLE -> loginUser = appleUserService.appleLogin(request);
         }
 
-        cacheService.visitMember(loginUser.getId());
+        visitCounter.countVisit(loginUser.getId());
 
         AuthResponse response = authService.getAuthResDto(loginUser);
         return ResponseEntity.ok().body(SuccessDataResponse.create(response));
@@ -55,7 +55,7 @@ public ResponseEntity<SuccessDataResponse<AuthResponse>> socialLogin(@RequestBod
     @Operation(summary = "*자동 로그인", description = "토큰 만료 시 error code : 4002")
     @GetMapping("/auto-login")
     public ResponseEntity<SuccessDataResponse<AutoLoginResponse>> autoLogin(@CurrentUserId Long userId) {
-        cacheService.visitMember(userId);
+        visitCounter.countVisit(userId);
         User user = authService.findLogInUser(userId);
 //        authService.checkFcm(user);
         AutoLoginResponse response = AutoLoginResponse.of(user);
@@ -66,7 +66,7 @@ public ResponseEntity<SuccessDataResponse<AutoLoginResponse>> autoLogin(@Current
     @PostMapping("/auto-login")
     public ResponseEntity<SuccessDataResponse<AutoLoginResponse>> autoLoginWithFcm(@CurrentUserId Long userId,
                                                                                    @Nullable @RequestBody AutoLoginRequest request) {
-        cacheService.visitMember(userId);
+        visitCounter.countVisit(userId);
         if (request != null) {
             authService.changeFcm(userId, request.getFcm());
         }

sluv-api/src/main/java/com/sluv/api/item/service/ItemCacheService.java

@@ -1,5 +1,6 @@
 package com.sluv.api.item.service;
 
+import com.sluv.api.item.dto.ItemDetailFixData;
 import com.sluv.domain.item.entity.Item;
 import com.sluv.domain.item.service.ItemDomainService;
 import com.sluv.infra.cache.CacheService;
@@ -14,7 +15,9 @@
 @RequiredArgsConstructor
 public class ItemCacheService {
     private final ItemDomainService itemDomainService;
-    private final CacheService cacheService;
+    private final CacheService<ItemDetailFixData> cacheService;
+
+    private final String ITEM_KEY_PREFIX = "item:";
 
     @Transactional
     @Async(value = "asyncThreadPoolExecutor")
@@ -24,7 +27,7 @@ public void deleteAllItemCacheByUserId(Long userId) {
                 .map(Item::getId)
                 .toList();
 
-        userItemIds.forEach(cacheService::deleteItemDetailFixDataByItemId);
+        userItemIds.forEach((userItemId) -> cacheService.deleteByKey(ITEM_KEY_PREFIX + userItemId));
     }
 
 }

sluv-api/src/main/java/com/sluv/api/item/service/ItemService.java

@@ -35,6 +35,7 @@
 import com.sluv.infra.ai.AiModelService;
 import com.sluv.infra.alarm.service.ItemAlarmService;
 import com.sluv.infra.cache.CacheService;
+import com.sluv.infra.counter.view.ViewCounter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -73,16 +74,19 @@ public class ItemService {
     private final ItemScrapDomainService itemScrapDomainService;
 
     private final AiModelService aiModelService;
-    private final CacheService cacheService;
+    private final CacheService<ItemDetailFixData> cacheService;
+    private final ViewCounter viewCounter;
     private final ItemAlarmService itemAlarmService;
     private final ItemHelper itemHelper;
 
+    private final String ITEM_KEY_PREFIX = "item:";
+
     @Transactional
     public ItemPostResDto postItem(Long userId, ItemPostReqDto reqDto) {
         User user = userDomainService.findById(userId);
 
         if (reqDto.getId() != null) {
-            cacheService.deleteItemDetailFixDataByItemId(reqDto.getId());
+            cacheService.deleteByKey(ITEM_KEY_PREFIX + reqDto.getId());
         }
 
         // 추가될 Celeb 확인
@@ -184,10 +188,10 @@ public ItemDetailResDto getItemDetail(Long userId, Long itemId) {
         }
 
         // 2. Item Detail 고정 데이터 조회 -> Cache Aside
-        ItemDetailFixData fixData = (ItemDetailFixData) cacheService.findItemDetailFixDataByItemId(itemId);
+        ItemDetailFixData fixData = cacheService.findByKey(ITEM_KEY_PREFIX + itemId);
         if (fixData == null) {
             fixData = getItemDetailFixData(item);
-            cacheService.saveItemDetailFixData(itemId, fixData);
+            cacheService.saveWithKey(ITEM_KEY_PREFIX + itemId, fixData);
         }
 
         // 3. 좋아요 수
@@ -243,14 +247,13 @@ public ItemDetailResDto getItemDetail(Long userId, Long itemId) {
     }
 
     private void increaseViewNum(Long userId, Item item) {
-        boolean isExist = cacheService.existUserViewItemId(userId, item.getId());
+        boolean isExist = viewCounter.existUserViewItemId(userId, item.getId());
         if (!isExist) {
-            cacheService.saveUserViewItemId(userId, item.getId());
+            viewCounter.saveUserViewItemId(userId, item.getId());
             item.increaseViewNum();
         }
     }
 
-    //    @Cacheable(cacheNames = "item", key = "#itemId")
     @Transactional
     public ItemDetailFixData getItemDetailFixData(Item item) {
         Long itemId = item.getId();
@@ -314,7 +317,7 @@ public void deleteItem(Long itemId) {
 
         item.changeStatus(ItemStatus.DELETED);
         itemDomainService.saveItem(item);
-        cacheService.deleteItemDetailFixDataByItemId(itemId);
+        cacheService.deleteByKey(ITEM_KEY_PREFIX + itemId);
     }
 
     @Transactional(readOnly = true)

sluv-api/src/main/java/com/sluv/api/question/service/QuestionService.java

@@ -26,7 +26,7 @@
 import com.sluv.domain.user.entity.User;
 import com.sluv.domain.user.service.UserDomainService;
 import com.sluv.infra.alarm.service.QuestionAlarmService;
-import com.sluv.infra.cache.CacheService;
+import com.sluv.infra.counter.view.ViewCounter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -58,7 +58,7 @@ public class QuestionService {
     private final QuestionVoteDomainService questionVoteDomainService;
     private final UserDomainService userDomainService;
 
-    private final CacheService cacheService;
+    private final ViewCounter viewCounter;
     private final QuestionAlarmService questionAlarmService;
 
 
@@ -405,9 +405,9 @@ public QuestionGetDetailResDto getQuestionDetail(Long nowUserId, Long questionId
     }
 
     private void increaseQuestionViewNum(Long userId, Question question) {
-        boolean isExist = cacheService.existUserViewQuestionId(userId, question.getId());
+        boolean isExist = viewCounter.existUserViewQuestionId(userId, question.getId());
         if (!isExist) {
-            cacheService.saveUserViewQuestionId(userId, question.getId());
+            viewCounter.saveUserViewQuestionId(userId, question.getId());
             question.increaseSearchNum();
         }
     }