From fb5642db9e81acfa4b71f13e9c78d54356c9bea9 Mon Sep 17 00:00:00 2001
From: vladp <vlad.popovtsevv@gmail.com>
Date: Thu, 29 Jan 2026 21:46:37 +0700
Subject: [PATCH] dev check null company

---
 .../java/ru/soune/nocopy/controller/UserController.java   | 2 +-
 src/main/java/ru/soune/nocopy/entity/user/User.java       | 8 ++++++++
 .../ru/soune/nocopy/service/file/FileEntityService.java   | 2 +-
 .../java/ru/soune/nocopy/service/user/UserService.java    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/soune/nocopy/controller/UserController.java b/src/main/java/ru/soune/nocopy/controller/UserController.java
index 1f77d7b..173ee84 100644
--- a/src/main/java/ru/soune/nocopy/controller/UserController.java
+++ b/src/main/java/ru/soune/nocopy/controller/UserController.java
@@ -47,7 +47,7 @@ public class UserController {
     @GetMapping("/all")
     public ResponseEntity<List<UserDTO>> getAllUsers() {
         List<UserDTO> allUsers = userRepository.findAll().stream()
-                .map(u -> new UserDTO(u.getFullName(), u.getCompany().getCompanyName(), u.getEmail(), u.isActive(),
+                .map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
                         u.getPhone(), u.getGenderType(),
                         u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
                 .toList();
diff --git a/src/main/java/ru/soune/nocopy/entity/user/User.java b/src/main/java/ru/soune/nocopy/entity/user/User.java
index aad5cf9..b839e2d 100644
--- a/src/main/java/ru/soune/nocopy/entity/user/User.java
+++ b/src/main/java/ru/soune/nocopy/entity/user/User.java
@@ -90,6 +90,14 @@ public class User {
     @JsonIgnore
     private ProtectedFileCheck protectedFileCheck;
 
+    public String getCompanyName() {
+        if (company != null) {
+            return company.getCompanyName();
+        } else {
+            return null;
+        }
+    }
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "company_id")
     @ToString.Exclude
diff --git a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
index 3d7e1dc..b6bc0d0 100644
--- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
+++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java
@@ -372,7 +372,7 @@ public class FileEntityService {
                 .fileName(fileEntity.getOriginalFileName())
                 .ownerName(user.getFullName())
                 .ownerEmail(user.getEmail())
-                .ownerCompany(user.getCompany().getCompanyName())
+                .ownerCompany(user.getCompanyName())
                 //TODO fix after add logic for check for protect file
                 .checksCount(0)
                 .fileUploadDate(fileEntity.getCreatedAt())
diff --git a/src/main/java/ru/soune/nocopy/service/user/UserService.java b/src/main/java/ru/soune/nocopy/service/user/UserService.java
index 7778f25..c118aab 100644
--- a/src/main/java/ru/soune/nocopy/service/user/UserService.java
+++ b/src/main/java/ru/soune/nocopy/service/user/UserService.java
@@ -83,7 +83,7 @@ public class UserService {
         return UserDTO.builder()
                 .fullName(user.getFullName())
                 .email(user.getEmail())
-                .company(user.getCompany().getCompanyName())
+                .company(user.getCompanyName())
                 .phone(user.getPhone())
                 .genderType(user.getGenderType())
                 .birthday(user.getBirthday())