[FIX] 활동 기간 계산 로직 통일 및 ActivityDurationCalculator 유틸화 - #511

src/main/java/org/sopt/app/common/utils/ActivityDurationCalculator.java

@@ -0,0 +1,40 @@
+package org.sopt.app.common.utils;
+
+import java.time.*;
+import java.util.Comparator;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.sopt.app.common.exception.BadRequestException;
+import org.sopt.app.common.response.ErrorCode;
+
+@RequiredArgsConstructor
+public final class ActivityDurationCalculator {
+
+    private static final int SOPT_START_YEAR = 2007;
+    private static final int EVEN_GENERATION_START_MONTH = 3;
+    private static final int ODD_GENERATION_START_MONTH = 9;
+
+    public static int calculate(List<Long> generations) {
+        if (generations == null || generations.isEmpty()) {
+            throw new BadRequestException(ErrorCode.USER_GENERATION_INFO_NOT_FOUND);
+        }
+
+        Long firstGeneration = generations.stream()
+            .min(Comparator.naturalOrder())
+            .orElseThrow(() -> new BadRequestException(ErrorCode.USER_GENERATION_INFO_NOT_FOUND));
+
+        LocalDate startDate = getGenerationStartDate(firstGeneration);
+        return getMonthDifferenceFromNow(startDate);
+    }
+
+    private static LocalDate getGenerationStartDate(Long generation) {
+        int startMonth = (generation % 2 == 0) ? EVEN_GENERATION_START_MONTH : ODD_GENERATION_START_MONTH;
+        int startYear = SOPT_START_YEAR + (int) (generation / 2);
+        return LocalDate.of(startYear, startMonth, 1);
+    }
+
+    private static int getMonthDifferenceFromNow(LocalDate startDate) {
+        Period period = Period.between(startDate, CurrentDate.now);
+        return period.getYears() * 12 + period.getMonths() + 1;
+    }
+}

src/main/java/org/sopt/app/facade/HomeFacade.java

@@ -9,7 +9,7 @@
 import org.sopt.app.application.app_service.dto.*;
 import org.sopt.app.application.description.DescriptionInfo.MainDescription;
 import org.sopt.app.application.description.DescriptionService;
-import org.sopt.app.application.home.ActivityDurationCalculator;
+import org.sopt.app.common.utils.ActivityDurationCalculator;
 import org.sopt.app.application.meeting.*;
 import org.sopt.app.application.playground.PlaygroundAuthService;
 import org.sopt.app.domain.entity.User;
@@ -41,10 +41,10 @@ public MainDescription getMainDescriptionForUser(User user) {
     public HomeDescriptionResponse getHomeMainDescription(User user) {
         List<Long> ownGenerations = playgroundAuthService.getOwnPlaygroundProfile(user.getPlaygroundToken())
                 .getAllGenerations();
-        ActivityDurationCalculator calculator = ActivityDurationCalculator.of(ownGenerations);
+        int duration = ActivityDurationCalculator.calculate(ownGenerations);
         return HomeDescriptionResponse.of(
                 wrapWithTag(user.getUsername(), "b"),
-                calculator.getActivityDuration()
+                duration
         );
     }
     @Transactional(readOnly = true)

src/main/java/org/sopt/app/presentation/user/UserController.java

@@ -12,8 +12,10 @@
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.sopt.app.application.fortune.FortuneService;
+import org.sopt.app.application.playground.dto.PlaygroundProfileInfo;
 import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.PlaygroundProfile;
 import org.sopt.app.application.soptamp.SoptampUserService;
+import org.sopt.app.common.utils.ActivityDurationCalculator;
 import org.sopt.app.domain.entity.User;
 import org.sopt.app.domain.enums.IconType;
 import org.sopt.app.facade.AuthFacade;
@@ -96,13 +98,19 @@ public ResponseEntity<UserResponse.SoptLog> getUserSoptLog(
         PlaygroundProfile playgroundProfile = authFacade.getUserDetails(user);
         Long soptampRank = null;
         Long soptDuring = null;
-        Boolean isActive = playgroundProfile.getLatestActivity().getGeneration() == generation;
+        Boolean isActive = playgroundProfile.getLatestActivity().getGeneration().equals(generation);
         boolean isFortuneChecked = fortuneService.isExistTodayFortune((user.getId()));
         String fortuneText = isFortuneChecked?fortuneService.getTodayFortuneWordByUserId(user.getId(), LocalDate.now()).title():"오늘 내 운세는?";
         if (isActive) {
             soptampRank = rankFacade.findUserRank(user.getId());
         } else {
-            soptDuring = authFacade.getDuration(playgroundProfile.getLatestActivity().getGeneration(), generation);
+            List<Long> generations = playgroundProfile.getAllActivities().stream()
+                .map(PlaygroundProfileInfo.ActivityCardinalInfo::getGeneration)
+                .toList();
+
+            if (!generations.isEmpty()) {
+                soptDuring = (long) ActivityDurationCalculator.calculate(generations);
+            }
         }
         List<String> icons = authFacade.getIcons(isActive ? IconType.ACTIVE : IconType.INACTIVE);
         return ResponseEntity.ok(