Add discounts

Co-Authored-By: Miłosz Urbaniak <[email protected]>
m-strzelec · Jun 19, 2024 · b3c8065 · b3c8065
1 parent 87718bd
commit b3c8065
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: Build and Deploy to Azure Container Apps
 on:
   push:
     branches:
-      - strzelec
+      - main
 
 jobs:
   build-and-deploy:

diff --git a/src/main/java/org/zzpj/tabi/controllers/ReservationController.java b/src/main/java/org/zzpj/tabi/controllers/ReservationController.java
@@ -7,10 +7,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.zzpj.tabi.dto.reservation.ReservationCreateDTO;
 import org.zzpj.tabi.dto.reservation.ReservationOutputDTO;
 import org.zzpj.tabi.entities.Account;
@@ -136,7 +133,7 @@ public ResponseEntity<?> getOwnReservations() {
                             examples = @ExampleObject("500 Internal Server Error"))}
             )
     })
-    public ResponseEntity<?> createReservation(@Valid ReservationCreateDTO reservationCreateDTO) {
+    public ResponseEntity<?> createReservation(@RequestBody ReservationCreateDTO reservationCreateDTO) {
         String login = SecurityContextHolder.getContext().getAuthentication().getName();
         try {
             Account account = accountService.getAccountByLogin(login);

diff --git a/src/main/java/org/zzpj/tabi/dto/reservation/ReservationCreateDTO.java b/src/main/java/org/zzpj/tabi/dto/reservation/ReservationCreateDTO.java
@@ -3,8 +3,6 @@
 import java.util.UUID;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Positive;
 import lombok.Data;
 
 @Data
@@ -14,7 +12,5 @@ public class ReservationCreateDTO {
     private UUID travelId;
 
     @Schema(example = "1")
-    @NotEmpty
-    @Positive
     private int guestCount;
 }
diff --git a/src/main/java/org/zzpj/tabi/dto/review/ReviewUpdateDTO.java b/src/main/java/org/zzpj/tabi/dto/review/ReviewUpdateDTO.java
@@ -3,7 +3,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -22,6 +21,5 @@ public class ReviewUpdateDTO {
     private String comment;
 
     @Schema(example = "00000000-0000-0000-0001-000000000001")
-    @NotEmpty
     private UUID travelId;
 }
diff --git a/src/main/java/org/zzpj/tabi/dto/travel/TravelCreateDTO.java b/src/main/java/org/zzpj/tabi/dto/travel/TravelCreateDTO.java
@@ -31,7 +31,6 @@ public class TravelCreateDTO {
     private String place;
 
     @Schema(example = "4999.99")
-    @Positive
     private BigDecimal basePrice;
 
     @Schema(example = "2025-12-15")
@@ -41,10 +40,8 @@ public class TravelCreateDTO {
     private LocalDate endDate;
 
     @Schema(example = "100")
-    @Positive
     private int maxPlaces;
 
     @Schema(example = "10")
-    @Positive
     private int available;
 }
diff --git a/src/main/java/org/zzpj/tabi/dto/travel/TravelUpdateDTO.java b/src/main/java/org/zzpj/tabi/dto/travel/TravelUpdateDTO.java
@@ -1,8 +1,6 @@
 package org.zzpj.tabi.dto.travel;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Positive;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,7 +24,5 @@ public class TravelUpdateDTO {
     private String description;
 
     @Schema(example = "0")
-    @Positive
-    @NotEmpty
     private Long version;
 }
diff --git a/src/main/java/org/zzpj/tabi/services/ReservationService.java b/src/main/java/org/zzpj/tabi/services/ReservationService.java
@@ -52,6 +52,16 @@ public void createReservation(Client client, Travel travel, int guestCount) thro
             throw new InvalidGuestCountException("Not enough available places");
         }
         BigDecimal amount = travel.getBasePrice().multiply(new BigDecimal(guestCount));
+        switch (client.getStatus()) {
+            case Client.Status.BRONZE:
+                break;
+            case Client.Status.SILVER:
+                amount = amount.multiply(new BigDecimal("0.9"));
+                break;
+            case Client.Status.GOLD:
+                amount = amount.multiply(new BigDecimal("0.8"));
+                break;
+        }
         String title = "travel " + travel.getId();
         travel.setAvailablePlaces(travel.getAvailablePlaces() - guestCount);
         if (!travel.getVersion().equals(travelRepository.findById(travel.getId()).orElseThrow().getVersion())) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Build and Deploy to Azure Container Apps @@
     on:
       push:
         branches:
-          - strzelec
+          - main
     jobs:
       build-and-deploy:
@@ Expand Down @@