Merge branch 'main' of https://github.com/Parpaillax/Ludotheque

src/main/java/fr/eni/demo/bll/AdresseService.java

@@ -6,4 +6,5 @@ public interface AdresseService {
   Adresse add(Adresse adresse);
   Adresse findById(Long id);
   Adresse findAdresseByClientId(Long clientId);
+
 }

src/main/java/fr/eni/demo/bll/ClientServiceImpl.java

@@ -3,9 +3,12 @@ package fr.eni.demo.bll;
 import fr.eni.demo.bo.Adresse;
 import fr.eni.demo.bo.Client;
 import fr.eni.demo.bo.Location;
+import fr.eni.demo.dal.AdresseRepository;
 import fr.eni.demo.dal.ClientRepository;
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -15,11 +18,14 @@ import java.util.Optional;
 public class ClientServiceImpl implements ClientService {
 
   private ClientRepository clientRepository;
+  private AdresseRepository adresseRepository;
 
-  public ClientServiceImpl(ClientRepository clientRepository) {
+  public ClientServiceImpl(ClientRepository clientRepository, AdresseRepository adresseRepository) {
     this.clientRepository = clientRepository;
+    this.adresseRepository = adresseRepository;
   }
 
+
   @Override
   public void add(Client client) {
     if (client == null) {
@@ -28,9 +34,23 @@ public class ClientServiceImpl implements ClientService {
     if (client.getAdresse() == null) {
       throw new IllegalArgumentException("Adresse mandatory");
     }
+
+    Adresse adresse = client.getAdresse();
+
+    ExampleMatcher matcher = ExampleMatcher.matchingAll()
+            .withIgnoreNullValues()
+            .withIgnoreCase();
+
+    Example<Adresse> example = Example.of(adresse, matcher);
+
+    Optional<Adresse> existingAdresse = adresseRepository.findOne(example);
+
+    client.setAdresse(existingAdresse.orElseGet(() -> adresseRepository.save(adresse)));
+
     clientRepository.save(client);
   }
 
+
   @Override
   public Client findById(Long clientId) {
     return clientRepository.findById(clientId)

src/main/java/fr/eni/demo/bo/Adresse.java

@@ -15,7 +15,7 @@ import org.springframework.data.mongodb.core.mapping.Field;
 public class Adresse {
 
   @Id
-  private Integer id;
+  private String id;
 
   @Field(name = "STREET")
   private String rue;

src/main/java/fr/eni/demo/bo/Client.java

@@ -36,7 +36,7 @@ public class Client {
   @Field(name = "LOCATIONS")
   private List<Location> locations;
 
-  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+  @DBRef
-  @JoinColumn(name = "CLIENT_ID")
+  @Field(name = "FACTURES")
   private List<Facture> factures;
 }

src/main/java/fr/eni/demo/bo/Facture.java

@@ -1,7 +1,10 @@
 package fr.eni.demo.bo;
 
-import jakarta.persistence.*;
 import lombok.*;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.util.Date;
 
@@ -12,22 +15,19 @@ import java.util.Date;
 @ToString
 @Builder
 
-@Entity
+@Document(collection = "factures")
-@Table(name="Facture")
 public class Facture {
 
   @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private String id;
-  @Column(name = "FACTURE_ID")
-  private Long id;
 
-  @Column(name = "PRICE")
+  @Field(name = "PRICE")
   private Double price;
 
-  @Column(name = "DATE_PAY")
+  @Field(name = "DATEPAY")
   private Date datePay;
 
-  @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+  @DBRef
-  @JoinColumn(name = "CLIENT_ID", nullable = false)
+  @Field(name = "CLIENTS")
   private Client client;
 }

src/main/java/fr/eni/demo/dal/AdresseRepository.java

@@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public interface AdresseRepository extends MongoRepository<Adresse, Long> {
+
 }