From 84bc58f9c9cbee2f7cd51070b4df1b8e9a882fb2 Mon Sep 17 00:00:00 2001
From: evilimkova <evilimkova@onpointserv.com>
Date: Sun, 30 Apr 2023 11:06:22 +0200
Subject: [PATCH] Fixing file structure

---
 .../modulecertificate/{ => certificate}/Certificate.java   | 2 +-
 .../{service => certificate}/CertificateController.java    | 3 +--
 .../{service => certificate}/CertificateFacade.java        | 2 +-
 .../{service => certificate}/CertificateMapper.java        | 4 +---
 .../{service => certificate}/CertificateRepository.java    | 3 +--
 .../{service => certificate}/CertificateService.java       | 3 +--
 .../{service => exceptions}/ApiError.java                  | 2 +-
 .../CustomRestGlobalExceptionHandling.java                 | 2 +-
 .../modulecertificate/CertificateControllerTests.java      | 2 +-
 .../fuseri/modulecertificate/CertificateFacadeTests.java   | 7 ++++---
 .../fuseri/modulecertificate/CertificateMapperTests.java   | 3 ++-
 .../modulecertificate/CertificateRepositoryTests.java      | 3 ++-
 .../fuseri/modulecertificate/CertificateServiceTests.java  | 5 +++--
 13 files changed, 20 insertions(+), 21 deletions(-)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{ => certificate}/Certificate.java (98%)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{service => certificate}/CertificateController.java (98%)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{service => certificate}/CertificateFacade.java (97%)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{service => certificate}/CertificateMapper.java (90%)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{service => certificate}/CertificateRepository.java (85%)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{service => certificate}/CertificateService.java (94%)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{service => exceptions}/ApiError.java (96%)
 rename application/module-certificate/src/main/java/org/fuseri/modulecertificate/{service => exceptions}/CustomRestGlobalExceptionHandling.java (97%)

diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/Certificate.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/Certificate.java
similarity index 98%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/Certificate.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/Certificate.java
index 3b9b0a94..38c6b946 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/Certificate.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/Certificate.java
@@ -1,4 +1,4 @@
-package org.fuseri.modulecertificate;
+package org.fuseri.modulecertificate.certificate;
 
 import jakarta.persistence.*;
 
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateController.java
similarity index 98%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateController.java
index 91ee0e5d..e1912833 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateController.java
@@ -1,9 +1,8 @@
-package org.fuseri.modulecertificate.service;
+package org.fuseri.modulecertificate.certificate;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import jakarta.persistence.EntityNotFoundException;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import org.fuseri.model.dto.certificate.CertificateCreateDto;
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateFacade.java
similarity index 97%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateFacade.java
index 018c0591..b3524b97 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateFacade.java
@@ -1,4 +1,4 @@
-package org.fuseri.modulecertificate.service;
+package org.fuseri.modulecertificate.certificate;
 
 
 import org.fuseri.model.dto.certificate.CertificateCreateDto;
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateMapper.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateMapper.java
similarity index 90%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateMapper.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateMapper.java
index f6738c44..f806843f 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateMapper.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateMapper.java
@@ -1,9 +1,7 @@
-package org.fuseri.modulecertificate.service;
+package org.fuseri.modulecertificate.certificate;
 
 import org.fuseri.model.dto.certificate.CertificateCreateDto;
-import org.fuseri.model.dto.certificate.CertificateDto;
 import org.fuseri.model.dto.certificate.CertificateSimpleDto;
-import org.fuseri.modulecertificate.Certificate;
 import org.mapstruct.Mapper;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateRepository.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateRepository.java
similarity index 85%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateRepository.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateRepository.java
index 832d2d22..367431f9 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateRepository.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateRepository.java
@@ -1,6 +1,5 @@
-package org.fuseri.modulecertificate.service;
+package org.fuseri.modulecertificate.certificate;
 
-import org.fuseri.modulecertificate.Certificate;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateService.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateService.java
similarity index 94%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateService.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateService.java
index 245c88c3..a32a659c 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateService.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/certificate/CertificateService.java
@@ -1,6 +1,5 @@
-package org.fuseri.modulecertificate.service;
+package org.fuseri.modulecertificate.certificate;
 
-import org.fuseri.modulecertificate.Certificate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/ApiError.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/exceptions/ApiError.java
similarity index 96%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/ApiError.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/exceptions/ApiError.java
index 8a48a45f..9f8a19a7 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/ApiError.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/exceptions/ApiError.java
@@ -1,4 +1,4 @@
-package org.fuseri.modulecertificate.service;
+package org.fuseri.modulecertificate.exceptions;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CustomRestGlobalExceptionHandling.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/exceptions/CustomRestGlobalExceptionHandling.java
similarity index 97%
rename from application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CustomRestGlobalExceptionHandling.java
rename to application/module-certificate/src/main/java/org/fuseri/modulecertificate/exceptions/CustomRestGlobalExceptionHandling.java
index a92bf270..8284014b 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CustomRestGlobalExceptionHandling.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/exceptions/CustomRestGlobalExceptionHandling.java
@@ -1,4 +1,4 @@
-package org.fuseri.modulecertificate.service;
+package org.fuseri.modulecertificate.exceptions;
 
 /**
  * @author Michal Badin - Formula 1 team
diff --git a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
index d4d4e27c..7f9d7ba7 100644
--- a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
+++ b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
@@ -9,7 +9,7 @@ import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
 import org.fuseri.model.dto.user.UserType;
-import org.fuseri.modulecertificate.service.CertificateFacade;
+import org.fuseri.modulecertificate.certificate.CertificateFacade;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
diff --git a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java
index 6875ef62..7ef75612 100644
--- a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java
+++ b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java
@@ -8,9 +8,10 @@ import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
 import org.fuseri.model.dto.user.UserType;
-import org.fuseri.modulecertificate.service.CertificateFacade;
-import org.fuseri.modulecertificate.service.CertificateMapper;
-import org.fuseri.modulecertificate.service.CertificateService;
+import org.fuseri.modulecertificate.certificate.Certificate;
+import org.fuseri.modulecertificate.certificate.CertificateFacade;
+import org.fuseri.modulecertificate.certificate.CertificateMapper;
+import org.fuseri.modulecertificate.certificate.CertificateService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
diff --git a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java
index 00cf08aa..b683de8a 100644
--- a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java
+++ b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java
@@ -8,7 +8,8 @@ import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
 import org.fuseri.model.dto.user.UserType;
-import org.fuseri.modulecertificate.service.CertificateMapper;
+import org.fuseri.modulecertificate.certificate.Certificate;
+import org.fuseri.modulecertificate.certificate.CertificateMapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateRepositoryTests.java b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateRepositoryTests.java
index 34ca57ba..08ae933b 100644
--- a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateRepositoryTests.java
+++ b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateRepositoryTests.java
@@ -1,6 +1,7 @@
 package org.fuseri.modulecertificate;
 
-import org.fuseri.modulecertificate.service.CertificateRepository;
+import org.fuseri.modulecertificate.certificate.Certificate;
+import org.fuseri.modulecertificate.certificate.CertificateRepository;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java
index dc11b78a..4ab79d90 100644
--- a/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java
+++ b/application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java
@@ -6,8 +6,9 @@ import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
 import org.fuseri.model.dto.user.UserType;
-import org.fuseri.modulecertificate.service.CertificateRepository;
-import org.fuseri.modulecertificate.service.CertificateService;
+import org.fuseri.modulecertificate.certificate.Certificate;
+import org.fuseri.modulecertificate.certificate.CertificateRepository;
+import org.fuseri.modulecertificate.certificate.CertificateService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-- 
GitLab