업로드 관련 수정

2026-01-08 18:43:40 +09:00
parent 0a311b09a8
commit ecf9b8a24f
15 changed files with 185 additions and 239 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java
@@ -1,10 +1,7 @@
 package com.kamco.cd.kamcoback.postgres.core;

-import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
-import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
 import com.kamco.cd.kamcoback.postgres.repository.model.ModelMngRepository;
-import jakarta.persistence.EntityNotFoundException;
 import java.time.LocalDate;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -35,15 +32,15 @@ public class ModelMngCoreService {
            .orElseThrow(() -> new EntityNotFoundException("model을 찾을 수 없습니다."));
    */
    // id 코드 deleted = true 업데이트
-    //entity.deleted();
+    // entity.deleted();

    modelMngRepository.deleteByModelUuid(uuid);
  }

-  public void insertModel(ModelMngDto.AddReq addReq){
+  public void insertModel(ModelMngDto.AddReq addReq) {

-    //ModelMngEntity addEntity =  new ModelMngEntity();
-    //addEntity.setModelType(addReq.getModelType());
+    // ModelMngEntity addEntity =  new ModelMngEntity();
+    // addEntity.setModelType(addReq.getModelType());

    modelMngRepository.insertModel(addReq);
  }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/UploadSessionCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/UploadSessionCoreService.java
@@ -12,8 +12,7 @@ public class UploadSessionCoreService {

  private final UploadSessionRepository uploadSessionRepository;

-  public void createUploadSession(UploadDto.UploadAddReq addReq)
-  {
+  public void createUploadSession(UploadDto.UploadAddReq addReq) {
    /*
    UUID newUuid = UUID.randomUUID();

@@ -39,18 +38,17 @@ public class UploadSessionCoreService {
    */

    uploadSessionRepository.insertUploadSession(addReq);
-
  }

-  public UploadDto.uploadDto findByDatasetUid(Long datasetId, String uploadDivi){
+  public UploadDto.uploadDto findByDatasetUid(Long datasetId, String uploadDivi) {
    return uploadSessionRepository.findByDatasetUid(datasetId, uploadDivi);
  }

-  public UploadDto.uploadDto findByUuid(UUID uuid){
+  public UploadDto.uploadDto findByUuid(UUID uuid) {
    return uploadSessionRepository.findByUuid(uuid);
  }

-  public void updateUploadSessionStatus(UploadDto.UploadAddReq addReq){
+  public void updateUploadSessionStatus(UploadDto.UploadAddReq addReq) {
    uploadSessionRepository.updateUploadSessionStatus(addReq);
  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/UploadSessionEntity.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/UploadSessionEntity.java
@@ -86,5 +86,4 @@ public class UploadSessionEntity {
  @ColumnDefault("uuid_generate_v4()")
  @Column(name = "uuid", nullable = false)
  private UUID uuid;
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java
@@ -20,7 +20,6 @@ public interface ModelMngRepositoryCustom {

  Optional<ModelMngEntity> findByModelUuid(UUID uuid);

-
  void insertModel(ModelMngDto.AddReq addReq);

  void deleteByModelUuid(UUID uuid);
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java
@@ -123,10 +123,7 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
    System.out.println("uuid == " + uuid);

    return Optional.ofNullable(
-      queryFactory
-        .selectFrom(modelMngEntity)
-        .where(modelMngEntity.uuid.eq(uuid))
-        .fetchOne());
+        queryFactory.selectFrom(modelMngEntity).where(modelMngEntity.uuid.eq(uuid)).fetchOne());
  }

  private BooleanExpression eventEndedAtBetween(
@@ -172,33 +169,32 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
  @Override
  public void insertModel(@Valid ModelMngDto.AddReq addReq) {
    long execCount =
-      queryFactory
-        .insert(modelMngEntity)
-        .columns(
-          modelMngEntity.modelVer,
-          modelMngEntity.modelType,
-          modelMngEntity.filePath,
-          modelMngEntity.fileName,
-          modelMngEntity.memo,
-          modelMngEntity.uuid)
-        .values(
-          addReq.getModelVer(),
-          addReq.getModelType(),
-          addReq.getFilePath(),
-          addReq.getFileName(),
-          addReq.getMemo(),
-          addReq.getUuid())
-        .execute();
+        queryFactory
+            .insert(modelMngEntity)
+            .columns(
+                modelMngEntity.modelVer,
+                modelMngEntity.modelType,
+                modelMngEntity.filePath,
+                modelMngEntity.fileName,
+                modelMngEntity.memo,
+                modelMngEntity.uuid)
+            .values(
+                addReq.getModelVer(),
+                addReq.getModelType(),
+                addReq.getFilePath(),
+                addReq.getFileName(),
+                addReq.getMemo(),
+                addReq.getUuid())
+            .execute();
  }

  @Override
-  public void deleteByModelUuid(UUID uuid){
+  public void deleteByModelUuid(UUID uuid) {
    long execCount =
-      queryFactory
-        .update(modelMngEntity)
-        .set(modelMngEntity.deleted, true)
-        .where(modelMngEntity.uuid.eq(uuid))
-        .execute();
+        queryFactory
+            .update(modelMngEntity)
+            .set(modelMngEntity.deleted, true)
+            .where(modelMngEntity.uuid.eq(uuid))
+            .execute();
  }
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/upload/UploadSessionRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/upload/UploadSessionRepositoryCustom.java
@@ -1,19 +1,15 @@
 package com.kamco.cd.kamcoback.postgres.repository.upload;

-
-
 import com.kamco.cd.kamcoback.upload.dto.UploadDto;
 import java.util.UUID;

 public interface UploadSessionRepositoryCustom {

-
  void insertUploadSession(UploadDto.UploadAddReq addReq);

  UploadDto.uploadDto findByDatasetUid(Long datasetId, String uploadDivi);

  UploadDto.uploadDto findByUuid(UUID uuid);
+
  void updateUploadSessionStatus(UploadDto.UploadAddReq addReq);
-
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/upload/UploadSessionRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/upload/UploadSessionRepositoryImpl.java
@@ -1,6 +1,5 @@
 package com.kamco.cd.kamcoback.postgres.repository.upload;

-
 import static com.kamco.cd.kamcoback.postgres.entity.QUploadSessionEntity.uploadSessionEntity;

 import com.kamco.cd.kamcoback.postgres.entity.UploadSessionEntity;
@@ -30,113 +29,104 @@ public class UploadSessionRepositoryImpl extends QuerydslRepositorySupport
  @Override
  public void insertUploadSession(UploadDto.UploadAddReq addReq) {
    long execCnt =
-      queryFactory
-        .insert(uploadSessionEntity)
-        .columns(
-          uploadSessionEntity.uploadId,
-          uploadSessionEntity.datasetId,
-          uploadSessionEntity.fileName,
-          uploadSessionEntity.fileSize,
-          uploadSessionEntity.finalPath,
-          uploadSessionEntity.status,
-          uploadSessionEntity.tempPath,
-          uploadSessionEntity.chunkIndex,
-          uploadSessionEntity.chunkTotalIndex,
-          uploadSessionEntity.uploadDivi,
-          uploadSessionEntity.fileHash,
-          uploadSessionEntity.uuid
-          )
-        .values(
-          addReq.getUploadId(),
-          addReq.getDatasetId(),
-          addReq.getFileName(),
-          addReq.getFileSize(),
-          addReq.getFinalPath(),
-          addReq.getStatus(),
-          addReq.getTempPath(),
-          addReq.getChunkIndex(),
-          addReq.getChunkTotalIndex(),
-          addReq.getUploadDivi(),
-          addReq.getFileHash(),
-          addReq.getUuid()
-          )
-        .execute();
-
-
+        queryFactory
+            .insert(uploadSessionEntity)
+            .columns(
+                uploadSessionEntity.uploadId,
+                uploadSessionEntity.datasetId,
+                uploadSessionEntity.fileName,
+                uploadSessionEntity.fileSize,
+                uploadSessionEntity.finalPath,
+                uploadSessionEntity.status,
+                uploadSessionEntity.tempPath,
+                uploadSessionEntity.chunkIndex,
+                uploadSessionEntity.chunkTotalIndex,
+                uploadSessionEntity.uploadDivi,
+                uploadSessionEntity.fileHash,
+                uploadSessionEntity.uuid)
+            .values(
+                addReq.getUploadId(),
+                addReq.getDatasetId(),
+                addReq.getFileName(),
+                addReq.getFileSize(),
+                addReq.getFinalPath(),
+                addReq.getStatus(),
+                addReq.getTempPath(),
+                addReq.getChunkIndex(),
+                addReq.getChunkTotalIndex(),
+                addReq.getUploadDivi(),
+                addReq.getFileHash(),
+                addReq.getUuid())
+            .execute();
  }

-
  @Override
  public UploadDto.uploadDto findByDatasetUid(Long datasetId, String uploadDivi) {

    UploadDto.uploadDto foundContent =
-      queryFactory
-        .select(
-          Projections.constructor(
-            UploadDto.uploadDto.class,
-            uploadSessionEntity.uploadId,
-            uploadSessionEntity.datasetId,
-            uploadSessionEntity.fileName,
-            uploadSessionEntity.fileSize,
-            uploadSessionEntity.finalPath,
-            uploadSessionEntity.uploadDivi,
-            uploadSessionEntity.status,
-            uploadSessionEntity.tempPath,
-            uploadSessionEntity.chunkIndex,
-            uploadSessionEntity.chunkTotalIndex,
-            uploadSessionEntity.fileHash,
-            uploadSessionEntity.uuid
-          ))
-        .from(uploadSessionEntity)
-        .where(uploadSessionEntity.datasetId.eq(datasetId)
-          .and(uploadSessionEntity.uploadDivi.eq(uploadDivi)))
-        .limit(1)
-        .fetchOne();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    UploadDto.uploadDto.class,
+                    uploadSessionEntity.uploadId,
+                    uploadSessionEntity.datasetId,
+                    uploadSessionEntity.fileName,
+                    uploadSessionEntity.fileSize,
+                    uploadSessionEntity.finalPath,
+                    uploadSessionEntity.uploadDivi,
+                    uploadSessionEntity.status,
+                    uploadSessionEntity.tempPath,
+                    uploadSessionEntity.chunkIndex,
+                    uploadSessionEntity.chunkTotalIndex,
+                    uploadSessionEntity.fileHash,
+                    uploadSessionEntity.uuid))
+            .from(uploadSessionEntity)
+            .where(
+                uploadSessionEntity
+                    .datasetId
+                    .eq(datasetId)
+                    .and(uploadSessionEntity.uploadDivi.eq(uploadDivi)))
+            .limit(1)
+            .fetchOne();

    return foundContent;
-
  }

-
  @Override
  public UploadDto.uploadDto findByUuid(UUID uuid) {

    UploadDto.uploadDto foundContent =
-      queryFactory
-        .select(
-          Projections.constructor(
-            UploadDto.uploadDto.class,
-            uploadSessionEntity.uploadId,
-            uploadSessionEntity.datasetId,
-            uploadSessionEntity.fileName,
-            uploadSessionEntity.fileSize,
-            uploadSessionEntity.finalPath,
-            uploadSessionEntity.uploadDivi,
-            uploadSessionEntity.status,
-            uploadSessionEntity.tempPath,
-            uploadSessionEntity.chunkIndex,
-            uploadSessionEntity.chunkTotalIndex,
-            uploadSessionEntity.fileHash,
-            uploadSessionEntity.uuid
-          ))
-        .from(uploadSessionEntity)
-        .where(uploadSessionEntity.uuid.eq(uuid))
-        .limit(1)
-        .fetchOne();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    UploadDto.uploadDto.class,
+                    uploadSessionEntity.uploadId,
+                    uploadSessionEntity.datasetId,
+                    uploadSessionEntity.fileName,
+                    uploadSessionEntity.fileSize,
+                    uploadSessionEntity.finalPath,
+                    uploadSessionEntity.uploadDivi,
+                    uploadSessionEntity.status,
+                    uploadSessionEntity.tempPath,
+                    uploadSessionEntity.chunkIndex,
+                    uploadSessionEntity.chunkTotalIndex,
+                    uploadSessionEntity.fileHash,
+                    uploadSessionEntity.uuid))
+            .from(uploadSessionEntity)
+            .where(uploadSessionEntity.uuid.eq(uuid))
+            .limit(1)
+            .fetchOne();

    return foundContent;
-
  }

-
-  public void updateUploadSessionStatus(UploadDto.UploadAddReq addReq){
+  public void updateUploadSessionStatus(UploadDto.UploadAddReq addReq) {
    long fileCount =
-      queryFactory
-        .update(uploadSessionEntity)
-        .set(uploadSessionEntity.chunkIndex, addReq.getChunkIndex())
-        .set(uploadSessionEntity.status, addReq.getStatus())
-        .where(uploadSessionEntity.uploadId.eq(addReq.getUploadId()))
-        .execute();
+        queryFactory
+            .update(uploadSessionEntity)
+            .set(uploadSessionEntity.chunkIndex, addReq.getChunkIndex())
+            .set(uploadSessionEntity.status, addReq.getStatus())
+            .where(uploadSessionEntity.uploadId.eq(addReq.getUploadId()))
+            .execute();
  }
-
 }