change services location

Took 26 minutes

src/main/java/com/github/gribanoveu/cuddle/controllers/anonymous/AuthenticationControllerImpl.java

@@ -5,8 +5,8 @@
 import com.github.gribanoveu.cuddle.dtos.request.LoginDto;
 import com.github.gribanoveu.cuddle.dtos.request.RefreshTokenDto;
 import com.github.gribanoveu.cuddle.dtos.response.auth.TokenResponse;
-import com.github.gribanoveu.cuddle.entities.services.email.EmailService;
-import com.github.gribanoveu.cuddle.entities.services.token.TokenService;
+import com.github.gribanoveu.cuddle.entities.services.EmailService;
+import com.github.gribanoveu.cuddle.entities.services.TokenService;
 import com.github.gribanoveu.cuddle.security.CustomUserDetails;
 import com.github.gribanoveu.cuddle.security.CustomUserDetailsService;
 import com.github.gribanoveu.cuddle.utils.RefreshTokenUtils;

src/main/java/com/github/gribanoveu/cuddle/controllers/anonymous/PublicAccountControllerImpl.java

@@ -9,9 +9,9 @@
 import com.github.gribanoveu.cuddle.dtos.request.*;
 import com.github.gribanoveu.cuddle.dtos.response.ResponseDetails;
 import com.github.gribanoveu.cuddle.dtos.response.StatusResponse;
-import com.github.gribanoveu.cuddle.entities.services.email.EmailService;
-import com.github.gribanoveu.cuddle.entities.services.otp.RedisOtpService;
-import com.github.gribanoveu.cuddle.entities.services.user.UserService;
+import com.github.gribanoveu.cuddle.entities.services.EmailService;
+import com.github.gribanoveu.cuddle.entities.services.RedisOtpService;
+import com.github.gribanoveu.cuddle.entities.services.UserService;
 import com.github.gribanoveu.cuddle.entities.tables.User;
 import com.github.gribanoveu.cuddle.exeptions.CredentialEx;
 import com.github.gribanoveu.cuddle.utils.JsonUtils;

src/main/java/com/github/gribanoveu/cuddle/controllers/secure/ModeratorControllerImpl.java

@@ -9,8 +9,8 @@
 import com.github.gribanoveu.cuddle.dtos.request.RestrictionDto;
 import com.github.gribanoveu.cuddle.dtos.response.StatusResponse;
 import com.github.gribanoveu.cuddle.dtos.response.auth.UsersResponse;
-import com.github.gribanoveu.cuddle.entities.services.email.EmailService;
-import com.github.gribanoveu.cuddle.entities.services.user.UserService;
+import com.github.gribanoveu.cuddle.entities.services.EmailService;
+import com.github.gribanoveu.cuddle.entities.services.UserService;
 import com.github.gribanoveu.cuddle.utils.emails.EmailTemplates;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/github/gribanoveu/cuddle/controllers/secure/UserControllerImpl.java

@@ -4,8 +4,8 @@
 import com.github.gribanoveu.cuddle.dtos.enums.ResponseCode;
 import com.github.gribanoveu.cuddle.dtos.enums.StatusLevel;
 import com.github.gribanoveu.cuddle.dtos.response.StatusResponse;
-import com.github.gribanoveu.cuddle.entities.services.email.EmailService;
-import com.github.gribanoveu.cuddle.entities.services.user.UserService;
+import com.github.gribanoveu.cuddle.entities.services.EmailService;
+import com.github.gribanoveu.cuddle.entities.services.UserService;
 import com.github.gribanoveu.cuddle.entities.tables.User;
 import com.github.gribanoveu.cuddle.utils.emails.EmailTemplates;
 import lombok.RequiredArgsConstructor;

src/main/java/com/github/gribanoveu/cuddle/controllers/secure/UserRoleControllerImpl.java

@@ -6,7 +6,7 @@
 import com.github.gribanoveu.cuddle.dtos.response.ResponseDetails;
 import com.github.gribanoveu.cuddle.dtos.response.StatusResponse;
 import com.github.gribanoveu.cuddle.dtos.response.auth.UsersResponse;
-import com.github.gribanoveu.cuddle.entities.services.user.UserService;
+import com.github.gribanoveu.cuddle.entities.services.UserService;
 import com.github.gribanoveu.cuddle.exeptions.CredentialEx;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/github/gribanoveu/cuddle/entities/services/email/EmailService.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/EmailService.java

@@ -1,4 +1,4 @@
-package com.github.gribanoveu.cuddle.entities.services.email;
+package com.github.gribanoveu.cuddle.entities.services;
 
 import com.github.gribanoveu.cuddle.dtos.data.SimpleEmailObject;
 

src/main/java/com/github/gribanoveu/cuddle/entities/services/otp/RedisOtpService.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/RedisOtpService.java

@@ -1,4 +1,4 @@
-package com.github.gribanoveu.cuddle.entities.services.otp;
+package com.github.gribanoveu.cuddle.entities.services;
 
 import java.time.Duration;
 import java.util.Optional;

src/main/java/com/github/gribanoveu/cuddle/entities/services/token/TokenService.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/TokenService.java

@@ -1,4 +1,4 @@
-package com.github.gribanoveu.cuddle.entities.services.token;
+package com.github.gribanoveu.cuddle.entities.services;
 
 import com.github.gribanoveu.cuddle.dtos.enums.TokenType;
 import com.github.gribanoveu.cuddle.security.CustomUserDetails;

src/main/java/com/github/gribanoveu/cuddle/entities/services/user/UserService.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/UserService.java

@@ -1,4 +1,4 @@
-package com.github.gribanoveu.cuddle.entities.services.user;
+package com.github.gribanoveu.cuddle.entities.services;
 
 import com.github.gribanoveu.cuddle.dtos.enums.Role;
 import com.github.gribanoveu.cuddle.entities.tables.User;

src/main/java/com/github/gribanoveu/cuddle/entities/services/email/EmailServiceImpl.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/impl/EmailServiceImpl.java

@@ -1,7 +1,8 @@
-package com.github.gribanoveu.cuddle.entities.services.email;
+package com.github.gribanoveu.cuddle.entities.services.impl;
 
 import com.github.gribanoveu.cuddle.dtos.data.SimpleEmailObject;
 import com.github.gribanoveu.cuddle.dtos.enums.ResponseCode;
+import com.github.gribanoveu.cuddle.entities.services.EmailService;
 import jakarta.mail.MessagingException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/github/gribanoveu/cuddle/entities/services/otp/RedisOtpServiceImpl.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/impl/RedisOtpServiceImpl.java

@@ -1,6 +1,7 @@
-package com.github.gribanoveu.cuddle.entities.services.otp;
+package com.github.gribanoveu.cuddle.entities.services.impl;
 
 import com.github.gribanoveu.cuddle.dtos.enums.ResponseCode;
+import com.github.gribanoveu.cuddle.entities.services.RedisOtpService;
 import com.github.gribanoveu.cuddle.exeptions.CredentialEx;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/github/gribanoveu/cuddle/entities/services/token/TokenServiceImpl.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/impl/TokenServiceImpl.java

@@ -1,7 +1,8 @@
-package com.github.gribanoveu.cuddle.entities.services.token;
+package com.github.gribanoveu.cuddle.entities.services.impl;
 
 import com.github.gribanoveu.cuddle.dtos.enums.ResponseCode;
 import com.github.gribanoveu.cuddle.dtos.enums.TokenType;
+import com.github.gribanoveu.cuddle.entities.services.TokenService;
 import com.github.gribanoveu.cuddle.exeptions.CredentialEx;
 import com.github.gribanoveu.cuddle.security.CustomUserDetails;
 import com.nimbusds.jwt.JWTClaimsSet;

src/main/java/com/github/gribanoveu/cuddle/entities/services/user/UserServiceImpl.java → src/main/java/com/github/gribanoveu/cuddle/entities/services/impl/UserServiceImpl.java

@@ -1,8 +1,9 @@
-package com.github.gribanoveu.cuddle.entities.services.user;
+package com.github.gribanoveu.cuddle.entities.services.impl;
 
 import com.github.gribanoveu.cuddle.dtos.enums.ResponseCode;
 import com.github.gribanoveu.cuddle.dtos.enums.Role;
 import com.github.gribanoveu.cuddle.entities.repositories.UserRepository;
+import com.github.gribanoveu.cuddle.entities.services.UserService;
 import com.github.gribanoveu.cuddle.entities.tables.User;
 import com.github.gribanoveu.cuddle.exeptions.CredentialEx;
 import lombok.RequiredArgsConstructor;

src/main/java/com/github/gribanoveu/cuddle/entities/tasks/BanExpirationTask.java

@@ -2,7 +2,7 @@
 
 import com.github.gribanoveu.cuddle.constants.Constants;
 import com.github.gribanoveu.cuddle.constants.CronRules;
-import com.github.gribanoveu.cuddle.entities.services.user.UserService;
+import com.github.gribanoveu.cuddle.entities.services.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;

src/test/java/com/github/gribanoveu/cuddle/base/BaseMockMvcTest.java

@@ -1,7 +1,7 @@
 package com.github.gribanoveu.cuddle.base;
 
 import com.github.gribanoveu.cuddle.dtos.enums.TokenType;
-import com.github.gribanoveu.cuddle.entities.services.token.TokenService;
+import com.github.gribanoveu.cuddle.entities.services.TokenService;
 import com.github.gribanoveu.cuddle.security.CustomUserDetails;
 import com.github.gribanoveu.cuddle.security.CustomUserDetailsService;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/com/github/gribanoveu/cuddle/entities/services/implementation/TokenServiceImplTest.java

@@ -1,7 +1,7 @@
 package com.github.gribanoveu.cuddle.entities.services.implementation;
 
 import com.github.gribanoveu.cuddle.base.BaseMockMvcTest;
-import com.github.gribanoveu.cuddle.entities.services.token.TokenService;
+import com.github.gribanoveu.cuddle.entities.services.TokenService;
 import com.github.gribanoveu.cuddle.exeptions.CredentialEx;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;