FIX Structure of Project

application/src/main/java/com/dh7789dev/xpeditis/advice/GlobalExceptionHandler.java

@@ -1,7 +1,7 @@
 package com.dh7789dev.xpeditis.advice;
 
 import com.dh7789dev.xpeditis.NlsService;
-import com.dh7789dev.xpeditis.dto.CustomInternalExceptionResponse;
+import com.dh7789dev.xpeditis.exception.CustomInternalExceptionResponse;
 import com.dh7789dev.xpeditis.exception.CustomInternalException;
 import com.dh7789dev.xpeditis.exception.GlobalNotFoundException;
 import com.dh7789dev.xpeditis.exception.StorageException;

application/src/main/java/com/dh7789dev/xpeditis/controller/api/v1/AuthenticationRestController.java

@@ -1,9 +1,9 @@
 package com.dh7789dev.xpeditis.controller.api.v1;
 
 import com.dh7789dev.xpeditis.AuthenticationService;
-import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
+import com.dh7789dev.xpeditis.dto.request.AuthenticationRequest;
-import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.response.AuthenticationResponse;
-import com.dh7789dev.xpeditis.dto.RegisterRequest;
+import com.dh7789dev.xpeditis.dto.request.RegisterRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -22,7 +22,7 @@ public class AuthenticationRestController {
 
     private final AuthenticationService service;
 
-    @PostMapping("/authenticate")
+    @PostMapping("/login")
     public ResponseEntity<AuthenticationResponse> authenticate(
             @RequestBody @Valid AuthenticationRequest request) {
         return ResponseEntity.ok(service.authenticate(request));

application/src/main/java/com/dh7789dev/xpeditis/controller/api/v1/UserRestController.java

@@ -1,7 +1,7 @@
 package com.dh7789dev.xpeditis.controller.api.v1;
 
 import com.dh7789dev.xpeditis.UserService;
-import com.dh7789dev.xpeditis.dto.ChangePasswordRequest;
+import com.dh7789dev.xpeditis.dto.request.ChangePasswordRequest;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

bootstrap/src/main/java/com/dh7789dev/xpeditis/configuration/GlobalConfiguration.java

@@ -78,8 +78,7 @@ public class GlobalConfiguration {
         CorsConfiguration configuration = new CorsConfiguration();
         //configuration.setAllowCredentials(true);
         configuration.setAllowedOrigins(List.of("http://localhost:8080", "http://localhost:3000",
-                "http://127.0.0.1:8080", "https://leblr.preprod.weworkstudio.fr","https://leblr.fr",
+                "http://127.0.0.1:8080"));
-                "https://api.leblr.preprod.weworkstudio.fr/","https://api.leblr.fr/", "https://www.leblr.fr"));
         configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH"));
         configuration.setAllowedHeaders(List.of("*"));
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
@@ -87,4 +86,10 @@ public class GlobalConfiguration {
         return source;
     }
 
+    @Bean
+    public UserDetailsService userDetailsService() {
+        return username -> userDao.findByUsername(username)
+                .orElseThrow(() -> new UsernameNotFoundException(String.format(USER_NOT_FOUND_MSG, username)));
+    }
+
 }

bootstrap/src/main/java/com/dh7789dev/xpeditis/configuration/SecurityConfiguration.java

@@ -34,6 +34,7 @@ public class SecurityConfiguration {
     boolean csrfEnabled;
 
     private static final String ADMIN_ROLE = "ADMIN";
+    private static final String ADMIN_PLATFORM_ROLE = "ADMIN_PLATFORM";
 
     private static final String API_V1_URI = "/api/v1/**";
 

bootstrap/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@
 spring:
   h2:
     console:
-      enabled: 'true'
+      enabled: 'false'
 
   datasource:
     url: jdbc:h2:mem:xpeditis;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE

bootstrap/src/main/resources/application.yml

@@ -38,7 +38,10 @@ spring:
 logging:
   level:
     org:
+      org.hibernate.orm.query.sqm.ast.logTree: OFF
       springframework:
+        boot:
+          autoconfigure: OFF
         web:
           filter:
             CommonsRequestLoggingFilter: INFO

domain/api/src/main/java/com/dh7789dev/xpeditis/AddressService.java

@@ -1,4 +1,5 @@
 package com.dh7789dev.xpeditis;
 
+
 public interface AddressService {
 }

domain/api/src/main/java/com/dh7789dev/xpeditis/AuthenticationService.java

@@ -1,8 +1,8 @@
 package com.dh7789dev.xpeditis;
 
-import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
+import com.dh7789dev.xpeditis.dto.request.AuthenticationRequest;
-import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.response.AuthenticationResponse;
-import com.dh7789dev.xpeditis.dto.RegisterRequest;
+import com.dh7789dev.xpeditis.dto.request.RegisterRequest;
 
 public interface AuthenticationService {
 

domain/api/src/main/java/com/dh7789dev/xpeditis/LicenseService.java

@@ -1,4 +1,4 @@
 package com.dh7789dev.xpeditis;
 
-public class LicenseService {
+public interface LicenseService {
 }

domain/api/src/main/java/com/dh7789dev/xpeditis/UserService.java

@@ -1,6 +1,6 @@
 package com.dh7789dev.xpeditis;
 
-import com.dh7789dev.xpeditis.dto.ChangePasswordRequest;
+import com.dh7789dev.xpeditis.dto.request.ChangePasswordRequest;
 
 import java.security.Principal;
 

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/Address.java

@@ -1,4 +1,20 @@
 package com.dh7789dev.xpeditis.dto.app;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
 public class Address {
+    private Long id;
+    private String companyName;
+    private String address;
+    private String postalCode;
+    private String country;
+    private String type;
+    private Company company;
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
 }

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/Company.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.app;
 
 
 import lombok.AllArgsConstructor;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/Dimension.java

@@ -1,4 +1,13 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.app;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
 public class Dimension {
+    private Long id;
+    private Double length;
+    private Double width;
+    private Double height;
 }

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/Document.java

@@ -1,4 +1,14 @@
 package com.dh7789dev.xpeditis.dto.app;
 
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
 public class Document {
+    private Long id;
+    private String fileName;
+    private String contentType;
+    private byte[] data;
 }

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/ExportFolder.java

@@ -1,10 +1,11 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.app;
 
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 @Data
@@ -15,5 +16,7 @@ public class ExportFolder {
     private LocalDateTime validationDate;
     private Company company;
     private Quote quote;
+    private List<Document> documents;
+
 }
 

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/License.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.app;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/Notification.java

@@ -1,4 +1,19 @@
 package com.dh7789dev.xpeditis.dto.app;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@Data
+@AllArgsConstructor
 public class Notification {
+    private Long id;
+    private String message;
+    private String type; // EMAIL, SMS, WEB
+    private boolean read;
+    private String recipient;
+    private ExportFolder exportFolder;
+    private LocalDateTime createdAt;
 }

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/Quote.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.app;
 
 
 import lombok.AllArgsConstructor;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/QuoteDetail.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.app;
 
 
 import lombok.AllArgsConstructor;
@@ -9,7 +9,7 @@ import lombok.Data;
 public class QuoteDetail {
     private Long id;
     private Integer quantity;
-    private DimensionDTO dimension;
+    private Dimension dimension;
     private Double weight;
     private boolean stackable;
     private Long quoteId;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/ShipmentTracking.java

@@ -1,4 +1,26 @@
 package com.dh7789dev.xpeditis.dto.app;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@Data
+@AllArgsConstructor
 public class ShipmentTracking {
+    private Long id;
+    private String containerNumber;
+    private String imoNumber;
+    private String mmsiNumber;
+    private String vesselName;
+    private Double currentLatitude;
+    private Double currentLongitude;
+    private Double speedKnots;
+    private String status; // e.g. "Underway", "Moored", etc.
+    private LocalDateTime eta;
+    private LocalDateTime lastReported;
+    private ExportFolder exportFolder;
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
 }

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/UserAccount.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.app;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/app/VesselSchedule.java

@@ -1,4 +1,43 @@
 package com.dh7789dev.xpeditis.dto.app;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
 public class VesselSchedule {
+
+    private Long id;
+
+    @JsonProperty("IMO")
+    private String imoNumber;
+
+    @JsonProperty("MMSI")
+    private String mmsiNumber;
+
+    @JsonProperty("SHIPNAME")
+    private String vesselName;
+
+    @JsonProperty("VOYAGE")
+    private String voyageNumber;
+
+    @JsonProperty("DEPARTURE_PORT")
+    private String departurePort;
+
+    @JsonProperty("ARRIVAL_PORT")
+    private String arrivalPort;
+
+    @JsonProperty("DEPARTURE_DATE")
+    private LocalDateTime departureDate;
+
+    @JsonProperty("ARRIVAL_DATE")
+    private LocalDateTime arrivalDate;
+
+    private LocalDateTime lastUpdated;
+
+    private ExportFolder exportFolder;
+
 }

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/AuthenticationRequest.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AccessLevel;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/ChangePasswordRequest.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.request;
 
 import lombok.AccessLevel;
 import lombok.Data;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/RegisterRequest.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AccessLevel;

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/AuthenticationResponse.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto;
+package com.dh7789dev.xpeditis.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

domain/data/src/main/java/com/dh7789dev/xpeditis/exception/CustomInternalExceptionResponse.java

@@ -1,4 +1,4 @@
-package com.dh7789dev.xpeditis.dto.app;
+package com.dh7789dev.xpeditis.exception;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;

domain/service/src/main/java/com/dh7789dev/xpeditis/AddressServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class AddressServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class AddressServiceImpl implements AddressService{
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/AuthenticationServiceImpl.java

@@ -1,10 +1,8 @@
 package com.dh7789dev.xpeditis;
 
-import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
+import com.dh7789dev.xpeditis.dto.request.AuthenticationRequest;
-import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.response.AuthenticationResponse;
-import com.dh7789dev.xpeditis.dto.RegisterRequest;
+import com.dh7789dev.xpeditis.dto.request.RegisterRequest;
-import com.dh7789dev.xpeditis.dto.UserAccount;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -23,6 +21,6 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
     @Override
     public AuthenticationResponse register(RegisterRequest request) {
-        return null;
+        return authenticationRepository.register(request);
     }
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/CompanyServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class CompanyServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class CompanyServiceImpl implements CompanyService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/DimensionServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class DimensionServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class DimensionServiceImpl implements DimensionService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/DocumentServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class DocumentServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class DocumentServiceImpl implements DocumentService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/ExportFolderServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class ExportFolderServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class ExportFolderServiceImpl implements ExportFolderService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/LicenseServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class LicenseServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class LicenseServiceImpl implements LicenseService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/NotificationServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class NotificationServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class NotificationServiceImpl implements NotificationService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/QuoteDetailsServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class QuoteDetailsServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class QuoteDetailsServiceImpl implements QuoteDetailsService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/QuoteServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class QuoteServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class QuoteServiceImpl implements QuoteService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/ShipmentTrackingServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class ShipmentTrackingServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class ShipmentTrackingServiceImpl implements ShipmentTrackingService {
 }

domain/service/src/main/java/com/dh7789dev/xpeditis/UserServiceImpl.java

@@ -1,6 +1,6 @@
 package com.dh7789dev.xpeditis;
 
-import com.dh7789dev.xpeditis.dto.ChangePasswordRequest;
+import com.dh7789dev.xpeditis.dto.request.ChangePasswordRequest;
 import org.springframework.stereotype.Service;
 
 import java.security.Principal;

domain/service/src/main/java/com/dh7789dev/xpeditis/VesselScheduleServiceImpl.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis;
 
-public class VesselScheduleServiceImpl {
+import org.springframework.stereotype.Service;
+
+@Service
+public class VesselScheduleServiceImpl implements VesselScheduleService {
 }

domain/spi/src/main/java/com/dh7789dev/xpeditis/AuthenticationRepository.java

@@ -1,9 +1,11 @@
 package com.dh7789dev.xpeditis;
 
-import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
+import com.dh7789dev.xpeditis.dto.request.AuthenticationRequest;
-import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.response.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.request.RegisterRequest;
 
 public interface AuthenticationRepository {
 
     AuthenticationResponse authenticate(AuthenticationRequest request);
+    AuthenticationResponse register(RegisterRequest request);
 }

domain/spi/src/main/java/com/dh7789dev/xpeditis/UserRepository.java

@@ -1,6 +1,6 @@
 package com.dh7789dev.xpeditis;
 
-import com.dh7789dev.xpeditis.dto.ChangePasswordRequest;
+import com.dh7789dev.xpeditis.dto.request.ChangePasswordRequest;
 
 import java.security.Principal;
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/AddressDao.java

@@ -1,4 +1,8 @@
 package com.dh7789dev.xpeditis.dao;
 
-public interface Address {
+import com.dh7789dev.xpeditis.entity.AddressEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+public interface AddressDao extends JpaRepository<AddressEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/CompanyDao.java

@@ -3,5 +3,6 @@ package com.dh7789dev.xpeditis.dao;
 import com.dh7789dev.xpeditis.entity.CompanyEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+
 public interface CompanyDao extends JpaRepository<CompanyEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/DimensionDao.java

@@ -1,4 +1,8 @@
 package com.dh7789dev.xpeditis.dao;
 
-public interface DimensionDao {
+import com.dh7789dev.xpeditis.entity.DimensionEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+public interface DimensionDao extends JpaRepository<DimensionEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/DocumentDao.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis.dao;
 
-public interface DocumentDao {
+import com.dh7789dev.xpeditis.entity.DocumentEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface DocumentDao extends JpaRepository<DocumentEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/LicenseDao.java

@@ -1,6 +1,7 @@
 package com.dh7789dev.xpeditis.dao;
 
+import com.dh7789dev.xpeditis.entity.LicenseEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface LicenseDao extends JpaRepository<LicenseDao, Long> {
+public interface LicenseDao extends JpaRepository<LicenseEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/NotificationDao.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis.dao;
 
-public class NotificationDao {
+import com.dh7789dev.xpeditis.entity.NotificationEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface NotificationDao extends JpaRepository<NotificationEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/QuoteDetailDao.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis.dao;
 
-public interface QuoteDetailDao {
+import com.dh7789dev.xpeditis.entity.QuoteDetailEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface QuoteDetailDao extends JpaRepository<QuoteDetailEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/ShipmentTrackingDao.java

@@ -1,4 +1,7 @@
 package com.dh7789dev.xpeditis.dao;
 
-public class ShipmentTrackingDao {
+import com.dh7789dev.xpeditis.entity.ShipmentTrackingEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ShipmentTrackingDao extends JpaRepository<ShipmentTrackingEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/TokenDao.java

@@ -6,13 +6,16 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 import java.util.Optional;
+import org.springframework.stereotype.Repository;
 
+
+@Repository
 public interface TokenDao extends JpaRepository<TokenEntity, Integer> {
 
     Optional<TokenEntity> findByToken(String token);
 
     @Query(value = """
-      select t from TokenEntity t inner join UserAccountEntity u\s
+      select t from TokenEntity t inner join UserEntity u\s
       on t.user.id = u.id\s
       where u.id = :userId and (t.expired = false or t.revoked = false)\s
       """)

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/UserDao.java

@@ -5,7 +5,13 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
 public interface UserDao extends JpaRepository<UserEntity, Long> {
 
+    @Query("SELECT u FROM UserEntity u WHERE u.username = :username")
     Optional<UserEntity> findByUsername(String username);
+    boolean existsByUsername(String username);
+
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/dao/VesselScheduleDao.java

@@ -1,4 +1,9 @@
 package com.dh7789dev.xpeditis.dao;
 
-public class VesselScheduleDao {
+import com.dh7789dev.xpeditis.entity.VesselScheduleEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface VesselScheduleDao extends JpaRepository<VesselScheduleEntity, Long> {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/AddressEntity.java

@@ -1,4 +1,62 @@
 package com.dh7789dev.xpeditis.entity;
 
-public class AddressEntity {
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "Address")
+public class AddressEntity extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "company_name", length = 100)
+    private String companyName;
+
+    @Column(name = "address", length = 200)
+    private String address;
+
+    @Column(name = "postal_code", length = 10)
+    private String postalCode;
+
+    @Column(name = "country", length = 50)
+    private String country;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "type", length = 20, nullable = false)
+    private AddressType type;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "company_id", nullable = false)
+    private CompanyEntity company;
+
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        modifiedAt = LocalDateTime.now();
+    }
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/AddressType.java

@@ -1,4 +1,14 @@
 package com.dh7789dev.xpeditis.entity;
 
-public enum AdresseType {
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum AddressType {
+    SHIPPER("Shipper"),
+    CONSIGNEE("Consignee"),
+    NOTIFY("Notify");
+
+    private final String displayName;
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/CompanyEntity.java

@@ -1,19 +1,43 @@
 package com.dh7789dev.xpeditis.entity;
 
 import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "Company")
 public class CompanyEntity extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(name = "name", length = 50)
     private String name;
 
+    @Column(name = "country", length = 50)
     private String country;
 
+    @Column(name = "siren")
+    private String siren;
+
+    @Column(name = "num_eori")
+    private String num_eori;
+
+    @Column(name = "phone", length = 20)
+    private String phone;
+
     @OneToMany(mappedBy = "company", cascade = CascadeType.ALL)
     private List<UserEntity> users;
 
@@ -22,5 +46,22 @@ public class CompanyEntity extends BaseEntity {
 
     @OneToMany(mappedBy = "company", cascade = CascadeType.ALL)
     private List<ExportFolderEntity> exports;
+
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        modifiedAt = LocalDateTime.now();
+    }
 }
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/DimensionEntity.java

@@ -1,4 +1,34 @@
 package com.dh7789dev.xpeditis.entity;
 
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "dimension")
 public class DimensionEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "length")
+    private Double length;
+
+    @Column(name = "width")
+    private Double width;
+
+    @Column(name = "height")
+    private Double height;
+
 }
+

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/DocumentEntity.java

@@ -1,4 +1,61 @@
 package com.dh7789dev.xpeditis.entity;
 
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "document")
 public class DocumentEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(unique = true)
+    private String reference;
+
+    @Column(name = "file_name", nullable = false)
+    private String fileName;
+
+    @Column(name = "content_type")
+    private String contentType;
+
+    @Lob
+    @Column(name = "data", nullable = false)
+    private byte[] data;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "export_folder_id")
+    private ExportFolderEntity exportFolder;
+
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        modifiedAt = LocalDateTime.now();
+    }
+
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/ExportFolderEntity.java

@@ -1,24 +1,63 @@
 package com.dh7789dev.xpeditis.entity;
 
 import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "exportfolder")
 public class ExportFolderEntity extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(unique = true)
     private String reference;
 
+    @Column(name = "validationDate")
     private LocalDateTime validationDate;
 
+    @OneToMany(mappedBy = "exportFolder", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<DocumentEntity> documents;
+
+    @OneToMany(mappedBy = "exportFolder", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<ShipmentTrackingEntity> trackingUpdates = new ArrayList<>();
+
     @ManyToOne
     private CompanyEntity company;
 
     @OneToOne
     @JoinColumn(name = "quote_id", unique = true)
     private QuoteEntity quote;
+
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        modifiedAt = LocalDateTime.now();
+    }
 }
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/LicenseEntity.java

@@ -1,17 +1,32 @@
 package com.dh7789dev.xpeditis.entity;
 
 import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "License")
 public class LicenseEntity extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(unique = true)
     private String licenseKey;
 
+    @Column(name = "expirationDate")
     private LocalDate expirationDate;
 
     private boolean active;
@@ -19,5 +34,22 @@ public class LicenseEntity extends BaseEntity {
     @OneToOne
     @JoinColumn(name = "user_id", unique = true)
     private UserEntity user;
+
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        modifiedAt = LocalDateTime.now();
+    }
 }
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/NotificationEntity.java

@@ -1,4 +1,39 @@
 package com.dh7789dev.xpeditis.entity;
 
+import jakarta.persistence.*;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "notification")
 public class NotificationEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String message;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private NotificationType type; // EMAIL, SMS, WEB
+
+    @Column(nullable = false)
+    private boolean read = false;
+
+    @Column(name = "recipient")
+    private String recipient; // email ou numéro téléphone
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "export_folder_id")
+    private ExportFolderEntity exportFolder;
+
+    @Column(name = "created_at", nullable = false, updatable = false)
+    private LocalDateTime createdAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
     }
+}
+

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/NotificationType.java

@@ -1,4 +1,8 @@
 package com.dh7789dev.xpeditis.entity;
 
-public class NotificationType {
+public enum NotificationType {
+    EMAIL,
+    SMS,
+    WEB
 }
+

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/Permission.java

@@ -7,6 +7,10 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public enum Permission {
 
+    ADMIN_PLATFORM_READ("admin_platform:read"),
+    ADMIN_PLATFORM_UPDATE("admin_platform:update"),
+    ADMIN_PLATFORM_DELETE("admin_platform:create"),
+    ADMIN_PLATFORM_CREATE("admin_platform:delete"),
     ADMIN_READ("admin:read"),
     ADMIN_UPDATE("admin:update"),
     ADMIN_CREATE("admin:create"),

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/QuoteDetailEntity.java

@@ -1,4 +1,43 @@
 package com.dh7789dev.xpeditis.entity;
 
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "quote_details")
 public class QuoteDetailEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "quantity")
+    private Integer quantity;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "dimension_id", referencedColumnName = "id")
+    private DimensionEntity dimension;
+
+    @Column(name = "weight")
+    private Double weight;
+
+    @Column(name = "gerbable")
+    private boolean gerbable;
+
+    // Relation Many-to-One avec Quote
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "quote_id", nullable = false)
+    private QuoteEntity quote;
+
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/QuoteEntity.java

@@ -1,25 +1,110 @@
 package com.dh7789dev.xpeditis.entity;
 
 import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
 
-import java.math.BigDecimal;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "Quote")
 public class QuoteEntity extends BaseEntity {
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(unique = true, nullable = false)
+    // General Information
+    @Column(name = "packager")
+    private String packager;
+
+    @Column(unique = true)
     private String reference;
 
-    @Column(nullable = false)
+    //Douane
-    private String status;
+    @Column(name = "customs_import_export")
+    private String customsImportExport;
 
-    private BigDecimal estimatedAmount;
+    @Column(name = "eur1")
+    private Boolean eur1;
 
-    private LocalDateTime createdAt = LocalDateTime.now();
+    @Column(name = "packaging_type")
+    private String packagingType;
+
+    @OneToMany(mappedBy = "quote", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<QuoteDetailEntity> details = new ArrayList<>();
+
+    @Column(name = "dangerous_goods")
+    private Boolean dangerousGoods;
+
+    @Column(name = "tailgate")
+    private Boolean tailgate;
+
+    @Column(name = "straps")
+    private Boolean straps;
+
+    @Column(name = "thermal_cover")
+    private Boolean thermalCover;
+
+    @Column(name = "regulated_products")
+    private Boolean regulatedProducts;
+
+    @Column(name = "appointment_required")
+    private Boolean appointmentRequired;
+
+    @Column(name = "t1")
+    private Boolean t1;
+
+    @Column(name = "customs_stop")
+    private Boolean customsStop;
+
+    @Column(name = "export_assistance")
+    private Boolean exportAssistance;
+
+    @Column(name = "insurance")
+    private Boolean insurance;
+
+    @Column(name = "operation_type")
+    private String operationType;
+
+    @Column(name = "incoterm")
+    private String incoterm;
+
+    @Column(name = "departure_postal_code")
+    private String departurePostalCode;
+
+    @Column(name = "departure_city")
+    private String departureCity;
+
+    @Column(name = "pickup_date")
+    private LocalDate pickupDate;
+
+    @Column(name = "arrival_postal_code")
+    private String arrivalPostalCode;
+
+    @Column(name = "arrival_city")
+    private String arrivalCity;
+
+    @Column(name = "delivery_date")
+    private LocalDate deliveryDate;
+
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
 
     @ManyToOne
     private UserEntity user;
@@ -29,5 +114,16 @@ public class QuoteEntity extends BaseEntity {
 
     @OneToOne(mappedBy = "quote", cascade = CascadeType.ALL)
     private ExportFolderEntity exportFile;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        modifiedAt = LocalDateTime.now();
+    }
 }
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/Role.java

@@ -30,7 +30,21 @@ public enum Role {
                     MANAGER_READ,
                     MANAGER_UPDATE,
                     MANAGER_DELETE,
-                    MANAGER_CREATE));
+                    MANAGER_CREATE)),
+    ADMIN_PLATFORM(Set.of(
+          ADMIN_PLATFORM_READ,
+          ADMIN_PLATFORM_UPDATE,
+          ADMIN_PLATFORM_DELETE,
+          ADMIN_PLATFORM_CREATE,
+          ADMIN_READ,
+          ADMIN_UPDATE,
+          ADMIN_DELETE,
+          ADMIN_CREATE,
+          MANAGER_READ,
+          MANAGER_UPDATE,
+          MANAGER_DELETE,
+          MANAGER_CREATE)
+    );
 
     private final Set<Permission> permissions;
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/ShipmentTrackingEntity.java

@@ -1,4 +1,79 @@
 package com.dh7789dev.xpeditis.entity;
 
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "shipment_tracking")
 public class ShipmentTrackingEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "container_number")
+    private String containerNumber;
+
+    @Column(name = "imo_number")
+    private String imoNumber;
+
+    @Column(name = "mmsi_number")
+    private String mmsiNumber;
+
+    @Column(name = "vessel_name")
+    private String vesselName;
+
+    @Column(name = "current_latitude")
+    private Double currentLatitude;
+
+    @Column(name = "current_longitude")
+    private Double currentLongitude;
+
+    @Column(name = "speed_knots")
+    private Double speedKnots;
+
+    @Column(name = "status")
+    private String status; // e.g. "Underway", "Moored", etc.
+
+    @Column(name = "eta")
+    private LocalDateTime eta;
+
+    @Column(name = "last_reported")
+    private LocalDateTime lastReported;
+
+    // Relation avec ExportFolder
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "export_folder_id", nullable = false)
+    private ExportFolderEntity exportFolder;
+
+    @Column(name = "created_at", nullable = false, updatable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
+        lastReported = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void onUpdate() {
+        modifiedAt = LocalDateTime.now();
+    }
+
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/TokenEntity.java

@@ -1,21 +1,16 @@
 package com.dh7789dev.xpeditis.entity;
 
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
+import lombok.*;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.experimental.Accessors;
 
 @Entity
+@Table(name = "Token", uniqueConstraints = @UniqueConstraint(columnNames = "token"))
 @Getter
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
 @Accessors(chain = true)
-@Table(name = "token", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"token"})
-})
 public class TokenEntity extends BaseEntity {
 
     public enum Type {
@@ -29,7 +24,6 @@ public class TokenEntity extends BaseEntity {
     private Type tokenType = Type.BEARER;
 
     private boolean revoked;
-
     private boolean expired;
 
     @ManyToOne(fetch = FetchType.LAZY)

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/UserEntity.java

@@ -1,18 +1,27 @@
 package com.dh7789dev.xpeditis.entity;
 
 import jakarta.persistence.*;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
 import org.hibernate.annotations.NaturalId;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
+import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
 @Entity
 @Getter
 @Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "Users")
 public class UserEntity extends BaseEntity implements UserDetails {
 
     @NaturalId
@@ -31,6 +40,9 @@ public class UserEntity extends BaseEntity implements UserDetails {
     @Column(nullable = false)
     private String password;
 
+    @Column(name = "phone", length = 20)
+    private String phone;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private Role role;
@@ -50,14 +62,21 @@ public class UserEntity extends BaseEntity implements UserDetails {
     @OneToMany(mappedBy = "user")
     private List<TokenEntity> tokens;
 
-    @Override
+    @Column(name = "created_at", updatable = false)
-    public String getPassword() {
+    private LocalDateTime createdAt;
-        return password;
+
+    @Column(name = "modified_at")
+    private LocalDateTime modifiedAt;
+
+    @PrePersist
+    public void onCreate() {
+        createdAt = LocalDateTime.now();
+        modifiedAt = LocalDateTime.now();
     }
 
-    @Override
+    @PreUpdate
-    public String getUsername() {
+    public void onUpdate() {
-        return username;
+        modifiedAt = LocalDateTime.now();
     }
 
     @Override
@@ -87,8 +106,9 @@ public class UserEntity extends BaseEntity implements UserDetails {
 
     @Override
     public String toString() {
-        return "UserEntity(" + super.toString() + String.format("username=%s, firstName=%s, lastName=%s, email=%s, role=%s)",
+        return "UserEntity(" + super.toString() + String.format(
-                username, firstName, lastName, email, role.name());
+                "username=%s, firstName=%s, lastName=%s, email=%s, role=%s)",
+                username, firstName, lastName, email, role.name()
+        );
     }
 }
-

infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/VesselScheduleEntity.java

@@ -1,4 +1,58 @@
 package com.dh7789dev.xpeditis.entity;
 
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@FieldNameConstants
+@FieldDefaults( level =  AccessLevel.PRIVATE)
+@Table(name = "vessel_schedule")
 public class VesselScheduleEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "imo_number") // Numéro unique du navire
+    private String imoNumber;
+
+    @Column(name = "mmsi_number") // Maritime Mobile Service Identity
+    private String mmsiNumber;
+
+    @Column(name = "vessel_name")
+    private String vesselName;
+
+    @Column(name = "voyage_number")
+    private String voyageNumber;
+
+    @Column(name = "departure_port")
+    private String departurePort;
+
+    @Column(name = "arrival_port")
+    private String arrivalPort;
+
+    @Column(name = "departure_date")
+    private LocalDateTime departureDate;
+
+    @Column(name = "arrival_date")
+    private LocalDateTime arrivalDate;
+
+    @Column(name = "last_updated")
+    private LocalDateTime lastUpdated;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "export_folder_id", nullable = false)
+    private ExportFolderEntity exportFolder;
+
+
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/AddressMapper.java

@@ -0,0 +1,18 @@
+package com.dh7789dev.xpeditis.mapper;
+
+
+import com.dh7789dev.xpeditis.dto.app.Address;
+import com.dh7789dev.xpeditis.entity.AddressEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = { CompanyMapper.class })
+public interface AddressMapper {
+
+    AddressMapper INSTANCE = Mappers.getMapper(AddressMapper.class);
+
+    AddressEntity addressToAddressEntity(Address address);
+
+    Address addressEntityToAddress(AddressEntity addressEntity);
+}

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/CompanyMapper.java

@@ -1,7 +1,7 @@
 package com.dh7789dev.xpeditis.mapper;
 
 
-import com.dh7789dev.xpeditis.dto.Company;
+import com.dh7789dev.xpeditis.dto.app.Company;
 import com.dh7789dev.xpeditis.entity.CompanyEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/DimensionMapper.java

@@ -1,4 +1,17 @@
 package com.dh7789dev.xpeditis.mapper;
 
-public class DimensionMapper {
+
+import com.dh7789dev.xpeditis.dto.app.Dimension;
+import com.dh7789dev.xpeditis.entity.DimensionEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring")
+public interface DimensionMapper {
+    DimensionMapper INSTANCE = Mappers.getMapper(DimensionMapper.class);
+
+    DimensionEntity dimensionToDimensionEntity(Dimension dimension);
+
+    Dimension dimensionEntityToDimension(DimensionEntity dimensionEntity);
+
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/DocumentMapper.java

@@ -1,4 +1,16 @@
 package com.dh7789dev.xpeditis.mapper;
 
+import com.dh7789dev.xpeditis.dto.app.Document;
+import com.dh7789dev.xpeditis.entity.DocumentEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring")
 public interface DocumentMapper {
+    DocumentMapper INSTANCE = Mappers.getMapper(DocumentMapper.class);
+
+    DocumentEntity documentToDocumentEntity(Document document);
+    Document documentEntityToDocument(DocumentEntity documentEntity);
+
 }
+

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/ExportFolderMapper.java

@@ -1,13 +1,13 @@
 package com.dh7789dev.xpeditis.mapper;
 
-import com.dh7789dev.xpeditis.dto.ExportFolder;
+import com.dh7789dev.xpeditis.dto.app.ExportFolder;
 import com.dh7789dev.xpeditis.entity.ExportFolderEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING,  uses = { DocumentMapper.class, CompanyMapper.class })
 public interface ExportFolderMapper {
     ExportFolderMapper INSTANCE = Mappers.getMapper(ExportFolderMapper.class);
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/LicenseMapper.java

@@ -1,7 +1,7 @@
 package com.dh7789dev.xpeditis.mapper;
 
 
-import com.dh7789dev.xpeditis.dto.License;
+import com.dh7789dev.xpeditis.dto.app.License;
 import com.dh7789dev.xpeditis.entity.LicenseEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/NotificationMapper.java

@@ -1,4 +1,18 @@
 package com.dh7789dev.xpeditis.mapper;
 
+
+import com.dh7789dev.xpeditis.dto.app.Notification;
+import com.dh7789dev.xpeditis.entity.NotificationEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+
+@Mapper(componentModel = "spring" , uses = { ExportFolderMapper.class })
 public interface NotificationMapper {
+    NotificationMapper INSTANCE = Mappers.getMapper(NotificationMapper.class);
+
+    NotificationEntity notificationToNotificationEntity(Notification notification);
+
+    Notification notificationEntityToNotification(NotificationEntity notificationEntity);
+
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/QuoteDetailMapper.java

@@ -1,4 +1,19 @@
 package com.dh7789dev.xpeditis.mapper;
 
+import com.dh7789dev.xpeditis.dto.app.QuoteDetail;
+import com.dh7789dev.xpeditis.entity.QuoteDetailEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = { DimensionMapper.class })
 public interface QuoteDetailMapper {
+    QuoteDetailMapper INSTANCE = Mappers.getMapper(QuoteDetailMapper.class);
+
+    @Mapping(source = "quoteId", target = "quote.id")
+    QuoteDetailEntity quoteDetailsToQuoteDetailsEntity(QuoteDetail quoteDetail);
+
+    @Mapping(source = "quote.id", target = "quoteId")
+    QuoteDetail quoteDetailsEntityToQuoteDetails(QuoteDetailEntity quoteDetailEntity);
 }
+

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/QuoteMapper.java

@@ -1,13 +1,13 @@
 package com.dh7789dev.xpeditis.mapper;
 
-import com.dh7789dev.xpeditis.dto.Quote;
+import com.dh7789dev.xpeditis.dto.app.Quote;
 import com.dh7789dev.xpeditis.entity.QuoteEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = { QuoteDetailMapper.class })
 public interface QuoteMapper {
     QuoteMapper INSTANCE = Mappers.getMapper(QuoteMapper.class);
 

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/ShipmentTrackingMapper.java

@@ -1,4 +1,17 @@
 package com.dh7789dev.xpeditis.mapper;
 
+
+import com.dh7789dev.xpeditis.dto.app.ShipmentTracking;
+import com.dh7789dev.xpeditis.entity.ShipmentTrackingEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = { ExportFolderMapper.class })
 public interface ShipmentTrackingMapper {
+
+    ShipmentTrackingMapper INSTANCE = Mappers.getMapper(ShipmentTrackingMapper.class);
+
+    ShipmentTrackingEntity shipmentTrackingToShipmentTrackingEntity(ShipmentTracking shipmentTracking);
+
+    ShipmentTracking shipmentTrackingEntityToShipmentTracking(ShipmentTrackingEntity shipmentTrackingEntity);
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/UserMapper.java

@@ -1,6 +1,6 @@
 package com.dh7789dev.xpeditis.mapper;
 
-import com.dh7789dev.xpeditis.dto.UserAccount;
+import com.dh7789dev.xpeditis.dto.app.UserAccount;
 import com.dh7789dev.xpeditis.entity.UserEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

infrastructure/src/main/java/com/dh7789dev/xpeditis/mapper/VesselScheduleMapper.java

@@ -1,4 +1,17 @@
 package com.dh7789dev.xpeditis.mapper;
 
+
+import com.dh7789dev.xpeditis.dto.app.VesselSchedule;
+import com.dh7789dev.xpeditis.entity.VesselScheduleEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = { ExportFolderMapper.class })
 public interface VesselScheduleMapper {
+
+    VesselScheduleMapper INSTANCE = Mappers.getMapper(VesselScheduleMapper.class);
+
+    VesselScheduleEntity vesselScheduleToVesselScheduleEntity(VesselSchedule vesselSchedule);
+
+    VesselSchedule vesselScheduleEntityToVesselSchedule(VesselScheduleEntity vesselScheduleEntity);
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/AddressJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class AddressJpaRepository {
+import com.dh7789dev.xpeditis.AddressRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class AddressJpaRepository implements AddressRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/AuthenticationJwtRepository.java

@@ -1,12 +1,13 @@
 package com.dh7789dev.xpeditis.repository;
 
 import com.dh7789dev.xpeditis.AuthenticationRepository;
+import com.dh7789dev.xpeditis.dao.CompanyDao;
 import com.dh7789dev.xpeditis.dao.TokenDao;
 import com.dh7789dev.xpeditis.dao.UserDao;
-import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
+import com.dh7789dev.xpeditis.dto.request.AuthenticationRequest;
-import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.response.AuthenticationResponse;
-import com.dh7789dev.xpeditis.entity.TokenEntity;
+import com.dh7789dev.xpeditis.dto.request.RegisterRequest;
-import com.dh7789dev.xpeditis.entity.UserEntity;
+import com.dh7789dev.xpeditis.entity.*;
 import com.dh7789dev.xpeditis.util.JwtUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +15,7 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -25,6 +27,8 @@ public class AuthenticationJwtRepository implements AuthenticationRepository {
     private final UserDao userDao;
     private final TokenDao tokenDao;
     private final JwtUtil jwtUtil;
+    private final PasswordEncoder passwordEncoder;
+    private final CompanyDao companyDao;
 
     @Override
     public AuthenticationResponse authenticate(AuthenticationRequest request) {
@@ -53,6 +57,32 @@ public class AuthenticationJwtRepository implements AuthenticationRepository {
                 .setExpiresAt(jwtUtil.extractExpiration(jwtToken));
     }
 
+    @Override
+    public AuthenticationResponse register(RegisterRequest request) {
+        if (userDao.existsByUsername(request.getUsername())) {
+            return new AuthenticationResponse().setError("Cette Utilisateur existe deja");
+        }
+        UserEntity userEntity = new UserEntity();
+        userEntity.setFirstName(request.getFirstName());
+        userEntity.setLastName(request.getLastName());
+        userEntity.setPassword(passwordEncoder.encode(request.getPassword()));
+        userEntity.setEmail(request.getEmail());
+        userEntity.setUsername(request.getUsername());
+        userEntity.setEnabled(true);
+        if(request.getCompany_uuid().isEmpty()){
+            userEntity.setRole(Role.ADMIN);
+            CompanyEntity companyEntity = new CompanyEntity();
+            companyEntity.setName(request.getCompany_name());
+            companyDao.save(companyEntity);
+        } else {
+            userEntity.setRole(Role.ADMIN);
+        }
+        userDao.save(userEntity);
+        AuthenticationRequest authenticationRequest = new AuthenticationRequest(request.getUsername(), request.getPassword());
+        return authenticate(authenticationRequest);
+    }
+
+
     private void saveUserToken(UserEntity user, String jwtToken) {
         var tokenEntity = new TokenEntity()
                 .setUser(user)

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/CompanyJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class CompanyJpaRepository {
+import com.dh7789dev.xpeditis.CompanyRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class CompanyJpaRepository implements CompanyRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/DimensionJpaRepository.java

@@ -1,4 +1,11 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class DimensionJpaRepository {
+
+import com.dh7789dev.xpeditis.DimensionRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class DimensionJpaRepository implements DimensionRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/DocumentJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class DocumentJpaRepository {
+import com.dh7789dev.xpeditis.DocumentRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class DocumentJpaRepository implements DocumentRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/ExportFolderJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class ExportFolderJpaRepository {
+import com.dh7789dev.xpeditis.ExportFolderRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class ExportFolderJpaRepository implements ExportFolderRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/LicenseJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class LicenseJpaRepository {
+import com.dh7789dev.xpeditis.LicenseRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class LicenseJpaRepository implements LicenseRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/NotificationJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class NotificationJpaRepository {
+import com.dh7789dev.xpeditis.NotificationRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class NotificationJpaRepository implements NotificationRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/QuoteDetailsJpaRepository.java

@@ -1,4 +1,11 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class QuoteDetailsJpaRepository {
+
+import com.dh7789dev.xpeditis.QuoteDetailsRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class QuoteDetailsJpaRepository implements QuoteDetailsRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/QuoteJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class QuoteJpaRepository {
+import com.dh7789dev.xpeditis.QuoteRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class QuoteJpaRepository implements QuoteRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/ShipmentTrackingJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class ShipmentTrackingJpaRepository {
+import com.dh7789dev.xpeditis.ShipmentTrackingRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class ShipmentTrackingJpaRepository implements ShipmentTrackingRepository {
 }

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/UserJpaRepository.java

@@ -2,7 +2,7 @@ package com.dh7789dev.xpeditis.repository;
 
 import com.dh7789dev.xpeditis.UserRepository;
 import com.dh7789dev.xpeditis.dao.UserDao;
-import com.dh7789dev.xpeditis.dto.ChangePasswordRequest;
+import com.dh7789dev.xpeditis.dto.request.ChangePasswordRequest;
 import com.dh7789dev.xpeditis.entity.UserEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

infrastructure/src/main/java/com/dh7789dev/xpeditis/repository/VesselScheduleJpaRepository.java

@@ -1,4 +1,10 @@
 package com.dh7789dev.xpeditis.repository;
 
-public class VesselScheduleJpaRepository {
+import com.dh7789dev.xpeditis.VesselScheduleRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+@Slf4j
+@Repository
+public class VesselScheduleJpaRepository implements VesselScheduleRepository {
 }