Sync Done

RamziHaddad · Dec 28, 2024 · 2cc8095 · 2cc8095
1 parent eecddfc
commit 2cc8095
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 17 deletions.
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/order/docker-compose.yml b/order/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: db_order
     environment:
       POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: fadizoe1212
+      POSTGRES_PASSWORD: SQL_2023test
       POSTGRES_DB: db_order
       PGDATA: /var/lib/postgresql/data
     ports:

diff --git a/order/src/main/java/com/microservices/order_service/controller/OrderController.java b/order/src/main/java/com/microservices/order_service/controller/OrderController.java
@@ -187,8 +187,8 @@ public ResponseEntity<?> processPaymentAndInitiateDelivery(
     }*/
 
     @GetMapping("/addresses")
-    public ResponseEntity<List<AddressDTO>> GetAddresses(){
-        List<AddressDTO> addresses = deliveryService.getUserAddresses();
+    public ResponseEntity<List<Address>> GetAddresses(){
+        List<Address> addresses = deliveryService.getUserAddresses();
         return ResponseEntity.ok(addresses);
     }
 

diff --git a/...ervices/order_service/dto/AddressDTO.java → ...roservices/order_service/dto/Address.java b/...ervices/order_service/dto/AddressDTO.java → ...roservices/order_service/dto/Address.java
@@ -14,7 +14,7 @@
 @Getter
 @Setter
 @NoArgsConstructor
-public class AddressDTO {
+public class Address {
 
     private UUID addressId;
 

diff --git a/order/src/main/java/com/microservices/order_service/service/DeliveryService.java b/order/src/main/java/com/microservices/order_service/service/DeliveryService.java
@@ -1,7 +1,7 @@
 package com.microservices.order_service.service;
 
-import com.microservices.order_service.dto.AddressDTO;
-import com.microservices.order_service.dto.OrderDeliveryDTO;
+
+import com.microservices.order_service.dto.Address;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -25,11 +25,11 @@ public DeliveryService(WebClient.Builder webClientBuilder) {
      *
      * @return List of AddressDTO
      */
-    public List<AddressDTO> getUserAddresses() {
+    public List<Address> getUserAddresses() {
         return webClient.get()
                 .uri(shippingServiceUrl)
                 .retrieve()
-                .bodyToFlux(AddressDTO.class)
+                .bodyToFlux(Address.class)
                 .collectList()
                 .block();
     }

diff --git a/order/src/main/resources/application-dev.yml b/order/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@ spring:
 
     url: jdbc:postgresql://localhost:5432/db_order
     username: postgres
-    password: azerty
+    password: SQL_2023test
     driver-class-name: org.postgresql.Driver
   jpa:
     hibernate:

diff --git a/order/src/main/resources/application.properties b/order/src/main/resources/application.properties
@@ -9,8 +9,8 @@ spring.kafka.consumer.value-deserializer=com.microservices.order_service.deseria
 spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
 spring.kafka.consumer.properties.spring.json.trusted.packages=*
 
-delivery.service.url=http://localhost:8090
+delivery.service.url=http://localhost:8090/addresses
 shipping.service.url=http://localhost:8090/api/shipping
 
-spring.kafka.topic.order-paid=**
-spring.kafka.consumer.group-id=**
+spring.kafka.topic.order-paid=order-paid
+spring.kafka.consumer.group-id=groupId
diff --git a/shipping/pom.xml b/shipping/pom.xml
@@ -142,7 +142,7 @@
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                 </configuration>
-            </plugin>
+            </plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>17</source><target>17</target></configuration></plugin>
         </plugins>
     </build>
 

diff --git a/shipping/src/main/java/org/shipping/model/Shipment.java b/shipping/src/main/java/org/shipping/model/Shipment.java
@@ -32,10 +32,12 @@ public class Shipment {
     private LocalDateTime deliveryDate;
 
     @ManyToOne
-    @JoinColumn(name = "addressId", referencedColumnName = "id")
+    @JoinColumn(name = "addressId", referencedColumnName = "addressId")
     private Address address;
 
 
+    @ManyToOne
+    @JoinColumn(name = "delivery_address_address_id")
     private Address deliveryAddress;
 
     // Ajouter addressId en tant que UUID pour utiliser explicitement la colonne

diff --git a/shipping/src/main/resources/application.properties b/shipping/src/main/resources/application.properties
@@ -5,8 +5,8 @@ quarkus.http.cors.origins=*
 
 quarkus.datasource.db-kind=postgresql
 quarkus.datasource.username=postgres
-quarkus.datasource.password=azerty
-quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5442/db_shipping
+quarkus.datasource.password=SQL_2023test
+quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/order_service
 
 # drop and create the database at startup (use `update` to only update the schema)
 quarkus.hibernate-orm.database.generation=create