feature login and register

application/src/main/java/com/dh7789dev/xpeditis/controller/UploadController.java

@@ -1,72 +0,0 @@
-package com.dh7789dev.xpeditis.controller;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
-
-@Controller
-public class UploadController {
-
-    @Value("${file.upload-dir}")
-    String uploadDir;
-
-    private final EventService eventService;
-
-    private final GalleryService galleryService;
-
-    public UploadController(EventService eventService, GalleryService galleryService) {
-        this.eventService = eventService;
-        this.galleryService = galleryService;
-    }
-
-    @GetMapping("/uploadimage")
-    public String displayUploadForm() {
-        return "addImages";
-    }
-
-    @PostMapping(value = "/upload/{eventId}", consumes = MULTIPART_FORM_DATA_VALUE)
-    public String uploadImage(Model model,
-                              @PathVariable long eventId,
-                              @RequestParam("images") List<MultipartFile> images) {
-
-        eventService.addImages(eventId, images);
-        StringBuilder fileNames = new StringBuilder();
-        images.forEach(image -> fileNames.append(image.getOriginalFilename()).append(" "));
-        model.addAttribute("msg", "Uploaded images: " + fileNames);
-        return "addImages";
-    }
-
-    @PostMapping(value = "/upload/gallery/{galleryId}", consumes = MULTIPART_FORM_DATA_VALUE)
-    public String uploadImageToGallery(Model model,
-                              @PathVariable long galleryId,
-                              @RequestParam("images") List<MultipartFile> images) {
-
-        galleryService.addImages(galleryId, images);
-        StringBuilder fileNames = new StringBuilder();
-        images.forEach(image -> fileNames.append(image.getOriginalFilename()).append(" "));
-        model.addAttribute("msg", "Uploaded images: " + fileNames);
-        return "addImages";
-    }
-
-    @GetMapping("/addevent")
-    public String displayUploadFormToAddEvent() {
-        return "addEvent";
-    }
-
-    @PostMapping(value = "/upload", consumes = MULTIPART_FORM_DATA_VALUE)
-    public String addEvent(Model model,
-                           @RequestPart("newEvent") Event newEvent,
-                           @RequestPart("images") List<MultipartFile> images) {
-        eventService.addEvent(newEvent, images);
-        StringBuilder fileNames = new StringBuilder();
-        images.forEach(image -> fileNames.append(image.getOriginalFilename()).append(" "));
-        model.addAttribute("msg", "Uploaded images: " + fileNames);
-        return "addEvent";
-    }
-}

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

@@ -3,6 +3,7 @@ package com.dh7789dev.xpeditis.controller.api.v1;
 import com.dh7789dev.xpeditis.AuthenticationService;
 import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
 import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.RegisterRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -26,4 +27,10 @@ public class AuthenticationRestController {
             @RequestBody @Valid AuthenticationRequest request) {
         return ResponseEntity.ok(service.authenticate(request));
     }
+
+    @PostMapping("/register")
+    public ResponseEntity<AuthenticationResponse> register(
+            @RequestBody @Valid RegisterRequest request) {
+        return ResponseEntity.ok(service.register(request));
+    }
 }

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

@@ -87,9 +87,4 @@ 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/JwtAuthenticationFilter.java

@@ -24,6 +24,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
     private static final String AUTH_HEADER = "Authorization";
     private static final String AUTH_TYPE = "Bearer ";
 
+    
     private final UserDetailsService userDetailsService;
     private final JwtUtil jwtUtil;
     private final TokenDao tokenDao;

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

@@ -52,8 +52,6 @@ public class SecurityConfiguration {
             "/swagger-ui/**",
             "/webjars/**",
             "/swagger-ui.html",
-            "/uploadimage",
-            "/upload/**",
             "/addevent"};
 
     private static final WebExpressionAuthorizationManager INTERNAL_ACCESS =
@@ -101,12 +99,8 @@ public class SecurityConfiguration {
                         auth.requestMatchers(WHITE_LIST_URL).permitAll()
                             .requestMatchers(antMatcher(HttpMethod.GET, "/")).permitAll()
                             .requestMatchers(antMatcher(HttpMethod.GET, API_V1_URI)).permitAll()
-                            .requestMatchers(antMatcher(HttpMethod.GET, "/images/**")).permitAll()
-                            .requestMatchers(antMatcher(HttpMethod.GET, "/api/v1/reservations")).hasRole(ADMIN_ROLE)
-                            .requestMatchers(antMatcher(HttpMethod.GET, "/api/v1/reservations/**")).hasRole(ADMIN_ROLE)
                             .requestMatchers(antMatcher(HttpMethod.PUT, API_V1_URI)).hasRole(ADMIN_ROLE)
                             .requestMatchers(antMatcher(HttpMethod.DELETE, API_V1_URI)).hasRole(ADMIN_ROLE)
-                            .requestMatchers(antMatcher(HttpMethod.POST, "/api/v1/reservations")).permitAll()
                             .requestMatchers(antMatcher(HttpMethod.POST, API_V1_URI)).hasRole(ADMIN_ROLE)
                             .requestMatchers(antMatcher("/h2-console/**")).access(INTERNAL_ACCESS)
                             .requestMatchers(antMatcher("/actuator/**")).access(INTERNAL_ACCESS)

bootstrap/src/main/resources/data-h2.sql

@@ -1,28 +1,39 @@
-INSERT INTO users (username, email, password, role)
+-- === Companies ===
-VALUES ('dbuser', 'dbuser@dev.ovh', '{bcrypt}$2y$10$.qkbukzzX21D.bqbI.B2R.tvWP90o/Y16QRWVLodw51BHft7ZWbc.', 'USER'),
+INSERT INTO company_entity (id, name, country)
-       ('dbadmin', 'dbadmin@dev.ovh', '{bcrypt}$2y$10$kp1V7UYDEWn17WSK16UcmOnFd1mPFVF6UkLrOOCGtf24HOYt8p1iC', 'ADMIN');
+VALUES
+    (1, 'Global Logistics', 'France'),
+    (2, 'TransWorld Exports', 'Germany');
 
-INSERT INTO event (name, description, date)
+-- === Users ===
-VALUES ('toto', 'hello', '2025-01-01'),
+INSERT INTO user_entity (id, username, first_name, last_name, email, password, role, enabled, company_id)
-       ('tata', 'hola', '2025-01-10');
+VALUES
+    (1, 'admin1', 'Alice', 'Martin', 'alice@globallogistics.com', '$2a$10$hash1', 'ADMIN', true, 1),
+    (2, 'user1', 'Bob', 'Dupont', 'bob@globallogistics.com', '$2a$10$hash2', 'USER', true, 1),
+    (3, 'admin2', 'Eva', 'Schmidt', 'eva@transworld.com', '$2a$10$hash3', 'ADMIN', true, 2);
 
-INSERT INTO gallery (name, description)
+-- === Licenses ===
-VALUES ('gallery', '');
+INSERT INTO license_entity (id, license_key, expiration_date, active, user_id)
+VALUES
+    (1, 'LIC-GL-A', '2025-12-31', true, 1),
+    (2, 'LIC-GL-B', '2025-12-31', true, 2),
+    (3, 'LIC-TW-A', '2025-11-30', true, 3);
 
-INSERT INTO menu_category (name)
+-- === Quotes ===
-VALUES ('STARTERS'),
+INSERT INTO quote_entity (id, reference, status, estimated_amount, created_at, user_id, company_id)
-       ('DISHES'),
+VALUES
-       ('DESSERTS'),
+    ('550e8400-e29b-41d4-a716-446655440000', 'QT-GL-001', 'PENDING', 1200.50, CURRENT_TIMESTAMP, 1, 1),
-       ('PIZZAS'),
+    ('550e8400-e29b-41d4-a716-446655440001', 'QT-GL-002', 'VALIDATED', 2300.75, CURRENT_TIMESTAMP, 2, 1),
-       ('RED_WINES'),
+    ('550e8400-e29b-41d4-a716-446655440002', 'QT-TW-001', 'VALIDATED', 1950.00, CURRENT_TIMESTAMP, 3, 2);
-       ('WHITE_WINES');
 
-INSERT INTO product (name, description, price, category_id)
+-- === Export Folders ===
-VALUES ('Coconut Cake', 'Fresh Coconut', 4.90, 3),
+INSERT INTO export_folder_entity (id, reference, validation_date, company_id, quote_id)
-       ('Pasta', 'Fresh Pasta', 12.79, 2),
+VALUES
-       ('Foie Gras', 'Fresh Pasta', 12.79, 1);
+    (1, 'EXP-GL-002', CURRENT_TIMESTAMP, 1, '550e8400-e29b-41d4-a716-446655440001'),
+    (2, 'EXP-TW-001', CURRENT_TIMESTAMP, 2, '550e8400-e29b-41d4-a716-446655440002');
 
-INSERT INTO selected_day (date)
+-- === Tokens ===
-VALUES ('2035-01-01'),
+INSERT INTO token (id, token, token_type, revoked, expired, user_id)
-       ('2035-03-02'),
+VALUES
-       ('2035-03-10');
+    (1, 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9-admin1', 'BEARER', false, false, 1),
+    (2, 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9-user1', 'BEARER', false, false, 2),
+    (3, 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9-admin2', 'BEARER', false, false, 3);

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

@@ -2,8 +2,11 @@ package com.dh7789dev.xpeditis;
 
 import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
 import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.RegisterRequest;
 
 public interface AuthenticationService {
 
     AuthenticationResponse authenticate(AuthenticationRequest request);
+    AuthenticationResponse register(RegisterRequest request);
+
 }

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

@@ -1,8 +0,0 @@
-package com.dh7789dev.xpeditis;
-
-public interface EmailService {
-
-    void sendCustomerReservationEmail(Reservation reservation);
-
-    void sendAdminReservationEmail(Reservation reservation);
-}

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

@@ -1,15 +0,0 @@
-package com.dh7789dev.xpeditis;
-
-import org.springframework.core.io.Resource;
-import org.springframework.web.multipart.MultipartFile;
-
-public interface StorageService {
-
-    void init();
-
-    String upload(MultipartFile file, String newFileName);
-
-    Resource download(String fileName);
-
-    void delete(String fileName);
-}

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

@@ -0,0 +1,19 @@
+package com.dh7789dev.xpeditis.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class Company {
+    private Long id;
+    private String name;
+    private String country;
+    private List<UserAccount> users;
+    private List<Quote> quotes;
+    private List<ExportFolder> exports;
+}
+

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

@@ -0,0 +1,19 @@
+package com.dh7789dev.xpeditis.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@Data
+@AllArgsConstructor
+public class ExportFolder {
+    private Long id;
+    private String reference;
+    private LocalDateTime validationDate;
+    private Company company;
+    private Quote quote;
+}
+

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/Gallery.java

@@ -1,35 +0,0 @@
-package com.dh7789dev.xpeditis.dto;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import jakarta.validation.constraints.NotBlank;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Accessors(chain = true)
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class Gallery {
-
-    Long id;
-
-    @NotBlank(message = "name cannot be empty")
-    String name;
-
-    String description;
-
-    List<Image> images;
-
-    @Override
-    public String toString() {
-        return "Gallery(" + String.format("name=%s, description=%s)", name, description);
-    }
-}

domain/data/src/main/java/com/dh7789dev/xpeditis/dto/Image.java

@@ -1,26 +0,0 @@
-package com.dh7789dev.xpeditis.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Accessors(chain = true)
-public class Image {
-
-    Long id;
-
-    String name;
-
-    @JsonIgnore
-    String path;
-
-    String uri;
-
-    public Image(String name) {
-        this.name = name;
-    }
-}

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

@@ -0,0 +1,16 @@
+package com.dh7789dev.xpeditis.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+public class License {
+    private Long id;
+    private String licenseKey;
+    private LocalDate expirationDate;
+    private boolean active;
+    private UserAccount user;
+}

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

@@ -0,0 +1,22 @@
+package com.dh7789dev.xpeditis.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+
+@Data
+@AllArgsConstructor
+public class Quote {
+    private Long id;
+    private String reference;
+    private String status;
+    private BigDecimal estimatedAmount;
+    private LocalDateTime createdAt = LocalDateTime.now();
+    private UserAccount user;
+    private Company company;
+    private ExportFolder exportFile;
+}

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

@@ -0,0 +1,37 @@
+package com.dh7789dev.xpeditis.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Accessors(chain = true)
+public class RegisterRequest {
+
+    @NotBlank
+    String firstName;
+
+    @NotBlank
+    String lastName;
+
+    @NotBlank
+    String username;
+
+    @NotBlank
+    String email;
+
+    @NotBlank
+    String password;
+
+    @NotBlank
+    String role; // Should be "USER" or "ADMIN"
+
+}
+

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

@@ -0,0 +1,20 @@
+package com.dh7789dev.xpeditis.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class UserAccount {
+    private String username;
+    private String firstName;
+    private String lastName;
+    private String email;
+    private String password;
+    private String role; // or "ADMIN"
+    private Company company;
+    private License license;
+    private List<Quote> quotes;
+}

domain/service/pom.xml

@@ -58,6 +58,10 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-crypto</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -2,6 +2,9 @@ package com.dh7789dev.xpeditis;
 
 import com.dh7789dev.xpeditis.dto.AuthenticationRequest;
 import com.dh7789dev.xpeditis.dto.AuthenticationResponse;
+import com.dh7789dev.xpeditis.dto.RegisterRequest;
+import com.dh7789dev.xpeditis.dto.UserAccount;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -17,4 +20,9 @@ public class AuthenticationServiceImpl implements AuthenticationService {
     public AuthenticationResponse authenticate(AuthenticationRequest request) {
         return authenticationRepository.authenticate(request);
     }
+
+    @Override
+    public AuthenticationResponse register(RegisterRequest request) {
+        return null;
+    }
 }

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

@@ -1,59 +0,0 @@
-package com.dh7789dev.xpeditis;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.time.format.DateTimeFormatter;
-
-@Service
-public class EmailServiceImpl implements EmailService {
-
-    @Value("${application.email.from}")
-    String adminEmail;
-
-    private final EmailSenderRepository emailSenderRepository;
-
-    private final DateTimeFormatter outputFormatter;
-
-    @Autowired
-    public EmailServiceImpl(EmailSenderRepository emailSenderRepository) {
-        this.emailSenderRepository = emailSenderRepository;
-        this.outputFormatter = DateTimeFormatter.ofPattern("dd-MM-yyyy 'à' HH:mm");
-    }
-
-    protected String buildCustomerReservationEmail(String name, String date, int nbPerson) {
-        return "<div dir=\"ltr\" style=\"font-family: Arial, sans-serif; background-color: #f6f6f6; padding: 20px;\">\n" +
-                "    <table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" style=\"max-width: 600px; margin: auto; background-color: #ffffff; border-radius: 8px; overflow: hidden;\">\n" +
-                "        <tr>\n" +
-                "            <td style=\"padding: 20px; text-align: center;\">\n" +
-                "                <h1 style=\"color: #333;\">Bienvenue au Restaurant le BLR!</h1>\n" +
-                "                <img src=\"https://demo.stripocdn.email/content/guids/04fb15d2-fa4d-45a6-9edf-63e2a4d6d00a/images/group_3.png\" alt=\"Restaurant le BLR\" width=\"100%\" style=\"max-width: 600px; border-radius: 8px;\">\n" +
-                "                <hr style=\"border: none; border-bottom: 4px solid #ccad53; margin: 20px 0;\">\n" +
-                "                <h2 style=\"color: #333;\">Bonjour " + name + ",</h2>\n" +
-                "                <p style=\"color: #555; line-height: 1.6;\">\n" +
-                "                    Merci beaucoup pour votre réservation chez <strong>Le BLR</strong>.<br>\n" +
-                "                    Nous sommes ravis de vous avoir parmi nous !<br>\n" +
-                "                    Vous avez effectué une réservation pour <strong>" + nbPerson + " " + (nbPerson > 1 ? "personnes" : "personne") + "</strong>.<br>\n" +
-                "                    Nous avons hâte de vous accueillir dans notre restaurant le <strong>" + date + "</strong> et de vous offrir une expérience inoubliable !<br>\n" +
-                "                    À très bientôt,<br>\n" +
-                "                    L'équipe du <strong>Le BLR</strong>\n" +
-                "                </p>\n" +
-                "            </td>\n" +
-                "        </tr>\n" +
-                "    </table>\n" +
-                "</div>";
-    }
-
-    @Override
-    public void sendCustomerReservationEmail(Reservation reservation) {
-        emailSenderRepository.send(reservation.getEmail(),
-                buildCustomerReservationEmail(reservation.getName(), reservation.getDate().format(outputFormatter), reservation.getNbPerson()));
-    }
-
-    @Override
-    public void sendAdminReservationEmail(Reservation reservation) {
-        emailSenderRepository.send(adminEmail,
-                buildCustomerReservationEmail(reservation.getName(), reservation.getDate().format(outputFormatter), reservation.getNbPerson()));
-    }
-}

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

@@ -1,86 +0,0 @@
-package com.dh7789dev.xpeditis;
-
-import com.dh7789dev.xpeditis.exception.StorageException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-@Slf4j
-@Service
-public class FileSystemStorageService implements StorageService {
-
-    @Value("${file.upload-dir}")
-    String uploadDir;
-
-    @Override
-    public void init() {
-        Path directory = Paths.get(uploadDir);
-        if (!Files.exists(directory)) {
-            try {
-                log.info("Create directory {} to store images", directory);
-                Files.createDirectories(directory);
-            } catch (IOException e) {
-                throw new StorageException("Failed to create directory " + uploadDir, e);
-            }
-        }
-    }
-
-    @Override
-    public String upload(MultipartFile file, String newFileName) {
-
-        if (!file.isEmpty()) {
-
-            Path filePath = Paths.get(uploadDir, newFileName);
-            log.info("File path: {}", filePath);
-            try {
-                Files.write(filePath, file.getBytes());
-            } catch (IOException e) {
-                throw new StorageException("Failed to store file", e);
-            }
-            log.info("save {} to {}", file.getOriginalFilename(), newFileName);
-            return filePath.toString();
-        } else {
-            throw new StorageException("Failed to store file");
-        }
-    }
-
-    @Override
-    public Resource download(String fileName) {
-
-        try {
-            Path filePath = Paths.get(uploadDir).resolve(fileName).normalize();
-            log.info("Download file path: {}", fileName);
-            Resource resource = new UrlResource(filePath.toUri());
-            if (!resource.exists() || !resource.isReadable()) {
-                throw new StorageException("Could not read file: " + fileName);
-            }
-            return resource;
-        } catch (IOException e) {
-            throw new StorageException("Failed to download file " + fileName, e);
-        }
-    }
-
-    @Override
-    public void delete(String fileName) {
-
-        try {
-            Path filePath = Paths.get(uploadDir).resolve(fileName).normalize();
-            log.info("Delete file path: {}", fileName);
-            if (Files.exists(filePath)) {
-                Files.delete(filePath);
-            } else {
-                throw new StorageException("File does not exist: " + fileName);
-            }
-        } catch (IOException e) {
-            throw new StorageException("Failed to delete file " + fileName, e);
-        }
-    }
-}

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

@@ -1,6 +0,0 @@
-package com.dh7789dev.xpeditis;
-
-public interface EmailSenderRepository {
-
-    void send(String emailAddressTo, String emailContent);
-}

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

@@ -0,0 +1,7 @@
+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/EventDao.java

@@ -1,17 +0,0 @@
-package com.dh7789dev.xpeditis.dao;
-
-import com.dh7789dev.xpeditis.entity.EventEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Optional;
-
-public interface EventDao extends JpaRepository<EventEntity, Long> {
-
-    Optional<EventEntity> findByName(String name);
-
-    List<EventEntity> findAllByDate(Instant date);
-
-    List<EventEntity> findAllByOrderByDateDescNameAsc();
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,18 +0,0 @@
-package com.dh7789dev.xpeditis.dao;
-
-import com.dh7789dev.xpeditis.entity.ReservationEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-public interface ReservationDao extends JpaRepository<ReservationEntity, Long> {
-
-    List<ReservationEntity> findByName(String name);
-
-    @Query("SELECT r FROM ReservationEntity r WHERE r.date >= :startOfDay AND r.date < :endOfDay")
-    List<ReservationEntity> findReservationsByDates(@Param("startOfDay") LocalDateTime startOfDay,
-                                                   @Param("endOfDay") LocalDateTime endOfDay);
-}

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

@@ -1,14 +0,0 @@
-package com.dh7789dev.xpeditis.dao;
-
-import com.dh7789dev.xpeditis.entity.SelectedDayEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.time.LocalDate;
-import java.util.List;
-
-public interface SelectedDayDao extends JpaRepository<SelectedDayEntity, Long> {
-
-    @Query("SELECT day FROM SelectedDayEntity day WHERE day.date >= :date")
-    List<SelectedDayEntity> findAllFromDate(LocalDate date);
-}

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

@@ -12,9 +12,9 @@ public interface TokenDao extends JpaRepository<TokenEntity, Integer> {
     Optional<TokenEntity> findByToken(String token);
 
     @Query(value = """
-      select t from TokenEntity t inner join UserEntity u\s
+      select t from TokenEntity t inner join UserAccountEntity u\s
       on t.user.id = u.id\s
       where u.id = :userId and (t.expired = false or t.revoked = false)\s
       """)
-    List<TokenEntity> findAllValidTokenByUserId(Long userId);
+    List<TokenEntity> findAllValidTokenByUserId(String userId);
 }

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

@@ -0,0 +1,26 @@
+package com.dh7789dev.xpeditis.entity;
+
+import jakarta.persistence.*;
+
+import java.util.List;
+
+@Entity
+public class CompanyEntity extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+
+    private String country;
+
+    @OneToMany(mappedBy = "company", cascade = CascadeType.ALL)
+    private List<UserEntity> users;
+
+    @OneToMany(mappedBy = "company", cascade = CascadeType.ALL)
+    private List<QuoteEntity> quotes;
+
+    @OneToMany(mappedBy = "company", cascade = CascadeType.ALL)
+    private List<ExportFolderEntity> exports;
+}
+

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

@@ -1,34 +0,0 @@
-package com.dh7789dev.xpeditis.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-
-import java.time.LocalDate;
-import java.util.List;
-
-@Entity
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Accessors(chain = true)
-@Table(name = "event", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"name"})
-})
-public class EventEntity extends BaseEntity {
-
-    @Column(nullable = false, unique = true)
-    String name;
-
-    @Column
-    String description;
-
-    @Column(nullable = false)
-    LocalDate date;
-
-    @OneToMany(mappedBy = "event", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<ImageEntity> images;
-}

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

@@ -0,0 +1,24 @@
+package com.dh7789dev.xpeditis.entity;
+
+import jakarta.persistence.*;
+
+import java.time.LocalDateTime;
+
+@Entity
+public class ExportFolderEntity extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String reference;
+
+    private LocalDateTime validationDate;
+
+    @ManyToOne
+    private CompanyEntity company;
+
+    @OneToOne
+    @JoinColumn(name = "quote_id", unique = true)
+    private QuoteEntity quote;
+}
+

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

@@ -1,30 +0,0 @@
-package com.dh7789dev.xpeditis.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-
-import java.util.List;
-
-@Entity
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Accessors(chain = true)
-@Table(name = "gallery", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"name"})
-})
-public class GalleryEntity extends BaseEntity {
-
-    @Column(unique = true)
-    String name;
-
-    @Column
-    String description;
-
-    @OneToMany(mappedBy = "gallery", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<ImageEntity> images;
-}

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

@@ -1,33 +0,0 @@
-package com.dh7789dev.xpeditis.entity;
-
-import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-
-@Entity
-@Getter
-@Setter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Accessors(chain = true)
-@Table(name = "image", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"name", "path"})
-})
-public class ImageEntity extends BaseEntity {
-
-    @Column(unique = true)
-    String name;
-
-    @Column(unique = true)
-    String path;
-
-    @ManyToOne
-    @JoinColumn(name = "event_id")
-    EventEntity event;
-
-    @ManyToOne
-    @JoinColumn(name = "gallery_id")
-    GalleryEntity gallery;
-}

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

@@ -0,0 +1,23 @@
+package com.dh7789dev.xpeditis.entity;
+
+import jakarta.persistence.*;
+
+import java.time.LocalDate;
+
+@Entity
+public class LicenseEntity extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String licenseKey;
+
+    private LocalDate expirationDate;
+
+    private boolean active;
+
+    @OneToOne
+    @JoinColumn(name = "user_id", unique = true)
+    private UserEntity user;
+}
+

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

@@ -1,29 +0,0 @@
-package com.dh7789dev.xpeditis.entity;
-
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-@Entity
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = true)
-@Table(name = "menu_category", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"name"})
-})
-public class MenuCategoryEntity extends BaseEntity {
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "name", nullable = false, unique = true)
-    private MenuCategory.Name name;
-
-    @OneToMany(mappedBy = "category")
-    private List<ProductEntity> products;
-}

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

@@ -1,34 +0,0 @@
-package com.dh7789dev.xpeditis.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-
-import java.math.BigDecimal;
-
-@Entity
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Accessors(chain = true)
-@Table(name = "product", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"name"})
-})
-public class ProductEntity extends BaseEntity {
-
-    @Column(nullable = false, unique = true)
-    String name;
-
-    @Column
-    String description;
-
-    @Column(nullable = false)
-    BigDecimal price;
-
-    @ManyToOne
-    @JoinColumn(name = "category_id")
-    private MenuCategoryEntity category;
-}

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

@@ -0,0 +1,33 @@
+package com.dh7789dev.xpeditis.entity;
+
+import jakarta.persistence.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Entity
+public class QuoteEntity extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private Long id;
+
+    @Column(unique = true, nullable = false)
+    private String reference;
+
+    @Column(nullable = false)
+    private String status;
+
+    private BigDecimal estimatedAmount;
+
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @ManyToOne
+    private UserEntity user;
+
+    @ManyToOne
+    private CompanyEntity company;
+
+    @OneToOne(mappedBy = "quote", cascade = CascadeType.ALL)
+    private ExportFolderEntity exportFile;
+}
+

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

@@ -1,35 +0,0 @@
-package com.dh7789dev.xpeditis.entity;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@Table(name = "reservation")
-public class ReservationEntity extends BaseEntity {
-
-    @Column(nullable = false)
-    String name;
-
-    @Column(nullable = false)
-    String email;
-
-    @Column
-    String phone;
-
-    @Column(nullable = false)
-    int nbPerson;
-
-    @Column(nullable = false)
-    LocalDateTime date;
-}

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

@@ -1,22 +0,0 @@
-package com.dh7789dev.xpeditis.entity;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.*;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-
-import java.time.LocalDate;
-
-@Entity
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Accessors(chain = true)
-@Table(name = "selected_day")
-public class SelectedDayEntity extends BaseEntity {
-
-    LocalDate date;
-}

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

@@ -13,9 +13,6 @@ import java.util.List;
 @Entity
 @Getter
 @Setter
-@Table(name = "users", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"username", "email"})
-})
 public class UserEntity extends BaseEntity implements UserDetails {
 
     @NaturalId
@@ -28,7 +25,7 @@ public class UserEntity extends BaseEntity implements UserDetails {
     @Column(name = "last_name", length = 50)
     private String lastName;
 
-    @Column(nullable = false, unique = true, length = 50)
+    @Column(unique = true, nullable = false)
     private String email;
 
     @Column(nullable = false)
@@ -41,6 +38,15 @@ public class UserEntity extends BaseEntity implements UserDetails {
     @Column(name = "enabled", nullable = false, columnDefinition = "BOOLEAN DEFAULT TRUE NOT NULL")
     private boolean enabled;
 
+    @ManyToOne
+    private CompanyEntity company;
+
+    @OneToOne(mappedBy = "user", cascade = CascadeType.ALL)
+    private LicenseEntity license;
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
+    private List<QuoteEntity> quotes;
+
     @OneToMany(mappedBy = "user")
     private List<TokenEntity> tokens;
 
@@ -85,3 +91,4 @@ public class UserEntity extends BaseEntity implements UserDetails {
                 username, firstName, lastName, email, role.name());
     }
 }
+

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

@@ -1,26 +1,25 @@
 package com.dh7789dev.xpeditis.mapper;
 
-import com.dh7789dev.xpeditis.entity.ProductEntity;
+
+import com.dh7789dev.xpeditis.dto.Company;
+import com.dh7789dev.xpeditis.entity.CompanyEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.factory.Mappers;
 
-import java.util.List;
+
 
 @Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface ProductMapper {
+public interface CompanyMapper {
 
-    ProductMapper INSTANCE = Mappers.getMapper(ProductMapper.class);
+    CompanyMapper INSTANCE = Mappers.getMapper(CompanyMapper.class);
 
     @Mapping(target = "createdDate", ignore = true)
     @Mapping(target = "modifiedDate", ignore = true)
     @Mapping(target = "createdBy", ignore = true)
     @Mapping(target = "modifiedBy", ignore = true)
-    @Mapping(target = "category", ignore = true)
+    CompanyEntity companyToCompanyEntity(Company company);
-    ProductEntity menuItemToProductEntity(MenuItem menuItem);
 
-    MenuItem productEntityToMenuItem(ProductEntity productEntity);
+    Company companyEntityToCompany(CompanyEntity companyEntity);
-
-    List<MenuItem> productEntitiesToMenuItems(List<ProductEntity> productEntities);
 }

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

@@ -1,25 +0,0 @@
-package com.dh7789dev.xpeditis.mapper;
-
-import com.dh7789dev.xpeditis.entity.EventEntity;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper(/*componentModel = MappingConstants.ComponentModel.SPRING,*/
-        uses = {ImageMapper.class})
-public interface EventMapper {
-
-    EventMapper INSTANCE = Mappers.getMapper(EventMapper.class);
-
-    @Mapping(target = "createdDate", ignore = true)
-    @Mapping(target = "modifiedDate", ignore = true)
-    @Mapping(target = "createdBy", ignore = true)
-    @Mapping(target = "modifiedBy", ignore = true)
-    EventEntity eventToEventEntity(Event event);
-
-    Event eventEntityToEvent(EventEntity eventEntity);
-
-    List<Event> eventEntitiesToEvents(List<EventEntity> eventEntities);
-}

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

@@ -0,0 +1,21 @@
+package com.dh7789dev.xpeditis.mapper;
+
+import com.dh7789dev.xpeditis.dto.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)
+public interface ExportFolderMapper {
+    ExportFolderMapper INSTANCE = Mappers.getMapper(ExportFolderMapper.class);
+
+    @Mapping(target = "createdDate", ignore = true)
+    @Mapping(target = "modifiedDate", ignore = true)
+    @Mapping(target = "createdBy", ignore = true)
+    @Mapping(target = "modifiedBy", ignore = true)
+    ExportFolderEntity exportFolderToCompanyEntity(ExportFolder exportFolder);
+
+    ExportFolder exportFolderEntityToExportFolder(ExportFolderEntity exportFolderEntity);
+}

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

@@ -1,22 +0,0 @@
-package com.dh7789dev.xpeditis.mapper;
-
-import com.dh7789dev.xpeditis.dto.Gallery;
-import com.dh7789dev.xpeditis.entity.GalleryEntity;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
-
-@Mapper(/*componentModel = MappingConstants.ComponentModel.SPRING,*/
-        uses = {ImageMapper.class})
-public interface GalleryMapper {
-
-    GalleryMapper INSTANCE = Mappers.getMapper(GalleryMapper.class);
-
-    @Mapping(target = "createdDate", ignore = true)
-    @Mapping(target = "modifiedDate", ignore = true)
-    @Mapping(target = "createdBy", ignore = true)
-    @Mapping(target = "modifiedBy", ignore = true)
-    GalleryEntity galleryToGalleryEntity(Gallery gallery);
-
-    Gallery galleryEntityToGallery(GalleryEntity galleryEntity);
-}

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

@@ -1,25 +0,0 @@
-package com.dh7789dev.xpeditis.mapper;
-
-import com.dh7789dev.xpeditis.dto.Image;
-import com.dh7789dev.xpeditis.entity.ImageEntity;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-import org.mapstruct.factory.Mappers;
-
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface ImageMapper {
-
-    ImageMapper INSTANCE = Mappers.getMapper(ImageMapper.class);
-
-    @Mapping(target = "createdDate", ignore = true)
-    @Mapping(target = "modifiedDate", ignore = true)
-    @Mapping(target = "createdBy", ignore = true)
-    @Mapping(target = "modifiedBy", ignore = true)
-    @Mapping(target = "event", ignore = true)
-    ImageEntity imageToImageEntity(Image image);
-
-    @Mapping(target = "path", ignore = true)
-    @Mapping(target = "uri", expression = "java(\"/api/v1/images/\" + imageEntity.getId())")
-    Image imageEntityToImage(ImageEntity imageEntity);
-}

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

@@ -0,0 +1,22 @@
+package com.dh7789dev.xpeditis.mapper;
+
+
+import com.dh7789dev.xpeditis.dto.License;
+import com.dh7789dev.xpeditis.entity.LicenseEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface LicenseMapper {
+    LicenseMapper INSTANCE = Mappers.getMapper(LicenseMapper.class);
+
+    @Mapping(target = "createdDate", ignore = true)
+    @Mapping(target = "modifiedDate", ignore = true)
+    @Mapping(target = "createdBy", ignore = true)
+    @Mapping(target = "modifiedBy", ignore = true)
+    LicenseEntity licenseToLicenseEntity(License license);
+
+    License licenseEntityToLicense(LicenseEntity licenseEntity);
+}

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

@@ -1,27 +0,0 @@
-package com.dh7789dev.xpeditis.mapper;
-
-import com.dh7789dev.xpeditis.entity.MenuCategoryEntity;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper(/*componentModel = MappingConstants.ComponentModel.SPRING,*/
-        uses = {ProductMapper.class})
-public interface MenuCategoryMapper {
-
-    MenuCategoryMapper INSTANCE = Mappers.getMapper(MenuCategoryMapper.class);
-
-    @Mapping(target = "createdDate", ignore = true)
-    @Mapping(target = "modifiedDate", ignore = true)
-    @Mapping(target = "createdBy", ignore = true)
-    @Mapping(target = "modifiedBy", ignore = true)
-    @Mapping(source = "menuItems", target = "products")
-    MenuCategoryEntity menuCategoryToMenuCategoryEntity(MenuCategory menuCategory);
-
-    @Mapping(source = "products", target = "menuItems")
-    MenuCategory menuCategoryEntityToMenuCategory(MenuCategoryEntity menuCategoryEntity);
-
-    List<MenuCategory> menuCategoryEntitiesToMenuCategories(List<MenuCategoryEntity> menuCategoryEntities);
-}

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

@@ -0,0 +1,21 @@
+package com.dh7789dev.xpeditis.mapper;
+
+import com.dh7789dev.xpeditis.dto.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)
+public interface QuoteMapper {
+    QuoteMapper INSTANCE = Mappers.getMapper(QuoteMapper.class);
+
+    @Mapping(target = "createdDate", ignore = true)
+    @Mapping(target = "modifiedDate", ignore = true)
+    @Mapping(target = "createdBy", ignore = true)
+    @Mapping(target = "modifiedBy", ignore = true)
+    QuoteEntity quoteToQuoteEntity(Quote quote);
+
+    Quote quoteEntityToQuote(QuoteEntity quoteEntity);
+}

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

@@ -1,25 +0,0 @@
-package com.dh7789dev.xpeditis.mapper;
-
-import com.dh7789dev.xpeditis.entity.ReservationEntity;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface ReservationMapper {
-
-    ReservationMapper INSTANCE = Mappers.getMapper(ReservationMapper.class);
-
-    @Mapping(target = "createdDate", ignore = true)
-    @Mapping(target = "modifiedDate", ignore = true)
-    @Mapping(target = "createdBy", ignore = true)
-    @Mapping(target = "modifiedBy", ignore = true)
-    ReservationEntity reservationToReservationEntity(Reservation reservation);
-
-    Reservation reservationEntityToReservation(ReservationEntity reservationEntity);
-
-    List<Reservation> reservationEntitiesToReservation(List<ReservationEntity> reservationEntities);
-}

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

@@ -1,25 +0,0 @@
-package com.dh7789dev.xpeditis.mapper;
-
-import com.dh7789dev.xpeditis.entity.SelectedDayEntity;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface SelectedDayMapper {
-
-    SelectedDayMapper INSTANCE = Mappers.getMapper(SelectedDayMapper.class);
-
-    @Mapping(target = "createdDate", ignore = true)
-    @Mapping(target = "modifiedDate", ignore = true)
-    @Mapping(target = "createdBy", ignore = true)
-    @Mapping(target = "modifiedBy", ignore = true)
-    SelectedDayEntity selectedDayToSelectedDayEntity(SelectedDay selectedDay);
-
-    SelectedDay selectedDayEntityToSelectedDay(SelectedDayEntity selectedDayEntity);
-
-    List<SelectedDay> selectedDayEntitiesToSelectedDays(List<SelectedDayEntity> selectedDayEntities);
-}

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

@@ -0,0 +1,24 @@
+package com.dh7789dev.xpeditis.mapper;
+
+import com.dh7789dev.xpeditis.dto.UserAccount;
+import com.dh7789dev.xpeditis.entity.UserEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.factory.Mappers;
+
+
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface UserMapper {
+
+    UserMapper INSTANCE = Mappers.getMapper(UserMapper.class);
+
+    @Mapping(target = "createdDate", ignore = true)
+    @Mapping(target = "modifiedDate", ignore = true)
+    @Mapping(target = "createdBy", ignore = true)
+    @Mapping(target = "modifiedBy", ignore = true)
+    UserEntity userAccountToUserEntity(UserAccount user);
+
+    UserAccount userEntityToUserAccount(UserEntity userEntity);
+}
+

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

@@ -64,7 +64,7 @@ public class AuthenticationJwtRepository implements AuthenticationRepository {
     }
 
     private void revokeAllUserTokens(UserEntity userEntity) {
-        var validUserTokens = tokenDao.findAllValidTokenByUserId(userEntity.getId());
+        var validUserTokens = tokenDao.findAllValidTokenByUserId(String.valueOf(userEntity.getId()));
         if (validUserTokens.isEmpty()) return;
         validUserTokens.forEach(token -> {
             token.setExpired(true);

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

@@ -1,44 +0,0 @@
-package com.dh7789dev.xpeditis.repository;
-
-import com.dh7789dev.xpeditis.EmailSenderRepository;
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.MimeMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Repository;
-
-@Slf4j
-@Repository
-public class JavaMailSenderRepository implements EmailSenderRepository {
-
-    @Value("${application.email.from}")
-    String emailAddressFrom;
-
-    private final JavaMailSender emailSender;
-
-    @Autowired
-    public JavaMailSenderRepository(JavaMailSender emailSender) {
-        this.emailSender = emailSender;
-    }
-
-    @Async
-    @Override
-    public void send(String emailAddressTo, String emailContent) {
-        try {
-            MimeMessage mimeMessage = emailSender.createMimeMessage();
-            MimeMessageHelper helperMessage = new MimeMessageHelper(mimeMessage, "utf-8");
-            helperMessage.setText(emailContent, true);
-            helperMessage.setTo(emailAddressTo);
-            helperMessage.setSubject("Reservation Confirmation");
-            helperMessage.setFrom(emailAddressFrom);
-            emailSender.send(mimeMessage);
-        } catch (MessagingException e) {
-            log.error("failed to send email", e);
-            throw new IllegalStateException("failed to send email");
-        }
-    }
-}

infrastructure/src/test/java/com/dh7789dev/xpeditis/repository/ReservationJpaRepositoryTest.java

@@ -1,7 +1,5 @@
 package com.dh7789dev.xpeditis.repository;
 
-import com.dh7789dev.xpeditis.dao.ReservationDao;
-import com.dh7789dev.xpeditis.entity.ReservationEntity;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;