diff --git a/pom.xml b/pom.xml index ad366b3..3c1e7e3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.example + com.infinity NTO-2024 1.0-SNAPSHOT diff --git a/src/main/java/com/example/nto/service/EmployeeService.java b/src/main/java/com/example/nto/service/EmployeeService.java deleted file mode 100644 index fada988..0000000 --- a/src/main/java/com/example/nto/service/EmployeeService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.nto.service; - -import com.example.nto.dto.EmployeeDataDto; -import com.example.nto.dto.EntryDto; -import com.example.nto.entity.Code; -import com.example.nto.entity.Employee; -import com.example.nto.entity.EmployeeData; -import com.example.nto.entity.Entry; -import org.springframework.lang.Nullable; -import org.springframework.web.bind.annotation.RequestParam; - -import java.time.LocalDateTime; -import java.util.List; - -public interface EmployeeService { - EmployeeDataDto info(String login); - - void open(String login, long value); - - List getEntryList(String login); - - boolean amIBlocked(String login); -} diff --git a/src/main/java/com/example/nto/App.java b/src/main/java/com/infinity/nto/App.java similarity index 74% rename from src/main/java/com/example/nto/App.java rename to src/main/java/com/infinity/nto/App.java index a1ec3e5..7752b3d 100644 --- a/src/main/java/com/example/nto/App.java +++ b/src/main/java/com/infinity/nto/App.java @@ -1,4 +1,4 @@ -package com.example.nto; +package com.infinity.nto; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class App { public static void main(String[] args) { - System.out.println("infinity stack backend: v 2024-11-20"); + System.out.println("infinity stack backend: v 2025-02-20"); SpringApplication.run(App.class, args); } } diff --git a/src/main/java/com/example/nto/config/WebSecurityConfig.java b/src/main/java/com/infinity/nto/config/WebSecurityConfig.java similarity index 98% rename from src/main/java/com/example/nto/config/WebSecurityConfig.java rename to src/main/java/com/infinity/nto/config/WebSecurityConfig.java index 5df3acb..b2eb0a1 100644 --- a/src/main/java/com/example/nto/config/WebSecurityConfig.java +++ b/src/main/java/com/infinity/nto/config/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.example.nto.config; +package com.infinity.nto.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/nto/controller/AdminController.java b/src/main/java/com/infinity/nto/controller/AdminController.java similarity index 88% rename from src/main/java/com/example/nto/controller/AdminController.java rename to src/main/java/com/infinity/nto/controller/AdminController.java index 387ead0..417e75f 100644 --- a/src/main/java/com/example/nto/controller/AdminController.java +++ b/src/main/java/com/infinity/nto/controller/AdminController.java @@ -1,10 +1,8 @@ -package com.example.nto.controller; +package com.infinity.nto.controller; -import com.example.nto.dto.EmployeeDataDto; -import com.example.nto.dto.EntryDto; -import com.example.nto.entity.EmployeeData; -import com.example.nto.entity.Entry; -import com.example.nto.service.AdminService; +import com.infinity.nto.dto.EmployeeDataDto; +import com.infinity.nto.dto.EntryDto; +import com.infinity.nto.service.AdminService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/infinity/nto/controller/EmployeeController.java similarity index 77% rename from src/main/java/com/example/nto/controller/EmployeeController.java rename to src/main/java/com/infinity/nto/controller/EmployeeController.java index b924161..8b0dcc5 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/infinity/nto/controller/EmployeeController.java @@ -1,20 +1,13 @@ -package com.example.nto.controller; +package com.infinity.nto.controller; -import com.example.nto.dto.EmployeeDataDto; -import com.example.nto.dto.EntryDto; -import com.example.nto.entity.Code; -import com.example.nto.entity.Employee; -import com.example.nto.entity.EmployeeData; -import com.example.nto.entity.Entry; -import com.example.nto.service.EmployeeService; +import com.infinity.nto.dto.EmployeeDataDto; +import com.infinity.nto.dto.EntryDto; +import com.infinity.nto.service.EmployeeService; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; import java.util.List; @RestController diff --git a/src/main/java/com/example/nto/dto/EmployeeDataDto.java b/src/main/java/com/infinity/nto/dto/EmployeeDataDto.java similarity index 92% rename from src/main/java/com/example/nto/dto/EmployeeDataDto.java rename to src/main/java/com/infinity/nto/dto/EmployeeDataDto.java index de0c146..afda757 100644 --- a/src/main/java/com/example/nto/dto/EmployeeDataDto.java +++ b/src/main/java/com/infinity/nto/dto/EmployeeDataDto.java @@ -1,4 +1,4 @@ -package com.example.nto.dto; +package com.infinity.nto.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/nto/dto/EntryDto.java b/src/main/java/com/infinity/nto/dto/EntryDto.java similarity index 91% rename from src/main/java/com/example/nto/dto/EntryDto.java rename to src/main/java/com/infinity/nto/dto/EntryDto.java index 0ca87a8..e953ebf 100644 --- a/src/main/java/com/example/nto/dto/EntryDto.java +++ b/src/main/java/com/infinity/nto/dto/EntryDto.java @@ -1,4 +1,4 @@ -package com.example.nto.dto; +package com.infinity.nto.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/nto/dto/mapper/EmployeeDataMapper.java b/src/main/java/com/infinity/nto/dto/mapper/EmployeeDataMapper.java similarity index 78% rename from src/main/java/com/example/nto/dto/mapper/EmployeeDataMapper.java rename to src/main/java/com/infinity/nto/dto/mapper/EmployeeDataMapper.java index 4cb5738..609601f 100644 --- a/src/main/java/com/example/nto/dto/mapper/EmployeeDataMapper.java +++ b/src/main/java/com/infinity/nto/dto/mapper/EmployeeDataMapper.java @@ -1,7 +1,7 @@ -package com.example.nto.dto.mapper; +package com.infinity.nto.dto.mapper; -import com.example.nto.dto.EmployeeDataDto; -import com.example.nto.entity.EmployeeData; +import com.infinity.nto.dto.EmployeeDataDto; +import com.infinity.nto.entity.EmployeeData; import lombok.experimental.UtilityClass; @UtilityClass diff --git a/src/main/java/com/example/nto/dto/mapper/EntryMapper.java b/src/main/java/com/infinity/nto/dto/mapper/EntryMapper.java similarity index 74% rename from src/main/java/com/example/nto/dto/mapper/EntryMapper.java rename to src/main/java/com/infinity/nto/dto/mapper/EntryMapper.java index ec59b10..a7fc84c 100644 --- a/src/main/java/com/example/nto/dto/mapper/EntryMapper.java +++ b/src/main/java/com/infinity/nto/dto/mapper/EntryMapper.java @@ -1,7 +1,7 @@ -package com.example.nto.dto.mapper; +package com.infinity.nto.dto.mapper; -import com.example.nto.dto.EntryDto; -import com.example.nto.entity.Entry; +import com.infinity.nto.dto.EntryDto; +import com.infinity.nto.entity.Entry; import lombok.experimental.UtilityClass; @UtilityClass diff --git a/src/main/java/com/example/nto/entity/Code.java b/src/main/java/com/infinity/nto/entity/Code.java similarity index 93% rename from src/main/java/com/example/nto/entity/Code.java rename to src/main/java/com/infinity/nto/entity/Code.java index 9ee338b..3e0aa07 100644 --- a/src/main/java/com/example/nto/entity/Code.java +++ b/src/main/java/com/infinity/nto/entity/Code.java @@ -1,4 +1,4 @@ -package com.example.nto.entity; +package com.infinity.nto.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/nto/entity/Employee.java b/src/main/java/com/infinity/nto/entity/Employee.java similarity index 94% rename from src/main/java/com/example/nto/entity/Employee.java rename to src/main/java/com/infinity/nto/entity/Employee.java index b331b1c..f3a8e5b 100644 --- a/src/main/java/com/example/nto/entity/Employee.java +++ b/src/main/java/com/infinity/nto/entity/Employee.java @@ -1,4 +1,4 @@ -package com.example.nto.entity; +package com.infinity.nto.entity; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,9 +8,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import javax.persistence.*; -import java.time.LocalDateTime; import java.util.Collection; -import java.util.List; import java.util.Set; @Entity diff --git a/src/main/java/com/example/nto/entity/EmployeeData.java b/src/main/java/com/infinity/nto/entity/EmployeeData.java similarity index 94% rename from src/main/java/com/example/nto/entity/EmployeeData.java rename to src/main/java/com/infinity/nto/entity/EmployeeData.java index eb3979d..ca13620 100644 --- a/src/main/java/com/example/nto/entity/EmployeeData.java +++ b/src/main/java/com/infinity/nto/entity/EmployeeData.java @@ -1,4 +1,4 @@ -package com.example.nto.entity; +package com.infinity.nto.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/nto/entity/Entry.java b/src/main/java/com/infinity/nto/entity/Entry.java similarity index 94% rename from src/main/java/com/example/nto/entity/Entry.java rename to src/main/java/com/infinity/nto/entity/Entry.java index 7110013..32e3ed5 100644 --- a/src/main/java/com/example/nto/entity/Entry.java +++ b/src/main/java/com/infinity/nto/entity/Entry.java @@ -1,4 +1,4 @@ -package com.example.nto.entity; +package com.infinity.nto.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/nto/entity/Role.java b/src/main/java/com/infinity/nto/entity/Role.java similarity index 94% rename from src/main/java/com/example/nto/entity/Role.java rename to src/main/java/com/infinity/nto/entity/Role.java index b99618f..f0e4cde 100644 --- a/src/main/java/com/example/nto/entity/Role.java +++ b/src/main/java/com/infinity/nto/entity/Role.java @@ -1,4 +1,4 @@ -package com.example.nto.entity; +package com.infinity.nto.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/nto/exception/CodeNotFoundException.java b/src/main/java/com/infinity/nto/exception/CodeNotFoundException.java similarity index 80% rename from src/main/java/com/example/nto/exception/CodeNotFoundException.java rename to src/main/java/com/infinity/nto/exception/CodeNotFoundException.java index 720b86f..a1f4d88 100644 --- a/src/main/java/com/example/nto/exception/CodeNotFoundException.java +++ b/src/main/java/com/infinity/nto/exception/CodeNotFoundException.java @@ -1,4 +1,4 @@ -package com.example.nto.exception; +package com.infinity.nto.exception; public class CodeNotFoundException extends RuntimeException { public CodeNotFoundException(String message) { diff --git a/src/main/java/com/example/nto/exception/EmployeeDataNotFoundException.java b/src/main/java/com/infinity/nto/exception/EmployeeDataNotFoundException.java similarity index 81% rename from src/main/java/com/example/nto/exception/EmployeeDataNotFoundException.java rename to src/main/java/com/infinity/nto/exception/EmployeeDataNotFoundException.java index 2144c53..2b3f3af 100644 --- a/src/main/java/com/example/nto/exception/EmployeeDataNotFoundException.java +++ b/src/main/java/com/infinity/nto/exception/EmployeeDataNotFoundException.java @@ -1,4 +1,4 @@ -package com.example.nto.exception; +package com.infinity.nto.exception; public class EmployeeDataNotFoundException extends RuntimeException { public EmployeeDataNotFoundException(String message) { diff --git a/src/main/java/com/example/nto/exception/EmployeeIsBlockedException.java b/src/main/java/com/infinity/nto/exception/EmployeeIsBlockedException.java similarity index 81% rename from src/main/java/com/example/nto/exception/EmployeeIsBlockedException.java rename to src/main/java/com/infinity/nto/exception/EmployeeIsBlockedException.java index b65bc1d..e760e81 100644 --- a/src/main/java/com/example/nto/exception/EmployeeIsBlockedException.java +++ b/src/main/java/com/infinity/nto/exception/EmployeeIsBlockedException.java @@ -1,4 +1,4 @@ -package com.example.nto.exception; +package com.infinity.nto.exception; public class EmployeeIsBlockedException extends RuntimeException { public EmployeeIsBlockedException(String message) { diff --git a/src/main/java/com/example/nto/exception/EmployeeNotFoundException.java b/src/main/java/com/infinity/nto/exception/EmployeeNotFoundException.java similarity index 81% rename from src/main/java/com/example/nto/exception/EmployeeNotFoundException.java rename to src/main/java/com/infinity/nto/exception/EmployeeNotFoundException.java index d427077..1b7b1b7 100644 --- a/src/main/java/com/example/nto/exception/EmployeeNotFoundException.java +++ b/src/main/java/com/infinity/nto/exception/EmployeeNotFoundException.java @@ -1,4 +1,4 @@ -package com.example.nto.exception; +package com.infinity.nto.exception; public class EmployeeNotFoundException extends RuntimeException { public EmployeeNotFoundException(String message) { diff --git a/src/main/java/com/example/nto/exception/GlobalExceptionHandler.java b/src/main/java/com/infinity/nto/exception/GlobalExceptionHandler.java similarity index 97% rename from src/main/java/com/example/nto/exception/GlobalExceptionHandler.java rename to src/main/java/com/infinity/nto/exception/GlobalExceptionHandler.java index 9b93efe..1c82be3 100644 --- a/src/main/java/com/example/nto/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/infinity/nto/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.example.nto.exception; +package com.infinity.nto.exception; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/nto/exception/SelfChangeException.java b/src/main/java/com/infinity/nto/exception/SelfChangeException.java similarity index 79% rename from src/main/java/com/example/nto/exception/SelfChangeException.java rename to src/main/java/com/infinity/nto/exception/SelfChangeException.java index 8518788..494be38 100644 --- a/src/main/java/com/example/nto/exception/SelfChangeException.java +++ b/src/main/java/com/infinity/nto/exception/SelfChangeException.java @@ -1,4 +1,4 @@ -package com.example.nto.exception; +package com.infinity.nto.exception; public class SelfChangeException extends RuntimeException { public SelfChangeException(String message) { diff --git a/src/main/java/com/example/nto/repository/CodeRepository.java b/src/main/java/com/infinity/nto/repository/CodeRepository.java similarity index 70% rename from src/main/java/com/example/nto/repository/CodeRepository.java rename to src/main/java/com/infinity/nto/repository/CodeRepository.java index b8512ed..678f199 100644 --- a/src/main/java/com/example/nto/repository/CodeRepository.java +++ b/src/main/java/com/infinity/nto/repository/CodeRepository.java @@ -1,8 +1,7 @@ -package com.example.nto.repository; +package com.infinity.nto.repository; -import com.example.nto.entity.Code; +import com.infinity.nto.entity.Code; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.lang.Nullable; import org.springframework.stereotype.Repository; import java.util.Optional; diff --git a/src/main/java/com/example/nto/repository/EmployeeDataRepository.java b/src/main/java/com/infinity/nto/repository/EmployeeDataRepository.java similarity index 81% rename from src/main/java/com/example/nto/repository/EmployeeDataRepository.java rename to src/main/java/com/infinity/nto/repository/EmployeeDataRepository.java index 505b5c3..81d565f 100644 --- a/src/main/java/com/example/nto/repository/EmployeeDataRepository.java +++ b/src/main/java/com/infinity/nto/repository/EmployeeDataRepository.java @@ -1,13 +1,11 @@ -package com.example.nto.repository; +package com.infinity.nto.repository; -import com.example.nto.entity.Code; -import com.example.nto.entity.EmployeeData; +import com.infinity.nto.entity.EmployeeData; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.Optional; diff --git a/src/main/java/com/example/nto/repository/EmployeeRepository.java b/src/main/java/com/infinity/nto/repository/EmployeeRepository.java similarity index 83% rename from src/main/java/com/example/nto/repository/EmployeeRepository.java rename to src/main/java/com/infinity/nto/repository/EmployeeRepository.java index 2f88000..a423aa1 100644 --- a/src/main/java/com/example/nto/repository/EmployeeRepository.java +++ b/src/main/java/com/infinity/nto/repository/EmployeeRepository.java @@ -1,14 +1,12 @@ -package com.example.nto.repository; +package com.infinity.nto.repository; -import com.example.nto.entity.Employee; +import com.infinity.nto.entity.Employee; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.lang.Nullable; import org.springframework.stereotype.Repository; -import java.time.LocalDateTime; import java.util.Optional; @Repository diff --git a/src/main/java/com/example/nto/repository/EntryRepository.java b/src/main/java/com/infinity/nto/repository/EntryRepository.java similarity index 80% rename from src/main/java/com/example/nto/repository/EntryRepository.java rename to src/main/java/com/infinity/nto/repository/EntryRepository.java index 2c0c6b2..f928156 100644 --- a/src/main/java/com/example/nto/repository/EntryRepository.java +++ b/src/main/java/com/infinity/nto/repository/EntryRepository.java @@ -1,12 +1,10 @@ -package com.example.nto.repository; +package com.infinity.nto.repository; -import com.example.nto.entity.Employee; -import com.example.nto.entity.Entry; +import com.infinity.nto.entity.Entry; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/example/nto/repository/RoleRepository.java b/src/main/java/com/infinity/nto/repository/RoleRepository.java similarity index 64% rename from src/main/java/com/example/nto/repository/RoleRepository.java rename to src/main/java/com/infinity/nto/repository/RoleRepository.java index c927b9d..9d26d12 100644 --- a/src/main/java/com/example/nto/repository/RoleRepository.java +++ b/src/main/java/com/infinity/nto/repository/RoleRepository.java @@ -1,7 +1,6 @@ -package com.example.nto.repository; +package com.infinity.nto.repository; -import com.example.nto.entity.Code; -import com.example.nto.entity.Role; +import com.infinity.nto.entity.Role; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/nto/service/AdminService.java b/src/main/java/com/infinity/nto/service/AdminService.java similarity index 61% rename from src/main/java/com/example/nto/service/AdminService.java rename to src/main/java/com/infinity/nto/service/AdminService.java index 60457a7..42b54b7 100644 --- a/src/main/java/com/example/nto/service/AdminService.java +++ b/src/main/java/com/infinity/nto/service/AdminService.java @@ -1,9 +1,7 @@ -package com.example.nto.service; +package com.infinity.nto.service; -import com.example.nto.dto.EmployeeDataDto; -import com.example.nto.dto.EntryDto; -import com.example.nto.entity.EmployeeData; -import com.example.nto.entity.Entry; +import com.infinity.nto.dto.EmployeeDataDto; +import com.infinity.nto.dto.EntryDto; import java.util.List; diff --git a/src/main/java/com/infinity/nto/service/EmployeeService.java b/src/main/java/com/infinity/nto/service/EmployeeService.java new file mode 100644 index 0000000..81ace85 --- /dev/null +++ b/src/main/java/com/infinity/nto/service/EmployeeService.java @@ -0,0 +1,16 @@ +package com.infinity.nto.service; + +import com.infinity.nto.dto.EmployeeDataDto; +import com.infinity.nto.dto.EntryDto; + +import java.util.List; + +public interface EmployeeService { + EmployeeDataDto info(String login); + + void open(String login, long value); + + List getEntryList(String login); + + boolean amIBlocked(String login); +} diff --git a/src/main/java/com/example/nto/service/impl/AdminServiceImpl.java b/src/main/java/com/infinity/nto/service/impl/AdminServiceImpl.java similarity index 78% rename from src/main/java/com/example/nto/service/impl/AdminServiceImpl.java rename to src/main/java/com/infinity/nto/service/impl/AdminServiceImpl.java index 1cab557..c8e4496 100644 --- a/src/main/java/com/example/nto/service/impl/AdminServiceImpl.java +++ b/src/main/java/com/infinity/nto/service/impl/AdminServiceImpl.java @@ -1,17 +1,17 @@ -package com.example.nto.service.impl; +package com.infinity.nto.service.impl; -import com.example.nto.dto.EmployeeDataDto; -import com.example.nto.dto.EntryDto; -import com.example.nto.dto.mapper.EmployeeDataMapper; -import com.example.nto.dto.mapper.EntryMapper; -import com.example.nto.entity.EmployeeData; -import com.example.nto.exception.EmployeeDataNotFoundException; -import com.example.nto.exception.EmployeeNotFoundException; -import com.example.nto.exception.SelfChangeException; -import com.example.nto.repository.EmployeeDataRepository; -import com.example.nto.repository.EmployeeRepository; -import com.example.nto.repository.EntryRepository; -import com.example.nto.service.AdminService; +import com.infinity.nto.dto.EmployeeDataDto; +import com.infinity.nto.dto.EntryDto; +import com.infinity.nto.dto.mapper.EmployeeDataMapper; +import com.infinity.nto.dto.mapper.EntryMapper; +import com.infinity.nto.entity.EmployeeData; +import com.infinity.nto.exception.EmployeeDataNotFoundException; +import com.infinity.nto.exception.EmployeeNotFoundException; +import com.infinity.nto.exception.SelfChangeException; +import com.infinity.nto.repository.EmployeeDataRepository; +import com.infinity.nto.repository.EmployeeRepository; +import com.infinity.nto.repository.EntryRepository; +import com.infinity.nto.service.AdminService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/infinity/nto/service/impl/EmployeeServiceImpl.java similarity index 76% rename from src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java rename to src/main/java/com/infinity/nto/service/impl/EmployeeServiceImpl.java index 3d75e0f..4e6f223 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/infinity/nto/service/impl/EmployeeServiceImpl.java @@ -1,22 +1,21 @@ -package com.example.nto.service.impl; +package com.infinity.nto.service.impl; -import com.example.nto.dto.EmployeeDataDto; -import com.example.nto.dto.EntryDto; -import com.example.nto.dto.mapper.EmployeeDataMapper; -import com.example.nto.dto.mapper.EntryMapper; -import com.example.nto.entity.Code; -import com.example.nto.entity.Employee; -import com.example.nto.entity.EmployeeData; -import com.example.nto.entity.Entry; -import com.example.nto.exception.CodeNotFoundException; -import com.example.nto.exception.EmployeeDataNotFoundException; -import com.example.nto.exception.EmployeeIsBlockedException; -import com.example.nto.exception.EmployeeNotFoundException; -import com.example.nto.repository.CodeRepository; -import com.example.nto.repository.EmployeeDataRepository; -import com.example.nto.repository.EmployeeRepository; -import com.example.nto.repository.EntryRepository; -import com.example.nto.service.EmployeeService; +import com.infinity.nto.dto.EmployeeDataDto; +import com.infinity.nto.dto.EntryDto; +import com.infinity.nto.dto.mapper.EmployeeDataMapper; +import com.infinity.nto.dto.mapper.EntryMapper; +import com.infinity.nto.entity.Code; +import com.infinity.nto.entity.Employee; +import com.infinity.nto.entity.EmployeeData; +import com.infinity.nto.exception.CodeNotFoundException; +import com.infinity.nto.exception.EmployeeDataNotFoundException; +import com.infinity.nto.exception.EmployeeIsBlockedException; +import com.infinity.nto.exception.EmployeeNotFoundException; +import com.infinity.nto.repository.CodeRepository; +import com.infinity.nto.repository.EmployeeDataRepository; +import com.infinity.nto.repository.EmployeeRepository; +import com.infinity.nto.repository.EntryRepository; +import com.infinity.nto.service.EmployeeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/nto/service/impl/UserDetailsServiceImpl.java b/src/main/java/com/infinity/nto/service/impl/UserDetailsServiceImpl.java similarity index 80% rename from src/main/java/com/example/nto/service/impl/UserDetailsServiceImpl.java rename to src/main/java/com/infinity/nto/service/impl/UserDetailsServiceImpl.java index 0e0bc03..9ee4be3 100644 --- a/src/main/java/com/example/nto/service/impl/UserDetailsServiceImpl.java +++ b/src/main/java/com/infinity/nto/service/impl/UserDetailsServiceImpl.java @@ -1,8 +1,8 @@ -package com.example.nto.service.impl; +package com.infinity.nto.service.impl; -import com.example.nto.entity.Employee; -import com.example.nto.exception.EmployeeNotFoundException; -import com.example.nto.repository.EmployeeRepository; +import com.infinity.nto.entity.Employee; +import com.infinity.nto.exception.EmployeeNotFoundException; +import com.infinity.nto.repository.EmployeeRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService;