Bug/#77

src/main/generated/hello/cluebackend/domain/assignment/domain/QAssignment.java

@@ -22,28 +22,14 @@ public class QAssignment extends EntityPathBase<Assignment> {
 
     public static final QAssignment assignment = new QAssignment("assignment");
 
-    public final QBaseEntity _super = new QBaseEntity(this);
-
     public final ComparablePath<java.util.UUID> assignmentId = createComparable("assignmentId", java.util.UUID.class);
 
     public final hello.cluebackend.domain.classroom.domain.QClassRoom classRoom;
 
     public final StringPath content = createString("content");
 
-    //inherited
-    public final StringPath createdBy = _super.createdBy;
-
-    //inherited
-    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
-
     public final DateTimePath<java.time.LocalDateTime> endDate = createDateTime("endDate", java.time.LocalDateTime.class);
 
-    //inherited
-    public final DateTimePath<java.time.LocalDateTime> lastModified = _super.lastModified;
-
-    //inherited
-    public final StringPath lastModifiedBy = _super.lastModifiedBy;
-
     public final DateTimePath<java.time.LocalDateTime> startDate = createDateTime("startDate", java.time.LocalDateTime.class);
 
     public final ListPath<hello.cluebackend.domain.submission.domain.Submission, hello.cluebackend.domain.submission.domain.QSubmission> submissions = this.<hello.cluebackend.domain.submission.domain.Submission, hello.cluebackend.domain.submission.domain.QSubmission>createList("submissions", hello.cluebackend.domain.submission.domain.Submission.class, hello.cluebackend.domain.submission.domain.QSubmission.class, PathInits.DIRECT2);

src/main/generated/hello/cluebackend/domain/assignment/domain/QAssignmentAttachment.java

@@ -22,26 +22,12 @@ public class QAssignmentAttachment extends EntityPathBase<AssignmentAttachment>
 
     public static final QAssignmentAttachment assignmentAttachment = new QAssignmentAttachment("assignmentAttachment");
 
-    public final QBaseEntity _super = new QBaseEntity(this);
-
     public final QAssignment assignment;
 
     public final ComparablePath<java.util.UUID> assignmentAttachmentId = createComparable("assignmentAttachmentId", java.util.UUID.class);
 
     public final StringPath contentType = createString("contentType");
 
-    //inherited
-    public final StringPath createdBy = _super.createdBy;
-
-    //inherited
-    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
-
-    //inherited
-    public final DateTimePath<java.time.LocalDateTime> lastModified = _super.lastModified;
-
-    //inherited
-    public final StringPath lastModifiedBy = _super.lastModifiedBy;
-
     public final StringPath originalFileName = createString("originalFileName");
 
     public final NumberPath<Long> size = createNumber("size", Long.class);

src/main/generated/hello/cluebackend/domain/submission/domain/QSubmission.java

@@ -22,24 +22,12 @@ public class QSubmission extends EntityPathBase<Submission> {
 
     public static final QSubmission submission = new QSubmission("submission");
 
-    public final QBaseEntity _super = new QBaseEntity(this);
-
     public final hello.cluebackend.domain.assignment.domain.QAssignment assignment;
 
-    //inherited
-    public final StringPath createdBy = _super.createdBy;
-
-    //inherited
-    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
+    public final hello.cluebackend.domain.classroom.domain.QClassRoom classRoom;
 
     public final BooleanPath isSubmitted = createBoolean("isSubmitted");
 
-    //inherited
-    public final DateTimePath<java.time.LocalDateTime> lastModified = _super.lastModified;
-
-    //inherited
-    public final StringPath lastModifiedBy = _super.lastModifiedBy;
-
     public final ComparablePath<java.util.UUID> submissionId = createComparable("submissionId", java.util.UUID.class);
 
     public final DateTimePath<java.time.LocalDateTime> submittedAt = createDateTime("submittedAt", java.time.LocalDateTime.class);
@@ -65,6 +53,7 @@ public QSubmission(PathMetadata metadata, PathInits inits) {
     public QSubmission(Class<? extends Submission> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.assignment = inits.isInitialized("assignment") ? new hello.cluebackend.domain.assignment.domain.QAssignment(forProperty("assignment"), inits.get("assignment")) : null;
+        this.classRoom = inits.isInitialized("classRoom") ? new hello.cluebackend.domain.classroom.domain.QClassRoom(forProperty("classRoom")) : null;
         this.user = inits.isInitialized("user") ? new hello.cluebackend.domain.user.domain.QUserEntity(forProperty("user")) : null;
     }
 

src/main/generated/hello/cluebackend/domain/submission/domain/QSubmissionAttachment.java

@@ -32,7 +32,7 @@ public class QSubmissionAttachment extends EntityPathBase<SubmissionAttachment>
 
     public final ComparablePath<java.util.UUID> SubmissionAttachmentId = createComparable("SubmissionAttachmentId", java.util.UUID.class);
 
-    public final EnumPath<fileType> type = createEnum("type", fileType.class);
+    public final EnumPath<FileType> type = createEnum("type", FileType.class);
 
     public final hello.cluebackend.domain.user.domain.QUserEntity user;
 

src/main/java/hello/cluebackend/ClueBackendApplication.java

@@ -16,8 +16,8 @@ public static void main(String[] args) {
     SpringApplication.run(ClueBackendApplication.class, args);
   }
 
-  @Bean
-  public AuditorAware<String> auditorProvider(){
-    return () -> Optional.of(UUID.randomUUID().toString());
-  }
+//  @Bean
+//  public AuditorAware<String> auditorProvider(){
+//    return () -> Optional.of(UUID.randomUUID().toString());
+//  } baseEntity의 필요성을 느끼지 못해서 잠시 정지
 }

src/main/java/hello/cluebackend/domain/assignment/application/AssignmentCommandService.java

@@ -1,8 +1,7 @@
 package hello.cluebackend.domain.assignment.application;
 
-import hello.cluebackend.domain.assignment.api.dto.response.AssignmentAttachmentDto;
-import hello.cluebackend.domain.assignment.api.dto.response.AssignmentResponseDto;
-import hello.cluebackend.domain.assignment.api.dto.response.GetAllAssignmentDto;
+import hello.cluebackend.domain.assignment.presentation.dto.response.AssignmentResponseDto;
+import hello.cluebackend.domain.assignment.presentation.dto.response.GetAllAssignmentDto;
 import hello.cluebackend.domain.assignment.domain.Assignment;
 import hello.cluebackend.domain.assignment.domain.AssignmentAttachment;
 import hello.cluebackend.domain.assignment.persistence.AssignmentRepository;
@@ -25,34 +24,16 @@
 @Transactional(readOnly = true)
 public class AssignmentCommandService{
   private final AssignmentRepository assignmentRepository;
-  private final ClassRoomService classRoomService;
   private final AssignmentAttachmentRepository assignmentAttachmentRepository;
+  private final ClassRoomService classRoomService;
   private final FileService fileService;
 
   // 과제 단일 조회
   public AssignmentResponseDto findById(UUID assignmentId) {
     Assignment a = findByIdOrThrow(assignmentId);
     List<AssignmentAttachment> assignmentAttachments = assignmentAttachmentRepository.findAllByAssignment(a);
 
-    List<AssignmentAttachmentDto> assignmentAttachmentDtos = assignmentAttachments.stream()
-            .map(aa -> AssignmentAttachmentDto.builder()
-                    .type(aa.getType())
-                    .value(aa.getValue())
-                    .originalFileName(aa.getOriginalFileName())
-                    .contentType(aa.getContentType())
-                    .size(aa.getSize())
-                    .build())
-            .toList();
-
-    return AssignmentResponseDto.builder()
-            .assignmentId(a.getAssignmentId())
-            .title(a.getTitle())
-            .content(a.getContent())
-            .startDate(a.getStartDate())
-            .endDate(a.getEndDate())
-            .userName(a.getUser().getUsername())
-            .xAssignmentResponseDtos(assignmentAttachmentDtos)
-            .build();
+    return AssignmentResponseDto.from(a, assignmentAttachments);
   }
 
   // 과제 전체 조회
@@ -64,33 +45,27 @@ public List<AssignmentResponseDto> findAllById(UUID userId, UUID classId) {
             .toList();
   }
 
-  // 과제 ID를 통한 조회
-  public Assignment findByIdOrThrow(UUID assignmentId) {
-    return assignmentRepository.findById(assignmentId)
-            .orElseThrow(() -> new EntityNotFoundException("해당 과제를 찾을수 없습니다."));
-  }
-
-  public AssignmentAttachment findAssignmentAttachmentByIdOrderThrow(UUID attachmentId){
-    return assignmentAttachmentRepository.findById(attachmentId)
-            .orElseThrow(() -> new EntityNotFoundException("해당 첨부 파일을 찾을수 없습니다."));
-  }
-
   // 사용자가 속한 모든 수업 과제 조회
   public List<GetAllAssignmentDto> findAllAssignmentMe(UUID userId) {
     List<Assignment> assignments = assignmentRepository.getAllByUser(userId);
     return assignments.stream()
-            .map(a -> GetAllAssignmentDto.builder()
-                    .assignmentId(a.getAssignmentId())
-                    .title(a.getTitle())
-                    .startDate(a.getStartDate())
-                    .endDate(a.getEndDate())
-                    .build()
-            )
+            .map(a -> GetAllAssignmentDto.from(a))
             .toList();
   }
 
   public Resource downloadAttachment(AssignmentAttachment assignmentAttachment) throws IOException {
     String path = assignmentAttachment.getValue();
     return fileService.downloadFile(path);
   }
+
+  // 과제 ID를 통한 조회
+  public Assignment findByIdOrThrow(UUID assignmentId) {
+    return assignmentRepository.findById(assignmentId)
+            .orElseThrow(() -> new EntityNotFoundException("해당 과제를 찾을수 없습니다."));
+  }
+
+  public AssignmentAttachment findAssignmentAttachmentByIdOrderThrow(UUID attachmentId){
+    return assignmentAttachmentRepository.findById(attachmentId)
+            .orElseThrow(() -> new EntityNotFoundException("해당 첨부 파일을 찾을수 없습니다."));
+  }
 }