diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/AuthenticationService.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/AuthenticationService.java index 02ce2be..e29704a 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/AuthenticationService.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/AuthenticationService.java @@ -2,7 +2,7 @@ package fr.itsonus.bousoleplussbackend.domain.auth; import fr.itsonus.bousoleplussbackend.domain.auth.model.User; import fr.itsonus.bousoleplussbackend.domain.auth.spi.UserCacheRepository; -import fr.itsonus.bousoleplussbackend.exception.NoCurrentUserException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.NoCurrentUserException; import lombok.AllArgsConstructor; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/InvalidPasswordException.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/InvalidPasswordException.java similarity index 71% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/InvalidPasswordException.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/InvalidPasswordException.java index 5ac3539..3d64c95 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/InvalidPasswordException.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/InvalidPasswordException.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.exception; +package fr.itsonus.bousoleplussbackend.domain.auth.exception; public class InvalidPasswordException extends RuntimeException { public InvalidPasswordException(String message) { diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/NoCurrentUserException.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/NoCurrentUserException.java similarity index 70% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/NoCurrentUserException.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/NoCurrentUserException.java index 785c912..f671609 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/NoCurrentUserException.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/NoCurrentUserException.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.exception; +package fr.itsonus.bousoleplussbackend.domain.auth.exception; public class NoCurrentUserException extends RuntimeException { public NoCurrentUserException() { diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/TokenRefreshException.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/TokenRefreshException.java similarity index 76% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/TokenRefreshException.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/TokenRefreshException.java index 97e0784..16c7102 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/TokenRefreshException.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/TokenRefreshException.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.exception; +package fr.itsonus.bousoleplussbackend.domain.auth.exception; public class TokenRefreshException extends RuntimeException { diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/UnknownEmailException.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/UnknownEmailException.java similarity index 70% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/UnknownEmailException.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/UnknownEmailException.java index 5caa6fa..4e5114c 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/UnknownEmailException.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/auth/exception/UnknownEmailException.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.exception; +package fr.itsonus.bousoleplussbackend.domain.auth.exception; public class UnknownEmailException extends RuntimeException { diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/quiz/spi/ResponseCacheRepository.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/quiz/spi/ResponseCacheRepository.java index bf74d7e..1a3a03b 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/quiz/spi/ResponseCacheRepository.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/domain/quiz/spi/ResponseCacheRepository.java @@ -2,7 +2,7 @@ package fr.itsonus.bousoleplussbackend.domain.quiz.spi; import fr.itsonus.bousoleplussbackend.domain.quiz.model.Quiz; import fr.itsonus.bousoleplussbackend.domain.quiz.model.QuizResponse; -import fr.itsonus.bousoleplussbackend.payload.request.ResponseRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.ResponseRequest; import java.util.List; import java.util.Set; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/postgres/repositories/ResponseCacheProxyRepository.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/postgres/repositories/ResponseCacheProxyRepository.java index 2ce4f6d..e937f50 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/postgres/repositories/ResponseCacheProxyRepository.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/postgres/repositories/ResponseCacheProxyRepository.java @@ -4,7 +4,7 @@ import fr.itsonus.bousoleplussbackend.domain.quiz.model.Quiz; import fr.itsonus.bousoleplussbackend.domain.quiz.model.QuizResponse; import fr.itsonus.bousoleplussbackend.domain.quiz.spi.ResponseCacheRepository; import fr.itsonus.bousoleplussbackend.infrastructure.postgres.models.PostgresQuizResponseDto; -import fr.itsonus.bousoleplussbackend.payload.request.ResponseRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.ResponseRequest; import jakarta.transaction.Transactional; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/advice/ErrorMessage.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/advice/ErrorMessage.java similarity index 78% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/advice/ErrorMessage.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/advice/ErrorMessage.java index 8dfa497..a599cef 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/advice/ErrorMessage.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/advice/ErrorMessage.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.advice; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.advice; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/advice/TokenControllerAdvice.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/advice/TokenControllerAdvice.java similarity index 83% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/advice/TokenControllerAdvice.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/advice/TokenControllerAdvice.java index cea6502..d96c897 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/advice/TokenControllerAdvice.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/advice/TokenControllerAdvice.java @@ -1,7 +1,7 @@ -package fr.itsonus.bousoleplussbackend.advice; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.advice; -import fr.itsonus.bousoleplussbackend.exception.TokenRefreshException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.TokenRefreshException; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/configuration/PersistenceConfiguration.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/configuration/PersistenceConfiguration.java similarity index 73% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/configuration/PersistenceConfiguration.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/configuration/PersistenceConfiguration.java index fd135f1..61ada9a 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/configuration/PersistenceConfiguration.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/configuration/PersistenceConfiguration.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.configuration; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.configuration; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/configuration/RestConfiguration.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/configuration/RestConfiguration.java similarity index 88% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/configuration/RestConfiguration.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/configuration/RestConfiguration.java index d583c60..f1572be 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/configuration/RestConfiguration.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/configuration/RestConfiguration.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.configuration; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.configuration; import org.springframework.context.annotation.Configuration; import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/handlers/ExceptionsHandler.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/exception/handlers/ExceptionsHandler.java similarity index 91% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/handlers/ExceptionsHandler.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/exception/handlers/ExceptionsHandler.java index a02b1dc..3e2e751 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/exception/handlers/ExceptionsHandler.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/exception/handlers/ExceptionsHandler.java @@ -1,11 +1,11 @@ -package fr.itsonus.bousoleplussbackend.exception.handlers; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.exception.handlers; import fr.itsonus.bousoleplussbackend.domain.auth.exception.AlreadyExistingUserException; -import fr.itsonus.bousoleplussbackend.exception.InvalidPasswordException; -import fr.itsonus.bousoleplussbackend.exception.NoCurrentUserException; -import fr.itsonus.bousoleplussbackend.exception.TokenRefreshException; -import fr.itsonus.bousoleplussbackend.payload.response.ApiError; -import fr.itsonus.bousoleplussbackend.exception.UnknownEmailException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.InvalidPasswordException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.NoCurrentUserException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.TokenRefreshException; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.response.ApiError; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.UnknownEmailException; import jakarta.validation.ConstraintViolationException; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.rest.webmvc.ResourceNotFoundException; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/CoreSecurityConfig.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/CoreSecurityConfig.java similarity index 96% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/CoreSecurityConfig.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/CoreSecurityConfig.java index 322df23..5d284b0 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/CoreSecurityConfig.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/CoreSecurityConfig.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.security; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/SecurityConfig.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/SecurityConfig.java similarity index 87% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/SecurityConfig.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/SecurityConfig.java index 66e8158..cc6be93 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/SecurityConfig.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/SecurityConfig.java @@ -1,9 +1,9 @@ -package fr.itsonus.bousoleplussbackend.security; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security; -import fr.itsonus.bousoleplussbackend.security.jwt.ExceptionHandlerFilter; -import fr.itsonus.bousoleplussbackend.security.jwt.JwtAuthenticationFilter; -import fr.itsonus.bousoleplussbackend.security.jwt.JwtGenerator; -import fr.itsonus.bousoleplussbackend.security.services.UserDetailsServiceImpl; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt.ExceptionHandlerFilter; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt.JwtAuthenticationFilter; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt.JwtGenerator; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.services.UserDetailsServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/SecurityConstants.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/SecurityConstants.java similarity index 88% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/SecurityConstants.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/SecurityConstants.java index 24841af..07a378d 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/SecurityConstants.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/SecurityConstants.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.security; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/ExceptionHandlerFilter.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/ExceptionHandlerFilter.java similarity index 92% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/ExceptionHandlerFilter.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/ExceptionHandlerFilter.java index 0e0be19..42e0af4 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/ExceptionHandlerFilter.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/ExceptionHandlerFilter.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.security.jwt; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/JwtAuthenticationFilter.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/JwtAuthenticationFilter.java similarity index 96% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/JwtAuthenticationFilter.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/JwtAuthenticationFilter.java index 2e8934d..98d64a1 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/JwtAuthenticationFilter.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/JwtAuthenticationFilter.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.security.jwt; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/JwtGenerator.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/JwtGenerator.java similarity index 93% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/JwtGenerator.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/JwtGenerator.java index c91204b..6dc0875 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/JwtGenerator.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/JwtGenerator.java @@ -1,6 +1,6 @@ -package fr.itsonus.bousoleplussbackend.security.jwt; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt; -import fr.itsonus.bousoleplussbackend.security.SecurityConstants; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.SecurityConstants; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; import org.springframework.beans.factory.annotation.Value; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/Token.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/Token.java similarity index 60% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/Token.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/Token.java index 1708f45..75c65d6 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/jwt/Token.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/jwt/Token.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.security.jwt; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt; import java.time.Instant; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/RefreshTokenService.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/RefreshTokenService.java similarity index 93% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/RefreshTokenService.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/RefreshTokenService.java index 938165d..e6904d1 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/RefreshTokenService.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/RefreshTokenService.java @@ -1,9 +1,9 @@ -package fr.itsonus.bousoleplussbackend.security.services; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security.services; import fr.itsonus.bousoleplussbackend.domain.auth.model.RefreshToken; import fr.itsonus.bousoleplussbackend.domain.auth.spi.RefreshTokenCacheRepository; import fr.itsonus.bousoleplussbackend.domain.auth.spi.UserCacheRepository; -import fr.itsonus.bousoleplussbackend.exception.TokenRefreshException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.TokenRefreshException; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/UserDetailsImpl.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/UserDetailsImpl.java similarity index 95% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/UserDetailsImpl.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/UserDetailsImpl.java index 18b6dea..138a7f7 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/UserDetailsImpl.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/UserDetailsImpl.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.security.services; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security.services; import com.fasterxml.jackson.annotation.JsonIgnore; import fr.itsonus.bousoleplussbackend.domain.auth.model.User; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/UserDetailsServiceImpl.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/UserDetailsServiceImpl.java similarity index 91% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/UserDetailsServiceImpl.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/UserDetailsServiceImpl.java index c4acb67..455a976 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/security/services/UserDetailsServiceImpl.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/security/services/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.security.services; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.security.services; import fr.itsonus.bousoleplussbackend.domain.auth.spi.UserCacheRepository; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AccountController.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AccountController.java similarity index 76% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AccountController.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AccountController.java index a823ee0..cd68729 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AccountController.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AccountController.java @@ -1,9 +1,9 @@ -package fr.itsonus.bousoleplussbackend.controllers; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.controllers; -import fr.itsonus.bousoleplussbackend.payload.request.NotifyPasswordResetRequest; -import fr.itsonus.bousoleplussbackend.payload.request.ResetPasswordRequest; -import fr.itsonus.bousoleplussbackend.payload.request.UpdateAccountRequest; -import fr.itsonus.bousoleplussbackend.payload.request.UpdatePasswordRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.NotifyPasswordResetRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.ResetPasswordRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.UpdateAccountRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.UpdatePasswordRequest; import fr.itsonus.bousoleplussbackend.usecase.UserPasswordResetUseCase; import fr.itsonus.bousoleplussbackend.usecase.UserUpdateUseCase; import jakarta.validation.Valid; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AuthController.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AuthController.java similarity index 78% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AuthController.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AuthController.java index 35d3972..a15c4cf 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AuthController.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AuthController.java @@ -1,17 +1,17 @@ -package fr.itsonus.bousoleplussbackend.controllers; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.controllers; import fr.itsonus.bousoleplussbackend.domain.auth.AuthenticationService; import fr.itsonus.bousoleplussbackend.domain.auth.model.RefreshToken; import fr.itsonus.bousoleplussbackend.domain.auth.model.User; -import fr.itsonus.bousoleplussbackend.exception.TokenRefreshException; -import fr.itsonus.bousoleplussbackend.payload.request.LogOutRequest; -import fr.itsonus.bousoleplussbackend.payload.request.LoginRequest; -import fr.itsonus.bousoleplussbackend.payload.request.RegisterRequest; -import fr.itsonus.bousoleplussbackend.payload.request.TokenRefreshRequest; -import fr.itsonus.bousoleplussbackend.payload.response.JwtResponse; -import fr.itsonus.bousoleplussbackend.security.jwt.JwtGenerator; -import fr.itsonus.bousoleplussbackend.security.services.RefreshTokenService; -import fr.itsonus.bousoleplussbackend.security.services.UserDetailsImpl; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.TokenRefreshException; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.LogOutRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.LoginRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.RegisterRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.TokenRefreshRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.response.JwtResponse; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt.JwtGenerator; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.services.RefreshTokenService; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.services.UserDetailsImpl; import fr.itsonus.bousoleplussbackend.usecase.UserCreationUseCase; import jakarta.validation.Valid; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AxeController.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AxeController.java similarity index 88% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AxeController.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AxeController.java index d7915e0..12d4d08 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/AxeController.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/AxeController.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.controllers; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.controllers; import fr.itsonus.bousoleplussbackend.domain.quiz.model.Axe; import fr.itsonus.bousoleplussbackend.usecase.AxeUseCase; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/BundleController.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/BundleController.java similarity index 90% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/BundleController.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/BundleController.java index b6c44c8..cbb2b2e 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/BundleController.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/BundleController.java @@ -1,8 +1,8 @@ -package fr.itsonus.bousoleplussbackend.controllers; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.controllers; import fr.itsonus.bousoleplussbackend.domain.quiz.model.Bundle; import fr.itsonus.bousoleplussbackend.domain.quiz.model.Question; -import fr.itsonus.bousoleplussbackend.payload.request.BundleCreationRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.BundleCreationRequest; import fr.itsonus.bousoleplussbackend.usecase.BundleUseCase; import jakarta.validation.Valid; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/QuestionController.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/QuestionController.java similarity index 92% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/QuestionController.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/QuestionController.java index fefb706..2c49b3e 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/QuestionController.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/QuestionController.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.controllers; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.controllers; import fr.itsonus.bousoleplussbackend.domain.quiz.model.Question; import fr.itsonus.bousoleplussbackend.usecase.QuestionUseCase; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/QuizController.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/QuizController.java similarity index 89% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/QuizController.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/QuizController.java index 3647d90..9dcdcc6 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/controllers/QuizController.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/controllers/QuizController.java @@ -1,8 +1,8 @@ -package fr.itsonus.bousoleplussbackend.controllers; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.controllers; import fr.itsonus.bousoleplussbackend.domain.quiz.model.Quiz; import fr.itsonus.bousoleplussbackend.domain.quiz.model.QuizDetailed; -import fr.itsonus.bousoleplussbackend.payload.request.QuizRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.QuizRequest; import fr.itsonus.bousoleplussbackend.usecase.QuizUseCase; import jakarta.validation.Valid; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/BundleCreationRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/BundleCreationRequest.java similarity index 92% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/BundleCreationRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/BundleCreationRequest.java index 669db61..654a37f 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/BundleCreationRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/BundleCreationRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import fr.itsonus.bousoleplussbackend.domain.quiz.model.Question; import jakarta.validation.Valid; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/LogOutRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/LogOutRequest.java similarity index 50% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/LogOutRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/LogOutRequest.java index a9da9db..599b4b3 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/LogOutRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/LogOutRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/LoginRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/LoginRequest.java similarity index 75% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/LoginRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/LoginRequest.java index f7fd5ff..8c26757 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/LoginRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/LoginRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/NotifyPasswordResetRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/NotifyPasswordResetRequest.java similarity index 57% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/NotifyPasswordResetRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/NotifyPasswordResetRequest.java index ef67ead..fcd0e91 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/NotifyPasswordResetRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/NotifyPasswordResetRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import jakarta.validation.constraints.Email; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/QuizRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/QuizRequest.java similarity index 77% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/QuizRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/QuizRequest.java index bd8823b..8494131 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/QuizRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/QuizRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/RegisterRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/RegisterRequest.java similarity index 78% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/RegisterRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/RegisterRequest.java index 5623c52..aa9c067 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/RegisterRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/RegisterRequest.java @@ -1,7 +1,7 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import fr.itsonus.bousoleplussbackend.domain.auth.model.User; -import fr.itsonus.bousoleplussbackend.payload.validation.Password; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.validation.Password; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/ResetPasswordRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/ResetPasswordRequest.java similarity index 65% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/ResetPasswordRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/ResetPasswordRequest.java index cce13a0..1931f31 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/ResetPasswordRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/ResetPasswordRequest.java @@ -1,6 +1,6 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; -import fr.itsonus.bousoleplussbackend.payload.validation.Password; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.validation.Password; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/ResponseRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/ResponseRequest.java similarity index 72% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/ResponseRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/ResponseRequest.java index 6a4d78e..a9cbd32 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/ResponseRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/ResponseRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/TokenRefreshRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/TokenRefreshRequest.java similarity index 66% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/TokenRefreshRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/TokenRefreshRequest.java index abef59d..57145d8 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/TokenRefreshRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/TokenRefreshRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/UpdateAccountRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/UpdateAccountRequest.java similarity index 74% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/UpdateAccountRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/UpdateAccountRequest.java index caf2999..d27ce49 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/UpdateAccountRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/UpdateAccountRequest.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/UpdatePasswordRequest.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/UpdatePasswordRequest.java similarity index 61% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/UpdatePasswordRequest.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/UpdatePasswordRequest.java index 68437ad..b938756 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/request/UpdatePasswordRequest.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/request/UpdatePasswordRequest.java @@ -1,6 +1,6 @@ -package fr.itsonus.bousoleplussbackend.payload.request; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request; -import fr.itsonus.bousoleplussbackend.payload.validation.Password; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.validation.Password; import jakarta.validation.constraints.NotBlank; public record UpdatePasswordRequest(@NotBlank String currentPassword, diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/ApiError.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/ApiError.java similarity index 90% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/ApiError.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/ApiError.java index 28fb75e..560bfa9 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/ApiError.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/ApiError.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.response; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.response; import com.fasterxml.jackson.annotation.JsonInclude; import org.springframework.http.HttpStatus; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/AxeWithQuestion.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/AxeWithQuestion.java similarity index 85% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/AxeWithQuestion.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/AxeWithQuestion.java index de7f4ea..b492ca5 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/AxeWithQuestion.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/AxeWithQuestion.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.response; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.response; import fr.itsonus.bousoleplussbackend.infrastructure.postgres.models.PostgresQuestionDto; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/JwtResponse.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/JwtResponse.java similarity index 50% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/JwtResponse.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/JwtResponse.java index 516c1aa..2975905 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/JwtResponse.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/JwtResponse.java @@ -1,6 +1,6 @@ -package fr.itsonus.bousoleplussbackend.payload.response; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.response; -import fr.itsonus.bousoleplussbackend.security.jwt.Token; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt.Token; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/MessageResponse.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/MessageResponse.java similarity index 63% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/MessageResponse.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/MessageResponse.java index c544f3a..634d3f1 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/MessageResponse.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/MessageResponse.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.response; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/TokenRefreshResponse.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/TokenRefreshResponse.java similarity index 72% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/TokenRefreshResponse.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/TokenRefreshResponse.java index c4092db..379f17c 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/response/TokenRefreshResponse.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/response/TokenRefreshResponse.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.response; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/validation/Password.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/validation/Password.java similarity index 90% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/validation/Password.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/validation/Password.java index 3465273..2f89bfd 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/validation/Password.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/validation/Password.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.validation; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.validation; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/validation/PasswordConstraintValidator.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/validation/PasswordConstraintValidator.java similarity index 83% rename from backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/validation/PasswordConstraintValidator.java rename to backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/validation/PasswordConstraintValidator.java index 6b502ff..c0d8484 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/payload/validation/PasswordConstraintValidator.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/infrastructure/spring/web/payload/validation/PasswordConstraintValidator.java @@ -1,4 +1,4 @@ -package fr.itsonus.bousoleplussbackend.payload.validation; +package fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.validation; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/QuizUseCase.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/QuizUseCase.java index 41805b2..e8c896a 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/QuizUseCase.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/QuizUseCase.java @@ -5,7 +5,7 @@ import fr.itsonus.bousoleplussbackend.domain.quiz.model.Quiz; import fr.itsonus.bousoleplussbackend.domain.quiz.model.QuizDetailed; import fr.itsonus.bousoleplussbackend.infrastructure.postgres.repositories.QuizCacheProxyRepository; import fr.itsonus.bousoleplussbackend.infrastructure.postgres.repositories.ResponseCacheProxyRepository; -import fr.itsonus.bousoleplussbackend.payload.request.QuizRequest; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.web.payload.request.QuizRequest; import jakarta.transaction.Transactional; import jakarta.validation.Valid; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserPasswordResetUseCase.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserPasswordResetUseCase.java index 958f361..c3043d9 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserPasswordResetUseCase.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserPasswordResetUseCase.java @@ -2,9 +2,9 @@ package fr.itsonus.bousoleplussbackend.usecase; import fr.itsonus.bousoleplussbackend.domain.auth.spi.UserCacheRepository; import fr.itsonus.bousoleplussbackend.domain.notification.NotificationService; -import fr.itsonus.bousoleplussbackend.exception.InvalidPasswordException; -import fr.itsonus.bousoleplussbackend.exception.UnknownEmailException; -import fr.itsonus.bousoleplussbackend.security.jwt.JwtGenerator; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.InvalidPasswordException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.UnknownEmailException; +import fr.itsonus.bousoleplussbackend.infrastructure.spring.security.jwt.JwtGenerator; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserUpdateUseCase.java b/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserUpdateUseCase.java index ca4827b..daf998e 100644 --- a/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserUpdateUseCase.java +++ b/backend/src/main/java/fr/itsonus/bousoleplussbackend/usecase/UserUpdateUseCase.java @@ -2,7 +2,7 @@ package fr.itsonus.bousoleplussbackend.usecase; import fr.itsonus.bousoleplussbackend.domain.auth.AuthenticationService; import fr.itsonus.bousoleplussbackend.domain.auth.spi.UserCacheRepository; -import fr.itsonus.bousoleplussbackend.exception.InvalidPasswordException; +import fr.itsonus.bousoleplussbackend.domain.auth.exception.InvalidPasswordException; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service;