fix: 추천받았던 꽃의 목록을 반환할 때 order 값 수정

Author: ss7622

src/main/java/com/example/fiurinee/domain/matchingFlower/dto/HarmonyRecentDto.java

@@ -47,7 +47,7 @@ public static List<HarmonyRecentDto> of(Long order, Member member){
             HarmonyRecentDto harmonyRecentDto = new HarmonyRecentDto();
             Flower flower = matchingFlowers.get(i).getFlower();
             harmonyRecentDto.harmonyFlower = flower.getName();
-            harmonyRecentDto.order = order;
+            harmonyRecentDto.order = (long) (recommendFlowers.size() - order.intValue());
             harmonyRecentDto.period = String.format("%02d", flower.getPeriod() / 100);
             harmonyRecentDto.explain = flower.getExplain();
             harmonyRecentDto.image = flower.getImage();

src/main/java/com/example/fiurinee/domain/preferList/controller/PreferListController.java

@@ -32,9 +32,7 @@ public Boolean savePrefer(@PathVariable("id") Long id,
                 .build();
         preferListService.save(build);
 
-        int size = byId.getRecommendFlowers().size();
-
-        RecommendFlower recommendFlower = byId.getRecommendFlowers().get(size - Math.toIntExact(order));
+        RecommendFlower recommendFlower = byId.getRecommendFlowers().get(Math.toIntExact(order));
 
         recommendFlowerService.editPrefer(recommendFlower,true);
 
@@ -49,9 +47,7 @@ public Boolean deletePrefer(@PathVariable("id") Long id,
 
         preferListService.delete(preferListService.findByMemberAndOrder(byId,order));
 
-        int size = byId.getRecommendFlowers().size();
-
-        RecommendFlower recommendFlower = byId.getRecommendFlowers().get(size - Math.toIntExact(order));
+        RecommendFlower recommendFlower = byId.getRecommendFlowers().get(Math.toIntExact(order));
 
         recommendFlowerService.editPrefer(recommendFlower,false);
 

src/main/java/com/example/fiurinee/domain/recommendFlower/dto/RecommendFlowerDto.java

@@ -48,21 +48,21 @@ public static RecommendFlowerDto of(Long order, Member member){
         Flower flower = recommendFlower.getFlower();
 
         RecommendFlowerDto recommendFlowerDto = new RecommendFlowerDto();
-        recommendFlowerDto.order = order;
+        recommendFlowerDto.order = (long) (recommendFlowers.size()-order.intValue());
         recommendFlowerDto.recommendFlower = flower.getName();
         recommendFlowerDto.period = String.format("%02d", flower.getPeriod() / 100);
         recommendFlowerDto.flower_language = flower.getFlowerLanguage();
         recommendFlowerDto.explain = flower.getExplain();
         recommendFlowerDto.image = flower.getImage();
 
         List<InputMessage> inputMessages = member.getInputMessages();
-        InputMessage inputMessage = inputMessages.get(inputMessages.size() - order.intValue());
+        InputMessage inputMessage = inputMessages.get(recommendFlowers.size() - order.intValue());
 
         recommendFlowerDto.inputMessage = inputMessage.getContent();
         recommendFlowerDto.create_at = inputMessage.getCreateAt().toString().substring(0,10);
 
         List<RecommendComment> recommendComments = member.getRecommendComments();
-        RecommendComment recommendComment = recommendComments.get(recommendComments.size() - order.intValue());
+        RecommendComment recommendComment = recommendComments.get(recommendFlowers.size() - order.intValue());
 
         recommendFlowerDto.recommendMessage = recommendComment.getContent();
         recommendFlowerDto.prefer = recommendFlower.getPrefer();