Merge pull request #412 from softeerbootcamp-2nd/feat/recommend

[BUG FIX] #411: 유사견적 옵션 순서 자동 sort되도록 버그수정
softeerbootcamp-2nd · Aug 22, 2023 · 803842d · 803842d
2 parents 7502240 + e333a98
commit 803842d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/backend-recommend/recommend.py b/backend-recommend/recommend.py
@@ -54,7 +54,7 @@ def recByApriori(body):
         antecedents = set(row.antecedents)
         consequents = set(row.consequents)
 
-        if antecedents.issubset(input) and len(consequents) <= 2 and not antecedents.union(consequents).issubset(input):
+        if antecedents.isdisjoint(input) and len(consequents) <= 2 and antecedents.union(consequents).isdisjoint(input):
             key = tuple(consequents)
             if key not in matching_itemsets or confidence > matching_itemsets[key]:
                 matching_itemsets[key] = confidence

diff --git a/backend/src/main/java/autoever2/cartag/domain/quote/HistorySearchDto.java b/backend/src/main/java/autoever2/cartag/domain/quote/HistorySearchDto.java
@@ -5,6 +5,7 @@
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -31,6 +32,7 @@ public HistorySearchDto(int carId, int powerTrainId, int bodyTypeId, int operati
 
     public void addAllOption(List<Integer> optionId) {
         optionIds.addAll(optionId);
+        Collections.sort(optionIds);
     }
 
     public String getOptionIds() {

diff --git a/backend/src/main/java/autoever2/cartag/service/QuoteService.java b/backend/src/main/java/autoever2/cartag/service/QuoteService.java
@@ -13,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -26,6 +27,7 @@ public class QuoteService {
 
     public HistoryShortDto findMyQuote(QuoteDataDto quoteDataDto) {
         List<Integer> optionIds = quoteDataDto.getOptionIdList();
+        Collections.sort(optionIds);
 
         HistorySearchDto historyData = HistorySearchDto.builder()
                 .carId(quoteDataDto.getCarId())
@@ -40,6 +42,7 @@ public HistoryShortDto findMyQuote(QuoteDataDto quoteDataDto) {
     public List<HistoryShortDto> findTopHistory(QuoteDataDto quoteDataDto) {
 
         List<Integer> optionIds = quoteDataDto.getOptionIdList();
+        Collections.sort(optionIds);
 
         if(optionIds.isEmpty()) {
             throw new InvalidDataException(ErrorCode.INVALID_PARAMETER);