From d80344614470a25ac45c3f928068ba926c58caee Mon Sep 17 00:00:00 2001 From: mepiphana2023 Date: Wed, 16 Jul 2025 16:45:52 +0200 Subject: [PATCH] correction multiple --- src/main/java/fr/eni/demo/bll/LocationService.java | 1 - .../java/fr/eni/demo/bll/LocationServiceImpl.java | 13 +++++++------ src/main/java/fr/eni/demo/bo/Client.java | 3 --- src/main/java/fr/eni/demo/bo/Facture.java | 1 - src/main/java/fr/eni/demo/bo/Location.java | 2 -- src/main/java/fr/eni/demo/bo/Stock.java | 2 -- .../java/fr/eni/demo/dal/LocationRepository.java | 4 +++- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/fr/eni/demo/bll/LocationService.java b/src/main/java/fr/eni/demo/bll/LocationService.java index 33ac035..997b2e8 100644 --- a/src/main/java/fr/eni/demo/bll/LocationService.java +++ b/src/main/java/fr/eni/demo/bll/LocationService.java @@ -5,7 +5,6 @@ import fr.eni.demo.bo.Location; public interface LocationService { Location findById(Long id); void add(Location location); - void update(Location location); void updateDateEnd(String id, Location location); Location findByCodeBarre(String codeBarre); } diff --git a/src/main/java/fr/eni/demo/bll/LocationServiceImpl.java b/src/main/java/fr/eni/demo/bll/LocationServiceImpl.java index 694d272..eae0a03 100644 --- a/src/main/java/fr/eni/demo/bll/LocationServiceImpl.java +++ b/src/main/java/fr/eni/demo/bll/LocationServiceImpl.java @@ -6,6 +6,7 @@ import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.NoSuchElementException; @Service public class LocationServiceImpl implements LocationService { @@ -29,12 +30,6 @@ public class LocationServiceImpl implements LocationService { stockService.isRent(location.getStock(), true); } - @Override - public void update(Location location) { - locationRepository.save(location); - stockService.isRent(location.getStock(), false); - } - @Override public void updateDateEnd(String id, Location location) { Location existing = findById(Long.valueOf(id)); @@ -43,4 +38,10 @@ public class LocationServiceImpl implements LocationService { locationRepository.save(location); } + @Override + public Location findByCodeBarre(String codeBarre) { + return locationRepository.findByCodeBarre(codeBarre) + .orElseThrow(() -> new NoSuchElementException("Code-barre inconnu : " + codeBarre)); + } + } diff --git a/src/main/java/fr/eni/demo/bo/Client.java b/src/main/java/fr/eni/demo/bo/Client.java index 935b821..f09bcb0 100644 --- a/src/main/java/fr/eni/demo/bo/Client.java +++ b/src/main/java/fr/eni/demo/bo/Client.java @@ -28,15 +28,12 @@ public class Client { @Field(name = "EMAIL") private String email; - @DBRef @Field(name = "ADRESSE") private Adresse adresse; - @DBRef @Field(name = "LOCATIONS") private List locations; - @DBRef @Field(name = "FACTURES") private List factures; } diff --git a/src/main/java/fr/eni/demo/bo/Facture.java b/src/main/java/fr/eni/demo/bo/Facture.java index 06b53b0..a9d1ca0 100644 --- a/src/main/java/fr/eni/demo/bo/Facture.java +++ b/src/main/java/fr/eni/demo/bo/Facture.java @@ -27,7 +27,6 @@ public class Facture { @Field(name = "DATEPAY") private Date datePay; - @DBRef @Field(name = "CLIENTS") private Client client; } diff --git a/src/main/java/fr/eni/demo/bo/Location.java b/src/main/java/fr/eni/demo/bo/Location.java index ab8ce48..0538bd1 100644 --- a/src/main/java/fr/eni/demo/bo/Location.java +++ b/src/main/java/fr/eni/demo/bo/Location.java @@ -28,11 +28,9 @@ public class Location { @Field(name = "LOCATION_END_DATE") private Date endDate; - @DBRef @Field(name = "CLIENT") private Client client; - @DBRef @Field(name = "STOCK") private Stock stock; } diff --git a/src/main/java/fr/eni/demo/bo/Stock.java b/src/main/java/fr/eni/demo/bo/Stock.java index 9d573a0..715e2ab 100644 --- a/src/main/java/fr/eni/demo/bo/Stock.java +++ b/src/main/java/fr/eni/demo/bo/Stock.java @@ -34,11 +34,9 @@ public class Stock { @Field(name = "GAME_IS_RENT") private Boolean isRent; - @DBRef @Field(name = "GAME_TYPE") private List gameType; - @DBRef @Field(name = "LOCATIONS") private List locations; } diff --git a/src/main/java/fr/eni/demo/dal/LocationRepository.java b/src/main/java/fr/eni/demo/dal/LocationRepository.java index 7f49dab..b4a7825 100644 --- a/src/main/java/fr/eni/demo/dal/LocationRepository.java +++ b/src/main/java/fr/eni/demo/dal/LocationRepository.java @@ -4,8 +4,10 @@ import fr.eni.demo.bo.Location; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository -public interface LocationRepository extends MongoRepository { +public interface LocationRepository extends MongoRepository { Optional findByCodeBarre(String codeBarre);