From 9ed87cbccb968f3bdc79e4be3b5e1de555171ded Mon Sep 17 00:00:00 2001 From: doraerdelyi <163741439+doraerdelyi@users.noreply.github.com> Date: Thu, 8 May 2025 14:17:15 +0200 Subject: [PATCH] refactor model and exception folders --- .../com/codecool/solarwatch/config/RoleInitializer.java | 4 ++-- .../solarwatch/controller/SolarWatchControllerAdvice.java | 6 +++--- .../{model => exception}/NoSuchCityException.java | 2 +- .../NoSunriseSunsetDataException.java | 2 +- .../{model => exception}/UserAlreadyExistsException.java | 2 +- .../com/codecool/solarwatch/model/{ => user}/Role.java | 2 +- .../codecool/solarwatch/model/{ => user}/RoleType.java | 2 +- .../solarwatch/model/{ => user}/SunriseSunsetUser.java | 2 +- .../codecool/solarwatch/repository/RoleRepository.java | 4 ++-- .../codecool/solarwatch/repository/UserRepository.java | 2 +- .../service/UserDetailsServiceImplementation.java | 4 ++-- .../codecool/solarwatch/service/SolarWatchService.java | 4 ++-- .../java/com/codecool/solarwatch/service/UserService.java | 8 ++++---- .../solarwatch/controller/SolarWatchControllerTest.java | 4 +--- .../solarwatch/integration/ProtectedEndpointIT.java | 6 +++--- .../com/codecool/solarwatch/integration/UserLoginIT.java | 6 +++--- .../solarwatch/integration/UserRegistrationIT.java | 2 +- .../solarwatch/service/SolarWatchServiceTest.java | 5 ++--- 18 files changed, 32 insertions(+), 35 deletions(-) rename backend/src/main/java/com/codecool/solarwatch/{model => exception}/NoSuchCityException.java (76%) rename backend/src/main/java/com/codecool/solarwatch/{model => exception}/NoSunriseSunsetDataException.java (81%) rename backend/src/main/java/com/codecool/solarwatch/{model => exception}/UserAlreadyExistsException.java (80%) rename backend/src/main/java/com/codecool/solarwatch/model/{ => user}/Role.java (91%) rename backend/src/main/java/com/codecool/solarwatch/model/{ => user}/RoleType.java (54%) rename backend/src/main/java/com/codecool/solarwatch/model/{ => user}/SunriseSunsetUser.java (95%) diff --git a/backend/src/main/java/com/codecool/solarwatch/config/RoleInitializer.java b/backend/src/main/java/com/codecool/solarwatch/config/RoleInitializer.java index 42d883f..6454066 100644 --- a/backend/src/main/java/com/codecool/solarwatch/config/RoleInitializer.java +++ b/backend/src/main/java/com/codecool/solarwatch/config/RoleInitializer.java @@ -1,7 +1,7 @@ package com.codecool.solarwatch.config; -import com.codecool.solarwatch.model.Role; -import com.codecool.solarwatch.model.RoleType; +import com.codecool.solarwatch.model.user.Role; +import com.codecool.solarwatch.model.user.RoleType; import com.codecool.solarwatch.repository.RoleRepository; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/com/codecool/solarwatch/controller/SolarWatchControllerAdvice.java b/backend/src/main/java/com/codecool/solarwatch/controller/SolarWatchControllerAdvice.java index 70825bc..e17a773 100644 --- a/backend/src/main/java/com/codecool/solarwatch/controller/SolarWatchControllerAdvice.java +++ b/backend/src/main/java/com/codecool/solarwatch/controller/SolarWatchControllerAdvice.java @@ -1,8 +1,8 @@ package com.codecool.solarwatch.controller; -import com.codecool.solarwatch.model.NoSuchCityException; -import com.codecool.solarwatch.model.NoSunriseSunsetDataException; -import com.codecool.solarwatch.model.UserAlreadyExistsException; +import com.codecool.solarwatch.exception.NoSuchCityException; +import com.codecool.solarwatch.exception.NoSunriseSunsetDataException; +import com.codecool.solarwatch.exception.UserAlreadyExistsException; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.BadCredentialsException; diff --git a/backend/src/main/java/com/codecool/solarwatch/model/NoSuchCityException.java b/backend/src/main/java/com/codecool/solarwatch/exception/NoSuchCityException.java similarity index 76% rename from backend/src/main/java/com/codecool/solarwatch/model/NoSuchCityException.java rename to backend/src/main/java/com/codecool/solarwatch/exception/NoSuchCityException.java index 5c10bb0..78ddd86 100644 --- a/backend/src/main/java/com/codecool/solarwatch/model/NoSuchCityException.java +++ b/backend/src/main/java/com/codecool/solarwatch/exception/NoSuchCityException.java @@ -1,4 +1,4 @@ -package com.codecool.solarwatch.model; +package com.codecool.solarwatch.exception; public class NoSuchCityException extends RuntimeException { public NoSuchCityException() { diff --git a/backend/src/main/java/com/codecool/solarwatch/model/NoSunriseSunsetDataException.java b/backend/src/main/java/com/codecool/solarwatch/exception/NoSunriseSunsetDataException.java similarity index 81% rename from backend/src/main/java/com/codecool/solarwatch/model/NoSunriseSunsetDataException.java rename to backend/src/main/java/com/codecool/solarwatch/exception/NoSunriseSunsetDataException.java index 21e587a..fdd3729 100644 --- a/backend/src/main/java/com/codecool/solarwatch/model/NoSunriseSunsetDataException.java +++ b/backend/src/main/java/com/codecool/solarwatch/exception/NoSunriseSunsetDataException.java @@ -1,4 +1,4 @@ -package com.codecool.solarwatch.model; +package com.codecool.solarwatch.exception; public class NoSunriseSunsetDataException extends RuntimeException { public NoSunriseSunsetDataException() { diff --git a/backend/src/main/java/com/codecool/solarwatch/model/UserAlreadyExistsException.java b/backend/src/main/java/com/codecool/solarwatch/exception/UserAlreadyExistsException.java similarity index 80% rename from backend/src/main/java/com/codecool/solarwatch/model/UserAlreadyExistsException.java rename to backend/src/main/java/com/codecool/solarwatch/exception/UserAlreadyExistsException.java index f4aa081..463c8c3 100644 --- a/backend/src/main/java/com/codecool/solarwatch/model/UserAlreadyExistsException.java +++ b/backend/src/main/java/com/codecool/solarwatch/exception/UserAlreadyExistsException.java @@ -1,4 +1,4 @@ -package com.codecool.solarwatch.model; +package com.codecool.solarwatch.exception; public class UserAlreadyExistsException extends RuntimeException { public UserAlreadyExistsException() { diff --git a/backend/src/main/java/com/codecool/solarwatch/model/Role.java b/backend/src/main/java/com/codecool/solarwatch/model/user/Role.java similarity index 91% rename from backend/src/main/java/com/codecool/solarwatch/model/Role.java rename to backend/src/main/java/com/codecool/solarwatch/model/user/Role.java index d943fc8..27f4b39 100644 --- a/backend/src/main/java/com/codecool/solarwatch/model/Role.java +++ b/backend/src/main/java/com/codecool/solarwatch/model/user/Role.java @@ -1,4 +1,4 @@ -package com.codecool.solarwatch.model; +package com.codecool.solarwatch.model.user; import jakarta.persistence.*; diff --git a/backend/src/main/java/com/codecool/solarwatch/model/RoleType.java b/backend/src/main/java/com/codecool/solarwatch/model/user/RoleType.java similarity index 54% rename from backend/src/main/java/com/codecool/solarwatch/model/RoleType.java rename to backend/src/main/java/com/codecool/solarwatch/model/user/RoleType.java index c6978ec..6c9b768 100644 --- a/backend/src/main/java/com/codecool/solarwatch/model/RoleType.java +++ b/backend/src/main/java/com/codecool/solarwatch/model/user/RoleType.java @@ -1,4 +1,4 @@ -package com.codecool.solarwatch.model; +package com.codecool.solarwatch.model.user; public enum RoleType { ROLE_USER, ROLE_ADMIN diff --git a/backend/src/main/java/com/codecool/solarwatch/model/SunriseSunsetUser.java b/backend/src/main/java/com/codecool/solarwatch/model/user/SunriseSunsetUser.java similarity index 95% rename from backend/src/main/java/com/codecool/solarwatch/model/SunriseSunsetUser.java rename to backend/src/main/java/com/codecool/solarwatch/model/user/SunriseSunsetUser.java index 23c804c..44b8094 100644 --- a/backend/src/main/java/com/codecool/solarwatch/model/SunriseSunsetUser.java +++ b/backend/src/main/java/com/codecool/solarwatch/model/user/SunriseSunsetUser.java @@ -1,4 +1,4 @@ -package com.codecool.solarwatch.model; +package com.codecool.solarwatch.model.user; import jakarta.persistence.*; import java.util.HashSet; diff --git a/backend/src/main/java/com/codecool/solarwatch/repository/RoleRepository.java b/backend/src/main/java/com/codecool/solarwatch/repository/RoleRepository.java index bd6d017..710dba7 100644 --- a/backend/src/main/java/com/codecool/solarwatch/repository/RoleRepository.java +++ b/backend/src/main/java/com/codecool/solarwatch/repository/RoleRepository.java @@ -1,7 +1,7 @@ package com.codecool.solarwatch.repository; -import com.codecool.solarwatch.model.Role; -import com.codecool.solarwatch.model.RoleType; +import com.codecool.solarwatch.model.user.Role; +import com.codecool.solarwatch.model.user.RoleType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.Optional; diff --git a/backend/src/main/java/com/codecool/solarwatch/repository/UserRepository.java b/backend/src/main/java/com/codecool/solarwatch/repository/UserRepository.java index 4a01ffc..4022338 100644 --- a/backend/src/main/java/com/codecool/solarwatch/repository/UserRepository.java +++ b/backend/src/main/java/com/codecool/solarwatch/repository/UserRepository.java @@ -1,6 +1,6 @@ package com.codecool.solarwatch.repository; -import com.codecool.solarwatch.model.SunriseSunsetUser; +import com.codecool.solarwatch.model.user.SunriseSunsetUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.Optional; diff --git a/backend/src/main/java/com/codecool/solarwatch/security/service/UserDetailsServiceImplementation.java b/backend/src/main/java/com/codecool/solarwatch/security/service/UserDetailsServiceImplementation.java index 6272d0b..118239d 100644 --- a/backend/src/main/java/com/codecool/solarwatch/security/service/UserDetailsServiceImplementation.java +++ b/backend/src/main/java/com/codecool/solarwatch/security/service/UserDetailsServiceImplementation.java @@ -1,7 +1,7 @@ package com.codecool.solarwatch.security.service; -import com.codecool.solarwatch.model.Role; -import com.codecool.solarwatch.model.SunriseSunsetUser; +import com.codecool.solarwatch.model.user.Role; +import com.codecool.solarwatch.model.user.SunriseSunsetUser; import com.codecool.solarwatch.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java b/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java index 31f5ccf..1438774 100644 --- a/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java +++ b/backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java @@ -2,8 +2,8 @@ import com.codecool.solarwatch.DTO.*; import com.codecool.solarwatch.model.City; -import com.codecool.solarwatch.model.NoSuchCityException; -import com.codecool.solarwatch.model.NoSunriseSunsetDataException; +import com.codecool.solarwatch.exception.NoSuchCityException; +import com.codecool.solarwatch.exception.NoSunriseSunsetDataException; import com.codecool.solarwatch.model.SunriseSunsetTime; import com.codecool.solarwatch.repository.CityRepository; import com.codecool.solarwatch.repository.SunriseSunsetTimeRepository; diff --git a/backend/src/main/java/com/codecool/solarwatch/service/UserService.java b/backend/src/main/java/com/codecool/solarwatch/service/UserService.java index 12659dc..46417a5 100644 --- a/backend/src/main/java/com/codecool/solarwatch/service/UserService.java +++ b/backend/src/main/java/com/codecool/solarwatch/service/UserService.java @@ -3,10 +3,10 @@ import com.codecool.solarwatch.DTO.JwtResponseDTO; import com.codecool.solarwatch.DTO.UserCreateDTO; import com.codecool.solarwatch.DTO.UserLoginDTO; -import com.codecool.solarwatch.model.Role; -import com.codecool.solarwatch.model.RoleType; -import com.codecool.solarwatch.model.SunriseSunsetUser; -import com.codecool.solarwatch.model.UserAlreadyExistsException; +import com.codecool.solarwatch.model.user.Role; +import com.codecool.solarwatch.model.user.RoleType; +import com.codecool.solarwatch.model.user.SunriseSunsetUser; +import com.codecool.solarwatch.exception.UserAlreadyExistsException; import com.codecool.solarwatch.repository.RoleRepository; import com.codecool.solarwatch.repository.UserRepository; import com.codecool.solarwatch.security.jwt.JwtUtils; diff --git a/backend/src/test/java/com/codecool/solarwatch/controller/SolarWatchControllerTest.java b/backend/src/test/java/com/codecool/solarwatch/controller/SolarWatchControllerTest.java index 027b820..0441e96 100644 --- a/backend/src/test/java/com/codecool/solarwatch/controller/SolarWatchControllerTest.java +++ b/backend/src/test/java/com/codecool/solarwatch/controller/SolarWatchControllerTest.java @@ -1,9 +1,7 @@ package com.codecool.solarwatch.controller; import com.codecool.solarwatch.DTO.SunriseSunsetDTO; -import com.codecool.solarwatch.controller.SolarWatchController; -import com.codecool.solarwatch.controller.SolarWatchControllerAdvice; -import com.codecool.solarwatch.model.NoSuchCityException; +import com.codecool.solarwatch.exception.NoSuchCityException; import com.codecool.solarwatch.service.SolarWatchService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/codecool/solarwatch/integration/ProtectedEndpointIT.java b/backend/src/test/java/com/codecool/solarwatch/integration/ProtectedEndpointIT.java index b4d5803..9074af0 100644 --- a/backend/src/test/java/com/codecool/solarwatch/integration/ProtectedEndpointIT.java +++ b/backend/src/test/java/com/codecool/solarwatch/integration/ProtectedEndpointIT.java @@ -2,9 +2,9 @@ import com.codecool.solarwatch.DTO.JwtResponseDTO; import com.codecool.solarwatch.DTO.UserLoginDTO; -import com.codecool.solarwatch.model.Role; -import com.codecool.solarwatch.model.RoleType; -import com.codecool.solarwatch.model.SunriseSunsetUser; +import com.codecool.solarwatch.model.user.Role; +import com.codecool.solarwatch.model.user.RoleType; +import com.codecool.solarwatch.model.user.SunriseSunsetUser; import com.codecool.solarwatch.repository.RoleRepository; import com.codecool.solarwatch.repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/backend/src/test/java/com/codecool/solarwatch/integration/UserLoginIT.java b/backend/src/test/java/com/codecool/solarwatch/integration/UserLoginIT.java index 3182f90..4ab1e1a 100644 --- a/backend/src/test/java/com/codecool/solarwatch/integration/UserLoginIT.java +++ b/backend/src/test/java/com/codecool/solarwatch/integration/UserLoginIT.java @@ -1,9 +1,9 @@ package com.codecool.solarwatch.integration; import com.codecool.solarwatch.DTO.UserLoginDTO; -import com.codecool.solarwatch.model.Role; -import com.codecool.solarwatch.model.RoleType; -import com.codecool.solarwatch.model.SunriseSunsetUser; +import com.codecool.solarwatch.model.user.Role; +import com.codecool.solarwatch.model.user.RoleType; +import com.codecool.solarwatch.model.user.SunriseSunsetUser; import com.codecool.solarwatch.repository.RoleRepository; import com.codecool.solarwatch.repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/backend/src/test/java/com/codecool/solarwatch/integration/UserRegistrationIT.java b/backend/src/test/java/com/codecool/solarwatch/integration/UserRegistrationIT.java index 5c6f6f1..9050ebd 100644 --- a/backend/src/test/java/com/codecool/solarwatch/integration/UserRegistrationIT.java +++ b/backend/src/test/java/com/codecool/solarwatch/integration/UserRegistrationIT.java @@ -1,7 +1,7 @@ package com.codecool.solarwatch.integration; import com.codecool.solarwatch.DTO.UserCreateDTO; -import com.codecool.solarwatch.model.SunriseSunsetUser; +import com.codecool.solarwatch.model.user.SunriseSunsetUser; import com.codecool.solarwatch.repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/com/codecool/solarwatch/service/SolarWatchServiceTest.java b/backend/src/test/java/com/codecool/solarwatch/service/SolarWatchServiceTest.java index 24cb962..f3ac268 100644 --- a/backend/src/test/java/com/codecool/solarwatch/service/SolarWatchServiceTest.java +++ b/backend/src/test/java/com/codecool/solarwatch/service/SolarWatchServiceTest.java @@ -2,12 +2,11 @@ import com.codecool.solarwatch.DTO.*; import com.codecool.solarwatch.model.City; -import com.codecool.solarwatch.model.NoSuchCityException; -import com.codecool.solarwatch.model.NoSunriseSunsetDataException; +import com.codecool.solarwatch.exception.NoSuchCityException; +import com.codecool.solarwatch.exception.NoSunriseSunsetDataException; import com.codecool.solarwatch.model.SunriseSunsetTime; import com.codecool.solarwatch.repository.CityRepository; import com.codecool.solarwatch.repository.SunriseSunsetTimeRepository; -import com.codecool.solarwatch.service.SolarWatchService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;