Merge pull request #1080 from Moadong/develop/be

Author: lepitaaar

backend/build.gradle

@@ -63,6 +63,7 @@ dependencies {
 
 	implementation 'com.google.firebase:firebase-admin:9.7.0'
 
+    implementation 'org.javers:javers-spring-boot-starter-mongo:7.10.0'
 }
 
 //전체 테스트

backend/src/main/java/moadong/club/entity/Club.java

@@ -13,6 +13,7 @@
 import moadong.club.payload.request.ClubRecruitmentInfoUpdateRequest;
 import moadong.global.exception.ErrorCode;
 import moadong.global.exception.RestApiException;
+import org.javers.core.metamodel.annotation.DiffIgnore;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.domain.Persistable;
@@ -41,6 +42,7 @@ public class Club implements Persistable<String> {
 
     private String userId;
 
+    @DiffIgnore
     private Map<String, String> socialLinks;
 
     @Field("recruitmentInformation")
@@ -146,9 +148,11 @@ public void updateRecruitmentStatus(ClubRecruitmentStatus clubRecruitmentStatus)
 
     public void sendPushNotification(Message message) {
         try {
-            FirebaseMessaging.getInstance().send(message);
+            log.info("FCM 알림 전송 시작 - clubId: {}, clubName: {}", this.id, this.name);
+            String messageId = FirebaseMessaging.getInstance().send(message);
+            log.info("FCM 알림 전송 성공 - clubId: {}, messageId: {}", this.id, messageId);
         } catch (FirebaseMessagingException e) {
-            log.error("FirebaseSendNotificationError: {}", e.getMessage());
+            log.error("FCM 알림 전송 실패 - clubId: {}, error: {}", this.id, e.getMessage());
         }
     }
 

backend/src/main/java/moadong/club/entity/ClubRecruitmentInformation.java

@@ -14,6 +14,7 @@
 import moadong.club.payload.request.ClubRecruitmentInfoUpdateRequest;
 import moadong.global.RegexConstants;
 import org.checkerframework.common.aliasing.qual.Unique;
+import org.javers.core.metamodel.annotation.DiffIgnore;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -26,15 +27,17 @@
 @Builder(toBuilder = true)
 public class ClubRecruitmentInformation {
 
-    @Id
-    private String id;
+//    @Id
+//    private String id;
 
     @Column(length = 1024)
     @Unique
+    @DiffIgnore
     private String logo;
 
     @Column(length = 1024)
     @Unique
+    @DiffIgnore
     private String cover;
 
     @Column(length = 30)
@@ -45,6 +48,7 @@ public class ClubRecruitmentInformation {
 
     @Pattern(regexp = RegexConstants.PHONE_NUMBER, message = "전화번호 형식이 올바르지 않습니다.")
     @Column(length = 13)
+    @DiffIgnore
     private String presidentTelephoneNumber;
 
     private Instant recruitmentStart;
@@ -53,16 +57,20 @@ public class ClubRecruitmentInformation {
 
     private String recruitmentTarget;
 
+    @DiffIgnore
     String externalApplicationUrl;
 
+    @DiffIgnore
     private List<String> feedImages;
 
     private List<String> tags;
 
     @Enumerated(EnumType.STRING)
     @NotNull
+    @DiffIgnore
     private ClubRecruitmentStatus clubRecruitmentStatus;
 
+    @DiffIgnore
     private LocalDateTime lastModifiedDate;
 
     public void updateLogo(String logo) {

backend/src/main/java/moadong/club/repository/ClubRepository.java

@@ -4,6 +4,7 @@
 import java.util.Optional;
 import moadong.club.entity.Club;
 import org.bson.types.ObjectId;
+import org.javers.spring.annotation.JaversSpringDataAuditable;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

backend/src/main/java/moadong/club/service/ClubProfileService.java

@@ -14,6 +14,7 @@
 import moadong.global.util.ObjectIdConverter;
 import moadong.user.payload.CustomUserDetails;
 import org.bson.types.ObjectId;
+import org.javers.core.Javers;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,27 +24,31 @@ public class ClubProfileService {
 
     private final ClubRepository clubRepository;
     private final ClubSearchRepository clubSearchRepository;
+    private final RecruitmentStateCalculator recruitmentStateCalculator;
+    private final Javers javers;
 
     @Transactional
     public void updateClubInfo(ClubInfoRequest request, CustomUserDetails user) {
         Club club = clubRepository.findClubByUserId(user.getId())
                 .orElseThrow(() -> new RestApiException(ErrorCode.CLUB_NOT_FOUND));
         club.update(request);
-        clubRepository.save(club);
+        Club saved = clubRepository.save(club);
+        javers.commit(user.getUsername(), saved);
     }
 
     public void updateClubRecruitmentInfo(ClubRecruitmentInfoUpdateRequest request,
                                           CustomUserDetails user) {
         Club club = clubRepository.findClubByUserId(user.getId())
                 .orElseThrow(() -> new RestApiException(ErrorCode.CLUB_NOT_FOUND));
         club.update(request);
-        RecruitmentStateCalculator.calculate(
+        recruitmentStateCalculator.calculate(
                 club,
                 club.getClubRecruitmentInformation().getRecruitmentStart(),
                 club.getClubRecruitmentInformation().getRecruitmentEnd()
         );
         club.getClubRecruitmentInformation().updateLastModifiedDate();
-        clubRepository.save(club);
+        Club saved = clubRepository.save(club);
+        javers.commit(user.getUsername(), saved);
     }
 
     public ClubDetailedResponse getClubDetail(String clubId) {
@@ -57,3 +62,4 @@ public ClubDetailedResponse getClubDetail(String clubId) {
         return new ClubDetailedResponse(clubDetailedResult);
     }
 }
+

backend/src/main/java/moadong/club/service/RecruitmentStateChecker.java

@@ -21,6 +21,7 @@
 public class RecruitmentStateChecker {
 
     private final ClubRepository clubRepository;
+    private final RecruitmentStateCalculator recruitmentStateCalculator;
 
     @Scheduled(fixedRate = 60 * 60 * 1000) // 1시간마다 실행
     public void performTask() {
@@ -32,9 +33,10 @@ public void performTask() {
             if (recruitInfo.getClubRecruitmentStatus() == ClubRecruitmentStatus.ALWAYS) {
                 continue;
             }
-            RecruitmentStateCalculator.calculate(club, recruitmentStartDate, recruitmentEndDate);
+            recruitmentStateCalculator.calculate(club, recruitmentStartDate, recruitmentEndDate);
 
             clubRepository.save(club);
         }
     }
 }
+

backend/src/main/java/moadong/club/util/RecruitmentStateCalculator.java

@@ -8,14 +8,21 @@
 
 import com.google.firebase.messaging.Message;
 import com.google.firebase.messaging.Notification;
+import lombok.RequiredArgsConstructor;
 import moadong.club.entity.Club;
 import moadong.club.entity.ClubRecruitmentInformation;
 import moadong.club.enums.ClubRecruitmentStatus;
+import moadong.fcm.util.FcmTopicResolver;
+import org.springframework.stereotype.Component;
 
+@Component
+@RequiredArgsConstructor
 public class RecruitmentStateCalculator {
     public static final int ALWAYS_RECRUIT_YEAR = 2999;
 
-    public static void calculate(Club club, ZonedDateTime recruitmentStartDate, ZonedDateTime recruitmentEndDate) {
+    private final FcmTopicResolver fcmTopicResolver;
+
+    public void calculate(Club club, ZonedDateTime recruitmentStartDate, ZonedDateTime recruitmentEndDate) {
         ClubRecruitmentStatus oldStatus = club.getClubRecruitmentInformation().getClubRecruitmentStatus();
         ClubRecruitmentStatus newStatus = calculateRecruitmentStatus(recruitmentStartDate, recruitmentEndDate);
         club.updateRecruitmentStatus(newStatus);
@@ -50,7 +57,7 @@ public static ClubRecruitmentStatus calculateRecruitmentStatus(ZonedDateTime rec
         return ClubRecruitmentStatus.CLOSED;
     }
 
-    public static Message buildRecruitmentMessage(Club club, ClubRecruitmentStatus status) {
+    public Message buildRecruitmentMessage(Club club, ClubRecruitmentStatus status) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M월 d일 a h시 m분", Locale.KOREAN);
         ClubRecruitmentInformation info = club.getClubRecruitmentInformation();
 
@@ -72,7 +79,8 @@ public static Message buildRecruitmentMessage(Club club, ClubRecruitmentStatus s
                         .setTitle(club.getName())
                         .setBody(bodyMessage)
                         .build())
-                .setTopic(club.getId())
+                .setTopic(fcmTopicResolver.resolveTopic(club.getId()))
                 .build();
     }
 }
+

backend/src/main/java/moadong/fcm/service/FcmAsyncService.java

@@ -6,6 +6,7 @@
 import com.google.firebase.messaging.TopicManagementResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import moadong.fcm.util.FcmTopicResolver;
 import moadong.global.exception.ErrorCode;
 import moadong.global.exception.RestApiException;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,6 +31,8 @@ public class FcmAsyncService {
 
     private final FirebaseMessaging firebaseMessaging;
 
+    private final FcmTopicResolver fcmTopicResolver;
+
     @Value("${fcm.topic.timeout-seconds:5}")
     private int timeoutSeconds;
 
@@ -40,14 +43,16 @@ public CompletableFuture<Void> updateSubscriptions(String token, Set<String> new
         // 새로운 동아리 구독
         if (!clubsToSubscribe.isEmpty()) {
             for (String clubId : clubsToSubscribe) {
-                futures.add(firebaseMessaging.subscribeToTopicAsync(Collections.singletonList(token), clubId));
+                String topic = fcmTopicResolver.resolveTopic(clubId);
+                futures.add(firebaseMessaging.subscribeToTopicAsync(Collections.singletonList(token), topic));
             }
         }
 
         // 더 이상 구독하지 않는 동아리 구독 해제
         if (!clubsToUnsubscribe.isEmpty()) {
             for (String clubId : clubsToUnsubscribe) {
-                futures.add(firebaseMessaging.unsubscribeFromTopicAsync(Collections.singletonList(token), clubId));
+                String topic = fcmTopicResolver.resolveTopic(clubId);
+                futures.add(firebaseMessaging.unsubscribeFromTopicAsync(Collections.singletonList(token), topic));
             }
         }
 
@@ -84,3 +89,4 @@ public CompletableFuture<Void> updateSubscriptions(String token, Set<String> new
         return CompletableFuture.completedFuture(null);
     }
 }
+

backend/src/main/java/moadong/fcm/util/FcmTopicResolver.java

@@ -0,0 +1,18 @@
+package moadong.fcm.util;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class FcmTopicResolver {
+
+    @Value("${spring.profiles.active:prod}")
+    private String activeProfile;
+
+    public String resolveTopic(String clubId) {
+        if ("prod".equals(activeProfile)) {
+            return clubId;
+        }
+        return activeProfile + "_" + clubId;
+    }
+}

backend/src/main/java/moadong/global/config/JaversConfig.java

@@ -0,0 +1,27 @@
+package moadong.global.config;
+
+import org.javers.core.Javers;
+import org.javers.core.JaversBuilder;
+import org.javers.repository.mongo.MongoRepository;
+import org.javers.spring.auditable.AuthorProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.transaction.PlatformTransactionManager;
+
+@Configuration
+public class JaversConfig {
+    @Bean
+    public AuthorProvider authorProvider() {
+        return () -> {
+            return SecurityContextHolder.getContext().getAuthentication().getName();
+        };
+    }
+
+    @Bean
+    public MongoRepository javersMongoRepository(MongoDatabaseFactory dbFactory) {
+        // MongoDatabaseFactory에서 database 객체를 꺼내서 Javers에 넘김
+        return new MongoRepository(dbFactory.getMongoDatabase());
+    }
+}