release/2025-02-20-10-46
This commit is contained in:
parent
899ce38b87
commit
d826b80c26
2
pom.xml
2
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">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.example</groupId>
|
||||
<groupId>com.infinity</groupId>
|
||||
<artifactId>NTO-2024</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
|
@ -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<EntryDto> getEntryList(String login);
|
||||
|
||||
boolean amIBlocked(String login);
|
||||
}
|
@ -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);
|
||||
}
|
||||
}
|
@ -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;
|
@ -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;
|
@ -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
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.dto;
|
||||
package com.infinity.nto.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.dto;
|
||||
package com.infinity.nto.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
@ -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
|
@ -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
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.entity;
|
||||
package com.infinity.nto.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
@ -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
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.entity;
|
||||
package com.infinity.nto.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.entity;
|
||||
package com.infinity.nto.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.entity;
|
||||
package com.infinity.nto.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.exception;
|
||||
package com.infinity.nto.exception;
|
||||
|
||||
public class CodeNotFoundException extends RuntimeException {
|
||||
public CodeNotFoundException(String message) {
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.exception;
|
||||
package com.infinity.nto.exception;
|
||||
|
||||
public class EmployeeDataNotFoundException extends RuntimeException {
|
||||
public EmployeeDataNotFoundException(String message) {
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.exception;
|
||||
package com.infinity.nto.exception;
|
||||
|
||||
public class EmployeeIsBlockedException extends RuntimeException {
|
||||
public EmployeeIsBlockedException(String message) {
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.exception;
|
||||
package com.infinity.nto.exception;
|
||||
|
||||
public class EmployeeNotFoundException extends RuntimeException {
|
||||
public EmployeeNotFoundException(String message) {
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.exception;
|
||||
package com.infinity.nto.exception;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
@ -1,4 +1,4 @@
|
||||
package com.example.nto.exception;
|
||||
package com.infinity.nto.exception;
|
||||
|
||||
public class SelfChangeException extends RuntimeException {
|
||||
public SelfChangeException(String message) {
|
@ -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;
|
@ -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;
|
@ -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
|
@ -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;
|
@ -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;
|
||||
|
@ -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;
|
||||
|
16
src/main/java/com/infinity/nto/service/EmployeeService.java
Normal file
16
src/main/java/com/infinity/nto/service/EmployeeService.java
Normal file
@ -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<EntryDto> getEntryList(String login);
|
||||
|
||||
boolean amIBlocked(String login);
|
||||
}
|
@ -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;
|
@ -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;
|
@ -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;
|
Loading…
x
Reference in New Issue
Block a user