From a840b389c90acf6d6bcfdf72a62d9874ff74ef64 Mon Sep 17 00:00:00 2001 From: koobontak Date: Fri, 18 Jul 2025 20:07:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat#197:=20clipScore=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/houme/domain/generateImage/entity/GenerateImage.java | 4 ++++ .../java/or/sopt/houme/global/dto/ImageUploadResponseDTO.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/or/sopt/houme/domain/generateImage/entity/GenerateImage.java b/src/main/java/or/sopt/houme/domain/generateImage/entity/GenerateImage.java index 51a4e2a1..a98c598e 100644 --- a/src/main/java/or/sopt/houme/domain/generateImage/entity/GenerateImage.java +++ b/src/main/java/or/sopt/houme/domain/generateImage/entity/GenerateImage.java @@ -30,6 +30,9 @@ public class GenerateImage extends BaseEntity { @Column(name = "file_extension", nullable = false) private String fileExtension; + @Column(name = "clip_score", nullable = false) + private Float clipScore; + @OneToOne @JoinColumn(name = "house_id") private House house; @@ -41,6 +44,7 @@ public static GenerateImage createGenerateImage(ImageUploadResponseDTO request, .filename(request.getFilename()) .originalFilename(request.getOriginalFilename()) .fileExtension(request.getContentType()) + .clipScore(request.getClipScore()) .house(house) .build(); } diff --git a/src/main/java/or/sopt/houme/global/dto/ImageUploadResponseDTO.java b/src/main/java/or/sopt/houme/global/dto/ImageUploadResponseDTO.java index 1ba857cd..2ba2cc39 100644 --- a/src/main/java/or/sopt/houme/global/dto/ImageUploadResponseDTO.java +++ b/src/main/java/or/sopt/houme/global/dto/ImageUploadResponseDTO.java @@ -13,6 +13,9 @@ public class ImageUploadResponseDTO { private String imageLink; private String contentType; + @Setter + private Float clipScore; + @Setter private String pullPrompt; From 2ceb1451a6967bd6545422b34e222d5d7d56960e Mon Sep 17 00:00:00 2001 From: koobontak Date: Fri, 18 Jul 2025 20:07:28 +0900 Subject: [PATCH 2/3] =?UTF-8?q?test#197:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facade/GenerateImageFacadeTest.java | 2 +- .../GenerateImageRepositoryImplTest.java | 1 + .../service/GenerateImageServiceImplTest.java | 29 +++++++++++-------- .../HouseCustomRepositoryImplTest.java | 5 ++-- .../repository/TagRepositoryImplTest.java | 1 + .../repository/UserRepositoryImplTest.java | 1 + 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/test/java/or/sopt/houme/domain/generateImage/facade/GenerateImageFacadeTest.java b/src/test/java/or/sopt/houme/domain/generateImage/facade/GenerateImageFacadeTest.java index 06ff4d02..ab04d371 100644 --- a/src/test/java/or/sopt/houme/domain/generateImage/facade/GenerateImageFacadeTest.java +++ b/src/test/java/or/sopt/houme/domain/generateImage/facade/GenerateImageFacadeTest.java @@ -227,4 +227,4 @@ void generateImageV2() { assertThat(imageInfoResponse.houseForm()).isEqualTo(house.getForm().getDescription()); assertThat(imageInfoResponse.name()).isEqualTo(user.getName()); } -} \ No newline at end of file +} diff --git a/src/test/java/or/sopt/houme/domain/generateImage/repository/GenerateImageRepositoryImplTest.java b/src/test/java/or/sopt/houme/domain/generateImage/repository/GenerateImageRepositoryImplTest.java index 44753633..e8300311 100644 --- a/src/test/java/or/sopt/houme/domain/generateImage/repository/GenerateImageRepositoryImplTest.java +++ b/src/test/java/or/sopt/houme/domain/generateImage/repository/GenerateImageRepositoryImplTest.java @@ -65,6 +65,7 @@ void setUp() { .filename("image.png") .originalFilename("origin-image.png") .fileExtension("png") + .clipScore(0.1234F) .house(house) .build(); em.persist(generateImage); diff --git a/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java b/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java index fdd25e60..9ede489e 100644 --- a/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java +++ b/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java @@ -43,6 +43,7 @@ class GenerateImageServiceImplTest { private User savedUser; private House savedHouse; + private ImageUploadResponseDTO responseDTO; @BeforeEach void setUp() { @@ -69,27 +70,29 @@ void setUp() { .user(savedUser) .build() ); + + responseDTO = ImageUploadResponseDTO.builder() + .filename("fileName") + .originalFilename("originalFilename") + .imageLink("imageLink") + .contentType("JPG") + .clipScore(0.1234F) + .build(); } @Test @DisplayName("도면 이미지를 생성 후 저장 할 수 있다.") void createGenerateImage() { - // Given - String fileName = "fileName"; - String originalFilename = "originalFilename"; - String imageLink = "imageLink"; - String contentType = "JPG"; - - ImageUploadResponseDTO from = ImageUploadResponseDTO.from(fileName, originalFilename, imageLink, contentType); // When - GenerateImage generateImage = generateImageService.createGenerateImage(from, savedHouse); + GenerateImage generateImage = generateImageService.createGenerateImage(responseDTO, savedHouse); // Then assertThat(generateImage).isNotNull(); - assertThat(generateImage.getFilename()).isEqualTo(fileName); - assertThat(generateImage.getFileExtension()).isEqualTo(contentType); - assertThat(generateImage.getOriginalFilename()).isEqualTo(originalFilename); + assertThat(generateImage.getFilename()).isEqualTo("fileName"); + assertThat(generateImage.getFileExtension()).isEqualTo("JPG"); + assertThat(generateImage.getOriginalFilename()).isEqualTo("originalFilename"); + assertThat(generateImage.getClipScore()).isEqualTo(0.1234F); } @Test @@ -100,12 +103,14 @@ void findGenerateImageById() { String originalFilename = "originalFilename"; String imageLink = "imageLink"; String contentType = "JPG"; + Float clipScore = 0.1234F; GenerateImage generateImage = GenerateImage.builder() .filename(fileName) .originalFilename(originalFilename) .url(imageLink) .fileExtension(contentType) + .clipScore(clipScore) .build(); GenerateImage saveImage = generateImageRepository.save(generateImage); @@ -120,4 +125,4 @@ void findGenerateImageById() { assertThat(generateImage1.getOriginalFilename()).isEqualTo(originalFilename); assertThat(generateImage1.getUrl()).isEqualTo(imageLink); } -} \ No newline at end of file +} diff --git a/src/test/java/or/sopt/houme/domain/house/repository/HouseCustomRepositoryImplTest.java b/src/test/java/or/sopt/houme/domain/house/repository/HouseCustomRepositoryImplTest.java index c4bf70bb..471d9394 100644 --- a/src/test/java/or/sopt/houme/domain/house/repository/HouseCustomRepositoryImplTest.java +++ b/src/test/java/or/sopt/houme/domain/house/repository/HouseCustomRepositoryImplTest.java @@ -69,6 +69,7 @@ void setUp() { .filename("image.png") .originalFilename("origin.png") .fileExtension("png") + .clipScore(0.1234F) .house(mockHouse) .build(); em.persist(mockGenerateImage); @@ -78,7 +79,7 @@ void setUp() { } @Test - @DisplayName("✅ userId와 imageId로 house 조회 성공") + @DisplayName("userId와 imageId로 house 조회 성공") void findHouseByUserIdAndImageId_success() { // when Optional result = houseCustomRepositoryImpl.findHouseByUserIdAndImageId(mockUser.getId(), mockGenerateImage.getId()); @@ -90,7 +91,7 @@ void findHouseByUserIdAndImageId_success() { } @Test - @DisplayName("❌ 잘못된 imageId로 조회 시 empty 반환") + @DisplayName("잘못된 imageId로 조회 시 empty 반환") void findHouseByUserIdAndImageId_invalidImage() { // when Optional result = houseCustomRepositoryImpl.findHouseByUserIdAndImageId(mockUser.getId(), 999L); diff --git a/src/test/java/or/sopt/houme/domain/taste/repository/TagRepositoryImplTest.java b/src/test/java/or/sopt/houme/domain/taste/repository/TagRepositoryImplTest.java index 87961350..48b783ac 100644 --- a/src/test/java/or/sopt/houme/domain/taste/repository/TagRepositoryImplTest.java +++ b/src/test/java/or/sopt/houme/domain/taste/repository/TagRepositoryImplTest.java @@ -78,6 +78,7 @@ void setUp() { .filename("image.png") .originalFilename("origin.png") .fileExtension("png") + .clipScore(0.1234F) .house(mockHouse) .build(); em.persist(mockGenerateImage); diff --git a/src/test/java/or/sopt/houme/domain/user/repository/UserRepositoryImplTest.java b/src/test/java/or/sopt/houme/domain/user/repository/UserRepositoryImplTest.java index 61d213b2..e09e2665 100644 --- a/src/test/java/or/sopt/houme/domain/user/repository/UserRepositoryImplTest.java +++ b/src/test/java/or/sopt/houme/domain/user/repository/UserRepositoryImplTest.java @@ -82,6 +82,7 @@ void setUp() { .filename("image.png") .originalFilename("original-image.png") .fileExtension("png") + .clipScore(0.1234F) .house(mockHouse) // 이미 생성된 House mock 객체 .build(); em.persist(mockGenerateImage); From d025b5e4d8c66c321e441fc993ca9d262edfe7dc Mon Sep 17 00:00:00 2001 From: koobontak Date: Fri, 18 Jul 2025 20:26:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?test#197:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generateImage/service/GenerateImageServiceImplTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java b/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java index 9ede489e..50ab9f1f 100644 --- a/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java +++ b/src/test/java/or/sopt/houme/domain/generateImage/service/GenerateImageServiceImplTest.java @@ -124,5 +124,6 @@ void findGenerateImageById() { assertThat(generateImage1.getFileExtension()).isEqualTo(contentType); assertThat(generateImage1.getOriginalFilename()).isEqualTo(originalFilename); assertThat(generateImage1.getUrl()).isEqualTo(imageLink); + assertThat(generateImage1.getClipScore()).isEqualTo(clipScore); } }