Merge pull request EveryUniv#189 from EveryUniv/dev_deploy

Release main
kjungw1025 · May 12, 2024 · c08e47b · c08e47b
2 parents 7f6568c + 21996ff
commit c08e47b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/dku/council/domain/danfesta/controller/LineUpController.java b/src/main/java/com/dku/council/domain/danfesta/controller/LineUpController.java
@@ -66,6 +66,7 @@ public void changeToTrue(AppAuthentication auth, @RequestParam FestivalDate fest
 
     /**
      * 라인업 날짜 조회
+     * <p>라인업 날짜는 중복되지 않게 조회됩니다.</p>
      */
     @GetMapping("/date")
     public List<ResponseFestivalDateDto> listFestivalDate() {

diff --git a/src/main/java/com/dku/council/domain/danfesta/service/LineUpService.java b/src/main/java/com/dku/council/domain/danfesta/service/LineUpService.java
@@ -132,12 +132,15 @@ public List<ResponseFestivalDateDto> listFestivalDate() {
             if (result.isEmpty()) {
                 result.add(lineUp);
             } else {
+                boolean flag = false;
                 for(LineUp resultLineUp : result) {
-                    if(!resultLineUp.getFestivalDate().equals(lineUp.getFestivalDate())) {
-                        result.add(lineUp);
-                        break;
+                    if(resultLineUp.getFestivalDate().equals(lineUp.getFestivalDate())) {
+                        flag = true;
                     }
                 }
+                if (!flag) {
+                    result.add(lineUp);
+                }
             }
         }