Merge pull request #261 from Clokey-dev/develop

[deploy] 배포 (#105)

Author: 2ghrms

.github/workflows/dev-cd.yml

@@ -98,6 +98,9 @@ jobs:
 
             export SWAGGER_USERNAME=${{ secrets.SWAGGER_USERNAME }}
             export SWAGGER_PASSWORD=${{ secrets.SWAGGER_PASSWORD }}
+            
+            export MEILISEARCH_ENDPOINT=${{ secrets.MEILISEARCH_ENDPOINT }}
+            export MEILISEARCH_KEY=${{ secrets.MEILISEARCH_KEY }}
 
             sudo mkdir -p /home/ubuntu/secrets
             echo "${{ secrets.FIREBASE_SA_JSON_B64 }}" | base64 -d | sudo tee /home/ubuntu/secrets/firebase-sa.json > /dev/null
@@ -112,4 +115,4 @@ jobs:
             
             echo "Cleaning up dangling Docker images..."
             docker image prune -f
-
+            

.github/workflows/prod-cd.yml

@@ -108,6 +108,9 @@ jobs:
 
             export SWAGGER_USERNAME=${{ secrets.SWAGGER_USERNAME }}
             export SWAGGER_PASSWORD=${{ secrets.SWAGGER_PASSWORD }}
+            
+            export MEILISEARCH_ENDPOINT=${{ secrets.MEILISEARCH_ENDPOINT }}
+            export MEILISEARCH_KEY=${{ secrets.MEILISEARCH_KEY }}
 
             sudo mkdir -p /home/ubuntu/secrets
             echo "${{ secrets.FIREBASE_SA_JSON_B64 }}" | base64 -d | sudo tee /home/ubuntu/secrets/firebase-sa.json > /dev/null
@@ -122,4 +125,4 @@ jobs:
 
             echo "Cleaning up dangling Docker images..."
             docker image prune -f
-
+            

clokey-api/build.gradle

@@ -19,4 +19,6 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+    implementation 'io.vanslog:spring-data-meilisearch:0.7.3'
 }

clokey-api/dev-compose.yml

@@ -51,6 +51,10 @@ services:
       SWAGGER_USERNAME: ${SWAGGER_USERNAME}
       SWAGGER_PASSWORD: ${SWAGGER_PASSWORD}
 
+      # MeilieSearch
+      MEILISEARCH_ENDPOINT: ${MEILISEARCH_ENDPOINT}
+      MEILISEARCH_KEY: ${MEILISEARCH_KEY}
+
     volumes:
       - /home/ubuntu/secrets/firebase-sa.json:/run/secrets/firebase-sa.json:ro
 

clokey-api/prod-compose.yml

@@ -51,6 +51,10 @@ services:
       SWAGGER_USERNAME: ${SWAGGER_USERNAME}
       SWAGGER_PASSWORD: ${SWAGGER_PASSWORD}
 
+      # MeilieSearch
+      MEILISEARCH_ENDPOINT: ${MEILISEARCH_ENDPOINT}
+      MEILISEARCH_KEY: ${MEILISEARCH_KEY}
+
     volumes:
       - /home/ubuntu/secrets/firebase-sa.json:/run/secrets/firebase-sa.json:ro
 

clokey-api/src/main/java/org/clokey/domain/auth/service/AuthServiceImpl.java

@@ -35,6 +35,7 @@
 import org.clokey.domain.member.repository.PendingFollowRepository;
 import org.clokey.domain.notification.repository.CodiveNotificationRepository;
 import org.clokey.domain.report.repository.ReportRepository;
+import org.clokey.domain.search.event.MemberDeleteEvent;
 import org.clokey.domain.term.repository.MemberTermRepository;
 import org.clokey.exception.BaseCustomException;
 import org.clokey.global.util.MemberUtil;
@@ -322,6 +323,9 @@ public void withdrawMemberById(Long memberId) {
 
         // 15. Member 삭제
         memberRepository.delete(currentMember);
+
+        // 16. MeiliSearch에 동기화
+        eventPublisher.publishEvent(MemberDeleteEvent.of(memberId, historyIds));
     }
 
     private Member getMember(RefreshTokenDto refreshTokenDto) {

clokey-api/src/main/java/org/clokey/domain/auth/service/CustomOAuth2UserService.java

@@ -1,26 +1,33 @@
 package org.clokey.domain.auth.service;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.clokey.domain.auth.util.UniqueUtil;
 import org.clokey.domain.member.repository.MemberRepository;
+import org.clokey.domain.search.event.MeiliSearchSyncEvent;
 import org.clokey.global.security.CustomPrincipal;
 import org.clokey.member.entity.Member;
 import org.clokey.member.entity.OauthInfo;
 import org.clokey.member.enums.OauthProvider;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class CustomOAuth2UserService extends OidcUserService {
 
     private final MemberRepository memberRepository;
     private final UniqueUtil uniqueUtil;
+    private final ApplicationEventPublisher eventPublisher;
 
     @Override
+    @Transactional
     public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
         OidcUser oidcUser = super.loadUser(userRequest);
 
@@ -42,7 +49,12 @@ public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2Authenticatio
                                                     uniqueUtil.generateRandomId(),
                                                     uniqueUtil.generateRandomNickname(),
                                                     oauthInfo);
-                                    return memberRepository.save(newMember);
+                                    memberRepository.save(newMember);
+                                    eventPublisher.publishEvent(
+                                            MeiliSearchSyncEvent.of(
+                                                    MeiliSearchSyncEvent.EntityType.MEMBER,
+                                                    newMember.getId()));
+                                    return newMember;
                                 });
 
         return new CustomPrincipal(member, oidcUser.getAttributes(), oidcUser.getIdToken());

clokey-api/src/main/java/org/clokey/domain/cloth/service/ClothServiceImpl.java

@@ -20,6 +20,8 @@
 import org.clokey.domain.coordinate.repository.CoordinateClothRepository;
 import org.clokey.domain.history.repository.HistoryClothTagRepository;
 import org.clokey.domain.image.event.ImageDeleteEvent;
+import org.clokey.domain.search.event.ClothDeleteEvent;
+import org.clokey.domain.search.event.MeiliSearchSyncEvent;
 import org.clokey.enums.ImageType;
 import org.clokey.exception.BaseCustomException;
 import org.clokey.global.paging.SortDirection;
@@ -159,13 +161,26 @@ public void updateCloth(Long clothId, ClothUpdateRequest request) {
             eventPublisher.publishEvent(ImageDeleteEvent.of(cloth.getClothImageUrl()));
         }
 
+        // Category 변경 여부 확인
+        boolean categoryChanged = !cloth.getCategory().getId().equals(category.getId());
+
         cloth.updateCloth(
                 request.clothImageUrl(),
                 request.clothUrl(),
                 request.name(),
                 request.brand(),
                 request.seasons(),
                 category);
+
+        // Category 변경 시 해당 Cloth를 사용하는 History들 검색엔진 동기화
+        if (categoryChanged) {
+            List<Long> historyIds = historyClothTagRepository.findHistoryIdsByClothId(clothId);
+            for (Long historyId : historyIds) {
+                eventPublisher.publishEvent(
+                        MeiliSearchSyncEvent.of(
+                                MeiliSearchSyncEvent.EntityType.HISTORY, historyId));
+            }
+        }
     }
 
     /**
@@ -181,11 +196,17 @@ public void deleteCloth(Long clothId) {
 
         validateClothOwnership(cloth, currentMember.getId());
 
+        List<Long> historyIds = historyClothTagRepository.findHistoryIdsByClothId(clothId);
+
         coordinateClothRepository.deleteAllByClothId(cloth.getId());
         historyClothTagRepository.deleteAllByClothId(cloth.getId());
 
         eventPublisher.publishEvent(ImageDeleteEvent.of(cloth.getClothImageUrl()));
         clothRepository.delete(cloth);
+
+        if (!historyIds.isEmpty()) {
+            eventPublisher.publishEvent(ClothDeleteEvent.of(clothId, historyIds));
+        }
     }
 
     private Map<Long, Category> getCategoryMapByIds(Set<Long> ids) {

clokey-api/src/main/java/org/clokey/domain/history/repository/HistoryClothTagRepository.java

@@ -11,8 +11,6 @@ public interface HistoryClothTagRepository
         extends JpaRepository<HistoryClothTag, Long>, HistoryClothTagRepositoryCustom {
     List<HistoryClothTag> findByHistoryImageId(Long historyImageId);
 
-    List<HistoryClothTag> findAllByClothId(Long clothId);
-
     @Modifying
     @Query("DELETE FROM HistoryClothTag hct WHERE hct.cloth.id = :clothId")
     void deleteAllByClothId(Long clothId);
@@ -26,4 +24,8 @@ public interface HistoryClothTagRepository
                     + "join fetch hct.cloth "
                     + "where hct.historyImage.id = :historyImageId")
     List<HistoryClothTag> findAllByHistoryImageIdWithCloth(Long historyImageId);
+
+    @Query(
+            "SELECT DISTINCT hct.historyImage.history.id FROM HistoryClothTag hct WHERE hct.cloth.id = :clothId")
+    List<Long> findHistoryIdsByClothId(@Param("clothId") Long clothId);
 }

clokey-api/src/main/java/org/clokey/domain/history/repository/HistoryRepository.java

@@ -23,6 +23,12 @@ and FUNCTION('MONTH', h.historyDate) = :month
             """)
     List<History> findByMemberIdAndYearAndMonthNotBanned(Long memberId, int year, int month);
 
+    @Query("SELECT h.id FROM History h WHERE h.member.id = :memberId")
+    List<Long> findAllIdsByMemberId(Long memberId);
+
+    @Query("SELECT h.id FROM History h")
+    List<Long> findAllIds();
+
     @Query(
             """
         select new org.clokey.domain.history.repository.HistoryRepository$HistorySituationInfo(