From 26bc3056ee429b61f8a378917516e796e1bd7e8d Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sat, 18 May 2024 19:11:13 +0700 Subject: [PATCH 01/21] Add SonarCloud analysis workflow and configuration files --- .github/workflows/sonarcloud.yml | 68 ++++++++++++++++++++++++++++++++ sonar-project.properties | 6 +++ 2 files changed, 74 insertions(+) create mode 100644 .github/workflows/sonarcloud.yml create mode 100644 sonar-project.properties diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml new file mode 100644 index 0000000..e9464da --- /dev/null +++ b/.github/workflows/sonarcloud.yml @@ -0,0 +1,68 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# This workflow helps you trigger a SonarCloud analysis of your code and populates +# GitHub Code Scanning alerts with the vulnerabilities found. +# Free for open source project. + +# 1. Login to SonarCloud.io using your GitHub account + +# 2. Import your project on SonarCloud +# * Add your GitHub organization first, then add your repository as a new project. +# * Please note that many languages are eligible for automatic analysis, +# which means that the analysis will start automatically without the need to set up GitHub Actions. +# * This behavior can be changed in Administration > Analysis Method. +# +# 3. Follow the SonarCloud in-product tutorial +# * a. Copy/paste the Project Key and the Organization Key into the args parameter below +# (You'll find this information in SonarCloud. Click on "Information" at the bottom left) +# +# * b. Generate a new token and add it to your Github repository's secrets using the name SONAR_TOKEN +# (On SonarCloud, click on your avatar on top-right > My account > Security +# or go directly to https://sonarcloud.io/account/security/) + +# Feel free to take a look at our documentation (https://docs.sonarcloud.io/getting-started/github/) +# or reach out to our community forum if you need some help (https://community.sonarsource.com/c/help/sc/9) + +name: SonarCloud analysis + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + workflow_dispatch: + +permissions: + pull-requests: read # allows SonarCloud to decorate PRs with analysis results + +jobs: + Analysis: + runs-on: ubuntu-latest + + steps: + - name: Analyze with SonarCloud + + # You can pin the exact commit or the version. + # uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 + uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) + with: + # Additional arguments for the sonarcloud scanner + args: + # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu) + # mandatory + -Dsonar.projectKey= + -Dsonar.organization= + # Comma-separated paths to directories containing main source files. + #-Dsonar.sources= # optional, default is project base directory + # When you need the analysis to take place in a directory other than the one from which it was launched + #-Dsonar.projectBaseDir= # optional, default is . + # Comma-separated paths to directories containing test source files. + #-Dsonar.tests= # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/ + # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing. + #-Dsonar.verbose= # optional, default is false diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..83364ee --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,6 @@ +sonar.organization=adpro-c11 +sonar.projectKey=ADPRO-C11_snackscription-review + +# relative paths to source directories. More details and properties are described +# in https://sonarcloud.io/documentation/project-administration/narrowing-the-focus/ +sonar.sources=. \ No newline at end of file From 55c1249faef3c2e5a9992221b17db97b3faceb29 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sat, 18 May 2024 19:40:38 +0700 Subject: [PATCH 02/21] chore: Update SonarCloud workflow to include dev branch --- .github/workflows/sonarcloud.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index e9464da..9069b9c 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -30,9 +30,9 @@ name: SonarCloud analysis on: push: - branches: [ "main" ] + branches: [ "main", "dev" ] pull_request: - branches: [ "main" ] + branches: [ "main", "dev" ] workflow_dispatch: permissions: From f3c9895a82cd169587841027d1ab61c4f0ca349b Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sat, 18 May 2024 19:51:33 +0700 Subject: [PATCH 03/21] [REFACTOR] Rename variables and improve code readability --- .github/workflows/sonarcloud.yml | 4 +- .../review/controller/ReviewController.java | 18 ++- .../controller/ReviewControllerTest.java | 134 ------------------ .../review/service/ReviewServiceTest.java | 2 - 4 files changed, 13 insertions(+), 145 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 9069b9c..82e63c3 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -56,8 +56,8 @@ jobs: args: # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu) # mandatory - -Dsonar.projectKey= - -Dsonar.organization= + -Dsonar.projectKey=ADPRO-C11_snackscription-review + -Dsonar.organization=adpro-c11 # Comma-separated paths to directories containing main source files. #-Dsonar.sources= # optional, default is project base directory # When you need the analysis to take place in a directory other than the one from which it was launched diff --git a/src/main/java/snackscription/review/controller/ReviewController.java b/src/main/java/snackscription/review/controller/ReviewController.java index bd802cd..4342da7 100644 --- a/src/main/java/snackscription/review/controller/ReviewController.java +++ b/src/main/java/snackscription/review/controller/ReviewController.java @@ -15,6 +15,10 @@ public class ReviewController { private ReviewService reviewService; + public static final String BODY_AUTHOR = "author"; + public static final String BODY_CONTENT = "content"; + public static final String BODY_RATING = "rating"; + public ReviewController(ReviewService reviewService) { this.reviewService = reviewService; } @@ -27,9 +31,9 @@ public ResponseEntity reviewPage() { @PostMapping("/subscription-boxes/{subsbox}") public ResponseEntity createSubsboxReview(@RequestBody Map body, @PathVariable String subsbox) { try { - String author = body.get("author"); - int rating = Integer.parseInt(body.get("rating")); - String content = body.get("content"); + String author = body.get(BODY_AUTHOR); + int rating = Integer.parseInt(body.get(BODY_RATING)); + String content = body.get(BODY_CONTENT); Review review = reviewService.createReview(rating, content, subsbox, author); return new ResponseEntity<>(review, HttpStatus.CREATED); @@ -51,7 +55,7 @@ public ResponseEntity> getPublicSubsboxReview(@PathVariable String @GetMapping("/subscription-boxes/{subsbox}/users/{user}") public ResponseEntity getSelfSubsboxReview(@RequestBody Map body, @PathVariable String subsbox, @PathVariable String user) { try { - String sender = body.get("author"); // TODO: nanti pakai JWT token untuk ambil sendernya + String sender = body.get(BODY_AUTHOR); if (!authenticate(sender, user)) { return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); } @@ -65,13 +69,13 @@ public ResponseEntity getSelfSubsboxReview(@RequestBody Map editReview(@RequestBody Map body, @PathVariable String subsbox, @PathVariable String user) { try { - String sender = body.get("author"); // TODO: nanti pakai JWT token untuk ambil sendernya + String sender = body.get(BODY_AUTHOR); if (!authenticate(sender, user)) { return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); } - int rating = Integer.parseInt(body.get("rating")); - String content = body.get("content"); + int rating = Integer.parseInt(body.get(BODY_RATING)); + String content = body.get(BODY_CONTENT); Review review = reviewService.editReview(rating, content, subsbox, user); return new ResponseEntity<>(review, HttpStatus.OK); diff --git a/src/test/java/snackscription/review/controller/ReviewControllerTest.java b/src/test/java/snackscription/review/controller/ReviewControllerTest.java index bf0ccca..8e3035e 100644 --- a/src/test/java/snackscription/review/controller/ReviewControllerTest.java +++ b/src/test/java/snackscription/review/controller/ReviewControllerTest.java @@ -146,44 +146,6 @@ public void readSelfSubscriptionBoxReview() throws Exception { verify(reviewService).getReview(subsbox, author); } -// @Test -// public void testEditSelfSubscriptionBoxReview() throws Exception { -// Review review = reviews.getFirst(); -// String subsboxId = review.getSubsbox(); -// String userId = review.getAuthor(); -// -// int newRating = 4; -// String newContent = "Awikwok"; -// when(reviewService.editReview(newRating, newContent, subsboxId, userId)).thenReturn(new Review(newRating, newContent, userId, subsboxId)); -// -// ResultActions result = mockMvc.perform(put("/reviews/subscription-boxes/{subscriptionBoxId}/users/self", subsboxId) -// .contentType(MediaType.APPLICATION_JSON) -// .content("{\"rating\": 4, \"content\": \"Awikwok\", \"userId\": \"user_123\"}")) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$.rating", is(newRating))) -// .andExpect(jsonPath("$.content", is(newContent))) -// .andExpect(jsonPath("$.userId", is(review.getAuthor()))) -// .andExpect(jsonPath("$.subscriptionBoxId", is(review.getSubsbox()))); -// -// verify(reviewService).editReview(newRating, newContent, subsboxId, userId); -// } -// -// @Test -// public void testDeleteSelfSubscriptionBoxReview() throws Exception { -// Review review = reviews.getFirst(); -// String subsboxId = review.getSubsbox(); -// String userId = review.getAuthor(); -// -// doNothing().when(reviewService).deleteReview(subsboxId, userId); -// -// ResultActions result = mockMvc.perform(delete("/subscription-boxes/{subscriptionBoxId}/users/self", subsboxId) -// .contentType(MediaType.APPLICATION_JSON) -// .content("{\"userId\": \"user_123\"}")) -// .andExpect(status().isNoContent()); -// -// verify(reviewService).deleteReview(subsboxId, userId); -// } - @Test public void testDeleteUserSubscriptionBoxReview() throws Exception { Review review = reviews.getFirst(); @@ -238,100 +200,4 @@ public void testRejectReview() throws Exception { verify(reviewService).approveReview(review.getSubsbox(), review.getAuthor()); } - -// @Test -// public void testGetAllSubscriptionBoxReview() { -// String subsboxId = "subsboxId"; - -// ArrayList reviews = new ArrayList<>(); -// reviews.add(new Review(5, "amazing", "user1", subsboxId)); -// reviews.add(new Review(4, "good", "user2", subsboxId)); - -// when(reviewService.testGetAllSubscriptionBoxReview(subsboxId)).thenReturn(reviews); - -// ResultActions result = mockMvc.perform(get("/api/subscription-boxes/{subsboxId}", subsboxId)) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$", hasSize(2))) -// .andExpect(jsonPath("$[0].rating", is(5))) -// .andExpect(jsonPath("$[0].content", is("amazing"))) -// .andExpect(jsonPath("$[0].userId", is("user1"))) -// .andExpect(jsonPath("$[0].subscriptionBoxId", is(subsboxId))) -// .andExpect(jsonPath("$[1].rating", is(4))) -// .andExpect(jsonPath("$[1].content", is("good"))) -// .andExpect(jsonPath("$[1].userId", is("user2"))) -// .andExpect(jsonPath("$[1].subscriptionBoxId", is(subsboxId))); - -// verify(reviewService).testGetAllSubscriptionBoxReview(subsboxId); -// } - -// @Test -// public void testGetById() throws Exception { -// Review review = new Review( -// 5, "amazing", "user1", "subsboxId" -// ); -// String reviewId = review.getId(); - -// when(reviewService.findById(reviewId)).thenReturn(review); - -// ResultActions result = mockMvc.perform(get("/api/reviews/{reviewId}", reviewId)) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$.rating", is(5))) -// .andExpect(jsonPath("$.content", is("amazing"))) -// .andExpect(jsonPath("$.userId", is("user1"))) -// .andExpect(jsonPath("$.subscriptionBoxId", is("subsboxId"))); - -// verify(reviewService).findById(reviewId); -// } - -// @Test -// public void testGetBySubscriptionBoxId() throws Exception { -// List curReviews = new ArrayList<>(); - -// String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); -// for (Review review : this.reviews) { -// if (review.getSubsbox().equals(subscriptionBoxId)) { -// curReviews.add(review); -// } -// } - -// when(reviewService.findBySubscriptionBoxId(subscriptionBoxId)).thenReturn(curReviews); - -// String result = mockMvc.perform(get("/api/subscription-boxes/{subscriptionBoxId}", subscriptionBoxId)) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$", hasSize(curReviews.size()))) -// .andReturn() -// .getResponse() -// .getContentAsString(); - -// List foundReviews = new ArrayList(); -// for (int i=0; i cmp = new Comparator() { -// @Override -// public int compare(Review o1, Review o2) { -// return o1.getAuthor().compareTo(o2.getAuthor()); -// } -// }; - -// curReviews.sort(cmp); -// foundReviews.sort(cmp); - -// for (int i=0; i curReviews = new ArrayList<>(); String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); From 5b315acf057b702b23763632af99a3aa85259dde Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sat, 18 May 2024 19:56:23 +0700 Subject: [PATCH 04/21] [FIX] Fix sonarcloud workflow --- .github/workflows/sonarcloud.yml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 82e63c3..3fc2599 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -30,10 +30,8 @@ name: SonarCloud analysis on: push: - branches: [ "main", "dev" ] - pull_request: - branches: [ "main", "dev" ] - workflow_dispatch: + branches: + - "**" permissions: pull-requests: read # allows SonarCloud to decorate PRs with analysis results @@ -43,11 +41,23 @@ jobs: runs-on: ubuntu-latest steps: - - name: Analyze with SonarCloud + - name: Check out the Git repository + uses: actions/checkout@v4 + + - name: Set up Java toolchain + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: "21" + cache: "gradle" + - name: Build + run: ./gradlew build + + - name: Analyze with SonarCloud # You can pin the exact commit or the version. # uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 - uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 + uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) @@ -58,6 +68,9 @@ jobs: # mandatory -Dsonar.projectKey=ADPRO-C11_snackscription-review -Dsonar.organization=adpro-c11 + -Dsonar.java.binaries=. + -Dsonar.sources=src/main/java + -Dsonar.tests=src/test/java # Comma-separated paths to directories containing main source files. #-Dsonar.sources= # optional, default is project base directory # When you need the analysis to take place in a directory other than the one from which it was launched @@ -65,4 +78,4 @@ jobs: # Comma-separated paths to directories containing test source files. #-Dsonar.tests= # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/ # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing. - #-Dsonar.verbose= # optional, default is false + #-Dsonar.verbose= # optional, default is false \ No newline at end of file From 58fcb8c9b1c0a5fdb1e73a7054c5ba0e9758c148 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sat, 18 May 2024 20:03:26 +0700 Subject: [PATCH 05/21] [FIX] Add test coverage --- .github/workflows/sonarcloud.yml | 13 ------------- build.gradle.kts | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 3fc2599..5e50c08 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -41,19 +41,6 @@ jobs: runs-on: ubuntu-latest steps: - - name: Check out the Git repository - uses: actions/checkout@v4 - - - name: Set up Java toolchain - uses: actions/setup-java@v4 - with: - distribution: "temurin" - java-version: "21" - cache: "gradle" - - - name: Build - run: ./gradlew build - - name: Analyze with SonarCloud # You can pin the exact commit or the version. # uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 diff --git a/build.gradle.kts b/build.gradle.kts index 01cc3e8..1fc1f0a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,7 +50,8 @@ tasks.jacocoTestReport { })) dependsOn(tasks.test) reports { - xml.required.set(false) + xml.required.set(true) + html.required.set(true) csv.required.set(false) html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml")) } From ad3688228ba031097fe0f7245037698061e399bb Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sat, 18 May 2024 20:06:35 +0700 Subject: [PATCH 06/21] [FIX] Update workflow --- .github/workflows/ci.yml | 33 +++++++++++++--- .github/workflows/sonarcloud.yml | 68 -------------------------------- 2 files changed, 27 insertions(+), 74 deletions(-) delete mode 100644 .github/workflows/sonarcloud.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de84db9..b781189 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,7 @@ name: Java CI Pipeline on: push: branches: - - main - - dev - pull_request: - branches: - - main - - dev + - "**" workflow_dispatch: jobs: @@ -90,3 +85,29 @@ jobs: env: PRODUCTION: test # (Optional) Add steps for generating coverage report and other post-test tasks + + - name: Analyze with SonarCloud + # You can pin the exact commit or the version. + # uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) + with: + # Additional arguments for the sonarcloud scanner + args: + # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu) + # mandatory + -Dsonar.projectKey=ADPRO-C11_snackscription-review + -Dsonar.organization=adpro-c11 + -Dsonar.java.binaries=. + -Dsonar.sources=src/main/java + -Dsonar.tests=src/test/java + # Comma-separated paths to directories containing main source files. + #-Dsonar.sources= # optional, default is project base directory + # When you need the analysis to take place in a directory other than the one from which it was launched + #-Dsonar.projectBaseDir= # optional, default is . + # Comma-separated paths to directories containing test source files. + #-Dsonar.tests= # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/ + # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing. + #-Dsonar.verbose= # optional, default is false \ No newline at end of file diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml deleted file mode 100644 index 5e50c08..0000000 --- a/.github/workflows/sonarcloud.yml +++ /dev/null @@ -1,68 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -# This workflow helps you trigger a SonarCloud analysis of your code and populates -# GitHub Code Scanning alerts with the vulnerabilities found. -# Free for open source project. - -# 1. Login to SonarCloud.io using your GitHub account - -# 2. Import your project on SonarCloud -# * Add your GitHub organization first, then add your repository as a new project. -# * Please note that many languages are eligible for automatic analysis, -# which means that the analysis will start automatically without the need to set up GitHub Actions. -# * This behavior can be changed in Administration > Analysis Method. -# -# 3. Follow the SonarCloud in-product tutorial -# * a. Copy/paste the Project Key and the Organization Key into the args parameter below -# (You'll find this information in SonarCloud. Click on "Information" at the bottom left) -# -# * b. Generate a new token and add it to your Github repository's secrets using the name SONAR_TOKEN -# (On SonarCloud, click on your avatar on top-right > My account > Security -# or go directly to https://sonarcloud.io/account/security/) - -# Feel free to take a look at our documentation (https://docs.sonarcloud.io/getting-started/github/) -# or reach out to our community forum if you need some help (https://community.sonarsource.com/c/help/sc/9) - -name: SonarCloud analysis - -on: - push: - branches: - - "**" - -permissions: - pull-requests: read # allows SonarCloud to decorate PRs with analysis results - -jobs: - Analysis: - runs-on: ubuntu-latest - - steps: - - name: Analyze with SonarCloud - # You can pin the exact commit or the version. - # uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) - with: - # Additional arguments for the sonarcloud scanner - args: - # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu) - # mandatory - -Dsonar.projectKey=ADPRO-C11_snackscription-review - -Dsonar.organization=adpro-c11 - -Dsonar.java.binaries=. - -Dsonar.sources=src/main/java - -Dsonar.tests=src/test/java - # Comma-separated paths to directories containing main source files. - #-Dsonar.sources= # optional, default is project base directory - # When you need the analysis to take place in a directory other than the one from which it was launched - #-Dsonar.projectBaseDir= # optional, default is . - # Comma-separated paths to directories containing test source files. - #-Dsonar.tests= # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/ - # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing. - #-Dsonar.verbose= # optional, default is false \ No newline at end of file From 0bcb63d5d90599e9a29aa450ebe77eb0a9f8404e Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sat, 18 May 2024 20:18:24 +0700 Subject: [PATCH 07/21] [FIX] Remove sonarcloud workflow --- .github/workflows/ci.yml | 28 +--------------------------- sonar-project.properties | 6 ------ 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 sonar-project.properties diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b781189..050ab36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,30 +84,4 @@ jobs: ./gradlew jacocoTestReport env: PRODUCTION: test - # (Optional) Add steps for generating coverage report and other post-test tasks - - - name: Analyze with SonarCloud - # You can pin the exact commit or the version. - # uses: SonarSource/sonarcloud-github-action@de2e56b42aa84d0b1c5b622644ac17e505c9a049 - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Generate a token on Sonarcloud.io, add it to the secrets of this repo with the name SONAR_TOKEN (Settings > Secrets > Actions > add new repository secret) - with: - # Additional arguments for the sonarcloud scanner - args: - # Unique keys of your project and organization. You can find them in SonarCloud > Information (bottom-left menu) - # mandatory - -Dsonar.projectKey=ADPRO-C11_snackscription-review - -Dsonar.organization=adpro-c11 - -Dsonar.java.binaries=. - -Dsonar.sources=src/main/java - -Dsonar.tests=src/test/java - # Comma-separated paths to directories containing main source files. - #-Dsonar.sources= # optional, default is project base directory - # When you need the analysis to take place in a directory other than the one from which it was launched - #-Dsonar.projectBaseDir= # optional, default is . - # Comma-separated paths to directories containing test source files. - #-Dsonar.tests= # optional. For more info about Code Coverage, please refer to https://docs.sonarcloud.io/enriching/test-coverage/overview/ - # Adds more detail to both client and server-side analysis logs, activating DEBUG mode for the scanner, and adding client-side environment variables and system properties to the server-side log of analysis report processing. - #-Dsonar.verbose= # optional, default is false \ No newline at end of file + # (Optional) Add steps for generating coverage report and other post-test tasks \ No newline at end of file diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index 83364ee..0000000 --- a/sonar-project.properties +++ /dev/null @@ -1,6 +0,0 @@ -sonar.organization=adpro-c11 -sonar.projectKey=ADPRO-C11_snackscription-review - -# relative paths to source directories. More details and properties are described -# in https://sonarcloud.io/documentation/project-administration/narrowing-the-focus/ -sonar.sources=. \ No newline at end of file From 4bc3c8f42e51632739b897d4bed9b82b7ca6cd27 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sun, 19 May 2024 19:34:28 +0700 Subject: [PATCH 08/21] Revert "Merge pull request #12 from ADPRO-C11/async" This reverts commit 697428ab5c0148081c460742bfc80746f7c5d590, reversing changes made to 130fa41cca4c54eaae4033be3ffbacf5cb2631b6. The Sonarcloud setting is not working yet, fixing it soon. --- .github/workflows/cd.yml | 10 ---------- .../review/ReviewApplication.java | 18 ++---------------- .../review/service/ReviewService.java | 10 ---------- .../service/SentimentAnalysisService.java | 8 -------- .../review/service/ReviewServiceTest.java | 5 ----- 5 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 src/main/java/snackscription/review/service/SentimentAnalysisService.java diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 40fcb7c..30e9471 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -45,16 +45,6 @@ jobs: name: Test runs-on: ubuntu-latest needs: build - services: - postgres: - image: postgres:latest - env: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - POSTGRES_DB: snackscription_review - ports: - - 5432:5432 - options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: Checkout Repository uses: actions/checkout@v4 diff --git a/src/main/java/snackscription/review/ReviewApplication.java b/src/main/java/snackscription/review/ReviewApplication.java index 4898e1d..ec64e1c 100644 --- a/src/main/java/snackscription/review/ReviewApplication.java +++ b/src/main/java/snackscription/review/ReviewApplication.java @@ -2,28 +2,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import java.util.concurrent.Executor; - -@EnableAsync @SpringBootApplication public class ReviewApplication { public static void main(String[] args) { SpringApplication.run(ReviewApplication.class, args); - } - @Bean - public Executor taskExecutor () { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setCorePoolSize(1); - executor.setMaxPoolSize(1); - executor.setQueueCapacity(500); - executor.setThreadNamePrefix("GithubLookup-"); - executor.initialize(); - return executor; + } + } diff --git a/src/main/java/snackscription/review/service/ReviewService.java b/src/main/java/snackscription/review/service/ReviewService.java index 44883b9..31a94c5 100644 --- a/src/main/java/snackscription/review/service/ReviewService.java +++ b/src/main/java/snackscription/review/service/ReviewService.java @@ -2,9 +2,6 @@ import java.util.List; import java.util.Optional; -import java.util.concurrent.CompletableFuture; - -import org.springframework.scheduling.annotation.Async; import java.util.concurrent.atomic.AtomicInteger; import io.micrometer.core.instrument.composite.CompositeMeterRegistry; @@ -22,7 +19,6 @@ @Component public class ReviewService { private ReviewRepository reviewRepository; - private SentimentAnalysisService sentimentAnalysisService; public ReviewService (ReviewRepository reviewRepository) { this.reviewRepository = reviewRepository; @@ -80,12 +76,6 @@ public Review rejectReview(String subsbox, String user) throws Exception { return reviewRepository.save(review); } - @Async - public CompletableFuture analyzeSentimentAsync(String reviewText) { - String sentiment = sentimentAnalysisService.analyze(reviewText); - return CompletableFuture.completedFuture(sentiment); - } - public void deleteReview(String subsbox, String user) throws Exception { Review review = reviewRepository.findByIdSubsboxAndIdAuthor(subsbox, user); diff --git a/src/main/java/snackscription/review/service/SentimentAnalysisService.java b/src/main/java/snackscription/review/service/SentimentAnalysisService.java deleted file mode 100644 index b9610a8..0000000 --- a/src/main/java/snackscription/review/service/SentimentAnalysisService.java +++ /dev/null @@ -1,8 +0,0 @@ -package snackscription.review.service; - -public class SentimentAnalysisService { - public String analyze(String reviewText) { - return "positive"; - } - -} diff --git a/src/test/java/snackscription/review/service/ReviewServiceTest.java b/src/test/java/snackscription/review/service/ReviewServiceTest.java index 4fdf16d..6350528 100644 --- a/src/test/java/snackscription/review/service/ReviewServiceTest.java +++ b/src/test/java/snackscription/review/service/ReviewServiceTest.java @@ -179,10 +179,5 @@ public void assertEqualReview(Review review1, Review review2) { assertEquals(review1.getAuthor(), review2.getAuthor()); assertEquals(review1.getSubsbox(), review2.getSubsbox()); } - - @Test - public void analyzeSentimentAsyncTest() { - - } } From c4e50d3daee45f06c18df7c2cfdff95a18a9400c Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Mon, 20 May 2024 10:35:15 +0700 Subject: [PATCH 09/21] Configure prometheus to monitor deployed app --- .monitoring/prometheus/prometheus.yml | 7 +++++-- build.gradle.kts | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.monitoring/prometheus/prometheus.yml b/.monitoring/prometheus/prometheus.yml index 94f2cfe..f454fff 100644 --- a/.monitoring/prometheus/prometheus.yml +++ b/.monitoring/prometheus/prometheus.yml @@ -1,8 +1,11 @@ scrape_configs: - - job_name: 'MyAppMetrics' + - job_name: 'Snackscription Metrics' metrics_path: '/actuator/prometheus' scrape_interval: 3s static_configs: - targets: ['host.docker.internal:8080'] labels: - application: 'Snackscription Review' \ No newline at end of file + application: 'Snackscription Review' + - targets: ['34.124.152.90'] + labels: + application: 'Snackscription Review (deployed)' \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 01cc3e8..0acc097 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,10 +27,11 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("io.micrometer:micrometer-registry-prometheus") + implementation("io.micrometer:micrometer-core") compileOnly("org.projectlombok:lombok") developmentOnly("org.springframework.boot:spring-boot-devtools") runtimeOnly("org.postgresql:postgresql") - runtimeOnly("io.micrometer:micrometer-registry-prometheus") annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") annotationProcessor("org.projectlombok:lombok") testImplementation("org.springframework.boot:spring-boot-starter-test") From fdd575dc9e12abc91ea4a260ebc5f4e7d7f9425a Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Mon, 20 May 2024 11:05:27 +0700 Subject: [PATCH 10/21] [REFACTOR] Move admin API endpoint to seperate class --- .../controller/ReviewAdminController.java | 37 +++++++ .../review/controller/ReviewController.java | 21 +--- .../controller/ReviewAdminControllerTest.java | 100 ++++++++++++++++++ .../controller/ReviewControllerTest.java | 40 ------- 4 files changed, 138 insertions(+), 60 deletions(-) create mode 100644 src/main/java/snackscription/review/controller/ReviewAdminController.java create mode 100644 src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java diff --git a/src/main/java/snackscription/review/controller/ReviewAdminController.java b/src/main/java/snackscription/review/controller/ReviewAdminController.java new file mode 100644 index 0000000..073976b --- /dev/null +++ b/src/main/java/snackscription/review/controller/ReviewAdminController.java @@ -0,0 +1,37 @@ +package snackscription.review.controller; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import snackscription.review.model.Review; +import snackscription.review.service.ReviewService; + +@RestController +@RequestMapping("/admin") +public class ReviewAdminController { + private ReviewService reviewService; + + public ReviewAdminController(ReviewService reviewService) { + this.reviewService = reviewService; + } + + @PutMapping("/subscription-boxes/{subsbox}/users/{user}/approve") + public ResponseEntity approveReview(@PathVariable String subsbox, @PathVariable String user) { + try { + Review review = reviewService.approveReview(subsbox, user); + return new ResponseEntity<>(review, HttpStatus.OK); + } catch (Exception e) { + return new ResponseEntity<>(HttpStatus.BAD_REQUEST); + } + } + + @PutMapping("/subscription-boxes/{subsbox}/users/{user}/reject") + public ResponseEntity rejectReview(@PathVariable String subsbox, @PathVariable String user) { + try { + Review review = reviewService.rejectReview(subsbox, user); + return new ResponseEntity<>(review, HttpStatus.OK); + } catch (Exception e) { + return new ResponseEntity<>(HttpStatus.BAD_REQUEST); + } + } +} diff --git a/src/main/java/snackscription/review/controller/ReviewController.java b/src/main/java/snackscription/review/controller/ReviewController.java index bd802cd..2825a5e 100644 --- a/src/main/java/snackscription/review/controller/ReviewController.java +++ b/src/main/java/snackscription/review/controller/ReviewController.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -98,24 +99,4 @@ public ResponseEntity deleteReview(@PathVariable String subsbox, @PathVa public List getSubsboxReview(@PathVariable String subsbox) throws Exception { return reviewService.getSubsboxReview(subsbox, null); } - - @PutMapping("/subscription-boxes/{subsbox}/users/{user}/approve") - public ResponseEntity approveReview(@PathVariable String subsbox, @PathVariable String user) { - try { - Review review = reviewService.approveReview(subsbox, user); - return new ResponseEntity<>(review, HttpStatus.OK); - } catch (Exception e) { - return new ResponseEntity<>(HttpStatus.BAD_REQUEST); - } - } - - @PutMapping("/subscription-boxes/{subsbox}/users/{user}/reject") - public ResponseEntity rejectReview(@PathVariable String subsbox, @PathVariable String user) { - try { - Review review = reviewService.rejectReview(subsbox, user); - return new ResponseEntity<>(review, HttpStatus.OK); - } catch (Exception e) { - return new ResponseEntity<>(HttpStatus.BAD_REQUEST); - } - } } \ No newline at end of file diff --git a/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java b/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java new file mode 100644 index 0000000..69fb75e --- /dev/null +++ b/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java @@ -0,0 +1,100 @@ +package snackscription.review.controller; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.web.servlet.MockMvc; + +import org.springframework.test.web.servlet.ResultActions; +import snackscription.review.model.Review; +import snackscription.review.model.ReviewState; +import snackscription.review.service.ReviewService; + +import java.util.ArrayList; +import java.util.List; + +import static org.hamcrest.Matchers.is; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@ExtendWith(MockitoExtension.class) +@WebMvcTest(ReviewAdminController.class) +public class ReviewAdminControllerTest { + @MockBean + ReviewService reviewService; + + @Autowired + MockMvc mockMvc; + + List reviews; + static final String BASE_URL = "/admin"; + + @BeforeEach + public void setUp() { + this.reviews = new ArrayList<>(); + + Review review1 = new Review(5, "I love it", "subsbox_123", "user_123"); + Review review2 = new Review(1, "I hate it", "subsbox_123", "user_124"); + Review review3 = new Review(2, "Hmmmm idk", "subsbox_124", "user_124"); + Review review4 = new Review(3, "It's okay", "subsbox_124", "user_125"); + Review review5 = new Review(4, "I like it", "subsbox_124", "user_126"); + + review1.setState(ReviewState.PENDING); + review4.setState(ReviewState.APPROVED); + review5.setState(ReviewState.REJECTED); + + reviews = new ArrayList<>(); + reviews.add(review1); + reviews.add(review2); + reviews.add(review3); + reviews.add(review4); + reviews.add(review5); + } + + @Test + public void testApproveReview() throws Exception { + Review review = reviews.getFirst(); + + Review approvedReview = new Review(review.getRating(), review.getContent(), review.getSubsbox(), review.getAuthor()); + approvedReview.setState(ReviewState.APPROVED); + + when(reviewService.approveReview(review.getSubsbox(), review.getAuthor())).thenReturn(approvedReview); + + ResultActions result = mockMvc.perform(put(BASE_URL + "/subscription-boxes/{subsboxId}/users/{userId}/approve", review.getSubsbox(), review.getAuthor())) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.rating", is(review.getRating()))) + .andExpect(jsonPath("$.content", is(review.getContent()))) + .andExpect(jsonPath("$.author", is(review.getAuthor()))) + .andExpect(jsonPath("$.subsbox", is(review.getSubsbox()))) + .andExpect(jsonPath("$.state", is("APPROVED"))); + + verify(reviewService).approveReview(review.getSubsbox(), review.getAuthor()); + } + + @Test + public void testRejectReview() throws Exception { + Review review = reviews.getFirst(); + + Review rejectedReview = new Review(review.getRating(), review.getContent(), review.getSubsbox(), review.getAuthor()); + rejectedReview.setState(ReviewState.REJECTED); + + when(reviewService.rejectReview(review.getSubsbox(), review.getAuthor())).thenReturn(rejectedReview); + + ResultActions result = mockMvc.perform(put(BASE_URL + "/subscription-boxes/{subsboxId}/users/{userId}/reject", review.getSubsbox(), review.getAuthor())) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.rating", is(review.getRating()))) + .andExpect(jsonPath("$.content", is(review.getContent()))) + .andExpect(jsonPath("$.author", is(review.getAuthor()))) + .andExpect(jsonPath("$.subsbox", is(review.getSubsbox()))) + .andExpect(jsonPath("$.state", is("REJECTED"))); + + verify(reviewService).rejectReview(review.getSubsbox(), review.getAuthor()); + } +} diff --git a/src/test/java/snackscription/review/controller/ReviewControllerTest.java b/src/test/java/snackscription/review/controller/ReviewControllerTest.java index bf0ccca..9a08858 100644 --- a/src/test/java/snackscription/review/controller/ReviewControllerTest.java +++ b/src/test/java/snackscription/review/controller/ReviewControllerTest.java @@ -199,46 +199,6 @@ public void testDeleteUserSubscriptionBoxReview() throws Exception { verify(reviewService).deleteReview(subsbox, author); } - @Test - public void testApproveReview() throws Exception { - Review review = reviews.getFirst(); - - Review approvedReview = new Review(review.getRating(), review.getContent(), review.getSubsbox(), review.getAuthor()); - approvedReview.setState(ReviewState.APPROVED); - - when(reviewService.approveReview(review.getSubsbox(), review.getAuthor())).thenReturn(approvedReview); - - ResultActions result = mockMvc.perform(put("/reviews/subscription-boxes/{subsbox}/users/{author}/approve", review.getSubsbox(), review.getAuthor())) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.rating", is(review.getRating()))) - .andExpect(jsonPath("$.content", is(review.getContent()))) - .andExpect(jsonPath("$.author", is(review.getAuthor()))) - .andExpect(jsonPath("$.subsbox", is(review.getSubsbox()))) - .andExpect(jsonPath("$.state", is("APPROVED"))); - - verify(reviewService).approveReview(review.getSubsbox(), review.getAuthor()); - } - - @Test - public void testRejectReview() throws Exception { - Review review = reviews.getFirst(); - - Review approvedReview = new Review(review.getRating(), review.getContent(), review.getSubsbox(), review.getAuthor()); - approvedReview.setState(ReviewState.REJECTED); - - when(reviewService.approveReview(review.getSubsbox(), review.getAuthor())).thenReturn(approvedReview); - - ResultActions result = mockMvc.perform(put("/reviews/subscription-boxes/{subsbox}/users/{author}/approve", review.getSubsbox(), review.getAuthor())) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.rating", is(review.getRating()))) - .andExpect(jsonPath("$.content", is(review.getContent()))) - .andExpect(jsonPath("$.author", is(review.getAuthor()))) - .andExpect(jsonPath("$.subsbox", is(review.getSubsbox()))) - .andExpect(jsonPath("$.state", is("REJECTED"))); - - verify(reviewService).approveReview(review.getSubsbox(), review.getAuthor()); - } - // @Test // public void testGetAllSubscriptionBoxReview() { // String subsboxId = "subsboxId"; From 18834fee84e3ff355654621593ee9ec57b62c333 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Mon, 20 May 2024 11:13:20 +0700 Subject: [PATCH 11/21] [REFACTOR] Simplify public API endpoint path --- .../review/controller/ReviewController.java | 2 +- .../review/controller/ReviewControllerTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/snackscription/review/controller/ReviewController.java b/src/main/java/snackscription/review/controller/ReviewController.java index 2825a5e..8fe5a17 100644 --- a/src/main/java/snackscription/review/controller/ReviewController.java +++ b/src/main/java/snackscription/review/controller/ReviewController.java @@ -12,7 +12,7 @@ import snackscription.review.service.ReviewService; @RestController -@RequestMapping("/reviews") +@RequestMapping("") public class ReviewController { private ReviewService reviewService; diff --git a/src/test/java/snackscription/review/controller/ReviewControllerTest.java b/src/test/java/snackscription/review/controller/ReviewControllerTest.java index 9a08858..88e9e41 100644 --- a/src/test/java/snackscription/review/controller/ReviewControllerTest.java +++ b/src/test/java/snackscription/review/controller/ReviewControllerTest.java @@ -69,7 +69,7 @@ public void testCreateSubsboxReview() throws Exception{ when(reviewService.createReview(review.getRating(), review.getContent(), review.getId().getSubsbox(), review.getId().getAuthor())).thenReturn(review); - ResultActions result = mockMvc.perform(post("/reviews/subscription-boxes/{subsbox}", review.getSubsbox()) + ResultActions result = mockMvc.perform(post("/subscription-boxes/{subsbox}", review.getSubsbox()) .contentType(MediaType.APPLICATION_JSON) .content("{\"rating\": 5, \"content\": \"I love it\", \"author\": \"user_123\"}")) .andExpect(status().isCreated()) @@ -82,7 +82,7 @@ public void testCreateSubsboxReview() throws Exception{ } @Test - public void testReadAllPublicSubscriptionBoxReview() throws Exception { + public void testReadAllPublicSubsboxReviews() throws Exception { List approvedReviews = new ArrayList<>(); String subsbox = "subsbox_124"; for (Review review : reviews) { @@ -93,7 +93,7 @@ public void testReadAllPublicSubscriptionBoxReview() throws Exception { when(reviewService.getSubsboxReview(subsbox, "APPROVED")).thenReturn(approvedReviews); - String result = mockMvc.perform(get("/reviews/subscription-boxes/{subsbox}/public", subsbox)) + String result = mockMvc.perform(get("/subscription-boxes/{subsbox}/public", subsbox)) .andExpect(status().isOk()) .andExpect(jsonPath("$", hasSize(approvedReviews.size()))) .andReturn() @@ -134,7 +134,7 @@ public void readSelfSubscriptionBoxReview() throws Exception { when(reviewService.getReview(subsbox, author)).thenReturn(review); - ResultActions result = mockMvc.perform(get("/reviews/subscription-boxes/{subscriptionBoxId}/users/{author}", subsbox, author) + ResultActions result = mockMvc.perform(get("/subscription-boxes/{subscriptionBoxId}/users/{author}", subsbox, author) .contentType(MediaType.APPLICATION_JSON) .content("{\"author\": \"user_123\"}")) .andExpect(status().isOk()) @@ -192,7 +192,7 @@ public void testDeleteUserSubscriptionBoxReview() throws Exception { doNothing().when(reviewService).deleteReview(subsbox, author); - ResultActions result = mockMvc.perform(delete("/reviews/subscription-boxes/{subsbox}/users/{author}", subsbox, author) + ResultActions result = mockMvc.perform(delete("/subscription-boxes/{subsbox}/users/{author}", subsbox, author) .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isNoContent()); From 17ab860789e0e0c51660ea7f59ae3a73bf67074c Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Mon, 20 May 2024 11:57:24 +0700 Subject: [PATCH 12/21] [RED] Add unhappy path test to review service --- .../review/service/ReviewServiceTest.java | 81 ++++++++++++++++++- 1 file changed, 77 insertions(+), 4 deletions(-) diff --git a/src/test/java/snackscription/review/service/ReviewServiceTest.java b/src/test/java/snackscription/review/service/ReviewServiceTest.java index 6350528..071bf5c 100644 --- a/src/test/java/snackscription/review/service/ReviewServiceTest.java +++ b/src/test/java/snackscription/review/service/ReviewServiceTest.java @@ -18,6 +18,7 @@ import snackscription.review.exception.ReviewNotFoundException; import snackscription.review.model.Review; +import snackscription.review.model.ReviewId; import snackscription.review.model.ReviewState; import snackscription.review.repository.ReviewRepository; @@ -55,8 +56,6 @@ public void setUp() { @Test public void getReviewsBySubscriptionBoxId() throws Exception { - ReviewService reviewService = new ReviewService(reviewRepo); - List curReviews = new ArrayList<>(); String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); @@ -75,10 +74,15 @@ public void getReviewsBySubscriptionBoxId() throws Exception { verify(reviewRepo).findByIdSubsbox(subscriptionBoxId); } + @Test + public void getReviewBySubsboxIdNotFound() throws Exception { + + } + @Test public void testCreateReview() throws Exception { Review review = reviews.getFirst(); - + when(reviewRepo.save(any(Review.class))).thenReturn(review); Review savedReview = reviewService.createReview( @@ -93,7 +97,37 @@ public void testCreateReview() throws Exception { } @Test - public void testgetSubsboxReview() throws Exception { + public void testCreateReviewUserNotFound() throws Exception { + + } + + @Test + public void testCreateReviewSubsboxNotFound() throws Exception { + + } + + @Test + public void testCreateReviewAlreadyExist() throws Exception { + Review review = reviews.get(0); + when(reviewRepo.existsById(review.getId())).thenReturn(true); + + assertThrows(Exception.class, () -> { + reviewService.createReview(review.getRating(), review.getContent(), review.getSubsbox(), review.getAuthor()); + }); + + verify(reviewRepo).existsById(review.getId()); + } + + @Test + public void testCreateReviewInvalidRating() throws Exception { + Review review = reviews.get(0); + assertThrows(Exception.class, () -> { + reviewService.createReview(-1, review.getContent(), review.getSubsbox(), review.getAuthor()); + }); + } + + @Test + public void testGetSubsboxReview() throws Exception { String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); List curReviews = new ArrayList<>(); @@ -157,6 +191,29 @@ public void testEditReview() throws Exception { assertEquals(review.getId(), editedReview.getId()); } + @Test + public void testEditReviewNotFound() throws Exception { + Review review = reviews.getFirst(); + String subsbox = review.getSubsbox(); + String author = review.getAuthor(); + + int newRating = 1; + String newContent = "Changed content"; + Review newReview = new Review(newRating, newContent, author, subsbox); + newReview.setId(review.getId()); + + when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(review); + when(reviewRepo.save(any(Review.class))).thenReturn(newReview); + + Review editedReview = reviewService.editReview(newRating, newContent, subsbox, author); + + assertEquals(newRating, editedReview.getRating()); + assertEquals(newContent, editedReview.getContent()); + assertEquals(subsbox, editedReview.getSubsbox()); + assertEquals(author, editedReview.getAuthor()); + assertEquals(review.getId(), editedReview.getId()); + } + @Test public void testDeleteReview() throws Exception { String subsbox = this.reviews.getFirst().getSubsbox(); @@ -173,6 +230,22 @@ public void testDeleteReview() throws Exception { verify(reviewRepo).delete(review); } + @Test + public void testDeleteReviewNotFound() throws Exception { + String subsbox = this.reviews.getFirst().getSubsbox(); + String author = this.reviews.getFirst().getAuthor(); + + Review review = reviews.getFirst(); + + when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(review); + + reviewService.deleteReview(subsbox, author); + + assertThrows(ReviewNotFoundException.class, () -> reviewService.getReview(subsbox, author)); + + verify(reviewRepo).delete(review); + } + public void assertEqualReview(Review review1, Review review2) { assertEquals(review1.getRating(), review2.getRating()); assertEquals(review1.getContent(), review2.getContent()); From 7588297ffc19530cfbeebab1a45f2bd5884d265a Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Mon, 20 May 2024 11:57:45 +0700 Subject: [PATCH 13/21] [GREEN] Handle unhappy path logic, add exceptions and such --- .../review/service/ReviewService.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/snackscription/review/service/ReviewService.java b/src/main/java/snackscription/review/service/ReviewService.java index 31a94c5..0e77afe 100644 --- a/src/main/java/snackscription/review/service/ReviewService.java +++ b/src/main/java/snackscription/review/service/ReviewService.java @@ -18,13 +18,35 @@ @Service @Component public class ReviewService { - private ReviewRepository reviewRepository; + private final ReviewRepository reviewRepository; public ReviewService (ReviewRepository reviewRepository) { this.reviewRepository = reviewRepository; } + public boolean reviewExist(String subsbox, String user) { + return reviewRepository.existsById(new ReviewId(subsbox, user)); + } + + public boolean subsboxExist(String subsbox) { + //TODO: connect to subsbox service + return true; + } + + public boolean userExist(String user) { + //TODO: connect to user service + return true; + } + public Review createReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception { + if (reviewExist(subscriptionBoxId, userId)) { + throw new Exception("User has made a review for this subscription box."); + } + + if (rating < 1 || rating > 5) { + throw new Exception("Rating out of range"); + } + Review review = new Review(rating, content, subscriptionBoxId, userId); reviewRepository.save(review); return review; @@ -39,6 +61,8 @@ public Review getReview(String subsbox, String user) throws Exception { } public List getSubsboxReview(String subscriptionBoxId, String state) throws Exception { + if (!subsboxExist(subscriptionBoxId)) throw new Exception(); + if (state == null) { return reviewRepository.findByIdSubsbox(subscriptionBoxId); } else { From 0dd6174c4ff5fbdf3a12bc10768718bd919139cf Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Mon, 20 May 2024 12:18:44 +0700 Subject: [PATCH 14/21] [RED] Add test for admin controller get pending review --- .../controller/ReviewAdminControllerTest.java | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java b/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java index 69fb75e..7e7596a 100644 --- a/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java +++ b/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java @@ -1,5 +1,6 @@ package snackscription.review.controller; +import com.jayway.jsonpath.JsonPath; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -15,11 +16,15 @@ import snackscription.review.service.ReviewService; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -46,7 +51,6 @@ public void setUp() { Review review4 = new Review(3, "It's okay", "subsbox_124", "user_125"); Review review5 = new Review(4, "I like it", "subsbox_124", "user_126"); - review1.setState(ReviewState.PENDING); review4.setState(ReviewState.APPROVED); review5.setState(ReviewState.REJECTED); @@ -97,4 +101,49 @@ public void testRejectReview() throws Exception { verify(reviewService).rejectReview(review.getSubsbox(), review.getAuthor()); } + + @Test + public void testGetAllPendingReview() throws Exception { + List pendingReviews = new ArrayList<>(); + String subsboxId = "subsbox_124"; + + for (Review review : reviews) { + if (review.getSubsbox().equals(subsboxId) && review.getState().equals(ReviewState.PENDING)) pendingReviews.add(review); + } + + when(reviewService.getSubsboxReview(subsboxId, ReviewState.PENDING.toString())).thenReturn(pendingReviews); + + String result = mockMvc.perform( + get(BASE_URL + "/subscription-boxes/{subsboxId}/reviews?state=PENDING", subsboxId)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(pendingReviews.size()))) + .andReturn().getResponse().getContentAsString(); + + List foundReviews = new ArrayList(); + for (int i=0; i cmp = Comparator.comparing(Review::getAuthor); + pendingReviews.sort(cmp); + foundReviews.sort(cmp); + + for (int i=0; i Date: Mon, 20 May 2024 12:19:01 +0700 Subject: [PATCH 15/21] [GREEN] Implement admin controller get review by state --- .../review/controller/ReviewAdminController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/snackscription/review/controller/ReviewAdminController.java b/src/main/java/snackscription/review/controller/ReviewAdminController.java index 073976b..4d736b7 100644 --- a/src/main/java/snackscription/review/controller/ReviewAdminController.java +++ b/src/main/java/snackscription/review/controller/ReviewAdminController.java @@ -6,6 +6,8 @@ import snackscription.review.model.Review; import snackscription.review.service.ReviewService; +import java.util.List; + @RestController @RequestMapping("/admin") public class ReviewAdminController { @@ -34,4 +36,13 @@ public ResponseEntity rejectReview(@PathVariable String subsbox, @PathVa return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } } + + @GetMapping("/subscription-boxes/{subsbox}/reviews") + public ResponseEntity> getSubsboxReviews( + @PathVariable String subsbox, + @RequestParam(required = false) String state) throws Exception { + List reviews = reviewService.getSubsboxReview(subsbox, state); + return ResponseEntity.ok().body(reviews); + } + } From 0f133d56de72193042f1825109c6388d0adaf5b1 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Thu, 23 May 2024 15:18:56 +0700 Subject: [PATCH 16/21] [FIX] Fix getReview service --- .../review/controller/ReviewAdminController.java | 1 + .../review/controller/ReviewController.java | 8 ++------ .../java/snackscription/review/service/ReviewService.java | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/snackscription/review/controller/ReviewAdminController.java b/src/main/java/snackscription/review/controller/ReviewAdminController.java index 4d736b7..6d84d87 100644 --- a/src/main/java/snackscription/review/controller/ReviewAdminController.java +++ b/src/main/java/snackscription/review/controller/ReviewAdminController.java @@ -8,6 +8,7 @@ import java.util.List; +@CrossOrigin @RestController @RequestMapping("/admin") public class ReviewAdminController { diff --git a/src/main/java/snackscription/review/controller/ReviewController.java b/src/main/java/snackscription/review/controller/ReviewController.java index 8fe5a17..8e7cd01 100644 --- a/src/main/java/snackscription/review/controller/ReviewController.java +++ b/src/main/java/snackscription/review/controller/ReviewController.java @@ -11,6 +11,7 @@ import snackscription.review.model.Review; import snackscription.review.service.ReviewService; +@CrossOrigin @RestController @RequestMapping("") public class ReviewController { @@ -39,7 +40,7 @@ public ResponseEntity createSubsboxReview(@RequestBody Map> getPublicSubsboxReview(@PathVariable String subsbox) { try { List reviews = reviewService.getSubsboxReview(subsbox, "APPROVED"); @@ -94,9 +95,4 @@ public ResponseEntity deleteReview(@PathVariable String subsbox, @PathVa return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } } - - @GetMapping("/subscription-boxes/{subsbox}") - public List getSubsboxReview(@PathVariable String subsbox) throws Exception { - return reviewService.getSubsboxReview(subsbox, null); - } } \ No newline at end of file diff --git a/src/main/java/snackscription/review/service/ReviewService.java b/src/main/java/snackscription/review/service/ReviewService.java index 0e77afe..687ae65 100644 --- a/src/main/java/snackscription/review/service/ReviewService.java +++ b/src/main/java/snackscription/review/service/ReviewService.java @@ -53,7 +53,7 @@ public Review createReview(int rating, String content, String subscriptionBoxId, } public Review getReview(String subsbox, String user) throws Exception { - Optional oreview = reviewRepository.findById(new ReviewId(user, subsbox)); + Optional oreview = reviewRepository.findById(new ReviewId(subsbox, user)); if (oreview.isEmpty()) { throw new ReviewNotFoundException(); } From bff470fd8ebb9075ff46fdabc66d7fec3ef23f92 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Thu, 23 May 2024 15:34:37 +0700 Subject: [PATCH 17/21] [RED] Add unhappy path test for review service --- .../review/repository/ReviewRepository.java | 10 ++ .../review/service/ReviewServiceTest.java | 97 +++++++------------ 2 files changed, 47 insertions(+), 60 deletions(-) diff --git a/src/main/java/snackscription/review/repository/ReviewRepository.java b/src/main/java/snackscription/review/repository/ReviewRepository.java index 096b317..f0f025e 100644 --- a/src/main/java/snackscription/review/repository/ReviewRepository.java +++ b/src/main/java/snackscription/review/repository/ReviewRepository.java @@ -2,14 +2,24 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; + +import io.micrometer.common.lang.Nullable; import snackscription.review.model.Review; import snackscription.review.model.ReviewId; import snackscription.review.model.ReviewState; public interface ReviewRepository extends JpaRepository { + @Nullable List findByIdSubsbox(String subsbox); + + @Nullable List findByIdAuthor(String author); + + @Nullable List findByIdSubsboxAndState(String subsbox, ReviewState state); + + @Nullable Review findByIdSubsboxAndIdAuthor(String subsbox, String author); + void deleteByIdSubsboxAndIdAuthor(String subsbox, String author); } \ No newline at end of file diff --git a/src/test/java/snackscription/review/service/ReviewServiceTest.java b/src/test/java/snackscription/review/service/ReviewServiceTest.java index 071bf5c..d15338e 100644 --- a/src/test/java/snackscription/review/service/ReviewServiceTest.java +++ b/src/test/java/snackscription/review/service/ReviewServiceTest.java @@ -1,7 +1,7 @@ package snackscription.review.service; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; @@ -18,7 +18,6 @@ import snackscription.review.exception.ReviewNotFoundException; import snackscription.review.model.Review; -import snackscription.review.model.ReviewId; import snackscription.review.model.ReviewState; import snackscription.review.repository.ReviewRepository; @@ -54,11 +53,11 @@ public void setUp() { reviews.add(review5); } - @Test - public void getReviewsBySubscriptionBoxId() throws Exception { - List curReviews = new ArrayList<>(); + @Test + public void testGetSubsboxReview() throws Exception { String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); + List curReviews = new ArrayList<>(); for (Review review : this.reviews) { if (review.getSubsbox().equals(subscriptionBoxId)) { curReviews.add(review); @@ -75,8 +74,38 @@ public void getReviewsBySubscriptionBoxId() throws Exception { } @Test - public void getReviewBySubsboxIdNotFound() throws Exception { + public void testGetSubsboxReviewNotFound() throws Exception { + String subscriptionBoxId = "nonexistent_subsbox_id"; + + when(reviewRepo.findByIdSubsbox(subscriptionBoxId)).thenReturn(null); + List foundReviews = reviewService.getSubsboxReview(subscriptionBoxId, null); + + assertNotNull(foundReviews); + assertEquals(0, foundReviews.size()); + + verify(reviewRepo).findByIdSubsbox(subscriptionBoxId); + } + + @Test + public void testGetSubsboxReviewApproved() throws Exception { + String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); + + List cuReviews = new ArrayList<>(); + + for (Review review : this.reviews) { + if (review.getSubsbox().equals(subscriptionBoxId) && review.getState().equals(ReviewState.APPROVED)) { + cuReviews.add(review); + } + } + + when(reviewRepo.findByIdSubsboxAndState(subscriptionBoxId, ReviewState.APPROVED)).thenReturn(cuReviews); + + List foundReviews = reviewService.getSubsboxReview(subscriptionBoxId, "APPROVED"); + + assertEquals(cuReviews, foundReviews); + + verify(reviewRepo).findByIdSubsboxAndState(subscriptionBoxId, ReviewState.APPROVED); } @Test @@ -96,16 +125,6 @@ public void testCreateReview() throws Exception { verify(reviewRepo).save(any(Review.class)); } - @Test - public void testCreateReviewUserNotFound() throws Exception { - - } - - @Test - public void testCreateReviewSubsboxNotFound() throws Exception { - - } - @Test public void testCreateReviewAlreadyExist() throws Exception { Review review = reviews.get(0); @@ -126,48 +145,6 @@ public void testCreateReviewInvalidRating() throws Exception { }); } - @Test - public void testGetSubsboxReview() throws Exception { - String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); - - List curReviews = new ArrayList<>(); - - for (Review review : this.reviews) { - if (review.getSubsbox().equals(subscriptionBoxId)) { - curReviews.add(review); - } - } - - when(reviewRepo.findByIdSubsbox(subscriptionBoxId)).thenReturn(curReviews); - - List foundReviews = reviewService.getSubsboxReview(subscriptionBoxId, null); - - assertEquals(curReviews, foundReviews); - - verify(reviewRepo).findByIdSubsbox(subscriptionBoxId); - } - - @Test - public void testgetSubsboxReviewApproved() throws Exception { - String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); - - List cuReviews = new ArrayList<>(); - - for (Review review : this.reviews) { - if (review.getSubsbox().equals(subscriptionBoxId) && review.getState().equals(ReviewState.APPROVED)) { - cuReviews.add(review); - } - } - - when(reviewRepo.findByIdSubsboxAndState(subscriptionBoxId, ReviewState.APPROVED)).thenReturn(cuReviews); - - List foundReviews = reviewService.getSubsboxReview(subscriptionBoxId, "APPROVED"); - - assertEquals(cuReviews, foundReviews); - - verify(reviewRepo).findByIdSubsboxAndState(subscriptionBoxId, ReviewState.APPROVED); - } - @Test public void testEditReview() throws Exception { Review review = reviews.getFirst(); @@ -202,7 +179,7 @@ public void testEditReviewNotFound() throws Exception { Review newReview = new Review(newRating, newContent, author, subsbox); newReview.setId(review.getId()); - when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(review); + when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(null); when(reviewRepo.save(any(Review.class))).thenReturn(newReview); Review editedReview = reviewService.editReview(newRating, newContent, subsbox, author); @@ -237,7 +214,7 @@ public void testDeleteReviewNotFound() throws Exception { Review review = reviews.getFirst(); - when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(review); + when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(null); reviewService.deleteReview(subsbox, author); From e728a5a614eb4322ce94a192365ece43aecf16be Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Thu, 23 May 2024 15:47:29 +0700 Subject: [PATCH 18/21] [GREEN] Fix review service logic based on unhappy path test --- .../review/service/ReviewService.java | 29 ++++++++----------- .../review/service/ReviewServiceTest.java | 27 ++++++++--------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/main/java/snackscription/review/service/ReviewService.java b/src/main/java/snackscription/review/service/ReviewService.java index 687ae65..25d163a 100644 --- a/src/main/java/snackscription/review/service/ReviewService.java +++ b/src/main/java/snackscription/review/service/ReviewService.java @@ -1,5 +1,6 @@ package snackscription.review.service; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; @@ -28,16 +29,6 @@ public boolean reviewExist(String subsbox, String user) { return reviewRepository.existsById(new ReviewId(subsbox, user)); } - public boolean subsboxExist(String subsbox) { - //TODO: connect to subsbox service - return true; - } - - public boolean userExist(String user) { - //TODO: connect to user service - return true; - } - public Review createReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception { if (reviewExist(subscriptionBoxId, userId)) { throw new Exception("User has made a review for this subscription box."); @@ -61,18 +52,22 @@ public Review getReview(String subsbox, String user) throws Exception { } public List getSubsboxReview(String subscriptionBoxId, String state) throws Exception { - if (!subsboxExist(subscriptionBoxId)) throw new Exception(); - + List result; if (state == null) { - return reviewRepository.findByIdSubsbox(subscriptionBoxId); + result = reviewRepository.findByIdSubsbox(subscriptionBoxId); } else { state = state.toUpperCase(); - ReviewState reviewState = Enum.valueOf(ReviewState.class, state); - if (reviewState == null) { + if (!state.equals("PENDING") && !state.equals("APPROVED") && !state.equals("REJECTED")) { throw new InvalidStateException(); } - return reviewRepository.findByIdSubsboxAndState(subscriptionBoxId, reviewState); - } + ReviewState reviewState = ReviewState.valueOf(state); + result = reviewRepository.findByIdSubsboxAndState(subscriptionBoxId, reviewState); + } + + if (result == null) { + result = new ArrayList<>(); + } + return result; } public Review editReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception { diff --git a/src/test/java/snackscription/review/service/ReviewServiceTest.java b/src/test/java/snackscription/review/service/ReviewServiceTest.java index d15338e..d1fbfe1 100644 --- a/src/test/java/snackscription/review/service/ReviewServiceTest.java +++ b/src/test/java/snackscription/review/service/ReviewServiceTest.java @@ -16,6 +16,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import snackscription.review.exception.InvalidStateException; import snackscription.review.exception.ReviewNotFoundException; import snackscription.review.model.Review; import snackscription.review.model.ReviewState; @@ -108,6 +109,15 @@ public void testGetSubsboxReviewApproved() throws Exception { verify(reviewRepo).findByIdSubsboxAndState(subscriptionBoxId, ReviewState.APPROVED); } + @Test + public void testGetSubsboxReviewInvalidState() throws Exception { + String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); + + assertThrows(InvalidStateException.class, () -> { + reviewService.getSubsboxReview(subscriptionBoxId, "INVALID_STATE"); + }); + } + @Test public void testCreateReview() throws Exception { Review review = reviews.getFirst(); @@ -180,15 +190,10 @@ public void testEditReviewNotFound() throws Exception { newReview.setId(review.getId()); when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(null); - when(reviewRepo.save(any(Review.class))).thenReturn(newReview); - Review editedReview = reviewService.editReview(newRating, newContent, subsbox, author); - - assertEquals(newRating, editedReview.getRating()); - assertEquals(newContent, editedReview.getContent()); - assertEquals(subsbox, editedReview.getSubsbox()); - assertEquals(author, editedReview.getAuthor()); - assertEquals(review.getId(), editedReview.getId()); + assertThrows(ReviewNotFoundException.class, () -> { + reviewService.editReview(newRating, newContent, subsbox, author); + }); } @Test @@ -216,11 +221,7 @@ public void testDeleteReviewNotFound() throws Exception { when(reviewRepo.findByIdSubsboxAndIdAuthor(subsbox, author)).thenReturn(null); - reviewService.deleteReview(subsbox, author); - - assertThrows(ReviewNotFoundException.class, () -> reviewService.getReview(subsbox, author)); - - verify(reviewRepo).delete(review); + assertThrows(ReviewNotFoundException.class, () -> reviewService.deleteReview(subsbox, author)); } public void assertEqualReview(Review review1, Review review2) { From 5ae121458c5cb53bbaed0469c809a0e708e348db Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Thu, 23 May 2024 15:51:34 +0700 Subject: [PATCH 19/21] [REFACTOR] Make interface for review service --- .../controller/ReviewAdminController.java | 6 +- .../review/controller/ReviewController.java | 7 +- .../review/service/ReviewService.java | 112 ++---------------- .../review/service/ReviewServiceImpl.java | 107 +++++++++++++++++ .../controller/ReviewAdminControllerTest.java | 4 +- .../review/service/ReviewServiceTest.java | 2 +- 6 files changed, 126 insertions(+), 112 deletions(-) create mode 100644 src/main/java/snackscription/review/service/ReviewServiceImpl.java diff --git a/src/main/java/snackscription/review/controller/ReviewAdminController.java b/src/main/java/snackscription/review/controller/ReviewAdminController.java index 6d84d87..25b7d0b 100644 --- a/src/main/java/snackscription/review/controller/ReviewAdminController.java +++ b/src/main/java/snackscription/review/controller/ReviewAdminController.java @@ -4,7 +4,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import snackscription.review.model.Review; -import snackscription.review.service.ReviewService; +import snackscription.review.service.ReviewServiceImpl; import java.util.List; @@ -12,9 +12,9 @@ @RestController @RequestMapping("/admin") public class ReviewAdminController { - private ReviewService reviewService; + private ReviewServiceImpl reviewService; - public ReviewAdminController(ReviewService reviewService) { + public ReviewAdminController(ReviewServiceImpl reviewService) { this.reviewService = reviewService; } diff --git a/src/main/java/snackscription/review/controller/ReviewController.java b/src/main/java/snackscription/review/controller/ReviewController.java index 8e7cd01..0165a1c 100644 --- a/src/main/java/snackscription/review/controller/ReviewController.java +++ b/src/main/java/snackscription/review/controller/ReviewController.java @@ -3,21 +3,20 @@ import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import snackscription.review.model.Review; -import snackscription.review.service.ReviewService; +import snackscription.review.service.ReviewServiceImpl; @CrossOrigin @RestController @RequestMapping("") public class ReviewController { - private ReviewService reviewService; + private ReviewServiceImpl reviewService; - public ReviewController(ReviewService reviewService) { + public ReviewController(ReviewServiceImpl reviewService) { this.reviewService = reviewService; } diff --git a/src/main/java/snackscription/review/service/ReviewService.java b/src/main/java/snackscription/review/service/ReviewService.java index 25d163a..aee0263 100644 --- a/src/main/java/snackscription/review/service/ReviewService.java +++ b/src/main/java/snackscription/review/service/ReviewService.java @@ -1,107 +1,15 @@ package snackscription.review.service; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicInteger; - -import io.micrometer.core.instrument.composite.CompositeMeterRegistry; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -import snackscription.review.exception.InvalidStateException; -import snackscription.review.exception.ReviewNotFoundException; import snackscription.review.model.Review; -import snackscription.review.model.ReviewId; -import snackscription.review.model.ReviewState; -import snackscription.review.repository.ReviewRepository; - -@Service -@Component -public class ReviewService { - private final ReviewRepository reviewRepository; - - public ReviewService (ReviewRepository reviewRepository) { - this.reviewRepository = reviewRepository; - } - - public boolean reviewExist(String subsbox, String user) { - return reviewRepository.existsById(new ReviewId(subsbox, user)); - } - - public Review createReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception { - if (reviewExist(subscriptionBoxId, userId)) { - throw new Exception("User has made a review for this subscription box."); - } - - if (rating < 1 || rating > 5) { - throw new Exception("Rating out of range"); - } - - Review review = new Review(rating, content, subscriptionBoxId, userId); - reviewRepository.save(review); - return review; - } - - public Review getReview(String subsbox, String user) throws Exception { - Optional oreview = reviewRepository.findById(new ReviewId(subsbox, user)); - if (oreview.isEmpty()) { - throw new ReviewNotFoundException(); - } - return oreview.get(); - } - - public List getSubsboxReview(String subscriptionBoxId, String state) throws Exception { - List result; - if (state == null) { - result = reviewRepository.findByIdSubsbox(subscriptionBoxId); - } else { - state = state.toUpperCase(); - if (!state.equals("PENDING") && !state.equals("APPROVED") && !state.equals("REJECTED")) { - throw new InvalidStateException(); - } - ReviewState reviewState = ReviewState.valueOf(state); - result = reviewRepository.findByIdSubsboxAndState(subscriptionBoxId, reviewState); - } - - if (result == null) { - result = new ArrayList<>(); - } - return result; - } - - public Review editReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception { - Review review = reviewRepository.findByIdSubsboxAndIdAuthor(subscriptionBoxId, userId); - - if (review == null) { - throw new ReviewNotFoundException(); - } - - review.setRating(rating); - review.setContent(content); - - return reviewRepository.save(review); - } - - public Review approveReview(String subsbox, String user) throws Exception { - Review review = getReview(subsbox, user); - review.approve(); - return reviewRepository.save(review); - } - - public Review rejectReview(String subsbox, String user) throws Exception { - Review review = getReview(subsbox, user); - review.reject(); - return reviewRepository.save(review); - } - - public void deleteReview(String subsbox, String user) throws Exception { - Review review = reviewRepository.findByIdSubsboxAndIdAuthor(subsbox, user); - - if (review == null) { - throw new ReviewNotFoundException(); - } +import java.util.List; - reviewRepository.delete(review); - } +public interface ReviewService { + public boolean reviewExist(String subsbox, String user); + public Review createReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception; + public Review getReview(String subsbox, String user) throws Exception; + public List getSubsboxReview(String subscriptionBoxId, String state) throws Exception; + public Review editReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception; + public void deleteReview(String subsbox, String user) throws Exception; + public Review approveReview(String subsbox, String user) throws Exception; + public Review rejectReview(String subsbox, String user) throws Exception; } diff --git a/src/main/java/snackscription/review/service/ReviewServiceImpl.java b/src/main/java/snackscription/review/service/ReviewServiceImpl.java new file mode 100644 index 0000000..4b0006c --- /dev/null +++ b/src/main/java/snackscription/review/service/ReviewServiceImpl.java @@ -0,0 +1,107 @@ +package snackscription.review.service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; + +import io.micrometer.core.instrument.composite.CompositeMeterRegistry; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import snackscription.review.exception.InvalidStateException; +import snackscription.review.exception.ReviewNotFoundException; +import snackscription.review.model.Review; +import snackscription.review.model.ReviewId; +import snackscription.review.model.ReviewState; +import snackscription.review.repository.ReviewRepository; + +@Service +@Component +public class ReviewServiceImpl implements ReviewService { + private final ReviewRepository reviewRepository; + + public ReviewServiceImpl (ReviewRepository reviewRepository) { + this.reviewRepository = reviewRepository; + } + + public boolean reviewExist(String subsbox, String user) { + return reviewRepository.existsById(new ReviewId(subsbox, user)); + } + + public Review createReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception { + if (reviewExist(subscriptionBoxId, userId)) { + throw new Exception("User has made a review for this subscription box."); + } + + if (rating < 1 || rating > 5) { + throw new Exception("Rating out of range"); + } + + Review review = new Review(rating, content, subscriptionBoxId, userId); + reviewRepository.save(review); + return review; + } + + public Review getReview(String subsbox, String user) throws Exception { + Optional oreview = reviewRepository.findById(new ReviewId(subsbox, user)); + if (oreview.isEmpty()) { + throw new ReviewNotFoundException(); + } + return oreview.get(); + } + + public List getSubsboxReview(String subscriptionBoxId, String state) throws Exception { + List result; + if (state == null) { + result = reviewRepository.findByIdSubsbox(subscriptionBoxId); + } else { + state = state.toUpperCase(); + if (!state.equals("PENDING") && !state.equals("APPROVED") && !state.equals("REJECTED")) { + throw new InvalidStateException(); + } + ReviewState reviewState = ReviewState.valueOf(state); + result = reviewRepository.findByIdSubsboxAndState(subscriptionBoxId, reviewState); + } + + if (result == null) { + result = new ArrayList<>(); + } + return result; + } + + public Review editReview(int rating, String content, String subscriptionBoxId, String userId) throws Exception { + Review review = reviewRepository.findByIdSubsboxAndIdAuthor(subscriptionBoxId, userId); + + if (review == null) { + throw new ReviewNotFoundException(); + } + + review.setRating(rating); + review.setContent(content); + + return reviewRepository.save(review); + } + + public Review approveReview(String subsbox, String user) throws Exception { + Review review = getReview(subsbox, user); + review.approve(); + return reviewRepository.save(review); + } + + public Review rejectReview(String subsbox, String user) throws Exception { + Review review = getReview(subsbox, user); + review.reject(); + return reviewRepository.save(review); + } + + public void deleteReview(String subsbox, String user) throws Exception { + Review review = reviewRepository.findByIdSubsboxAndIdAuthor(subsbox, user); + + if (review == null) { + throw new ReviewNotFoundException(); + } + + reviewRepository.delete(review); + } +} diff --git a/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java b/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java index 7e7596a..75cf3f4 100644 --- a/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java +++ b/src/test/java/snackscription/review/controller/ReviewAdminControllerTest.java @@ -13,7 +13,7 @@ import org.springframework.test.web.servlet.ResultActions; import snackscription.review.model.Review; import snackscription.review.model.ReviewState; -import snackscription.review.service.ReviewService; +import snackscription.review.service.ReviewServiceImpl; import java.util.ArrayList; import java.util.Comparator; @@ -33,7 +33,7 @@ @WebMvcTest(ReviewAdminController.class) public class ReviewAdminControllerTest { @MockBean - ReviewService reviewService; + ReviewServiceImpl reviewService; @Autowired MockMvc mockMvc; diff --git a/src/test/java/snackscription/review/service/ReviewServiceTest.java b/src/test/java/snackscription/review/service/ReviewServiceTest.java index d1fbfe1..3cacbff 100644 --- a/src/test/java/snackscription/review/service/ReviewServiceTest.java +++ b/src/test/java/snackscription/review/service/ReviewServiceTest.java @@ -34,7 +34,7 @@ public class ReviewServiceTest { @BeforeEach public void setUp() { - reviewService = new ReviewService(reviewRepo); + reviewService = new ReviewServiceImpl(reviewRepo); Review review1 = new Review(5, "I love it", "subsbox_123", "user_123"); Review review2 = new Review(1, "I hate it", "subsbox_123", "user_124"); From c8aac1a23a2cbb580af164a8ad11e553144fe7d0 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sun, 26 May 2024 08:13:39 +0700 Subject: [PATCH 20/21] [FIX] Fix Sonar settings --- build.gradle.kts | 10 ++++++++++ gradle/gradle.properties | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 gradle/gradle.properties diff --git a/build.gradle.kts b/build.gradle.kts index 1fc1f0a..0572b5f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("org.springframework.boot") version "3.2.5" id("io.spring.dependency-management") version "1.1.4" jacoco + id("org.sonarqube") version "4.4.1.3373" } group = "snackscription" @@ -12,6 +13,7 @@ java { sourceCompatibility = JavaVersion.VERSION_21 } + configurations { compileOnly { extendsFrom(configurations.annotationProcessor.get()) @@ -55,4 +57,12 @@ tasks.jacocoTestReport { csv.required.set(false) html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml")) } +} + +sonar { + properties { + property("sonar.projectKey","ADPRO-C11_snackscription-review") + property("sonar.organization", "adpro-c11") + property("sonar.host.url", "https://sonarcloud.io") + } } \ No newline at end of file diff --git a/gradle/gradle.properties b/gradle/gradle.properties new file mode 100644 index 0000000..2b4c21a --- /dev/null +++ b/gradle/gradle.properties @@ -0,0 +1,5 @@ +systemProp.sonar.host.url=https://sonarcloud.io + +# Token generated from an account with 'Execute analysis' permission. +# It can also be set with the environment variable SONAR_TOKEN. +systemProp.sonar.token=${SONAR_TOKEN} \ No newline at end of file From 47a7ff4d8ac91f5f0618300480338f59caeb3da3 Mon Sep 17 00:00:00 2001 From: asteriskzie Date: Sun, 26 May 2024 19:16:47 +0700 Subject: [PATCH 21/21] [REFACTOR] Fix API endpoints naming --- .../review/controller/ReviewController.java | 43 ++--- .../controller/ReviewControllerTest.java | 169 +++--------------- 2 files changed, 46 insertions(+), 166 deletions(-) diff --git a/src/main/java/snackscription/review/controller/ReviewController.java b/src/main/java/snackscription/review/controller/ReviewController.java index 0165a1c..6ce65b5 100644 --- a/src/main/java/snackscription/review/controller/ReviewController.java +++ b/src/main/java/snackscription/review/controller/ReviewController.java @@ -8,15 +8,16 @@ import org.springframework.web.bind.annotation.*; import snackscription.review.model.Review; +import snackscription.review.service.ReviewService; import snackscription.review.service.ReviewServiceImpl; @CrossOrigin @RestController @RequestMapping("") public class ReviewController { - private ReviewServiceImpl reviewService; + private ReviewService reviewService; - public ReviewController(ReviewServiceImpl reviewService) { + public ReviewController(ReviewService reviewService) { this.reviewService = reviewService; } @@ -25,8 +26,8 @@ public ResponseEntity reviewPage() { return ResponseEntity.ok().body("Welcome to the review service!"); } - @PostMapping("/subscription-boxes/{subsbox}") - public ResponseEntity createSubsboxReview(@RequestBody Map body, @PathVariable String subsbox) { + @PostMapping("/subscription-boxes/{subsbox}/users/self") + public ResponseEntity createSelfSubsboxReview(@RequestBody Map body, @PathVariable String subsbox) { try { String author = body.get("author"); int rating = Integer.parseInt(body.get("rating")); @@ -49,46 +50,36 @@ public ResponseEntity> getPublicSubsboxReview(@PathVariable String } } - @GetMapping("/subscription-boxes/{subsbox}/users/{user}") - public ResponseEntity getSelfSubsboxReview(@RequestBody Map body, @PathVariable String subsbox, @PathVariable String user) { + @GetMapping("/subscription-boxes/{subsbox}/users/self") + public ResponseEntity getSelfSubsboxReview(@RequestBody Map body, @PathVariable String subsbox) { try { - String sender = body.get("author"); // TODO: nanti pakai JWT token untuk ambil sendernya - if (!authenticate(sender, user)) { - return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); - } - Review review = reviewService.getReview(subsbox, user); + String author = body.get("author"); // TODO: nanti pakai JWT token untuk ambil sendernya + Review review = reviewService.getReview(subsbox, author); return new ResponseEntity<>(review, HttpStatus.OK); } catch (Exception e) { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } } - @PutMapping("/subscription-boxes/{subsbox}/users/{user}") - public ResponseEntity editReview(@RequestBody Map body, @PathVariable String subsbox, @PathVariable String user) { + @PutMapping("/subscription-boxes/{subsbox}/users/self") + public ResponseEntity editSelfReview(@RequestBody Map body, @PathVariable String subsbox) { try { - String sender = body.get("author"); // TODO: nanti pakai JWT token untuk ambil sendernya - if (!authenticate(sender, user)) { - return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); - } - + String author = body.get("author"); // TODO: nanti pakai JWT token untuk ambil sendernya int rating = Integer.parseInt(body.get("rating")); String content = body.get("content"); - Review review = reviewService.editReview(rating, content, subsbox, user); + Review review = reviewService.editReview(rating, content, subsbox, author); return new ResponseEntity<>(review, HttpStatus.OK); } catch (Exception e) { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } } - private boolean authenticate(String sender, String user) { - return true; - } - - @DeleteMapping("/subscription-boxes/{subsbox}/users/{user}") - public ResponseEntity deleteReview(@PathVariable String subsbox, @PathVariable String user) { + @DeleteMapping("/subscription-boxes/{subsbox}/users/self") + public ResponseEntity deleteSelfReview(@RequestBody Map body, @PathVariable String subsbox) { try { - reviewService.deleteReview(subsbox, user); + String author = body.get("author"); // TODO: nanti pakai JWT token untuk ambil sendernya + reviewService.deleteReview(subsbox, author); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } catch (Exception e) { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); diff --git a/src/test/java/snackscription/review/controller/ReviewControllerTest.java b/src/test/java/snackscription/review/controller/ReviewControllerTest.java index 88e9e41..edf1599 100644 --- a/src/test/java/snackscription/review/controller/ReviewControllerTest.java +++ b/src/test/java/snackscription/review/controller/ReviewControllerTest.java @@ -69,7 +69,7 @@ public void testCreateSubsboxReview() throws Exception{ when(reviewService.createReview(review.getRating(), review.getContent(), review.getId().getSubsbox(), review.getId().getAuthor())).thenReturn(review); - ResultActions result = mockMvc.perform(post("/subscription-boxes/{subsbox}", review.getSubsbox()) + ResultActions result = mockMvc.perform(post("/subscription-boxes/{subsbox}/users/self", review.getSubsbox()) .contentType(MediaType.APPLICATION_JSON) .content("{\"rating\": 5, \"content\": \"I love it\", \"author\": \"user_123\"}")) .andExpect(status().isCreated()) @@ -93,7 +93,7 @@ public void testReadAllPublicSubsboxReviews() throws Exception { when(reviewService.getSubsboxReview(subsbox, "APPROVED")).thenReturn(approvedReviews); - String result = mockMvc.perform(get("/subscription-boxes/{subsbox}/public", subsbox)) + String result = mockMvc.perform(get("/subscription-boxes/{subsbox}", subsbox)) .andExpect(status().isOk()) .andExpect(jsonPath("$", hasSize(approvedReviews.size()))) .andReturn() @@ -127,14 +127,14 @@ public void testReadAllPublicSubsboxReviews() throws Exception { } @Test - public void readSelfSubscriptionBoxReview() throws Exception { + public void testReadSelfSubsboxReview() throws Exception { Review review = reviews.getFirst(); String subsbox = review.getSubsbox(); String author = review.getAuthor(); when(reviewService.getReview(subsbox, author)).thenReturn(review); - ResultActions result = mockMvc.perform(get("/subscription-boxes/{subscriptionBoxId}/users/{author}", subsbox, author) + ResultActions result = mockMvc.perform(get("/subscription-boxes/{subscriptionBoxId}/users/self", subsbox, author) .contentType(MediaType.APPLICATION_JSON) .content("{\"author\": \"user_123\"}")) .andExpect(status().isOk()) @@ -146,152 +146,41 @@ public void readSelfSubscriptionBoxReview() throws Exception { verify(reviewService).getReview(subsbox, author); } -// @Test -// public void testEditSelfSubscriptionBoxReview() throws Exception { -// Review review = reviews.getFirst(); -// String subsboxId = review.getSubsbox(); -// String userId = review.getAuthor(); -// -// int newRating = 4; -// String newContent = "Awikwok"; -// when(reviewService.editReview(newRating, newContent, subsboxId, userId)).thenReturn(new Review(newRating, newContent, userId, subsboxId)); -// -// ResultActions result = mockMvc.perform(put("/reviews/subscription-boxes/{subscriptionBoxId}/users/self", subsboxId) -// .contentType(MediaType.APPLICATION_JSON) -// .content("{\"rating\": 4, \"content\": \"Awikwok\", \"userId\": \"user_123\"}")) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$.rating", is(newRating))) -// .andExpect(jsonPath("$.content", is(newContent))) -// .andExpect(jsonPath("$.userId", is(review.getAuthor()))) -// .andExpect(jsonPath("$.subscriptionBoxId", is(review.getSubsbox()))); -// -// verify(reviewService).editReview(newRating, newContent, subsboxId, userId); -// } -// -// @Test -// public void testDeleteSelfSubscriptionBoxReview() throws Exception { -// Review review = reviews.getFirst(); -// String subsboxId = review.getSubsbox(); -// String userId = review.getAuthor(); -// -// doNothing().when(reviewService).deleteReview(subsboxId, userId); -// -// ResultActions result = mockMvc.perform(delete("/subscription-boxes/{subscriptionBoxId}/users/self", subsboxId) -// .contentType(MediaType.APPLICATION_JSON) -// .content("{\"userId\": \"user_123\"}")) -// .andExpect(status().isNoContent()); -// -// verify(reviewService).deleteReview(subsboxId, userId); -// } + @Test + public void testEditSelfSubsboxReview() throws Exception { + Review review = reviews.getFirst(); + String subsboxId = review.getSubsbox(); + String userId = review.getAuthor(); + + int newRating = 4; + String newContent = "Awikwok"; + when(reviewService.editReview(newRating, newContent, subsboxId, userId)).thenReturn(new Review(newRating, newContent, subsboxId, userId)); + + ResultActions result = mockMvc.perform(put("/subscription-boxes/{subscriptionBoxId}/users/self", subsboxId) + .contentType(MediaType.APPLICATION_JSON) + .content("{\"rating\": 4, \"content\": \"Awikwok\", \"author\": \"user_123\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.rating", is(newRating))) + .andExpect(jsonPath("$.content", is(newContent))) + .andExpect(jsonPath("$.author", is(review.getAuthor()))) + .andExpect(jsonPath("$.subsbox", is(review.getSubsbox()))); + + verify(reviewService).editReview(newRating, newContent, subsboxId, userId); + } @Test - public void testDeleteUserSubscriptionBoxReview() throws Exception { + public void testDeleteSelfSubsboxReview() throws Exception { Review review = reviews.getFirst(); String subsbox = review.getSubsbox(); String author = review.getAuthor(); doNothing().when(reviewService).deleteReview(subsbox, author); - ResultActions result = mockMvc.perform(delete("/subscription-boxes/{subsbox}/users/{author}", subsbox, author) - .contentType(MediaType.APPLICATION_JSON)) + ResultActions result = mockMvc.perform(delete("/subscription-boxes/{subsbox}/users/self", subsbox) + .contentType(MediaType.APPLICATION_JSON) + .content("{\"author\": \"user_123\"}")) .andExpect(status().isNoContent()); verify(reviewService).deleteReview(subsbox, author); } - -// @Test -// public void testGetAllSubscriptionBoxReview() { -// String subsboxId = "subsboxId"; - -// ArrayList reviews = new ArrayList<>(); -// reviews.add(new Review(5, "amazing", "user1", subsboxId)); -// reviews.add(new Review(4, "good", "user2", subsboxId)); - -// when(reviewService.testGetAllSubscriptionBoxReview(subsboxId)).thenReturn(reviews); - -// ResultActions result = mockMvc.perform(get("/api/subscription-boxes/{subsboxId}", subsboxId)) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$", hasSize(2))) -// .andExpect(jsonPath("$[0].rating", is(5))) -// .andExpect(jsonPath("$[0].content", is("amazing"))) -// .andExpect(jsonPath("$[0].userId", is("user1"))) -// .andExpect(jsonPath("$[0].subscriptionBoxId", is(subsboxId))) -// .andExpect(jsonPath("$[1].rating", is(4))) -// .andExpect(jsonPath("$[1].content", is("good"))) -// .andExpect(jsonPath("$[1].userId", is("user2"))) -// .andExpect(jsonPath("$[1].subscriptionBoxId", is(subsboxId))); - -// verify(reviewService).testGetAllSubscriptionBoxReview(subsboxId); -// } - -// @Test -// public void testGetById() throws Exception { -// Review review = new Review( -// 5, "amazing", "user1", "subsboxId" -// ); -// String reviewId = review.getId(); - -// when(reviewService.findById(reviewId)).thenReturn(review); - -// ResultActions result = mockMvc.perform(get("/api/reviews/{reviewId}", reviewId)) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$.rating", is(5))) -// .andExpect(jsonPath("$.content", is("amazing"))) -// .andExpect(jsonPath("$.userId", is("user1"))) -// .andExpect(jsonPath("$.subscriptionBoxId", is("subsboxId"))); - -// verify(reviewService).findById(reviewId); -// } - -// @Test -// public void testGetBySubscriptionBoxId() throws Exception { -// List curReviews = new ArrayList<>(); - -// String subscriptionBoxId = this.reviews.getFirst().getSubsbox(); -// for (Review review : this.reviews) { -// if (review.getSubsbox().equals(subscriptionBoxId)) { -// curReviews.add(review); -// } -// } - -// when(reviewService.findBySubscriptionBoxId(subscriptionBoxId)).thenReturn(curReviews); - -// String result = mockMvc.perform(get("/api/subscription-boxes/{subscriptionBoxId}", subscriptionBoxId)) -// .andExpect(status().isOk()) -// .andExpect(jsonPath("$", hasSize(curReviews.size()))) -// .andReturn() -// .getResponse() -// .getContentAsString(); - -// List foundReviews = new ArrayList(); -// for (int i=0; i cmp = new Comparator() { -// @Override -// public int compare(Review o1, Review o2) { -// return o1.getAuthor().compareTo(o2.getAuthor()); -// } -// }; - -// curReviews.sort(cmp); -// foundReviews.sort(cmp); - -// for (int i=0; i