Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public class ImageUploadResponseDTO {
private String imageLink;
private String contentType;

@Setter
private Float clipScore;

@Setter
private String pullPrompt;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ void setUp() {
.filename("image.png")
.originalFilename("origin-image.png")
.fileExtension("png")
.clipScore(0.1234F)
.house(house)
.build();
em.persist(generateImage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class GenerateImageServiceImplTest {

private User savedUser;
private House savedHouse;
private ImageUploadResponseDTO responseDTO;

@BeforeEach
void setUp() {
Expand All @@ -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
Expand All @@ -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);
Expand All @@ -119,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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ void setUp() {
.filename("image.png")
.originalFilename("origin.png")
.fileExtension("png")
.clipScore(0.1234F)
.house(mockHouse)
.build();
em.persist(mockGenerateImage);
Expand All @@ -78,7 +79,7 @@ void setUp() {
}

@Test
@DisplayName("userId와 imageId로 house 조회 성공")
@DisplayName("userId와 imageId로 house 조회 성공")
void findHouseByUserIdAndImageId_success() {
// when
Optional<House> result = houseCustomRepositoryImpl.findHouseByUserIdAndImageId(mockUser.getId(), mockGenerateImage.getId());
Expand All @@ -90,7 +91,7 @@ void findHouseByUserIdAndImageId_success() {
}

@Test
@DisplayName("잘못된 imageId로 조회 시 empty 반환")
@DisplayName("잘못된 imageId로 조회 시 empty 반환")
void findHouseByUserIdAndImageId_invalidImage() {
// when
Optional<House> result = houseCustomRepositoryImpl.findHouseByUserIdAndImageId(mockUser.getId(), 999L);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ void setUp() {
.filename("image.png")
.originalFilename("origin.png")
.fileExtension("png")
.clipScore(0.1234F)
.house(mockHouse)
.build();
em.persist(mockGenerateImage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ void setUp() {
.filename("image1.png")
.originalFilename("original-image1.png")
.fileExtension("png")
.house(house1)
.clipScore(0.1234F)
.house(house1) // 이미 생성된 House mock 객체
.build();
em.persist(generateImage1);

Expand All @@ -144,6 +145,7 @@ void setUp() {
.filename("image2.png")
.originalFilename("original-image2.png")
.fileExtension("png")
.clipScore(0.1234F)
.house(house2)
.build();
em.persist(generateImage2);
Expand Down
Loading