refactor: change package structure for spot_references, change auth p…

…ackage name

src/main/java/com/shulpov/spots_app/auth/auth_providers/LoginPasswordAuthenticationProvider.java → src/main/java/com/shulpov/spots_app/auth_management/auth_providers/LoginPasswordAuthenticationProvider.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.auth_providers;
+package com.shulpov.spots_app.auth_management.auth_providers;
 
 import com.shulpov.spots_app.user.User;
 import org.slf4j.Logger;

src/main/java/com/shulpov/spots_app/auth/controllers/AuthenticationController.java → src/main/java/com/shulpov/spots_app/auth_management/controllers/AuthenticationController.java

@@ -1,13 +1,13 @@
-package com.shulpov.spots_app.auth.controllers;
+package com.shulpov.spots_app.auth_management.controllers;
 
-import com.shulpov.spots_app.auth.exceptions.RegisterErrorException;
-import com.shulpov.spots_app.auth.requests.AuthenticationRequest;
-import com.shulpov.spots_app.auth.requests.RegisterRequest;
-import com.shulpov.spots_app.auth.responses.AuthenticationResponse;
-import com.shulpov.spots_app.auth.responses.LogoutMessageResponse;
-import com.shulpov.spots_app.auth.responses.RegisterErrorResponse;
-import com.shulpov.spots_app.auth.responses.RegisterResponse;
-import com.shulpov.spots_app.auth.services.AuthenticationService;
+import com.shulpov.spots_app.auth_management.exceptions.RegisterErrorException;
+import com.shulpov.spots_app.auth_management.requests.AuthenticationRequest;
+import com.shulpov.spots_app.auth_management.requests.RegisterRequest;
+import com.shulpov.spots_app.auth_management.responses.AuthenticationResponse;
+import com.shulpov.spots_app.auth_management.responses.LogoutMessageResponse;
+import com.shulpov.spots_app.auth_management.responses.RegisterErrorResponse;
+import com.shulpov.spots_app.auth_management.responses.RegisterResponse;
+import com.shulpov.spots_app.auth_management.services.AuthenticationService;
 import com.shulpov.spots_app.dto.FieldErrorDto;
 import com.shulpov.spots_app.responses.ErrorMessageResponse;
 import com.shulpov.spots_app.utils.DtoConverter;

src/main/java/com/shulpov/spots_app/auth/exceptions/RegisterErrorException.java → src/main/java/com/shulpov/spots_app/auth_management/exceptions/RegisterErrorException.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.exceptions;
+package com.shulpov.spots_app.auth_management.exceptions;
 
 import lombok.Getter;
 import org.springframework.validation.FieldError;

src/main/java/com/shulpov/spots_app/auth/filters/JwtAuthenticationFilter.java → src/main/java/com/shulpov/spots_app/auth_management/filters/JwtAuthenticationFilter.java

@@ -1,6 +1,6 @@
-package com.shulpov.spots_app.auth.filters;
+package com.shulpov.spots_app.auth_management.filters;
 
-import com.shulpov.spots_app.auth.services.JwtService;
+import com.shulpov.spots_app.auth_management.services.JwtService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/shulpov/spots_app/auth/requests/AuthenticationRequest.java → src/main/java/com/shulpov/spots_app/auth_management/requests/AuthenticationRequest.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.requests;
+package com.shulpov.spots_app.auth_management.requests;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/shulpov/spots_app/auth/requests/RegisterRequest.java → src/main/java/com/shulpov/spots_app/auth_management/requests/RegisterRequest.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.requests;
+package com.shulpov.spots_app.auth_management.requests;
 
 import jakarta.validation.constraints.*;
 import lombok.AllArgsConstructor;

src/main/java/com/shulpov/spots_app/auth/responses/AuthenticationResponse.java → src/main/java/com/shulpov/spots_app/auth_management/responses/AuthenticationResponse.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.responses;
+package com.shulpov.spots_app.auth_management.responses;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;

src/main/java/com/shulpov/spots_app/auth/responses/LogoutMessageResponse.java → src/main/java/com/shulpov/spots_app/auth_management/responses/LogoutMessageResponse.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.responses;
+package com.shulpov.spots_app.auth_management.responses;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;

src/main/java/com/shulpov/spots_app/auth/responses/RegisterErrorResponse.java → src/main/java/com/shulpov/spots_app/auth_management/responses/RegisterErrorResponse.java

@@ -1,11 +1,10 @@
-package com.shulpov.spots_app.auth.responses;
+package com.shulpov.spots_app.auth_management.responses;
 
 import com.shulpov.spots_app.responses.ValidationErrorResponse;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
-@Data
+@Getter
+@Setter
 @AllArgsConstructor
 @NoArgsConstructor
 public class RegisterErrorResponse extends ValidationErrorResponse {

src/main/java/com/shulpov/spots_app/auth/responses/RegisterResponse.java → src/main/java/com/shulpov/spots_app/auth_management/responses/RegisterResponse.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.responses;
+package com.shulpov.spots_app.auth_management.responses;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/shulpov/spots_app/auth/services/AuthenticationService.java → src/main/java/com/shulpov/spots_app/auth_management/services/AuthenticationService.java

@@ -1,16 +1,16 @@
-package com.shulpov.spots_app.auth.services;
+package com.shulpov.spots_app.auth_management.services;
 
-import com.shulpov.spots_app.auth.exceptions.RegisterErrorException;
-import com.shulpov.spots_app.auth.requests.AuthenticationRequest;
-import com.shulpov.spots_app.auth.requests.RegisterRequest;
-import com.shulpov.spots_app.auth.responses.AuthenticationResponse;
-import com.shulpov.spots_app.auth.responses.LogoutMessageResponse;
-import com.shulpov.spots_app.auth.responses.RegisterResponse;
-import com.shulpov.spots_app.auth.token.Token;
-import com.shulpov.spots_app.auth.token.TokenRepository;
-import com.shulpov.spots_app.auth.token.TokenService;
-import com.shulpov.spots_app.auth.token.TokenType;
-import com.shulpov.spots_app.auth.validators.UserValidator;
+import com.shulpov.spots_app.auth_management.exceptions.RegisterErrorException;
+import com.shulpov.spots_app.auth_management.requests.AuthenticationRequest;
+import com.shulpov.spots_app.auth_management.requests.RegisterRequest;
+import com.shulpov.spots_app.auth_management.responses.AuthenticationResponse;
+import com.shulpov.spots_app.auth_management.responses.LogoutMessageResponse;
+import com.shulpov.spots_app.auth_management.responses.RegisterResponse;
+import com.shulpov.spots_app.auth_management.token.Token;
+import com.shulpov.spots_app.auth_management.token.TokenRepository;
+import com.shulpov.spots_app.auth_management.token.TokenService;
+import com.shulpov.spots_app.auth_management.token.TokenType;
+import com.shulpov.spots_app.auth_management.validators.UserValidator;
 import com.shulpov.spots_app.user.Role;
 import com.shulpov.spots_app.user.User;
 import com.shulpov.spots_app.user.UserRepository;

src/main/java/com/shulpov/spots_app/auth/services/JwtService.java → src/main/java/com/shulpov/spots_app/auth_management/services/JwtService.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.services;
+package com.shulpov.spots_app.auth_management.services;
 
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.io.Decoders;

src/main/java/com/shulpov/spots_app/auth/token/Token.java → src/main/java/com/shulpov/spots_app/auth_management/token/Token.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.token;
+package com.shulpov.spots_app.auth_management.token;
 
 import com.shulpov.spots_app.user.User;
 import jakarta.persistence.*;

src/main/java/com/shulpov/spots_app/auth/token/TokenRepository.java → src/main/java/com/shulpov/spots_app/auth_management/token/TokenRepository.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.token;
+package com.shulpov.spots_app.auth_management.token;
 
 import com.shulpov.spots_app.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/shulpov/spots_app/auth/token/TokenService.java → src/main/java/com/shulpov/spots_app/auth_management/token/TokenService.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.token;
+package com.shulpov.spots_app.auth_management.token;
 
 import org.springframework.stereotype.Service;
 

src/main/java/com/shulpov/spots_app/auth/token/TokenType.java → src/main/java/com/shulpov/spots_app/auth_management/token/TokenType.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.auth.token;
+package com.shulpov.spots_app.auth_management.token;
 
 public enum TokenType {
     //    BEARER,

src/main/java/com/shulpov/spots_app/auth/validators/UserValidator.java → src/main/java/com/shulpov/spots_app/auth_management/validators/UserValidator.java

@@ -1,10 +1,11 @@
-package com.shulpov.spots_app.auth.validators;
+package com.shulpov.spots_app.auth_management.validators;
 
 import com.shulpov.spots_app.services.UserService;
 import com.shulpov.spots_app.user.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNullApi;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;

src/main/java/com/shulpov/spots_app/configs/SecurityConfig.java

@@ -1,7 +1,7 @@
 package com.shulpov.spots_app.configs;
 
-import com.shulpov.spots_app.auth.auth_providers.LoginPasswordAuthenticationProvider;
-import com.shulpov.spots_app.auth.filters.JwtAuthenticationFilter;
+import com.shulpov.spots_app.auth_management.auth_providers.LoginPasswordAuthenticationProvider;
+import com.shulpov.spots_app.auth_management.filters.JwtAuthenticationFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;

src/main/java/com/shulpov/spots_app/models/Spot.java

@@ -1,6 +1,9 @@
 package com.shulpov.spots_app.models;
 
 import com.shulpov.spots_app.location.models.City;
+import com.shulpov.spots_app.spot_references.models.SpaceType;
+import com.shulpov.spots_app.spot_references.models.SportType;
+import com.shulpov.spots_app.spot_references.models.SpotType;
 import com.shulpov.spots_app.user.User;
 import jakarta.persistence.*;
 

src/main/java/com/shulpov/spots_app/controllers/SpaceTypeController.java → src/main/java/com/shulpov/spots_app/spot_references/controllers/SpaceTypeController.java

@@ -1,8 +1,8 @@
-package com.shulpov.spots_app.controllers;
+package com.shulpov.spots_app.spot_references.controllers;
 
-import com.shulpov.spots_app.dto.SpaceTypeDto;
-import com.shulpov.spots_app.models.SpaceType;
-import com.shulpov.spots_app.services.SpaceTypeService;
+import com.shulpov.spots_app.spot_references.dto.SpaceTypeDto;
+import com.shulpov.spots_app.spot_references.models.SpaceType;
+import com.shulpov.spots_app.spot_references.services.SpaceTypeService;
 import com.shulpov.spots_app.utils.DtoConverter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/shulpov/spots_app/controllers/SportTypeController.java → src/main/java/com/shulpov/spots_app/spot_references/controllers/SportTypeController.java

@@ -1,8 +1,8 @@
-package com.shulpov.spots_app.controllers;
+package com.shulpov.spots_app.spot_references.controllers;
 
-import com.shulpov.spots_app.dto.SportTypeDto;
-import com.shulpov.spots_app.models.SportType;
-import com.shulpov.spots_app.services.SportTypeService;
+import com.shulpov.spots_app.spot_references.dto.SportTypeDto;
+import com.shulpov.spots_app.spot_references.models.SportType;
+import com.shulpov.spots_app.spot_references.services.SportTypeService;
 import com.shulpov.spots_app.utils.DtoConverter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/shulpov/spots_app/controllers/SpotTypeController.java → src/main/java/com/shulpov/spots_app/spot_references/controllers/SpotTypeController.java

@@ -1,8 +1,8 @@
-package com.shulpov.spots_app.controllers;
+package com.shulpov.spots_app.spot_references.controllers;
 
-import com.shulpov.spots_app.dto.SpotTypeDto;
-import com.shulpov.spots_app.models.SpotType;
-import com.shulpov.spots_app.services.SpotTypeService;
+import com.shulpov.spots_app.spot_references.dto.SpotTypeDto;
+import com.shulpov.spots_app.spot_references.models.SpotType;
+import com.shulpov.spots_app.spot_references.services.SpotTypeService;
 import com.shulpov.spots_app.utils.DtoConverter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/shulpov/spots_app/dto/SpaceTypeDto.java → src/main/java/com/shulpov/spots_app/spot_references/dto/SpaceTypeDto.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.dto;
+package com.shulpov.spots_app.spot_references.dto;
 
 public class SpaceTypeDto {
     private Integer id;

src/main/java/com/shulpov/spots_app/dto/SportTypeDto.java → src/main/java/com/shulpov/spots_app/spot_references/dto/SportTypeDto.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.dto;
+package com.shulpov.spots_app.spot_references.dto;
 
 public class SportTypeDto {
     private Integer id;

src/main/java/com/shulpov/spots_app/dto/SpotTypeDto.java → src/main/java/com/shulpov/spots_app/spot_references/dto/SpotTypeDto.java

@@ -1,4 +1,4 @@
-package com.shulpov.spots_app.dto;
+package com.shulpov.spots_app.spot_references.dto;
 
 public class SpotTypeDto {
 

src/main/java/com/shulpov/spots_app/models/SpaceType.java → src/main/java/com/shulpov/spots_app/spot_references/models/SpaceType.java

@@ -1,6 +1,7 @@
-package com.shulpov.spots_app.models;
+package com.shulpov.spots_app.spot_references.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.shulpov.spots_app.models.Spot;
 import jakarta.persistence.*;
 
 import java.util.List;

src/main/java/com/shulpov/spots_app/models/SportType.java → src/main/java/com/shulpov/spots_app/spot_references/models/SportType.java

@@ -1,6 +1,7 @@
-package com.shulpov.spots_app.models;
+package com.shulpov.spots_app.spot_references.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.shulpov.spots_app.models.Spot;
 import jakarta.persistence.*;
 
 import java.util.List;

src/main/java/com/shulpov/spots_app/models/SpotType.java → src/main/java/com/shulpov/spots_app/spot_references/models/SpotType.java

@@ -1,6 +1,7 @@
-package com.shulpov.spots_app.models;
+package com.shulpov.spots_app.spot_references.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.shulpov.spots_app.models.Spot;
 import jakarta.persistence.*;
 
 import java.util.List;

src/main/java/com/shulpov/spots_app/repo/SpaceTypeRepo.java → src/main/java/com/shulpov/spots_app/spot_references/repo/SpaceTypeRepo.java

@@ -1,6 +1,6 @@
-package com.shulpov.spots_app.repo;
+package com.shulpov.spots_app.spot_references.repo;
 
-import com.shulpov.spots_app.models.SpaceType;
+import com.shulpov.spots_app.spot_references.models.SpaceType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/shulpov/spots_app/repo/SportTypeRepo.java → src/main/java/com/shulpov/spots_app/spot_references/repo/SportTypeRepo.java

@@ -1,6 +1,6 @@
-package com.shulpov.spots_app.repo;
+package com.shulpov.spots_app.spot_references.repo;
 
-import com.shulpov.spots_app.models.SportType;
+import com.shulpov.spots_app.spot_references.models.SportType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/shulpov/spots_app/repo/SpotTypeRepo.java → src/main/java/com/shulpov/spots_app/spot_references/repo/SpotTypeRepo.java

@@ -1,6 +1,6 @@
-package com.shulpov.spots_app.repo;
+package com.shulpov.spots_app.spot_references.repo;
 
-import com.shulpov.spots_app.models.SpotType;
+import com.shulpov.spots_app.spot_references.models.SpotType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/shulpov/spots_app/services/SpaceTypeService.java → src/main/java/com/shulpov/spots_app/spot_references/services/SpaceTypeService.java

@@ -1,7 +1,7 @@
-package com.shulpov.spots_app.services;
+package com.shulpov.spots_app.spot_references.services;
 
-import com.shulpov.spots_app.models.SpaceType;
-import com.shulpov.spots_app.repo.SpaceTypeRepo;
+import com.shulpov.spots_app.spot_references.models.SpaceType;
+import com.shulpov.spots_app.spot_references.repo.SpaceTypeRepo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/shulpov/spots_app/services/SportTypeService.java → src/main/java/com/shulpov/spots_app/spot_references/services/SportTypeService.java

@@ -1,7 +1,7 @@
-package com.shulpov.spots_app.services;
+package com.shulpov.spots_app.spot_references.services;
 
-import com.shulpov.spots_app.models.SportType;
-import com.shulpov.spots_app.repo.SportTypeRepo;
+import com.shulpov.spots_app.spot_references.models.SportType;
+import com.shulpov.spots_app.spot_references.repo.SportTypeRepo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/shulpov/spots_app/services/SpotTypeService.java → src/main/java/com/shulpov/spots_app/spot_references/services/SpotTypeService.java

@@ -1,7 +1,7 @@
-package com.shulpov.spots_app.services;
+package com.shulpov.spots_app.spot_references.services;
 
-import com.shulpov.spots_app.models.SpotType;
-import com.shulpov.spots_app.repo.SpotTypeRepo;
+import com.shulpov.spots_app.spot_references.models.SpotType;
+import com.shulpov.spots_app.spot_references.repo.SpotTypeRepo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/shulpov/spots_app/user/User.java

@@ -1,6 +1,6 @@
 package com.shulpov.spots_app.user;
 
-import com.shulpov.spots_app.auth.token.Token;
+import com.shulpov.spots_app.auth_management.token.Token;
 import com.shulpov.spots_app.location.models.City;
 import com.shulpov.spots_app.models.*;
 import jakarta.persistence.*;

src/main/java/com/shulpov/spots_app/utils/DtoConverter.java

@@ -9,6 +9,15 @@
 import com.shulpov.spots_app.location.models.Region;
 import com.shulpov.spots_app.models.*;
 import com.shulpov.spots_app.services.*;
+import com.shulpov.spots_app.spot_references.dto.SpaceTypeDto;
+import com.shulpov.spots_app.spot_references.dto.SportTypeDto;
+import com.shulpov.spots_app.spot_references.dto.SpotTypeDto;
+import com.shulpov.spots_app.spot_references.models.SpaceType;
+import com.shulpov.spots_app.spot_references.models.SportType;
+import com.shulpov.spots_app.spot_references.models.SpotType;
+import com.shulpov.spots_app.spot_references.services.SpaceTypeService;
+import com.shulpov.spots_app.spot_references.services.SportTypeService;
+import com.shulpov.spots_app.spot_references.services.SpotTypeService;
 import com.shulpov.spots_app.user.Role;
 import com.shulpov.spots_app.user.User;
 import org.modelmapper.ModelMapper;
@@ -38,11 +47,11 @@ public class DtoConverter {
     /** Компонент маппинга классов */
     private final  ModelMapper modelMapper;
     /** Сервис типов помещений */
-    private final  SpaceTypeService spaceTypeService;
+    private final SpaceTypeService spaceTypeService;
     /** Сервис типов спотов */
-    private final  SpotTypeService spotTypeService;
+    private final SpotTypeService spotTypeService;
     /** Сервис типов спорта */
-    private final  SportTypeService sportTypeService;
+    private final SportTypeService sportTypeService;
     /** Сервис управления данными между пользователями и спотами */
     private final SpotUserService spotUserService;
 

src/test/java/com/shulpov/spots_app/AuthTests.java

@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.shulpov.spots_app.auth.responses.AuthenticationResponse;
-import com.shulpov.spots_app.auth.token.Token;
-import com.shulpov.spots_app.auth.token.TokenService;
+import com.shulpov.spots_app.auth_management.responses.AuthenticationResponse;
+import com.shulpov.spots_app.auth_management.token.Token;
+import com.shulpov.spots_app.auth_management.token.TokenService;
 import com.shulpov.spots_app.db_cleaner.DBCleaner;
 import com.shulpov.spots_app.responses.ErrorMessageResponse;
 import com.shulpov.spots_app.services.UserService;