Refactor user package structure and add DTOs

src/main/java/org/example/untitled/User/Role.java → src/main/java/org/example/untitled/user/Role.java

@@ -1,4 +1,4 @@
-package org.example.untitled.User;
+package org.example.untitled.user;
 
 public enum Role {
     USER,

src/main/java/org/example/untitled/User/User.java → src/main/java/org/example/untitled/user/User.java

@@ -1,4 +1,4 @@
-package org.example.untitled.User;
+package org.example.untitled.user;
 
 import jakarta.persistence.*;
 import org.example.untitled.usercase.*;

src/main/java/org/example/untitled/User/controller/UserController.java → src/main/java/org/example/untitled/user/controller/UserController.java

@@ -1,6 +1,6 @@
-package org.example.untitled.User.controller;
+package org.example.untitled.user.controller;
 
-import org.example.untitled.User.service.UserService;
+import org.example.untitled.user.service.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -9,14 +9,14 @@
 @Controller
 public class UserController {
     private static final Logger log = LoggerFactory.getLogger(UserController.class);
-    UserService userService;
+    private final UserService userService;
 
-    private UserController(UserService service){
+    public UserController(UserService service){
         this.userService = service;
     }
 
     @GetMapping("/user")
     public String userLanding(){
         return "userpage";
     }
-}
+}

src/main/java/org/example/untitled/user/dto/UserDto.java

@@ -0,0 +1,39 @@
+package org.example.untitled.user.dto;
+
+import org.example.untitled.user.Role;
+
+import java.time.LocalDateTime;
+
+public class UserDto {
+
+    private Long id;
+    private String username;
+    private String email;
+    private Role role;
+    private LocalDateTime createdAt;
+
+    public UserDto() {}
+
+    public UserDto(Long id, String username, String email, Role role, LocalDateTime createdAt) {
+        this.id = id;
+        this.username = username;
+        this.email = email;
+        this.role = role;
+        this.createdAt = createdAt;
+    }
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+
+    public String getUsername() { return username; }
+    public void setUsername(String username) { this.username = username; }
+
+    public String getEmail() { return email; }
+    public void setEmail(String email) { this.email = email; }
+
+    public Role getRole() { return role; }
+    public void setRole(Role role) { this.role = role; }
+
+    public LocalDateTime getCreatedAt() { return createdAt; }
+    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
+}

src/main/java/org/example/untitled/user/mapper/UserMapper.java

@@ -0,0 +1,28 @@
+package org.example.untitled.user.mapper;
+
+import org.example.untitled.user.User;
+import org.example.untitled.user.dto.UserDto;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserMapper {
+
+    public UserDto toDto(User user) {
+        if (user == null) return null;
+        UserDto dto = new UserDto();
+        dto.setId(user.getId());
+        dto.setUsername(user.getUsername());
+        dto.setEmail(user.getEmail());
+        dto.setRole(user.getRole());
+        dto.setCreatedAt(user.getCreatedAt());
+        return dto;
+    }
+
+    public User toEntity(UserDto dto) {
+        if (dto == null) return null;
+        User user = new User();
+        user.setUsername(dto.getUsername());
+        user.setEmail(dto.getEmail());
+        return user;
+    }
+}

src/main/java/org/example/untitled/User/Repository/UserRepository.java → src/main/java/org/example/untitled/user/repository/UserRepository.java

@@ -1,9 +1,9 @@
-package org.example.untitled.User.Repository;
+package org.example.untitled.user.repository;
 
-import org.example.untitled.User.User;
+import org.example.untitled.user.User;
 import org.springframework.data.repository.ListCrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface UserRepository extends ListCrudRepository<User, Long> {
-}
+}

src/main/java/org/example/untitled/user/service/UserService.java

@@ -0,0 +1,17 @@
+package org.example.untitled.user.service;
+
+import org.example.untitled.user.mapper.UserMapper;
+import org.example.untitled.user.repository.UserRepository;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserService {
+
+    private final UserRepository userRep;
+    private final UserMapper userMapper;
+
+    public UserService(UserRepository userRep, UserMapper userMapper) {
+        this.userRep = userRep;
+        this.userMapper = userMapper;
+    }
+}

src/main/java/org/example/untitled/usercase/AuditLog.java

@@ -1,7 +1,7 @@
 package org.example.untitled.usercase;
 
 import jakarta.persistence.*;
-import org.example.untitled.User.User;
+import org.example.untitled.user.User;
 
 import java.time.LocalDateTime;
 

src/main/java/org/example/untitled/usercase/CaseEntity.java

@@ -1,7 +1,7 @@
 package org.example.untitled.usercase;
 
 import jakarta.persistence.*;
-import org.example.untitled.User.User;
+import org.example.untitled.user.User;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;

src/main/java/org/example/untitled/usercase/Comment.java

@@ -1,7 +1,7 @@
 package org.example.untitled.usercase;
 
 import jakarta.persistence.*;
-import org.example.untitled.User.User;
+import org.example.untitled.user.User;
 
 import java.time.LocalDateTime;
 

src/main/java/org/example/untitled/usercase/UploadedFile.java

@@ -1,7 +1,7 @@
 package org.example.untitled.usercase;
 
 import jakarta.persistence.*;
-import org.example.untitled.User.User;
+import org.example.untitled.user.User;
 
 import java.time.LocalDateTime;
 

src/main/java/org/example/untitled/usercase/dto/CaseEntityDto.java

@@ -0,0 +1,47 @@
+package org.example.untitled.usercase.dto;
+
+import org.example.untitled.usercase.CaseStatus;
+
+import java.time.LocalDateTime;
+
+public class CaseEntityDto {
+
+    private Long id;
+    private String title;
+    private String description;
+    private CaseStatus status;
+    private Long ownerId;
+    private String ownerUsername;
+    private Long assignedToId;
+    private String assignedToUsername;
+    private LocalDateTime createdAt;
+
+    public CaseEntityDto() {}
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+
+    public String getTitle() { return title; }
+    public void setTitle(String title) { this.title = title; }
+
+    public String getDescription() { return description; }
+    public void setDescription(String description) { this.description = description; }
+
+    public CaseStatus getStatus() { return status; }
+    public void setStatus(CaseStatus status) { this.status = status; }
+
+    public Long getOwnerId() { return ownerId; }
+    public void setOwnerId(Long ownerId) { this.ownerId = ownerId; }
+
+    public String getOwnerUsername() { return ownerUsername; }
+    public void setOwnerUsername(String ownerUsername) { this.ownerUsername = ownerUsername; }
+
+    public Long getAssignedToId() { return assignedToId; }
+    public void setAssignedToId(Long assignedToId) { this.assignedToId = assignedToId; }
+
+    public String getAssignedToUsername() { return assignedToUsername; }
+    public void setAssignedToUsername(String assignedToUsername) { this.assignedToUsername = assignedToUsername; }
+
+    public LocalDateTime getCreatedAt() { return createdAt; }
+    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
+}

src/main/java/org/example/untitled/usercase/dto/CommentDto.java

@@ -0,0 +1,33 @@
+package org.example.untitled.usercase.dto;
+
+import java.time.LocalDateTime;
+
+public class CommentDto {
+
+    private Long id;
+    private String text;
+    private Long authorId;
+    private String authorUsername;
+    private Long caseId;
+    private LocalDateTime createdAt;
+
+    public CommentDto() {}
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+
+    public String getText() { return text; }
+    public void setText(String text) { this.text = text; }
+
+    public Long getAuthorId() { return authorId; }
+    public void setAuthorId(Long authorId) { this.authorId = authorId; }
+
+    public String getAuthorUsername() { return authorUsername; }
+    public void setAuthorUsername(String authorUsername) { this.authorUsername = authorUsername; }
+
+    public Long getCaseId() { return caseId; }
+    public void setCaseId(Long caseId) { this.caseId = caseId; }
+
+    public LocalDateTime getCreatedAt() { return createdAt; }
+    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
+}

src/main/java/org/example/untitled/usercase/dto/UploadedFileDto.java

@@ -0,0 +1,33 @@
+package org.example.untitled.usercase.dto;
+
+import java.time.LocalDateTime;
+
+public class UploadedFileDto {
+
+    private Long id;
+    private String filename;
+    private Long uploadedById;
+    private String uploadedByUsername;
+    private Long caseId;
+    private LocalDateTime uploadedAt;
+
+    public UploadedFileDto() {}
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+
+    public String getFilename() { return filename; }
+    public void setFilename(String filename) { this.filename = filename; }
+
+    public Long getUploadedById() { return uploadedById; }
+    public void setUploadedById(Long uploadedById) { this.uploadedById = uploadedById; }
+
+    public String getUploadedByUsername() { return uploadedByUsername; }
+    public void setUploadedByUsername(String uploadedByUsername) { this.uploadedByUsername = uploadedByUsername; }
+
+    public Long getCaseId() { return caseId; }
+    public void setCaseId(Long caseId) { this.caseId = caseId; }
+
+    public LocalDateTime getUploadedAt() { return uploadedAt; }
+    public void setUploadedAt(LocalDateTime uploadedAt) { this.uploadedAt = uploadedAt; }
+}

src/main/java/org/example/untitled/usercase/mapper/CaseMapper.java

@@ -0,0 +1,78 @@
+package org.example.untitled.usercase.mapper;
+
+import org.example.untitled.user.User;
+import org.example.untitled.usercase.CaseEntity;
+import org.example.untitled.usercase.Comment;
+import org.example.untitled.usercase.UploadedFile;
+import org.example.untitled.usercase.dto.CaseEntityDto;
+import org.example.untitled.usercase.dto.CommentDto;
+import org.example.untitled.usercase.dto.UploadedFileDto;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CaseMapper {
+
+    public CaseEntityDto toDto(CaseEntity entity) {
+        if (entity == null) return null;
+        CaseEntityDto dto = new CaseEntityDto();
+        dto.setId(entity.getId());
+        dto.setTitle(entity.getTitle());
+        dto.setDescription(entity.getDescription());
+        dto.setStatus(entity.getStatus());
+        dto.setCreatedAt(entity.getCreatedAt());
+
+        User owner = entity.getOwner();
+        if (owner != null) {
+            dto.setOwnerId(owner.getId());
+            dto.setOwnerUsername(owner.getUsername());
+        }
+
+        User assigned = entity.getAssignedTo();
+        if (assigned != null) {
+            dto.setAssignedToId(assigned.getId());
+            dto.setAssignedToUsername(assigned.getUsername());
+        }
+
+        return dto;
+    }
+
+    public CommentDto toDto(Comment comment) {
+        if (comment == null) return null;
+        CommentDto dto = new CommentDto();
+        dto.setId(comment.getId());
+        dto.setText(comment.getText());
+        dto.setCreatedAt(comment.getCreatedAt());
+
+        User author = comment.getAuthor();
+        if (author != null) {
+            dto.setAuthorId(author.getId());
+            dto.setAuthorUsername(author.getUsername());
+        }
+
+        if (comment.getCaseEntity() != null) {
+            dto.setCaseId(comment.getCaseEntity().getId());
+        }
+
+        return dto;
+    }
+
+    public UploadedFileDto toDto(UploadedFile file) {
+        if (file == null) return null;
+        UploadedFileDto dto = new UploadedFileDto();
+        dto.setId(file.getId());
+        dto.setFilename(file.getFilename());
+        dto.setUploadedAt(file.getUploadedAt());
+
+        User uploadedBy = file.getUploadedBy();
+        if (uploadedBy != null) {
+            dto.setUploadedById(uploadedBy.getId());
+            dto.setUploadedByUsername(uploadedBy.getUsername());
+        }
+
+        if (file.getAssociatedCase() != null) {
+            dto.setCaseId(file.getAssociatedCase().getId());
+        }
+
+        return dto;
+    }
+}