Merge pull request #105 from EWHA-LUX/fix/#100

test: 임시 업데이트
EWHA-LUX · Jun 17, 2024 · 46a7a6a · 46a7a6a
2 parents 67f24d8 + c5becd3
commit 46a7a6a
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 2 deletions.
diff --git a/src/main/java/ewha/lux/once/domain/home/service/AnnouncementService.java b/src/main/java/ewha/lux/once/domain/home/service/AnnouncementService.java
@@ -57,8 +57,10 @@ public void cheeringBenefitGoalAnnounce() throws CustomException {
 
             int remainBenefit = Math.max(goalBenefitGoal - receivedBenefit, 0);
             if (remainBenefit == 0){
+                // 목표 달성한 경우 알림을 보내지 않음
                 content = currentDate + "월 목표를 달성했어요!";
                 moreInfo = "100";
+                continue;
             } else {
                 content = currentDate + "월 목표 혜택 달성까지 " + String.format("%,d", remainBenefit) + "원 남았어요.";
                 if(goalBenefitGoal==0) moreInfo="100";
@@ -90,6 +92,7 @@ public void cardPerformanceAnnounce() throws CustomException {
         for (OwnedCard card : ownedCardList) {
             // 실적 업데이트
             Users users = card.getUsers();
+            if(users.getConnectedId()==null) continue;
             HashMap<String,Object> performResult = codefapi.Performace(card.getCard().getCardCompany().getCode(),users.getConnectedId(),card.getCard().getName()); //?????
             int performanceCondition = (int) performResult.get("performanceCondition");
             int currentPerformance = (int) performResult.get("performanceCondition");
@@ -98,6 +101,10 @@ public void cardPerformanceAnnounce() throws CustomException {
 
             ownedCardRepository.save(card);
             String res = String.valueOf(Math.max(card.getPerformanceCondition()-card.getCurrentPerformance(),0));
+            if(res == "0"){
+                // 실적 완료한 경우 알림을 보내지 않음
+                continue;
+            }
             String content = "이번 달 "+card.getCard().getName()+" 실적까지\n"+res+"원 남았어요!";
             String moreInfo = card.getCard().getImgUrl();
 
@@ -110,6 +117,7 @@ public void cardPerformanceAnnounce() throws CustomException {
                     .build();
             announcementRepository.save(announcement);
             List<FCMToken> fcmTokens = fcmTokenRepository.findAllByUsers(users);
+
             for ( FCMToken fcmToken : fcmTokens){
                 String token = fcmToken.getToken();
                 firebaseCloudMessageService.sendNotification(new AnnouncementRequestDto(token,currentDate+"월 실적 알림",content,announcement.getId().toString()));

diff --git a/src/main/java/ewha/lux/once/domain/home/service/HomeService.java b/src/main/java/ewha/lux/once/domain/home/service/HomeService.java
@@ -67,6 +67,47 @@ public ChatDto getHomeChat(Users nowUser, String keyword, int paymentAmount) thr
         } catch (JsonProcessingException e) {
             throw new CustomException(ResponseCode.FAILED_TO_OPENAI_RECOMMEND);
         }
+        if(discount==0){
+            List <OwnedCard> mainOwncardList = ownedCardRepository.findOwnedCardByUsersAndIsMain(nowUser, true);
+            if (mainOwncardList.size() == 0) {
+                List <OwnedCard> ownedCardList = ownedCardRepository.findOwnedCardByUsers(nowUser);
+
+                // 실적 많이 남은 카드 찾기
+                OwnedCard maxDifferenceCard = null;
+                int maxDifference = Integer.MIN_VALUE;
+
+                for (OwnedCard ownedCard : ownedCardList) {
+                    int difference = ownedCard.getPerformanceCondition() - ownedCard.getCurrentPerformance();
+                    if (difference > maxDifference) {
+                        maxDifference = difference;
+                        maxDifferenceCard = ownedCard;
+                    }
+                }
+
+                card = maxDifferenceCard.getCard();
+                benefit= keyword+"에 해당하는 혜택이 없어요.\n실적이 가장 많이 남은 카드에요";
+
+            } else if(mainOwncardList.size() == 1) {
+                card = mainOwncardList.get(0).getCard();
+                benefit= keyword+"에 해당하는 혜택이 없어요.\n주카드로 결제해보세요.";
+            } else {
+                OwnedCard maxDifferenceCard = null;
+                int maxDifference = Integer.MIN_VALUE;
+
+                for (OwnedCard ownedCard : mainOwncardList) {
+                    int difference = ownedCard.getPerformanceCondition() - ownedCard.getCurrentPerformance();
+                    if (difference > maxDifference) {
+                        maxDifference = difference;
+                        maxDifferenceCard = ownedCard;
+                    }
+                }
+
+                card = maxDifferenceCard.getCard();
+
+                benefit= keyword+"에 해당하는 혜택이 없어요.\n실적이 가장 많이 남은 주카드에요.";
+            }
+        }
+
 
         // 챗봇 대화 기록
         ChatHistory chat = ChatHistory.builder()
@@ -83,7 +124,7 @@ public ChatDto getHomeChat(Users nowUser, String keyword, int paymentAmount) thr
         // Chat 객체 저장
         ChatHistory savedChat = chatHistoryRepository.save(chat);
 
-        OwnedCard ownedCard = ownedCardRepository.findOwnedCardByCardIdAndUsers(Long.valueOf(cardId),nowUser);
+        OwnedCard ownedCard = ownedCardRepository.findOwnedCardByCardIdAndUsers(card.getId(),nowUser);
 
         // 챗봇 응답
         ChatDto chatDto = ChatDto.builder()

diff --git a/src/main/java/ewha/lux/once/domain/home/service/OpenaiService.java b/src/main/java/ewha/lux/once/domain/home/service/OpenaiService.java
@@ -78,7 +78,6 @@ public String cardRecommend(Users nowUser, String keyword, int paymentAmount) th
         }
 
         String result = response.getChoices().get(0).getMessage().getContent();
-
         log.info(result);
 
         return result;

diff --git a/src/main/java/ewha/lux/once/global/repository/OwnedCardRepository.java b/src/main/java/ewha/lux/once/global/repository/OwnedCardRepository.java
@@ -22,4 +22,6 @@ public interface OwnedCardRepository extends JpaRepository<OwnedCard, Long> {
     List<OwnedCard> findOwnedCardByIsMain(boolean isMain);
 
     Optional<OwnedCard> findOwnedCardByUsersAndCard(Users users, Card card);
+
+    List<OwnedCard> findOwnedCardByUsersAndIsMain(Users nowUser, boolean isMain);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             String result = response.getChoices().get(0).getMessage().getContent();
             log.info(result);
             return result;
@@ Expand Down @@