Merge pull request #47 from Central-MakeUs/test/repository

test: repository 및 통합 테스트 구성 수정 및 동시성 테스트 작성
Central-MakeUs · Apr 30, 2024 · d07a283 · d07a283
2 parents 6081dda + 120f0a1
commit d07a283
Show file tree

Hide file tree

Showing 27 changed files with 57 additions and 34 deletions.
diff --git a/...ervice/GetRecommendedPopocornUseCase.java → ...cation/GetRecommendedPopocornUseCase.java b/...ervice/GetRecommendedPopocornUseCase.java → ...cation/GetRecommendedPopocornUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.recommendedPopcorn.service;
+package com.example.api.recommendedPopcorn.application;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...e/GetRecommendedRandomPopcornUseCase.java → ...n/GetRecommendedRandomPopcornUseCase.java b/...e/GetRecommendedRandomPopcornUseCase.java → ...n/GetRecommendedRandomPopcornUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.recommendedPopcorn.service;
+package com.example.api.recommendedPopcorn.application;
 
 
 import com.example.adaptor.UseCase;

diff --git a/.../service/PostRecommendPopcornUseCase.java → ...lication/PostRecommendPopcornUseCase.java b/.../service/PostRecommendPopcornUseCase.java → ...lication/PostRecommendPopcornUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.recommendedPopcorn.service;
+package com.example.api.recommendedPopcorn.application;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...n/service/PostVoteRecommendedPopcorn.java → ...plication/PostVoteRecommendedPopcorn.java b/...n/service/PostVoteRecommendedPopcorn.java → ...plication/PostVoteRecommendedPopcorn.java
@@ -1,4 +1,4 @@
-package com.example.api.recommendedPopcorn.service;
+package com.example.api.recommendedPopcorn.application;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...main/java/com/example/api/recommendedPopcorn/controller/RecommendedPopcornController.java b/...main/java/com/example/api/recommendedPopcorn/controller/RecommendedPopcornController.java
@@ -1,11 +1,11 @@
 package com.example.api.recommendedPopcorn.controller;
 
 
+import com.example.api.recommendedPopcorn.application.GetRecommendedPopocornUseCase;
+import com.example.api.recommendedPopcorn.application.GetRecommendedRandomPopcornUseCase;
+import com.example.api.recommendedPopcorn.application.PostRecommendPopcornUseCase;
+import com.example.api.recommendedPopcorn.application.PostVoteRecommendedPopcorn;
 import com.example.api.recommendedPopcorn.dto.request.RecommendedPopcornRequest;
-import com.example.api.recommendedPopcorn.service.GetRecommendedPopocornUseCase;
-import com.example.api.recommendedPopcorn.service.GetRecommendedRandomPopcornUseCase;
-import com.example.api.recommendedPopcorn.service.PostRecommendPopcornUseCase;
-import com.example.api.recommendedPopcorn.service.PostVoteRecommendedPopcorn;
 import com.example.domains.recommendedPopcorn.entity.RecommendedPopcorn;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

diff --git a/...ing/service/BookMarkScreeningUseCase.java → ...reening/api/BookMarkScreeningUseCase.java b/...ing/service/BookMarkScreeningUseCase.java → ...reening/api/BookMarkScreeningUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...rvice/GetBookMarkedScreeningsUseCase.java → ...g/api/GetBookMarkedScreeningsUseCase.java b/...rvice/GetBookMarkedScreeningsUseCase.java → ...g/api/GetBookMarkedScreeningsUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...tBookmarkedUpcomingScreeningsUseCase.java → ...tBookmarkedUpcomingScreeningsUseCase.java b/...tBookmarkedUpcomingScreeningsUseCase.java → ...tBookmarkedUpcomingScreeningsUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...ervice/GetMostRecentScreeningUseCase.java → ...ng/api/GetMostRecentScreeningUseCase.java b/...ervice/GetMostRecentScreeningUseCase.java → ...ng/api/GetMostRecentScreeningUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...ening/service/GetMostReviewedUseCase.java → ...screening/api/GetMostReviewedUseCase.java b/...ening/service/GetMostReviewedUseCase.java → ...screening/api/GetMostReviewedUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...eening/service/GetMyScreeningUseCase.java → .../screening/api/GetMyScreeningUseCase.java b/...eening/service/GetMyScreeningUseCase.java → .../screening/api/GetMyScreeningUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/.../service/GetPastScreeningListUseCase.java → ...ning/api/GetPastScreeningListUseCase.java b/.../service/GetPastScreeningListUseCase.java → ...ning/api/GetPastScreeningListUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...creening/service/GetRateCountUseCase.java → ...pi/screening/api/GetRateCountUseCase.java b/...creening/service/GetRateCountUseCase.java → ...pi/screening/api/GetRateCountUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...reening/service/GetReviewListUseCase.java → ...i/screening/api/GetReviewListUseCase.java b/...reening/service/GetReviewListUseCase.java → ...i/screening/api/GetReviewListUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...i/screening/service/GetReviewUseCase.java → ...e/api/screening/api/GetReviewUseCase.java b/...i/screening/service/GetReviewUseCase.java → ...e/api/screening/api/GetReviewUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...ning/service/GetScreeningListUseCase.java → ...creening/api/GetScreeningListUseCase.java b/...ning/service/GetScreeningListUseCase.java → ...creening/api/GetScreeningListUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...ervice/GetScreeningReviewListUseCase.java → ...ng/api/GetScreeningReviewListUseCase.java b/...ervice/GetScreeningReviewListUseCase.java → ...ng/api/GetScreeningReviewListUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...ervice/GetScreeningStatisticsUseCase.java → ...ng/api/GetScreeningStatisticsUseCase.java b/...ervice/GetScreeningStatisticsUseCase.java → ...ng/api/GetScreeningStatisticsUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...creening/service/GetScreeningUseCase.java → ...pi/screening/api/GetScreeningUseCase.java b/...creening/service/GetScreeningUseCase.java → ...pi/screening/api/GetScreeningUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...service/GetThisWeekScreeningsUseCase.java → ...ing/api/GetThisWeekScreeningsUseCase.java b/...service/GetThisWeekScreeningsUseCase.java → ...ing/api/GetThisWeekScreeningsUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...eening/service/PatchScreeningUseCase.java → .../screening/api/PatchScreeningUseCase.java b/...eening/service/PatchScreeningUseCase.java → .../screening/api/PatchScreeningUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...ng/service/PostReviewComplainUseCase.java → ...eening/api/PostReviewComplainUseCase.java b/...ng/service/PostReviewComplainUseCase.java → ...eening/api/PostReviewComplainUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/.../screening/service/PostReviewUseCase.java → .../api/screening/api/PostReviewUseCase.java b/.../screening/service/PostReviewUseCase.java → .../api/screening/api/PostReviewUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;
@@ -56,6 +56,15 @@ private PostReviewResponse reviewUpload(
                         request.getNegative());
         Screening screening = screeningAdaptor.findById(userScreening.getScreening().getId());
 
+        updateScreeningRate(request, screening);
+
+        // save
+        reviewAdaptor.save(newSreeningReview);
+        // screeningAdaptor.save(screening);
+        return PostReviewResponse.from(newSreeningReview);
+    }
+
+    public synchronized void updateScreeningRate(PostReviewRequest request, Screening screening) {
         calculateCount(
                 request.isScreeningReview(),
                 request.isLocationReview(),
@@ -64,11 +73,6 @@ private PostReviewResponse reviewUpload(
         calculateRate(request.isAfterScreening(), screening);
         incrementNegative(request.getNegative(), screening);
         incrementPositive(request.getPositive(), screening);
-
-        // save
-        reviewAdaptor.save(newSreeningReview);
-        // screeningAdaptor.save(screening);
-        return PostReviewResponse.from(newSreeningReview);
     }
 
     @Transactional

diff --git a/.../service/PostScreeningPrivateUseCase.java → ...ning/api/PostScreeningPrivateUseCase.java b/.../service/PostScreeningPrivateUseCase.java → ...ning/api/PostScreeningPrivateUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/...ening/service/ScreeningUploadUseCase.java → ...screening/api/ScreeningUploadUseCase.java b/...ening/service/ScreeningUploadUseCase.java → ...screening/api/ScreeningUploadUseCase.java
@@ -1,4 +1,4 @@
-package com.example.api.screening.service;
+package com.example.api.screening.api;
 
 
 import com.example.adaptor.UseCase;

diff --git a/Api/src/main/java/com/example/api/screening/controller/ScreeningController.java b/Api/src/main/java/com/example/api/screening/controller/ScreeningController.java
@@ -2,10 +2,10 @@
 
 
 import com.example.api.config.response.SuccessResponse;
+import com.example.api.screening.api.*;
 import com.example.api.screening.dto.request.PostReviewRequest;
 import com.example.api.screening.dto.request.PostScreeningRequest;
 import com.example.api.screening.dto.response.*;
-import com.example.api.screening.service.*;
 import com.example.domains.common.util.SliceResponse;
 import com.example.domains.common.util.SliceUtil;
 import com.example.domains.screening.adaptor.ScreeningAdaptor;

diff --git a/Domain/src/main/java/com/example/domains/screeningReview/entity/enums/Positive.java b/Domain/src/main/java/com/example/domains/screeningReview/entity/enums/Positive.java
@@ -29,4 +29,23 @@ public class Positive {
     private boolean actingIsGood = false;
 
     private boolean chemistryIsGood = false;
+    //    @Builder
+    //    private Positive() {
+    //        this.cineMaster = false;
+    //        this.greatFilming = false;
+    //        this.pom = false;
+    //        this.animationIsGood = false;
+    //        this.artIsGood = false;
+    //        this.setIsArt = false;
+    //        this.custom = false;
+    //        this.music = false;
+    //        this.ost = false;
+    //        this.writtenByGod = false;
+    //        this.topicIsGood = false;
+    //        this.linesAreGood = false;
+    //        this.endingIsGood = false;
+    //        this.castingIsGood = false;
+    //        this.actingIsGood = false;
+    //        this.chemistryIsGood = false;
+    //    }
 }