fix path
Test Workflow / test (push) Successful in 3s

This commit is contained in:
vladp
2025-12-17 22:37:46 +07:00
parent 9e8c7f0fa1
commit 7e2dd4a654
74 changed files with 194 additions and 198 deletions
@@ -1,4 +1,4 @@
package ru.soune.no_copy; package ru.soune.nocopy;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.configuration; package ru.soune.nocopy.configuration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.configuration; package ru.soune.nocopy.configuration;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.configuration; package ru.soune.nocopy.configuration;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.configuration; package ru.soune.nocopy.configuration;
import lombok.Getter; import lombok.Getter;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.configuration.file; package ru.soune.nocopy.configuration.file;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@@ -1,17 +1,17 @@
package ru.soune.no_copy.controller; package ru.soune.nocopy.controller;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.soune.no_copy.dto.AuthResponse; import ru.soune.nocopy.dto.AuthResponse;
import ru.soune.no_copy.dto.LoginRequest; import ru.soune.nocopy.dto.LoginRequest;
import ru.soune.no_copy.dto.LoginResponse; import ru.soune.nocopy.dto.LoginResponse;
import ru.soune.no_copy.dto.RegisterRequest; import ru.soune.nocopy.dto.RegisterRequest;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import ru.soune.no_copy.exception.TokenNotFoundException; import ru.soune.nocopy.exception.TokenNotFoundException;
import ru.soune.no_copy.repository.AuthTokenRepository; import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.no_copy.service.AuthService; import ru.soune.nocopy.service.AuthService;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@@ -1,6 +1,5 @@
package ru.soune.no_copy.controller; package ru.soune.nocopy.controller;
import org.apache.coyote.Response;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.controller; package ru.soune.nocopy.controller;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -1,19 +1,19 @@
package ru.soune.no_copy.controller; package ru.soune.nocopy.controller;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.soune.no_copy.dto.ChangePasswordRequest; import ru.soune.nocopy.dto.ChangePasswordRequest;
import ru.soune.no_copy.dto.UserDTO; import ru.soune.nocopy.dto.UserDTO;
import ru.soune.no_copy.dto.UserRequest; import ru.soune.nocopy.dto.UserRequest;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import ru.soune.no_copy.entity.User; import ru.soune.nocopy.entity.User;
import ru.soune.no_copy.exception.InvalidUserEmail; import ru.soune.nocopy.exception.InvalidUserEmail;
import ru.soune.no_copy.exception.NotFoundAuthToken; import ru.soune.nocopy.exception.NotFoundAuthToken;
import ru.soune.no_copy.mapper.UserMapper; import ru.soune.nocopy.mapper.UserMapper;
import ru.soune.no_copy.repository.AuthTokenRepository; import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.no_copy.repository.UserRepository; import ru.soune.nocopy.repository.UserRepository;
import ru.soune.no_copy.service.UserService; import ru.soune.nocopy.service.UserService;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.controller.file; package ru.soune.nocopy.controller.file;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -8,11 +8,11 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.soune.no_copy.dto.file.FileEntityResponse; import ru.soune.nocopy.dto.file.FileEntityResponse;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import ru.soune.no_copy.exception.NotFoundAuthToken; import ru.soune.nocopy.exception.NotFoundAuthToken;
import ru.soune.no_copy.repository.AuthTokenRepository; import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.no_copy.service.file.FileEntityService; import ru.soune.nocopy.service.file.FileEntityService;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@@ -1,16 +1,16 @@
package ru.soune.no_copy.controller.file; package ru.soune.nocopy.controller.file;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.soune.no_copy.dto.file.FileApiResponse; import ru.soune.nocopy.dto.file.FileApiResponse;
import ru.soune.no_copy.dto.file.FileEntityResponse; import ru.soune.nocopy.dto.file.FileEntityResponse;
import ru.soune.no_copy.dto.file.FileListResponse; import ru.soune.nocopy.dto.file.FileListResponse;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import ru.soune.no_copy.exception.NotFoundAuthToken; import ru.soune.nocopy.exception.NotFoundAuthToken;
import ru.soune.no_copy.repository.AuthTokenRepository; import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.no_copy.service.file.FileEntityService; import ru.soune.nocopy.service.file.FileEntityService;
@Slf4j @Slf4j
@RestController @RestController
@@ -1,4 +1,4 @@
package ru.soune.no_copy.controller.file; package ru.soune.nocopy.controller.file;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -7,19 +7,19 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ru.soune.no_copy.dto.file.FileApiResponse; import ru.soune.nocopy.dto.file.FileApiResponse;
import ru.soune.no_copy.dto.file.InitUploadRequest; import ru.soune.nocopy.dto.file.InitUploadRequest;
import ru.soune.no_copy.dto.file.UploadProgressResponse; import ru.soune.nocopy.dto.file.UploadProgressResponse;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import ru.soune.no_copy.entity.file.FileType; import ru.soune.nocopy.entity.file.FileType;
import ru.soune.no_copy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.FileUploadSession;
import ru.soune.no_copy.entity.file.UploadStatus; import ru.soune.nocopy.entity.file.UploadStatus;
import ru.soune.no_copy.exception.FileUploadException; import ru.soune.nocopy.exception.FileUploadException;
import ru.soune.no_copy.exception.NotFoundAuthToken; import ru.soune.nocopy.exception.NotFoundAuthToken;
import ru.soune.no_copy.exception.UploadSessionNotFoundException; import ru.soune.nocopy.exception.UploadSessionNotFoundException;
import ru.soune.no_copy.repository.AuthTokenRepository; import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.no_copy.repository.FileUploadSessionRepository; import ru.soune.nocopy.repository.FileUploadSessionRepository;
import ru.soune.no_copy.service.file.FileUploadService; import ru.soune.nocopy.service.file.FileUploadService;
import java.util.*; import java.util.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
@@ -1,8 +1,7 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import ru.soune.no_copy.entity.User;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
@@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Past; import jakarta.validation.constraints.Past;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import ru.soune.no_copy.entity.GenderType; import ru.soune.nocopy.entity.GenderType;
import ru.soune.no_copy.entity.SubscriptionType; import ru.soune.nocopy.entity.SubscriptionType;
import java.time.LocalDate; import java.time.LocalDate;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
@@ -1,7 +1,7 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import ru.soune.no_copy.entity.ContentStatus; import ru.soune.nocopy.entity.ContentStatus;
import ru.soune.no_copy.entity.file.FileType; import ru.soune.nocopy.entity.file.FileType;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
@@ -1,11 +1,11 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import ru.soune.no_copy.entity.GenderType; import ru.soune.nocopy.entity.GenderType;
import ru.soune.no_copy.entity.SubscriptionType; import ru.soune.nocopy.entity.SubscriptionType;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,14 +1,13 @@
package ru.soune.no_copy.dto; package ru.soune.nocopy.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.Past; import jakarta.validation.constraints.Past;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.Data; import lombok.Data;
import ru.soune.no_copy.entity.GenderType; import ru.soune.nocopy.entity.GenderType;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
@Data @Data
public class UserRequest { public class UserRequest {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto.file; package ru.soune.nocopy.dto.file;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
@@ -1,10 +1,10 @@
package ru.soune.no_copy.dto.file; package ru.soune.nocopy.dto.file;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import ru.soune.no_copy.entity.file.FileStatus; import ru.soune.nocopy.entity.file.FileStatus;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto.file; package ru.soune.nocopy.dto.file;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.dto.file; package ru.soune.nocopy.dto.file;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@@ -1,12 +1,12 @@
package ru.soune.no_copy.dto.file; package ru.soune.nocopy.dto.file;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import ru.soune.no_copy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.FileUploadSession;
import ru.soune.no_copy.entity.file.UploadStatus; import ru.soune.nocopy.entity.file.UploadStatus;
@Data @Data
@Builder @Builder
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*; import lombok.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.Getter; import lombok.Getter;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import lombok.Getter; import lombok.Getter;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
public enum GenderType { public enum GenderType {
MALE, FEMALE MALE, FEMALE
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*; import lombok.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import lombok.Getter; import lombok.Getter;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*; import jakarta.persistence.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*; import lombok.*;
@@ -1,10 +1,10 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import ru.soune.no_copy.entity.file.FileType; import ru.soune.nocopy.entity.file.FileType;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity; package ru.soune.nocopy.entity;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*; import lombok.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity.file; package ru.soune.nocopy.entity.file;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*; import lombok.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity.file; package ru.soune.nocopy.entity.file;
public enum FileStatus { public enum FileStatus {
ACTIVE, ACTIVE,
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity.file; package ru.soune.nocopy.entity.file;
import lombok.Getter; import lombok.Getter;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity.file; package ru.soune.nocopy.entity.file;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.*; import lombok.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.entity.file; package ru.soune.nocopy.entity.file;
public enum UploadStatus { public enum UploadStatus {
INITIATED, INITIATED,
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class ChunkSizeExceededException extends RuntimeException { public class ChunkSizeExceededException extends RuntimeException {
public ChunkSizeExceededException(long actualSize, long maxSize) { public ChunkSizeExceededException(long actualSize, long maxSize) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class ContentNotFoundException extends RuntimeException { public class ContentNotFoundException extends RuntimeException {
public ContentNotFoundException(String message) { public ContentNotFoundException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class FileEntityNotFoundException extends RuntimeException { public class FileEntityNotFoundException extends RuntimeException {
public FileEntityNotFoundException(String fileId) { public FileEntityNotFoundException(String fileId) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class FileIntegrityException extends RuntimeException { public class FileIntegrityException extends RuntimeException {
public FileIntegrityException(String message) { public FileIntegrityException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class FileUploadException extends RuntimeException { public class FileUploadException extends RuntimeException {
public FileUploadException(String message) { public FileUploadException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class InvalidPasswordException extends RuntimeException { public class InvalidPasswordException extends RuntimeException {
public InvalidPasswordException(String message) { public InvalidPasswordException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class InvalidUserEmail extends RuntimeException { public class InvalidUserEmail extends RuntimeException {
public InvalidUserEmail(String message) { public InvalidUserEmail(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class NotFoundAuthToken extends RuntimeException { public class NotFoundAuthToken extends RuntimeException {
public NotFoundAuthToken(String message) { public NotFoundAuthToken(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class NotValidationPasswordException extends RuntimeException { public class NotValidationPasswordException extends RuntimeException {
public NotValidationPasswordException(String message) { public NotValidationPasswordException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class TokenNotFoundException extends RuntimeException { public class TokenNotFoundException extends RuntimeException {
public TokenNotFoundException(String message) { public TokenNotFoundException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class UploadSessionNotFoundException extends RuntimeException { public class UploadSessionNotFoundException extends RuntimeException {
public UploadSessionNotFoundException(String uploadId) { public UploadSessionNotFoundException(String uploadId) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class UserAlreadyExistsException extends RuntimeException { public class UserAlreadyExistsException extends RuntimeException {
public UserAlreadyExistsException(String message) { public UserAlreadyExistsException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.exception; package ru.soune.nocopy.exception;
public class UserNotFoundException extends RuntimeException { public class UserNotFoundException extends RuntimeException {
public UserNotFoundException(String message) { public UserNotFoundException(String message) {
@@ -1,4 +1,4 @@
package ru.soune.no_copy.handler; package ru.soune.nocopy.handler;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.context.support.DefaultMessageSourceResolvable;
@@ -8,7 +8,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;
import ru.soune.no_copy.exception.*; import ru.soune.nocopy.exception.*;
import java.util.Map; import java.util.Map;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.handler; package ru.soune.nocopy.handler;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -1,11 +1,11 @@
package ru.soune.no_copy.mapper; package ru.soune.nocopy.mapper;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget; import org.mapstruct.MappingTarget;
import org.mapstruct.NullValuePropertyMappingStrategy; import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import ru.soune.no_copy.dto.UserContentUpdateRequest; import ru.soune.nocopy.dto.UserContentUpdateRequest;
import ru.soune.no_copy.entity.UserContent; import ru.soune.nocopy.entity.UserContent;
@Mapper(componentModel = "spring", @Mapper(componentModel = "spring",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
@@ -1,10 +1,10 @@
package ru.soune.no_copy.mapper; package ru.soune.nocopy.mapper;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.NullValuePropertyMappingStrategy; import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import ru.soune.no_copy.dto.UserDTO; import ru.soune.nocopy.dto.UserDTO;
import ru.soune.no_copy.entity.User; import ru.soune.nocopy.entity.User;
@Mapper(componentModel = "spring", @Mapper(componentModel = "spring",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
@@ -1,8 +1,8 @@
package ru.soune.no_copy.repository; package ru.soune.nocopy.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Optional; import java.util.Optional;
@@ -1,11 +1,11 @@
package ru.soune.no_copy.repository; package ru.soune.nocopy.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import ru.soune.no_copy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.no_copy.entity.file.FileStatus; import ru.soune.nocopy.entity.file.FileStatus;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -1,11 +1,11 @@
package ru.soune.no_copy.repository; package ru.soune.nocopy.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import ru.soune.no_copy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.FileUploadSession;
import ru.soune.no_copy.entity.file.UploadStatus; import ru.soune.nocopy.entity.file.UploadStatus;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@@ -1,9 +1,9 @@
package ru.soune.no_copy.repository; package ru.soune.nocopy.repository;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.soune.no_copy.entity.file.FileType; import ru.soune.nocopy.entity.file.FileType;
import ru.soune.no_copy.entity.UserContent; import ru.soune.nocopy.entity.UserContent;
import java.util.List; import java.util.List;
@@ -1,7 +1,7 @@
package ru.soune.no_copy.repository; package ru.soune.nocopy.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.soune.no_copy.entity.User; import ru.soune.nocopy.entity.User;
import java.util.Optional; import java.util.Optional;
@@ -1,24 +1,23 @@
package ru.soune.no_copy.service; package ru.soune.nocopy.service;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.soune.no_copy.dto.LoginRequest; import ru.soune.nocopy.dto.LoginRequest;
import ru.soune.no_copy.dto.RegisterRequest; import ru.soune.nocopy.dto.RegisterRequest;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import ru.soune.no_copy.entity.User; import ru.soune.nocopy.entity.User;
import ru.soune.no_copy.exception.NotValidationPasswordException; import ru.soune.nocopy.exception.NotValidationPasswordException;
import ru.soune.no_copy.exception.UserAlreadyExistsException; import ru.soune.nocopy.exception.UserAlreadyExistsException;
import ru.soune.no_copy.exception.UserNotFoundException; import ru.soune.nocopy.exception.UserNotFoundException;
import ru.soune.no_copy.repository.AuthTokenRepository; import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.no_copy.repository.UserRepository; import ru.soune.nocopy.repository.UserRepository;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Base64; import java.util.Base64;
import java.util.Locale;
import java.util.Optional; import java.util.Optional;
@Service @Service
@@ -1,18 +1,18 @@
package ru.soune.no_copy.service; package ru.soune.nocopy.service;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.soune.no_copy.dto.UserContentRequest; import ru.soune.nocopy.dto.UserContentRequest;
import ru.soune.no_copy.dto.UserContentUpdateRequest; import ru.soune.nocopy.dto.UserContentUpdateRequest;
import ru.soune.no_copy.entity.file.FileType; import ru.soune.nocopy.entity.file.FileType;
import ru.soune.no_copy.entity.User; import ru.soune.nocopy.entity.User;
import ru.soune.no_copy.entity.UserContent; import ru.soune.nocopy.entity.UserContent;
import ru.soune.no_copy.exception.ContentNotFoundException; import ru.soune.nocopy.exception.ContentNotFoundException;
import ru.soune.no_copy.exception.UserNotFoundException; import ru.soune.nocopy.exception.UserNotFoundException;
import ru.soune.no_copy.mapper.UserContentMapper; import ru.soune.nocopy.mapper.UserContentMapper;
import ru.soune.no_copy.repository.UserContentRepository; import ru.soune.nocopy.repository.UserContentRepository;
import ru.soune.no_copy.repository.UserRepository; import ru.soune.nocopy.repository.UserRepository;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -1,17 +1,17 @@
package ru.soune.no_copy.service; package ru.soune.nocopy.service;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.soune.no_copy.dto.ChangePasswordRequest; import ru.soune.nocopy.dto.ChangePasswordRequest;
import ru.soune.no_copy.dto.UserDTO; import ru.soune.nocopy.dto.UserDTO;
import ru.soune.no_copy.dto.UserRequest; import ru.soune.nocopy.dto.UserRequest;
import ru.soune.no_copy.entity.User; import ru.soune.nocopy.entity.User;
import ru.soune.no_copy.exception.InvalidUserEmail; import ru.soune.nocopy.exception.InvalidUserEmail;
import ru.soune.no_copy.exception.NotValidationPasswordException; import ru.soune.nocopy.exception.NotValidationPasswordException;
import ru.soune.no_copy.exception.UserNotFoundException; import ru.soune.nocopy.exception.UserNotFoundException;
import ru.soune.no_copy.repository.UserRepository; import ru.soune.nocopy.repository.UserRepository;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
@@ -1,4 +1,4 @@
package ru.soune.no_copy.service.file; package ru.soune.nocopy.service.file;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
@@ -1,16 +1,16 @@
package ru.soune.no_copy.service.file; package ru.soune.nocopy.service.file;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.soune.no_copy.dto.file.FileEntityResponse; import ru.soune.nocopy.dto.file.FileEntityResponse;
import ru.soune.no_copy.dto.file.FileListResponse; import ru.soune.nocopy.dto.file.FileListResponse;
import ru.soune.no_copy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileEntity;
import ru.soune.no_copy.entity.file.FileStatus; import ru.soune.nocopy.entity.file.FileStatus;
import ru.soune.no_copy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.FileUploadSession;
import ru.soune.no_copy.exception.FileEntityNotFoundException; import ru.soune.nocopy.exception.FileEntityNotFoundException;
import ru.soune.no_copy.repository.FileEntityRepository; import ru.soune.nocopy.repository.FileEntityRepository;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@@ -1,8 +1,8 @@
package ru.soune.no_copy.service.file; package ru.soune.nocopy.service.file;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ru.soune.no_copy.dto.file.UploadProgressResponse; import ru.soune.nocopy.dto.file.UploadProgressResponse;
import ru.soune.no_copy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.FileUploadSession;
import java.io.IOException; import java.io.IOException;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.service.file; package ru.soune.nocopy.service.file;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -9,13 +9,13 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import ru.soune.no_copy.dto.file.UploadProgressResponse; import ru.soune.nocopy.dto.file.UploadProgressResponse;
import ru.soune.no_copy.entity.file.FileUploadSession; import ru.soune.nocopy.entity.file.FileUploadSession;
import ru.soune.no_copy.entity.file.UploadStatus; import ru.soune.nocopy.entity.file.UploadStatus;
import ru.soune.no_copy.exception.ChunkSizeExceededException; import ru.soune.nocopy.exception.ChunkSizeExceededException;
import ru.soune.no_copy.exception.FileUploadException; import ru.soune.nocopy.exception.FileUploadException;
import ru.soune.no_copy.exception.UploadSessionNotFoundException; import ru.soune.nocopy.exception.UploadSessionNotFoundException;
import ru.soune.no_copy.repository.FileUploadSessionRepository; import ru.soune.nocopy.repository.FileUploadSessionRepository;
import java.io.*; import java.io.*;
import java.nio.file.*; import java.nio.file.*;
@@ -1,4 +1,4 @@
package ru.soune.no_copy.service; package ru.soune.nocopy.service;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -8,15 +8,15 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import ru.soune.no_copy.dto.LoginRequest; import ru.soune.nocopy.dto.LoginRequest;
import ru.soune.no_copy.dto.RegisterRequest; import ru.soune.nocopy.dto.RegisterRequest;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.nocopy.entity.AuthToken;
import ru.soune.no_copy.entity.User; import ru.soune.nocopy.entity.User;
import ru.soune.no_copy.exception.NotValidationPasswordException; import ru.soune.nocopy.exception.NotValidationPasswordException;
import ru.soune.no_copy.exception.UserAlreadyExistsException; import ru.soune.nocopy.exception.UserAlreadyExistsException;
import ru.soune.no_copy.exception.UserNotFoundException; import ru.soune.nocopy.exception.UserNotFoundException;
import ru.soune.no_copy.repository.AuthTokenRepository; import ru.soune.nocopy.repository.AuthTokenRepository;
import ru.soune.no_copy.repository.UserRepository; import ru.soune.nocopy.repository.UserRepository;
import java.util.Locale; import java.util.Locale;
import java.util.Optional; import java.util.Optional;