Merge pull request #96 from Mojacknong/fix_88/팜클럽-도움말-수정

[fix] 내 팜클럽 조회 시 현재 스텝의 도움말만 뜨도록 변경
Mojacknong · Aug 19, 2024 · c093531 · c093531
2 parents 48a03ec + 7c0e48c
commit c093531
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/service/FarmClubService.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/service/FarmClubService.java
@@ -128,7 +128,7 @@ public GetMyFarmClubResponseDto getMyFarmClub(Long farmClubId, Long userId) {
         GetMyFarmClubVo farmClubInfo = farmClubRepository.findMyFarmClub(farmClubId, userId);
         String veggieInfoId = farmClubInfo.veggieInfoId();
         List<StepVo> stepList = veggieInfoHelper.getStepList(veggieInfoId);
-        String randomTip = getRandomTip(stepList);
+        String randomTip = getRandomTip(stepList, farmClubInfo.currentStep());
         List<GetMissionPostListVo> missionList =
                 missionPostRepository.getMissionPostStepNumAndImage(farmClubId);
 
@@ -167,14 +167,14 @@ public void withdrawFarmClub(Long farmClubId, Long userId, Boolean deleteVeggie)
         }
     }
 
-    private String getRandomTip(List<StepVo> stepList) {
+    private String getRandomTip(List<StepVo> stepList, int currentStep) {
         List<String> tips = new ArrayList<>();
-        stepList.forEach(step -> tips.addAll(step.tips()));
-
-        if (tips.isEmpty()) {
-            return "아직 도움말이 없습니다.";
+        for (StepVo step : stepList) {
+            if (step.num() == currentStep) {
+                tips = step.tips();
+                break;
+            }
         }
-
         return tips.get((int) (Math.random() * tips.size()));
     }