créer vente : appel du service backend

benjaminpochat · Jan 7, 2024 · 6edcb26 · 6edcb26
1 parent 9593102
commit 6edcb26
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git a/...end/app/src/main/java/eu/viandeendirect/security/configuration/SecurityConfiguration.java b/...end/app/src/main/java/eu/viandeendirect/security/configuration/SecurityConfiguration.java
@@ -41,31 +41,31 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .anonymous()
             .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/sales", "/sales/*")
+                .requestMatchers("/sales", "/sales/**")
                 .permitAll()
             .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/packageTemplates", "/packageTemplates/*")
+                .requestMatchers("/packageTemplates", "/packageTemplates/**")
                 .hasRole("PRODUCER")
             .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/productions", "/productions/*")
+                .requestMatchers("/productions", "/productions/**")
                 .hasRole("PRODUCER")
             .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/beefProductions", "/beefProductions/*")
+                .requestMatchers("/beefProductions", "/beefProductions/**")
                 .hasRole("PRODUCER")
             .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/honneyProductions", "/honneyProductions/*")
+                .requestMatchers("/honneyProductions", "/honneyProductions/**")
                 .hasRole("PRODUCER")
             .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/customers", "/customers/*")
+                .requestMatchers("/customers", "/customers/**")
                 .hasRole("PRODUCER")
             .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/orders", "/orders/*")
+                .requestMatchers("/orders", "/orders/**")
                 .hasRole("PRODUCER")
             .and()
                 .authorizeHttpRequests()

diff --git a/backend/app/src/main/java/eu/viandeendirect/service/ProductionService.java b/backend/app/src/main/java/eu/viandeendirect/service/ProductionService.java
@@ -40,10 +40,10 @@ public ResponseEntity<Integer> getProductionPercentageSold(Integer productionId)
         List<PackageLot> lots = packageLotRepository.findByProduction(production);
         Float initialQuantityToSell = lots.stream()
                 .map(lot -> lot.getQuantity() * lot.getNetWeight())
-                .reduce((quantity1, quantity2) -> quantity1 + quantity2).get();
+                .reduce((quantity1, quantity2) -> quantity1 + quantity2).orElse(0f);
         Float quantitySold = lots.stream()
                 .map(lot -> lot.getQuantitySold() * lot.getNetWeight())
-                .reduce((quantity1, quantity2) -> quantity1 + quantity2).get();
+                .reduce((quantity1, quantity2) -> quantity1 + quantity2).orElse(0f);
         Float percentageSold = quantitySold / initialQuantityToSell * 100;
         Integer roundedPercentageSold = Math.round(percentageSold);
         return new ResponseEntity<>(roundedPercentageSold, OK);

diff --git a/backend/app/src/main/resources/application-postgre.properties b/backend/app/src/main/resources/application-postgre.properties
@@ -1,4 +1,3 @@
 spring.datasource.driverClassName=org.postgresql.Driver
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-spring.jpa.hibernate.ddl-auto = create
diff --git a/backend/model/src/main/java/eu/viandeendirect/model/Production.java b/backend/model/src/main/java/eu/viandeendirect/model/Production.java
@@ -81,6 +81,7 @@ public static ProductionTypeEnum fromValue(String value) {
 
   @ManyToOne
   @JsonProperty("producer")
+  @JsonIgnore
   private Producer producer;
 
   @JsonProperty("lots")

diff --git a/backend/model/src/main/java/eu/viandeendirect/model/Sale.java b/backend/model/src/main/java/eu/viandeendirect/model/Sale.java
@@ -1,6 +1,7 @@
 package eu.viandeendirect.model;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.annotation.Generated;

diff --git a/frontend/app/src/api/Api.js b/frontend/app/src/api/Api.js
diff --git a/frontend/app/src/domains/sale/components/SaleCard.tsx b/frontend/app/src/domains/sale/components/SaleCard.tsx
@@ -72,13 +72,13 @@ export default function SaleCard({ sale: sale, manageOrdersCallback: manageOrder
         return sale.orders
             .flatMap(order => order.items)
             .map(item => item.packageLot.netWeight * item.quantity)
-            .reduce((totalQuantity, orderItemQuantity) => totalQuantity + orderItemQuantity)
+            .reduce((totalQuantity, orderItemQuantity) => totalQuantity + orderItemQuantity, 0)
     }
 
     function getAmountSold() {
         return sale.orders
             .flatMap(order => order.items)
             .map(item => item.unitPrice * item.quantity)
-            .reduce((totalAmout, orderItemAmout) => totalAmout + orderItemAmout)
+            .reduce((totalAmout, orderItemAmout) => totalAmout + orderItemAmout, 0)
     }
 }
diff --git a/frontend/app/src/domains/sale/views/SaleForm.js b/frontend/app/src/domains/sale/views/SaleForm.js
@@ -192,7 +192,18 @@ export default function SaleForm({returnCallback: returnCallback}) {
     }
 
     function validate() {
-        returnCallback()
+        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+                api.createSale(sale, (error, data, response) => {
+                    if (error) {
+                        console.error(error)
+                    } else {
+                        console.log('API called successfully. Returned data: ' + data)
+                        returnCallback()
+                    }
+                })
+            }, keycloak)
+        });
     }
 
     function cancel() {