Skip to content

1.82차 배포 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SSUHYUNKIM merged 2 commits into from
Feb 11, 2025
Merged

1.82차 배포 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db95f0a
[REFACTOR] 디자인 시스템 섬네일 응답 추가(#41)
SSUHYUNKIM Feb 11, 2025
052b357
Merge pull request #39 from JECT-Study/J01-41-be-디자인-시스템-기능
SSUHYUNKIM Feb 11, 2025
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
3 changes: 2 additions & 1 deletion src/main/java/ject/componote/domain/design/domain/Design.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import ject.componote.domain.common.model.Count;
import ject.componote.domain.common.model.converter.CountConverter;
import ject.componote.domain.design.domain.summary.DesignSummary;
import ject.componote.domain.design.model.DesignPhotoImage;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -38,7 +39,7 @@ private Design(final DesignSummary summary) {
this.bookmarkCount = Count.create();
}

public static Design of(final String name, final String organization, final String description, final BaseImage thumbnail, final Count recommendCount) {
public static Design of(final String name, final String organization, final String description, final DesignPhotoImage thumbnail, final Count recommendCount) {
return new Design(DesignSummary.of(name, organization, description, thumbnail, recommendCount));
}
}
10 changes: 6 additions & 4 deletions src/main/java/ject/componote/domain/design/domain/summary/DesignSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import ject.componote.domain.common.model.Count;
import ject.componote.domain.common.model.converter.BaseImageConverter;
import ject.componote.domain.common.model.converter.CountConverter;
import ject.componote.domain.design.model.DesignPhotoImage;
import ject.componote.domain.design.model.converter.DesignPhotoImageConverter;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand All @@ -26,23 +28,23 @@ public class DesignSummary {
@Column(name = "description", nullable = false)
private String description;

@Convert(converter = BaseImageConverter.class)
@Convert(converter = DesignPhotoImageConverter.class)
@Column(name = "thumbnail", nullable = false)
private BaseImage thumbnail;
private DesignPhotoImage thumbnail;

@Convert(converter = CountConverter.class)
@Column(name = "recommendCount", nullable = false)
private Count recommendCount;

private DesignSummary(final String name, final String organization, final String description, final BaseImage thumbnail, final Count recommendCount) {
private DesignSummary(final String name, final String organization, final String description, final DesignPhotoImage thumbnail, final Count recommendCount) {
this.name = name;
this.organization = organization;
this.description = description;
this.thumbnail = thumbnail;
this.recommendCount = recommendCount;
}

public static DesignSummary of(final String name, final String organization, final String description, final BaseImage thumbnail, final Count recommendCount) {
public static DesignSummary of(final String name, final String organization, final String description, final DesignPhotoImage thumbnail, final Count recommendCount) {
return new DesignSummary(name, organization, description, thumbnail, recommendCount);
}
}
6 changes: 4 additions & 2 deletions ...ain/java/ject/componote/domain/design/dto/search/response/DesignSystemSearchResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ public record DesignSystemSearchResponse(
String description,
List<DesignFilterSearchResponse> filters,
List<DesignLinkResponse> links,
Long recommendCount
Long recommendCount,
String thumbnailUrl
) {
public static DesignSystemSearchResponse from(DesignSystem designSystem) {
return new DesignSystemSearchResponse(
Expand All @@ -29,7 +30,8 @@ public static DesignSystemSearchResponse from(DesignSystem designSystem) {
link.getUrl().getValue()
))
.collect(Collectors.toList()),
designSystem.getDesign().getSummary().getRecommendCount().getValue()
designSystem.getDesign().getSummary().getRecommendCount().getValue(),
designSystem.getDesign().getSummary().getThumbnail().toUrl()
);
}

Expand Down
112 changes: 56 additions & 56 deletions src/test/java/ject/componote/fixture/DesignFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
package ject.componote.fixture;

import ject.componote.domain.common.model.BaseImage;
import ject.componote.domain.design.domain.Design;
import ject.componote.domain.design.domain.filter.DesignFilter;
import ject.componote.domain.design.domain.link.DesignLink;
import ject.componote.domain.design.domain.filter.FilterType;
import ject.componote.domain.design.domain.link.LinkType;
import ject.componote.domain.design.model.Url;

import java.util.List;

public enum DesignFixture {
기본_디자인("기본 디자인", "Componote", "이것은 기본 디자인입니다.", "https://example.com/thumbnail1.png"),
추가_디자인("추가 디자인", "Componote", "이것은 추가적인 디자인입니다.", "https://example.com/thumbnail2.png");

private final String name;
private final String organization;
private final String description;
private final String thumbnailUrl;

DesignFixture(String name, String organization, String description, String thumbnailUrl) {
this.name = name;
this.organization = organization;
this.description = description;
this.thumbnailUrl = thumbnailUrl;
}

public Design 생성() {
return Design.of(name, organization, description, BaseImage.from(thumbnailUrl));
}

public static Design 기본_디자인_생성() {
return 기본_디자인.생성();
}

public static Design 추가_디자인_생성() {
return 추가_디자인.생성();
}

public static List<DesignFilter> 필터_리스트_생성(Long designId) {
return List.of(
DesignFilter.of(FilterType.DEVICE, "DEVICE", designId),
DesignFilter.of(FilterType.CONTENT, "CONTENT", designId)
);
}

public static List<DesignLink> 링크_리스트_생성(Long designId) {
return List.of(
DesignLink.of(Design.of("Sample", "Org", "Description", BaseImage.from("https://example.com/sample.png")),
LinkType.FIGMA, Url.from("https://example.com/link1")),
DesignLink.of(Design.of("Sample", "Org", "Description", BaseImage.from("https://example.com/sample.png")),
LinkType.CODE_PEN, Url.from("https://example.com/link2"))
);
}
}
//package ject.componote.fixture;
//
//import ject.componote.domain.common.model.BaseImage;
//import ject.componote.domain.design.domain.Design;
//import ject.componote.domain.design.domain.filter.DesignFilter;
//import ject.componote.domain.design.domain.link.DesignLink;
//import ject.componote.domain.design.domain.filter.FilterType;
//import ject.componote.domain.design.domain.link.LinkType;
//import ject.componote.domain.design.model.Url;
//
//import java.util.List;
//
//public enum DesignFixture {
// 기본_디자인("기본 디자인", "Componote", "이것은 기본 디자인입니다.", "https://example.com/thumbnail1.png"),
// 추가_디자인("추가 디자인", "Componote", "이것은 추가적인 디자인입니다.", "https://example.com/thumbnail2.png");
//
// private final String name;
// private final String organization;
// private final String description;
// private final String thumbnailUrl;
//
// DesignFixture(String name, String organization, String description, String thumbnailUrl) {
// this.name = name;
// this.organization = organization;
// this.description = description;
// this.thumbnailUrl = thumbnailUrl;
// }
//
// public Design 생성() {
// return Design.of(name, organization, description, BaseImage.from(thumbnailUrl));
// }
//
// public static Design 기본_디자인_생성() {
// return 기본_디자인.생성();
// }
//
// public static Design 추가_디자인_생성() {
// return 추가_디자인.생성();
// }
//
// public static List<DesignFilter> 필터_리스트_생성(Long designId) {
// return List.of(
// DesignFilter.of(FilterType.DEVICE, "DEVICE", designId),
// DesignFilter.of(FilterType.CONTENT, "CONTENT", designId)
// );
// }
//
// public static List<DesignLink> 링크_리스트_생성(Long designId) {
// return List.of(
// DesignLink.of(Design.of("Sample", "Org", "Description", BaseImage.from("https://example.com/sample.png")),
// LinkType.FIGMA, Url.from("https://example.com/link1")),
// DesignLink.of(Design.of("Sample", "Org", "Description", BaseImage.from("https://example.com/sample.png")),
// LinkType.CODE_PEN, Url.from("https://example.com/link2"))
// );
// }
//}