fix type GF_AUTH

.gitea/workflows/job.yaml

@@ -0,0 +1,17 @@
+name: Test Workflow
+
+on:
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Print environment variables
+        run: |
+          echo "GITHUB_REPOSITORY: $GITHUB_REPOSITORY"  
+          echo "GITHUB_SHA: $GITHUB_SHA"  
+          echo "GITHUB_REF: $GITHUB_REF"  
+          echo "GITHUB_ACTOR: $GITHUB_ACTOR"  
+          echo "PATH: $PATH"

build.gradle

@@ -28,8 +28,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.security:spring-security-crypto:6.5.3'
-	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
-	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'

docker-compose.yaml

@@ -13,14 +13,11 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
     container_name: postgres
-    networks:
-      app-network:
-        aliases:
-          - database
 
   app:
-    build: .
-    container_name: app-backend
+#    image: popovtsev/ncp
+    build:  .
+    container_name: no_copy_app
     environment:
       POSTGRES_DB: no_copy_
       POSTGRES_USER: postgres
@@ -30,13 +27,7 @@ services:
     depends_on:
       - db
     ports:
-      - "80:8080"
-    networks:
-      app-network:
-        aliases:
-          - app
-          - backend
-          - api
+      - "8080:8080"
 
   grafana:
     image: grafana/grafana:10.3.1
@@ -53,7 +44,7 @@ services:
       alloy:
         condition: service_started
     environment:
-      GF_AUTH_ANONYMOUS_ENABLED: "true"
+      GF_AUTH_ANONYMOUS_ENABLED: true
       GF_SECURITY_ADMIN_USER: admin
       GF_SECURITY_ADMIN_PASSWORD: admin
       GF_METRICS_ENABLED: "true"
@@ -65,8 +56,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 10
-    networks:
-      - app-network
 
   prometheus:
     image: prom/prometheus:latest
@@ -80,8 +69,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-    networks:
-      - app-network
 
   loki:
     image: grafana/loki:2.9.2
@@ -95,8 +82,6 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-    networks:
-      - app-network
 
   tempo:
     image: grafana/tempo:2.4.1
@@ -107,17 +92,15 @@ services:
       - tempo_data:/var/tempo
     ports:
       - "3200:3200"
-    networks:
-      - app-network
 
   alloy:
     image: grafana/alloy:latest
     container_name: alloy
     user: root
     ports:
-      - "9080:9080"
-      - "4317:4317"
-      - "4318:4318"
+      - "9080:9080" # HTTP interface
+      - "4317:4317" # OTLP gRPC
+      - "4318:4318" # OTLP http
     volumes:
       - ./infrastructure/alloy/config.alloy:/etc/alloy/config.alloy:ro
       - /var/lib/docker/containers:/var/lib/docker/containers:ro
@@ -130,8 +113,6 @@ services:
       - --server.http.listen-addr=0.0.0.0:9080
       - --storage.path=/var/lib/alloy/data
       - /etc/alloy/config.alloy
-    networks:
-      - app-network
 
 volumes:
   pgdata:
@@ -141,8 +122,3 @@ volumes:
   loki_chunks:
   loki_index:
   loki_rules:
-
-networks:
-  app-network:
-    external: true
-    driver: bridge

infrastructure/jenkins/deploy-front.groovy

@@ -1,183 +0,0 @@
-pipeline {
-    agent any
-
-    parameters {
-        string(
-                name: 'BRANCH',
-                defaultValue: 'main',
-                description: 'Ветка для деплоя'
-        )
-    }
-
-    stages {
-        stage('Git pull') {
-            steps {
-                script {
-                    checkout([
-                            $class: 'GitSCM',
-                            branches: [[name: params.BRANCH]],
-                            userRemoteConfigs: [[
-                                                        url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
-                                                        credentialsId: 'nx-jen'
-                                                ]]
-                    ])
-                }
-            }
-        }
-
-        stage('Stop old') {
-            steps {
-                script {
-                    withCredentials([
-                            usernamePassword(
-                                    credentialsId: 'server-root-password',
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                docker stop no-copy-frontend 2>/dev/null || true
-                                docker rm no-copy-frontend 2>/dev/null || true
-                                
-                                cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
-                                
-                                if [ -f 'docker-compose.yaml' ]; then
-                                    docker-compose -f docker-compose.yaml down 2>/dev/null || true
-                                elif [ -f 'docker-compose.yml' ]; then
-                                    docker-compose -f docker-compose.yml down 2>/dev/null || true
-                                fi
-                            "
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('Copy to server') {
-            steps {
-                script {
-                    withCredentials([
-                            usernamePassword(
-                                    credentialsId: 'server-root-password',
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                rm -rf /opt/deployments/frontend/${params.BRANCH}/*
-                                mkdir -p /opt/deployments/frontend/${params.BRANCH}
-                            "
-                            
-                            sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('Build on server') {
-            steps {
-                script {
-                    withCredentials([
-                            usernamePassword(
-                                    credentialsId: 'server-root-password',
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                cd /opt/deployments/frontend/${params.BRANCH}
-                                
-                                if [ -f 'docker-compose.yaml' ]; then
-                                    docker-compose -f docker-compose.yaml build
-                                elif [ -f 'docker-compose.yml' ]; then
-                                    docker-compose -f docker-compose.yml build
-                                else
-                                    echo 'Exception:don't found docker-compose'
-                                    exit 1
-                                fi
-                            "
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('Start on server') {
-            steps {
-                script {
-                    withCredentials([
-                            usernamePassword(
-                                    credentialsId: 'server-root-password',
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                cd /opt/deployments/frontend/${params.BRANCH}
-                                
-                                if [ -f 'docker-compose.yaml' ]; then
-                                    docker-compose -f docker-compose.yaml up -d
-                                elif [ -f 'docker-compose.yml' ]; then
-                                    docker-compose -f docker-compose.yml up -d
-                                fi
-                                
-                                sleep 10
-                                
-                                echo 'Status container:'
-                                docker ps --filter name=no-copy-frontend
-                            "
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('Check status') {
-            steps {
-                script {
-                    withCredentials([
-                            usernamePassword(
-                                    credentialsId: 'server-root-password',
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
-                                    echo 'Container start'
-                                    
-                                    sleep 5
-                                    
-                                    HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
-                                    echo 'HTTP код: ' \$HTTP_CODE
-                                    
-                                    echo 'Frong start on http://92.242.61.23:2998'
-                                else
-                                    echo 'Exception: container don't start'
-                                    docker ps -a | grep frontend
-                                    exit 1
-                                fi
-                            "
-                        """
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        success {
-            echo "Front branch ${params.BRANCH} completed"
-            echo "Use on http://92.242.61.23:2998"
-        }
-        failure {
-            echo "Failed"
-        }
-    }
-}

src/main/java/ru/soune/no_copy/configuration/JacksonConfig.java

@@ -1,41 +0,0 @@
-package ru.soune.no_copy.configuration;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-@Configuration
-public class JacksonConfig {
-
-    @Bean
-    @Primary
-    public ObjectMapper objectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-
-        JavaTimeModule javaTimeModule = new JavaTimeModule();
-
-        javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(
-                DateTimeFormatter.ofPattern("dd-MM-yyyy")));
-
-        javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(
-                DateTimeFormatter.ofPattern("dd-MM-yyyy")));
-
-        javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(
-                DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm:ss")));
-
-        mapper.registerModule(javaTimeModule);
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-
-        return mapper;
-    }
-}

src/main/java/ru/soune/no_copy/configuration/SubscriptionConfig.java

@@ -1,35 +0,0 @@
-package ru.soune.no_copy.configuration;
-
-import lombok.Getter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-@Component
-@ConfigurationProperties(prefix = "subscription")
-@Getter
-public class SubscriptionConfig {
-
-    private final Map<SubscriptionType, SubscriptionLimits> limits = Map.of(
-            SubscriptionType.START, new SubscriptionLimits(50, 5.0),
-            SubscriptionType.BASIC, new SubscriptionLimits(200, 20.0),
-            SubscriptionType.PRO, new SubscriptionLimits(1000, 100.0),
-            SubscriptionType.ENTERPRISE, new SubscriptionLimits(-1, 500.0)
-    );
-
-    @Getter
-    public static class SubscriptionLimits {
-        private final int monthlyFiles;
-        private final double storageGB;
-
-        public SubscriptionLimits(int monthlyFiles, double storageGB) {
-            this.monthlyFiles = monthlyFiles;
-            this.storageGB = storageGB;
-        }
-    }
-
-    public enum SubscriptionType {
-        START, BASIC, PRO, ENTERPRISE
-    }
-}

src/main/java/ru/soune/no_copy/controller/AuthController.java

@@ -9,22 +9,17 @@ import ru.soune.no_copy.dto.LoginRequest;
 import ru.soune.no_copy.dto.LoginResponse;
 import ru.soune.no_copy.dto.RegisterRequest;
 import ru.soune.no_copy.entity.AuthToken;
-import ru.soune.no_copy.exception.TokenNotFoundException;
-import ru.soune.no_copy.repository.AuthTokenRepository;
 import ru.soune.no_copy.service.AuthService;
 
 import java.util.Map;
-import java.util.Optional;
 
 @RestController
-@RequestMapping("v1/api/auth")
+@RequestMapping("/api/auth")
 @RequiredArgsConstructor
 public class AuthController {
 
     private final AuthService authService;
 
-    private final AuthTokenRepository authTokenRepository;
-
     @PostMapping("/register")
     public ResponseEntity<AuthResponse> register(@Valid @RequestBody RegisterRequest registerRequest) {
         AuthToken authToken = authService.register(registerRequest);
@@ -45,12 +40,6 @@ public class AuthController {
     public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
         String token = tokenHeader.replace("Bearer ", "");
 
-        Optional<AuthToken> opToken = authTokenRepository.findByToken(token);
-
-        if (opToken.isEmpty()) {
-            throw new TokenNotFoundException("Token not found");
-        }
-
         authService.logout(token);
 
         return ResponseEntity.ok(Map.of("success", true));

src/main/java/ru/soune/no_copy/controller/UserContentController.java

@@ -1,11 +0,0 @@
-package ru.soune.no_copy.controller;
-
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("v1/api/content")
-@AllArgsConstructor
-public class UserContentController {
-}

src/main/java/ru/soune/no_copy/controller/UserController.java

@@ -2,110 +2,27 @@ package ru.soune.no_copy.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ru.soune.no_copy.dto.ChangePasswordRequest;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import ru.soune.no_copy.dto.UserDTO;
-import ru.soune.no_copy.dto.UserRequest;
-import ru.soune.no_copy.entity.AuthToken;
-import ru.soune.no_copy.entity.User;
-import ru.soune.no_copy.exception.InvalidUserEmail;
-import ru.soune.no_copy.exception.NotFoundAuthToken;
-import ru.soune.no_copy.mapper.UserMapper;
-import ru.soune.no_copy.repository.AuthTokenRepository;
 import ru.soune.no_copy.repository.UserRepository;
-import ru.soune.no_copy.service.UserService;
 
 import java.util.List;
-import java.util.Optional;
 
 @RestController
-@RequestMapping("v1/api/user")
+@RequestMapping("/api/user")
 @RequiredArgsConstructor
 public class UserController {
 
     private final UserRepository userRepository;
 
-    private final UserService userService;
-
-    private final AuthTokenRepository authTokenRepository;
-
-    private final UserMapper userMapper;
-
     @GetMapping("/all")
     public ResponseEntity<List<UserDTO>> getAllUsers() {
         List<UserDTO> allUsers = userRepository.findAll().stream()
-                .map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.getIsActive(),
-                        u.getPhone(), u.getGenderType(),
-                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
+                .map(u -> new UserDTO(u.getFirstName(), u.getEmail(), u.getIsActive()))
                 .toList();
 
         return ResponseEntity.ok(allUsers);
     }
-
-    @GetMapping
-    public ResponseEntity<UserDTO> getUser(@RequestParam("email") String email,
-                                           @RequestHeader("Authorization") String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
-
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
-
-        if (authToken != null) {
-            Optional<User> user = userRepository.findByEmail(email);
-            //TODO add mapper
-            if (user.isPresent()) {
-                UserDTO userDTO = userMapper.toDTO(user.get());
-                userDTO.setEmail(email);
-                userDTO.setFullName(user.get().getFullName());
-                userDTO.setCompany(user.get().getCompany());
-                userDTO.setPhone(user.get().getPhone());
-                userDTO.setGenderType(user.get().getGenderType());
-                userDTO.setBirthday(user.get().getBirthday());
-                userDTO.setCreatedAt(user.get().getCreatedAt());
-                userDTO.setSubscriptionType(user.get().getSubscriptionType());
-                userDTO.setActive(user.get().getIsActive());
-
-                return ResponseEntity.ok(userDTO);
-            }
-
-        }
-
-        return ResponseEntity.notFound().build();
-    }
-
-    //TODO fix mapper,doesnot exist all fields
-    @PostMapping("/change-password")
-    public ResponseEntity<UserDTO> updateUser(@RequestBody ChangePasswordRequest changePasswordRequest,
-                                              @RequestHeader("Authorization") String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
-
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
-
-        User user = authToken.getUser();
-
-        if (!changePasswordRequest.getEmail().equals(user.getEmail())) {
-            throw new InvalidUserEmail("Email is not valid: " + changePasswordRequest.getEmail() + "not found");
-        }
-
-        User updateUser = userService.changePassword(user, changePasswordRequest);
-
-        return ResponseEntity.ok(userMapper.toDTO(updateUser));
-    }
-
-    @PatchMapping("/user-update")
-    public ResponseEntity<UserDTO> updateUser(@RequestBody UserRequest userRequest,
-                                              @RequestHeader("Authorization") String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-
-        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
-
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
-
-        User user = authToken.getUser();
-
-        return ResponseEntity.ok(userService.updateUser(userRequest, user));
-    }
 }

src/main/java/ru/soune/no_copy/dto/AuthResponse.java

@@ -2,9 +2,4 @@ package ru.soune.no_copy.dto;
 
 import java.time.LocalDateTime;
 
-public record AuthResponse (
-        boolean success,
-        String message,
-        String token,
-        LocalDateTime expiresAt
-) {}
+public record AuthResponse (boolean success, String message, String token, LocalDateTime expiresAt) {}

src/main/java/ru/soune/no_copy/dto/ChangePasswordRequest.java

@@ -1,14 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-
-@Data
-@AllArgsConstructor
-@Getter
-public class ChangePasswordRequest {
-    private String email;
-    private String currentPassword;
-    private String newPassword;
-}

src/main/java/ru/soune/no_copy/dto/LoginRequest.java

@@ -5,11 +5,9 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
-@NoArgsConstructor
 public class LoginRequest {
 
     @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)

src/main/java/ru/soune/no_copy/dto/RegisterRequest.java

@@ -1,40 +1,13 @@
 package ru.soune.no_copy.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Past;
 import jakarta.validation.constraints.Size;
-import org.springframework.format.annotation.DateTimeFormat;
-import ru.soune.no_copy.entity.GenderType;
-import ru.soune.no_copy.entity.SubscriptionType;
-
-import java.time.LocalDate;
 
 public record RegisterRequest(
-        @NotBlank(message = "error.name.length")
-        String fullName,
-
-        String companyName,
-
-        @Size(min = 11, max = 14)
-        String phone,
-
-        @NotBlank(message = "error.not.blank")
-        @Email(message = "error.not.email")
-        @Size(max = 128)
-        String email,
-
-        @DateTimeFormat(pattern = "dd-MM-yyyy")
-        @JsonFormat(pattern = "dd-MM-yyyy")
-        @Past
-        LocalDate birthday,
-
-        @NotBlank(message = "error.not.blank")
-        @Size(min = 8)
-        String password,
-
-        SubscriptionType subscriptionType,
-
-        GenderType genderType
+        @NotBlank(message = "error.name.length") @Size(min = 2, max = 64) String firstName,
+        @NotBlank(message = "error.name.length") @Size(min = 2, max = 64) String secondName,
+        @NotBlank(message = "error.name.length") @Size(min = 2, max = 64) String lastName,
+        @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128) String email,
+        @NotBlank(message = "error.not.blank") @Size(min = 8) String password
 ) {}

src/main/java/ru/soune/no_copy/dto/UserContentDTO.java

@@ -1,15 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import lombok.Data;
-import ru.soune.no_copy.entity.FileType;
-
-@Data
-public class UserContentDTO {
-    String fileName;
-    String originalFilename;
-    String fileType;
-    String fileExtension;
-    Long fileSize;
-    String filePath;
-    Integer protectionLevel;
-}

src/main/java/ru/soune/no_copy/dto/UserContentRequest.java

@@ -1,15 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-
-public record UserContentRequest(
-        @NotBlank @Email String userEmail,
-        @NotBlank String fileName,
-        @NotBlank String originalFilename,
-        @NotBlank String fileType,
-        @NotBlank String fileExtension,
-        @NotBlank Long fileSize,
-        @NotBlank String filePath,
-        Integer protectionLevel
-) {}

src/main/java/ru/soune/no_copy/dto/UserContentResponse.java

@@ -1,17 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import ru.soune.no_copy.entity.ContentStatus;
-import ru.soune.no_copy.entity.FileType;
-
-import java.time.LocalDateTime;
-
-public record UserContentResponse(
-        Long id,
-        String filename,
-        String originalFilename,
-        FileType fileType,
-        long fileSize,
-        String filePath,
-        ContentStatus status,
-        LocalDateTime uploadDate
-) {}

src/main/java/ru/soune/no_copy/dto/UserContentUpdateRequest.java

@@ -1,16 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-
-public record UserContentUpdateRequest(
-        @NotBlank @Email String userEmail,
-        @NotBlank String fileName,
-        @NotBlank String originalFilename,
-        @NotBlank String fileType,
-        @NotBlank String fileExtension,
-        @NotBlank Long fileSize,
-        @NotBlank String filePath,
-        Integer protectionLevel,
-        Long id
-) {}

src/main/java/ru/soune/no_copy/dto/UserDTO.java

@@ -1,27 +1,12 @@
 package ru.soune.no_copy.dto;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import ru.soune.no_copy.entity.GenderType;
-import ru.soune.no_copy.entity.SubscriptionType;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 @AllArgsConstructor
-@NoArgsConstructor
-@Builder
 public class UserDTO {
     private String fullName;
-    private String company;
     private String email;
-    private boolean active;
-    private String phone;
-    private GenderType genderType;
-    private LocalDate birthday;
-    private LocalDateTime createdAt;
-    private SubscriptionType subscriptionType;
+    private boolean isActive;
 }

src/main/java/ru/soune/no_copy/dto/UserRequest.java

@@ -1,25 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.Past;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-import ru.soune.no_copy.entity.GenderType;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Data
-public class UserRequest {
-    @Size(min = 2)
-    private String fullName;
-    private String company;
-    @Email
-    private String email;
-    private String phone;
-    private GenderType genderType;
-    @Past
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    private LocalDate birthday;
-}

src/main/java/ru/soune/no_copy/entity/AuthToken.java

@@ -1,30 +1,25 @@
 package ru.soune.no_copy.entity;
 
 import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "auth_tokens")
+@NoArgsConstructor
 @Getter
 @Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
 @EntityListeners(AuditingEntityListener.class)
+@Table(name = "auth_tokens")
 public class AuthToken {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long tokenId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
+    private Long id;
 
     @Column(nullable = false, unique = true, length = 64)
     private String token;
@@ -36,13 +31,7 @@ public class AuthToken {
     @Column(name = "created_at", updatable = false, nullable = false)
     private LocalDateTime createdAt;
 
-    @Column(name = "last_used_at")
-    private LocalDateTime lastUsedAt;
-
-    @Column(name = "is_active")
-    private Boolean isActive = true;
-
-    public boolean isValid() {
-        return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
-    }
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
 }

src/main/java/ru/soune/no_copy/entity/BaseEntity.java

@@ -1,29 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@MappedSuperclass
-@EntityListeners(AuditingEntityListener.class)
-@Getter
-@Setter
-public abstract class BaseEntity {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @CreatedDate
-    @Column(name = "created_at", updatable = false, nullable = false)
-    private LocalDateTime createdAt;
-
-    @LastModifiedDate
-    @Column(name = "updated_at")
-    private LocalDateTime updatedAt;
-}

src/main/java/ru/soune/no_copy/entity/ContentStatus.java

@@ -1,20 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import lombok.Getter;
-
-@Getter
-public enum ContentStatus {
-    PROCESSING("processing"),
-    COMPLETED("completed"),
-    ERROR("error");
-
-    private final String code;
-
-    ContentStatus(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-}

src/main/java/ru/soune/no_copy/entity/FileType.java

@@ -1,21 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import lombok.Getter;
-
-@Getter
-public enum FileType {
-    PHOTO("photo"),
-    VIDEO("video"),
-    AUDIO("audio"),
-    DOCUMENT("document");
-
-    private final String code;
-
-    FileType(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-}

src/main/java/ru/soune/no_copy/entity/GenderType.java

@@ -1,5 +0,0 @@
-package ru.soune.no_copy.entity;
-
-public enum GenderType {
-    MALE, FEMALE
-}

src/main/java/ru/soune/no_copy/entity/ImageProtection.java

@@ -1,49 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "image_protection")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@EntityListeners(AuditingEntityListener.class)
-public class ImageProtection {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long protectionId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "content_id", nullable = false)
-    @ToString.Exclude
-    private UserContent content;
-
-    @Column(name = "protection_method", nullable = false, length = 50)
-    private String protectionMethod;
-
-    @Column(name = "protection_level", nullable = false)
-    private Integer protectionLevel;
-
-    @Column(name = "is_active", nullable = false)
-    private Boolean isActive = true;
-
-    @CreatedDate
-    @Column(name = "applied_at", nullable = false, updatable = false)
-    private LocalDateTime appliedAt;
-
-    @Column(name = "metadata", columnDefinition = "JSON")
-    private String metadata;
-}

src/main/java/ru/soune/no_copy/entity/SubscriptionType.java

@@ -1,8 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import lombok.Getter;
-
-@Getter
-public enum SubscriptionType {
-    START, BASIC, PRO, ENTERPRISE, DEMO;
-}

src/main/java/ru/soune/no_copy/entity/User.java

@@ -7,86 +7,52 @@ import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
 @Entity
-@Table(name = "users")
-@Getter
-@Setter
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
 @ToString
+@EqualsAndHashCode
+@Getter @Setter
 @EntityListeners(AuditingEntityListener.class)
+@Table(name = "users")
 public class User {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long Id;
+    private Long userId;
 
-    @Column(name = "full_name", nullable = false)
-    private String fullName;
+    @Size(max = 64)
+    @Column(name = "firstName", nullable = false, length = 64)
+    private String firstName;
+
+    @Size(max = 64)
+    @Column(name = "lastName", nullable = false, length = 64)
+    private String lastName;
+
+    @Size(max = 64)
+    @Column(name = "secondName", length = 64)
+    private String secondName;
 
     @Size(max = 1024)
     @Column(name = "email", nullable = false, length = 1024, unique = true)
     private String email;
 
-    @Column(name = "company")
-    private String company;
-
     @Column(nullable = false)
-    @Size(min = 6)
     @JsonIgnore
     private String password;
 
-    @Size(min = 11, max = 14)
-    private String phone;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "subscription_type", nullable = false, length = 20)
-    private SubscriptionType subscriptionType = SubscriptionType.DEMO;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "gender")
-    private GenderType genderType = GenderType.MALE;
-
-    @Column(name = "birthday")
-    private LocalDate birthday;
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<AuthToken> tokens = new ArrayList<>();
 
     @CreatedDate
     @Column(name = "created_at", updatable = false, nullable = false)
     private LocalDateTime createdAt;
 
-    @Column(name = "last_login_at")
-    private LocalDateTime lastLoginAt;
-
     @Column(name = "is_active")
     private Boolean isActive = true;
 
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<AuthToken> tokens = new ArrayList<>();
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<UserContent> userContents = new ArrayList<>();
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<UserAction> userActions = new ArrayList<>();
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<Violation> violations = new ArrayList<>();
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<ImageProtection> imageProtections = new ArrayList<>();
 }

src/main/java/ru/soune/no_copy/entity/UserAction.java

@@ -1,44 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "user_actions")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@EntityListeners(AuditingEntityListener.class)
-public class UserAction {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long actionId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
-
-    @Column(name = "action", nullable = false, length = 100)
-    private String action;
-
-    @Column(name = "details", columnDefinition = "TEXT")
-    private String details;
-
-    @Column(name = "ip_address", length = 45)
-    private String ipAddress;
-
-    @Column(name = "user_agent", columnDefinition = "TEXT")
-    private String userAgent;
-
-    @CreatedDate
-    @Column(name = "created_at", nullable = false, updatable = false)
-    private LocalDateTime createdAt;
-}

src/main/java/ru/soune/no_copy/entity/UserContent.java

@@ -1,80 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.hibernate.annotations.CreationTimestamp;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "user_content")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@EntityListeners(AuditingEntityListener.class)
-public class UserContent {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long contentId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
-
-    @Column(name = "filename", nullable = false, length = 255)
-    private String filename;
-
-    @Column(name = "original_filename", nullable = false, length = 255)
-    private String originalFilename;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "file_type", nullable = false, length = 20)
-    private FileType fileType;
-
-    @Column(name = "file_extension", nullable = false, length = 10)
-    private String fileExtension;
-
-    @Column(name = "file_size", nullable = false)
-    private Long fileSize;
-
-    @Column(name = "file_path", nullable = false, columnDefinition = "TEXT")
-    private String filePath;
-
-    @Column(name = "protection_level")
-    private Integer protectionLevel = 0;
-
-    @Column(name = "geometric_resistant")
-    private Boolean geometricResistant = false;
-
-    @Column(name = "watermark_applied")
-    private Boolean watermarkApplied = false;
-
-    @Column(name = "protection_hash", length = 64)
-    private String protectionHash;
-
-    @Column(name = "watermark_id", length = 50)
-    private String watermarkId;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "status", nullable = false, length = 20)
-    private ContentStatus status = ContentStatus.PROCESSING;
-
-    @CreatedDate
-    @Column(name = "upload_date", nullable = false, updatable = false)
-    private LocalDateTime uploadDate;
-
-    public Double getFileSizeInGB() {
-        return fileSize != null ? fileSize / (1024.0 * 1024.0 * 1024.0) : 0.0;
-    }
-
-    public Boolean isProtected() {
-        return protectionLevel != null && protectionLevel > 0;
-    }
-}
-

src/main/java/ru/soune/no_copy/entity/Violation.java

@@ -1,56 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "violations")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@EntityListeners(AuditingEntityListener.class)
-public class Violation {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long violationId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
-
-    @Column(name = "violation_type", nullable = false, length = 50)
-    private String violationType;
-
-    @Column(name = "description", columnDefinition = "TEXT")
-    private String description;
-
-    @Column(name = "content_id")
-    private Long contentId;
-
-    @Column(name = "status", nullable = false, length = 20)
-    private String status = "new";
-
-    @Column(name = "severity", length = 20)
-    private String severity;
-
-    @Column(name = "resolved_at")
-    private LocalDateTime resolvedAt;
-
-    @Column(name = "resolved_by")
-    private Long resolvedBy;
-
-    @Column(name = "resolution_notes", columnDefinition = "TEXT")
-    private String resolutionNotes;
-
-    @CreatedDate
-    @Column(name = "created_at", nullable = false, updatable = false)
-    private LocalDateTime createdAt;
-}

src/main/java/ru/soune/no_copy/exception/ContentNotFoundException.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.exception;
-
-public class ContentNotFoundException extends RuntimeException {
-    public ContentNotFoundException(String message) {
-        super(message);
-    }
-}

src/main/java/ru/soune/no_copy/exception/InvalidPasswordException.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.exception;
-
-public class InvalidPasswordException extends RuntimeException {
-    public InvalidPasswordException(String message) {
-        super(message);
-    }
-}

src/main/java/ru/soune/no_copy/exception/InvalidUserEmail.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.exception;
-
-public class InvalidUserEmail extends RuntimeException {
-    public InvalidUserEmail(String message) {
-        super(message);
-    }
-}

src/main/java/ru/soune/no_copy/exception/NotFoundAuthToken.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.exception;
-
-public class NotFoundAuthToken extends RuntimeException {
-    public NotFoundAuthToken(String message) {
-        super(message);
-    }
-}

src/main/java/ru/soune/no_copy/exception/TokenNotFoundException.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.exception;
-
-public class TokenNotFoundException extends RuntimeException {
-    public TokenNotFoundException(String message) {
-        super(message);
-    }
-}

src/main/java/ru/soune/no_copy/handler/GlobalExceptionHandler.java

@@ -8,7 +8,9 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.soune.no_copy.exception.*;
+import ru.soune.no_copy.exception.NotValidationPasswordException;
+import ru.soune.no_copy.exception.UserAlreadyExistsException;
+import ru.soune.no_copy.exception.UserNotFoundException;
 
 import java.util.Map;
 
@@ -51,17 +53,6 @@ public class GlobalExceptionHandler {
                 ));
     }
 
-    @ExceptionHandler(ContentNotFoundException.class)
-    @ResponseStatus(HttpStatus.NOT_FOUND)
-    public ResponseEntity<?> handleUserNotFoundException(ContentNotFoundException ex) {
-        return ResponseEntity.
-                badRequest()
-                .body(Map.of(
-                        "success", false,
-                        "message" ,ex.getMessage()
-                ));
-    }
-
     @ExceptionHandler(NotValidationPasswordException.class)
     @ResponseStatus(HttpStatus.FORBIDDEN)
     public ResponseEntity<?> handleNotValidationPasswordException(NotValidationPasswordException ex) {
@@ -72,15 +63,4 @@ public class GlobalExceptionHandler {
                         "message" ,ex.getMessage()
                 ));
     }
-
-    @ExceptionHandler(TokenNotFoundException.class)
-    @ResponseStatus(HttpStatus.NOT_FOUND)
-    public ResponseEntity<?> handleNotFoundTokenException(TokenNotFoundException ex) {
-        return ResponseEntity.
-                badRequest()
-                .body(Map.of(
-                        "success", false,
-                        "message" ,ex.getMessage()
-                ));
-    }
 }

src/main/java/ru/soune/no_copy/handler/JwtTokenProvider.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.handler;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class JwtTokenProvider {
-}

src/main/java/ru/soune/no_copy/mapper/UserContentMapper.java

@@ -1,18 +0,0 @@
-package ru.soune.no_copy.mapper;
-
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValuePropertyMappingStrategy;
-import org.mapstruct.factory.Mappers;
-import ru.soune.no_copy.dto.UserContentUpdateRequest;
-import ru.soune.no_copy.entity.UserContent;
-
-@Mapper(componentModel = "spring",
-        nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
-public interface UserContentMapper {
-
-    UserContentMapper INSTANCE = Mappers.getMapper(UserContentMapper.class);
-
-
-    void updateEntityFromDto(UserContentUpdateRequest dto, @MappingTarget UserContent entity);
-}

src/main/java/ru/soune/no_copy/mapper/UserMapper.java

@@ -1,16 +0,0 @@
-package ru.soune.no_copy.mapper;
-
-import org.mapstruct.Mapper;
-import org.mapstruct.NullValuePropertyMappingStrategy;
-import org.mapstruct.factory.Mappers;
-import ru.soune.no_copy.dto.UserDTO;
-import ru.soune.no_copy.entity.User;
-
-@Mapper(componentModel = "spring",
-        nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
-public interface UserMapper {
-
-    UserMapper INSTANCE = Mappers.getMapper(UserMapper.class);
-
-    UserDTO toDTO(User user);
-}

src/main/java/ru/soune/no_copy/repository/UserContentRepository.java

@@ -1,20 +0,0 @@
-package ru.soune.no_copy.repository;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import ru.soune.no_copy.entity.FileType;
-import ru.soune.no_copy.entity.UserContent;
-
-import java.util.List;
-
-public interface UserContentRepository extends JpaRepository<UserContent, Long> {
-    List<UserContent> findByUserIdOrderByUploadDateDesc(Long userId);
-
-    List<UserContent> findByUserId(Long userId);
-
-    List<UserContent> findByUserIdAndFileTypeOrderByUploadDateDesc(Long userId, FileType type, Pageable pageable);
-
-    long countByUserIdAndFileType(Long userId, FileType type);
-
-    long countByUserId(Long userId);
-}

src/main/java/ru/soune/no_copy/repository/UserRepository.java

@@ -7,5 +7,6 @@ import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
+
     boolean existsByEmail(String email);
 }

src/main/java/ru/soune/no_copy/service/AuthService.java

@@ -16,7 +16,6 @@ import ru.soune.no_copy.repository.AuthTokenRepository;
 import ru.soune.no_copy.repository.UserRepository;
 
 import java.security.SecureRandom;
-import java.time.LocalDateTime;
 import java.util.Base64;
 import java.util.Locale;
 import java.util.Optional;
@@ -38,22 +37,17 @@ public class AuthService {
     @Transactional
     public AuthToken register(RegisterRequest registerRequest) {
         if (userRepository.existsByEmail(registerRequest.email())) {
-            throw new UserAlreadyExistsException("User already exists with email: " + registerRequest.email());
+            throw new UserAlreadyExistsException(messageSource.getMessage("error.user.exists", null,
+                    Locale.getDefault()));
         }
 
         User user = new User();
-        user.setFullName(registerRequest.fullName());
+        user.setFirstName(registerRequest.firstName());
+        user.setSecondName(registerRequest.secondName());
+        user.setLastName(registerRequest.lastName());
         user.setEmail(registerRequest.email());
         user.setPassword(passwordEncoder.encode(registerRequest.password()));
 
-        if (registerRequest.companyName() != null) {
-            user.setCompany(registerRequest.companyName());
-        }
-
-        if (registerRequest.phone() != null) {
-            user.setPhone(registerRequest.phone());
-        }
-
         User savedUser = userRepository.save(user);
 
         AuthToken authToken = new AuthToken();
@@ -77,17 +71,13 @@ public class AuthService {
             throw new NotValidationPasswordException("Invalid password");
         }
 
-        user.setLastLoginAt(LocalDateTime.now());
-        User savedUser = userRepository.save(user);
-
         AuthToken authToken = new AuthToken();
         authToken.setToken(generateAuthToken());
-        authToken.setUser(savedUser);
+        authToken.setUser(user);
 
         return authTokenRepository.save(authToken);
     }
 
-    @Transactional
     public void logout(String token) {
         authTokenRepository.findByToken(token)
                 .ifPresent(authTokenRepository::delete);

src/main/java/ru/soune/no_copy/service/UserContentService.java

@@ -1,72 +0,0 @@
-package ru.soune.no_copy.service;
-
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import ru.soune.no_copy.dto.UserContentRequest;
-import ru.soune.no_copy.dto.UserContentUpdateRequest;
-import ru.soune.no_copy.entity.FileType;
-import ru.soune.no_copy.entity.User;
-import ru.soune.no_copy.entity.UserContent;
-import ru.soune.no_copy.exception.ContentNotFoundException;
-import ru.soune.no_copy.exception.UserNotFoundException;
-import ru.soune.no_copy.mapper.UserContentMapper;
-import ru.soune.no_copy.repository.UserContentRepository;
-import ru.soune.no_copy.repository.UserRepository;
-
-import java.util.List;
-import java.util.Optional;
-
-@Service
-@AllArgsConstructor
-public class UserContentService {
-
-    private final UserContentRepository userContentRepository;
-
-    private final UserRepository userRepository;
-
-    private final UserContentMapper userContentMapper;
-
-    public List<UserContent> findByUser(long userId) {
-        return userContentRepository.findByUserId(userId);
-    }
-
-    @Transactional
-    public UserContent addUserContent(UserContentRequest userContentRequest) {
-        UserContent userContent = new UserContent();
-
-        Optional<User> byEmail = userRepository.findByEmail(userContentRequest.userEmail());
-        User user = byEmail.orElseThrow(() -> new UserNotFoundException(userContentRequest.userEmail()));
-
-        userContent.setUser(user);
-        userContent.setFilename(userContentRequest.fileName());
-        userContent.setFileExtension(userContentRequest.fileExtension());
-        userContent.setFilePath(userContentRequest.filePath());
-        userContent.setFileType(FileType.valueOf(userContentRequest.fileType()));
-        userContent.setOriginalFilename(userContentRequest.originalFilename());
-        userContent.setProtectionLevel(userContentRequest.protectionLevel());
-        userContent.setFileSize(userContentRequest.fileSize());
-
-        //TODO add
-        //    @Column(name = "protection_hash", length = 64)
-        //    private String protectionHash;
-        //    @Column(name = "watermark_id", length = 50)
-        //    private String watermarkId;
-
-        return userContentRepository.save(userContent);
-    }
-
-    @Transactional
-    public UserContent updateUserContent(UserContentUpdateRequest userContentRequest) {
-        UserContent entity = userContentRepository.findById(userContentRequest.id())
-                .orElseThrow(() -> new ContentNotFoundException("Content not found with: " + userContentRequest.id()));
-
-        userContentMapper.updateEntityFromDto(userContentRequest, entity);
-
-        return userContentRepository.save(entity);
-    }
-
-    public void deleteUserContent(long userContentId) {
-        userContentRepository.deleteById(userContentId);
-    }
-}

src/main/java/ru/soune/no_copy/service/UserService.java

@@ -1,86 +0,0 @@
-package ru.soune.no_copy.service;
-
-import lombok.AllArgsConstructor;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import ru.soune.no_copy.dto.ChangePasswordRequest;
-import ru.soune.no_copy.dto.UserDTO;
-import ru.soune.no_copy.dto.UserRequest;
-import ru.soune.no_copy.entity.User;
-import ru.soune.no_copy.exception.InvalidUserEmail;
-import ru.soune.no_copy.exception.NotValidationPasswordException;
-import ru.soune.no_copy.exception.UserNotFoundException;
-import ru.soune.no_copy.repository.UserRepository;
-
-@Service
-@AllArgsConstructor
-public class UserService {
-
-    private final UserRepository userRepository;
-
-    private final PasswordEncoder passwordEncoder;
-
-    @Transactional
-    public User changePassword(User user, ChangePasswordRequest request) {
-        if (!passwordEncoder.matches(request.getCurrentPassword(), user.getPassword())) {
-            throw new NotValidationPasswordException("Current password is incorrect");
-        }
-
-        user.setPassword(passwordEncoder.encode(request.getNewPassword()));
-
-        return userRepository.save(user);
-    }
-
-    @Transactional
-    public UserDTO updateUser(UserRequest userRequest, User currentUser) {
-        User user = userRepository.findById(currentUser.getId())
-                .orElseThrow(() -> new UserNotFoundException("User not found with id: " + currentUser.getId()));
-
-        updateUserFromRequest(user, userRequest);
-
-        User updatedUser = userRepository.save(user);
-
-        return mapToDTO(updatedUser);
-    }
-
-    private void updateUserFromRequest(User user, UserRequest request) {
-        if (request.getFullName() != null) {
-            user.setFullName(request.getFullName());
-        }
-
-        if (request.getCompany() != null) {
-            user.setCompany(request.getCompany());
-        }
-
-        if (request.getEmail() != null && !request.getEmail().equals(user.getEmail())) {
-            if (userRepository.existsByEmail(request.getEmail())) {
-                throw new InvalidUserEmail("Email already exists: " + request.getEmail());
-            }
-            user.setEmail(request.getEmail());
-        }
-
-        if (request.getPhone() != null) {
-            user.setPhone(request.getPhone());
-        }
-        if (request.getGenderType() != null) {
-            user.setGenderType(request.getGenderType());
-        }
-        if (request.getBirthday() != null) {
-            user.setBirthday(request.getBirthday());
-        }
-    }
-
-    private UserDTO mapToDTO(User user) {
-        return UserDTO.builder()
-                .fullName(user.getFullName())
-                .email(user.getEmail())
-                .company(user.getCompany())
-                .phone(user.getPhone())
-                .genderType(user.getGenderType())
-                .birthday(user.getBirthday())
-                .subscriptionType(user.getSubscriptionType())
-                .createdAt(user.getCreatedAt())
-                .build();
-    }
-}

src/test/java/ru/soune/no_copy/service/AuthServiceTest.java

@@ -51,8 +51,8 @@ public class AuthServiceTest {
 
     @Test
     void registerSuccess() {
-        RegisterRequest request = new RegisterRequest("John","A.","124124",
-                "john@example.com", null,"password123", null, null);
+        RegisterRequest request = new RegisterRequest("John","A.","Doe",
+                "john@example.com", "password123");
 
         when(userRepository.existsByEmail(request.email())).thenReturn(false);
         when(passwordEncoder.encode(request.password())).thenReturn("hashed");
@@ -72,8 +72,8 @@ public class AuthServiceTest {
 
     @Test
     void registerExistingEmailThrows() {
-        RegisterRequest request = new RegisterRequest("John","A.","124124",
-                "john@example.com", null,"password123", null, null);
+        RegisterRequest request = new RegisterRequest("John","A.","Doe",
+                "john@example.com", "password123");
 
         when(userRepository.existsByEmail(request.email()))
                 .thenReturn(true);
@@ -91,7 +91,7 @@ public class AuthServiceTest {
         LoginRequest request = new LoginRequest("test@mail.com", "password");
 
         User user = new User();
-        user.setId(1L);
+        user.setUserId(1L);
         user.setEmail("test@mail.com");
         user.setPassword("encoded_pass");
 
@@ -106,12 +106,12 @@ public class AuthServiceTest {
 
         assertNotNull(token);
         assertNotNull(token.getToken());
-//        assertEquals(user.getTokens().get(0), token.getUser());
+        assertEquals(user, token.getUser());
 
         ArgumentCaptor<AuthToken> captor = ArgumentCaptor.forClass(AuthToken.class);
         verify(authTokenRepository).save(captor.capture());
 
-//        assertEquals(user, captor.getValue().getUser());
+        assertEquals(user, captor.getValue().getUser());
         assertNotNull(captor.getValue().getToken());
     }