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

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

@@ -1,6 +1,7 @@
 package fr.eni.demo.bll;
 
 import fr.eni.demo.bo.Facture;
+import fr.eni.demo.bo.Location;
 
 import java.util.List;
 
@@ -8,4 +9,5 @@ public interface FactureService {
   List<Facture> getByClient(Long clientId);
   List<Facture> getAll();
   List<Facture> getUnpayed();
+  void add(Facture facture);
 }

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

@@ -1,6 +1,7 @@
 package fr.eni.demo.bll;
 
 import fr.eni.demo.bo.Facture;
+import fr.eni.demo.bo.Location;
 import fr.eni.demo.dal.FactureRepository;
 import org.springframework.stereotype.Service;
 
@@ -35,4 +36,10 @@ public class FactureServiceImpl implements FactureService {
   public List<Facture> getUnpayed() {
     return factureRepo.findByDatePayEmpty();
   }
+
+  @Override
+  public void add(Facture facture) {
+    factureRepo.save(facture);
+  }
+
 }

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

@@ -3,6 +3,8 @@ package fr.eni.demo.bll;
 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);
 }

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

@@ -2,17 +2,28 @@ package fr.eni.demo.bll;
 
 import fr.eni.demo.bo.Location;
 import fr.eni.demo.dal.LocationRepository;
+import jakarta.persistence.EntityNotFoundException;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.NoSuchElementException;
+
 @Service
 public class LocationServiceImpl implements LocationService {
-  private LocationRepository locationRepository;
+
+  private final LocationRepository locationRepository;
   private StockService stockService;
 
   public LocationServiceImpl(LocationRepository locationRepository) {
     this.locationRepository = locationRepository;
   }
 
+  @Override
+  public Location findById(Long id) {
+    return locationRepository.findById(id)
+            .orElseThrow(() -> new EntityNotFoundException("Location non trouvée"));
+  }
+
   @Override
   public void add(Location location) {
     locationRepository.save(location);
@@ -20,8 +31,17 @@ public class LocationServiceImpl implements LocationService {
   }
 
   @Override
-  public void update(Location location) {
+  public void updateDateEnd(String id, Location location) {
+    Location existing = findById(Long.valueOf(id));
+    location.setId(existing.getId());
+    location.setEndDate(new Date());
     locationRepository.save(location);
-    stockService.isRent(location.getStock(), false);
   }
+
+  @Override
+  public Location findByCodeBarre(String codeBarre) {
+    return locationRepository.findByCodeBarre(codeBarre)
+            .orElseThrow(() -> new NoSuchElementException("Code-barre inconnu : " + codeBarre));
+  }
+
 }

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

@@ -0,0 +1,11 @@
+package fr.eni.demo.bll;
+
+import fr.eni.demo.bo.User;
+import java.util.Optional;
+import java.util.List;
+
+public interface UserService {
+    void addUser(User user);
+    Optional<User> findByUsername(String username);
+    List<User> findAll();
+} 

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

@@ -0,0 +1,39 @@
+package fr.eni.demo.bll;
+
+import fr.eni.demo.bo.User;
+import fr.eni.demo.dal.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+public class UserServiceImpl implements UserService {
+
+    private final UserRepository userRepository;
+    private final PasswordEncoder passwordEncoder;
+
+    @Autowired
+    public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder) {
+        this.userRepository = userRepository;
+        this.passwordEncoder = passwordEncoder;
+    }
+
+    @Override
+    public void addUser(User user) {
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
+        userRepository.save(user);
+    }
+
+    @Override
+    public Optional<User> findByUsername(String username) {
+        return userRepository.findByUsername(username);
+    }
+
+    @Override
+    public List<User> findAll() {
+        return userRepository.findAll();
+    }
+} 

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<Location> locations;
 
-  @DBRef
   @Field(name = "FACTURES")
   private List<Facture> factures;
 }

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;
 }

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

@@ -19,17 +19,18 @@ public class Location {
   @Id
   private String id;
 
+  @Field(name = "CODE_BARRE")
+  private String codeBarre;
+
   @Field(name = "LOCATION_START_DATE")
   private Date startDate;
 
   @Field(name = "LOCATION_END_DATE")
   private Date endDate;
 
-  @DBRef
   @Field(name = "CLIENT")
   private Client client;
 
-  @DBRef
   @Field(name = "STOCK")
   private Stock stock;
 }

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> gameType;
 
-  @DBRef
   @Field(name = "LOCATIONS")
   private List<Location> locations;
 }

src/main/java/fr/eni/demo/controller/ClientController.java

@@ -58,6 +58,7 @@ public class ClientController {
         clientService.delete(id);
         return buildResponse("Address deleted", true, new HashMap<>());
     }
+
     private ResponseEntity<Map<String, Object>> buildResponse(String message, boolean status, Object data) {
         Map<String, Object> response = new HashMap<>();
         response.put("message", message);

src/main/java/fr/eni/demo/controller/FactureController.java

@@ -1,11 +1,14 @@
 package fr.eni.demo.controller;
 
 import fr.eni.demo.bll.FactureService;
+import fr.eni.demo.bll.LocationService;
 import fr.eni.demo.bo.Facture;
+import fr.eni.demo.bo.Location;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -16,31 +19,51 @@ import java.util.Map;
 public class FactureController {
 
   private final FactureService factureService;
+  private final LocationService locationService;
 
   // Toutes les factures
   @GetMapping
   public ResponseEntity<Map<String, Object>> getAllFactures() {
     List<Facture> result = factureService.getAll();
-    return buildResponse(result);
+    return buildResponse("List all order", true, result);
   }
 
   // Factures par client
   @GetMapping("/client/{clientId}")
   public ResponseEntity<Map<String, Object>> getFactureByClient(@PathVariable Long clientId) {
-    return buildResponse(factureService.getByClient(clientId));
+    List<Facture> result = factureService.getByClient(clientId);
+    return buildResponse("List order customer", true, result);
   }
 
   // Factures impayees
   @GetMapping("/unpayed")
   public ResponseEntity<Map<String, Object>> getUnpayedFactures() {
     List<Facture> result = factureService.getUnpayed();
-    return buildResponse(result);
+    return buildResponse("List unpayed older", true, result);
   }
 
-  private ResponseEntity<Map<String, Object>> buildResponse(Object data) {
+  // Génère une facture
+  @PostMapping
+  public ResponseEntity<Map<String, Object>> setFacture(@RequestBody List<Location> locations) {
+    double price = 0;
+    for(Location location : locations){
+      price += location.getStock().getDailyPrice();
+      locationService.updateDateEnd(location.getId(), location);
+    }
+    Facture facture = new Facture();
+    facture.setClient(locations.get(0).getClient());
+    facture.setDatePay(new Date());
+    facture.setPrice(price);
+    factureService.add(facture);
+    return buildResponse("Older created", true, new HashMap<>());
+  }
+
+  private ResponseEntity<Map<String, Object>> buildResponse(String message, boolean status, Object data) {
     Map<String, Object> response = new HashMap<>();
+    response.put("message", message);
+    response.put("status", status);
     response.put("data", data);
-    response.put("status", 200);
     return ResponseEntity.ok(response);
   }
+
 }

src/main/java/fr/eni/demo/controller/LocationController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 @RestController
 @RequestMapping("/api/location")
@@ -23,6 +24,17 @@ public class LocationController {
         return buildResponse("Location added", true, new HashMap<>());
     }
 
+    // Chercher location depuis code barre
+    @GetMapping("/codeBarre/{codeBarre}")
+    public ResponseEntity<Map<String, Object>> findByCodeBarre(@PathVariable String codeBarre) {
+        try {
+            Location location = locationService.findByCodeBarre(codeBarre);
+            return buildResponse("Location trouvée", true, location);
+        } catch (NoSuchElementException e) {
+            return buildResponse(e.getMessage(), false, new HashMap<>());
+        }
+    }
+
     private ResponseEntity<Map<String, Object>> buildResponse(String message, boolean status, Object data) {
         Map<String, Object> response = new HashMap<>();
         response.put("message", message);

src/main/java/fr/eni/demo/controller/UserController.java

@@ -0,0 +1,35 @@
+package fr.eni.demo.controller;
+
+import fr.eni.demo.bll.UserService;
+import fr.eni.demo.bo.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/users")
+@RequiredArgsConstructor
+public class UserController {
+
+    private final UserService userService;
+
+    @PostMapping
+    public ResponseEntity<User> createUser(@RequestBody User user) {
+        userService.addUser(user);
+        return ResponseEntity.ok(user);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<User>> getAllUsers() {
+        return ResponseEntity.ok(userService.findAll());
+    }
+
+    @GetMapping("/{username}")
+    public ResponseEntity<User> getUserByUsername(@PathVariable String username) {
+        return userService.findByUsername(username)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
+    }
+} 

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

@@ -4,6 +4,11 @@ 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<Location, Integer> {
+public interface LocationRepository extends MongoRepository<Location, Long> {
+
+    Optional<Location> findByCodeBarre(String codeBarre);
+
 }

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

@@ -0,0 +1,12 @@
+package fr.eni.demo.dal;
+
+import fr.eni.demo.bo.User;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface UserRepository extends MongoRepository<User, String> {
+    Optional<User> findByUsername(String username);
+} 

src/main/java/fr/eni/demo/security/SecurityConfig.java

@@ -66,7 +66,7 @@ public class SecurityConfig {
         UserDetails user = User.builder()
                 .username("user")
                 .password(encoder.encode("password"))
-                .roles("USER")
+                .roles("EMPLOYE")
                 .build();
 
         return new InMemoryUserDetailsManager(user);