Skip to content

Commit 8bc5e28

Browse files
authored
chore: formTag 추가 (#173)
1 parent c69f638 commit 8bc5e28

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

layer-api/src/main/java/org/layer/domain/space/controller/dto/SpaceResponse.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public record SpaceWithMemberCountInfo(
4545

4646
@Schema(description = "설정된 회고 폼 아이디")
4747
Long formId,
48+
@Schema(description = "설정된 회고 폼 태그")
49+
String formTag,
4850

4951
@Schema(description = "소속된 회원 수")
5052
Long memberCount,
@@ -75,6 +77,7 @@ public static SpaceWithMemberCountInfo toResponse(SpaceWithMemberCount space) {
7577
.name(it.getName())
7678
.introduction(it.getIntroduction())
7779
.formId(it.getFormId())
80+
.formTag(it.getFormTag())
7881
.memberCount(it.getMemberCount())
7982
.bannerUrl(it.getBannerUrl())
8083
.createdAt(it.getCreatedAt())

layer-domain/src/main/java/org/layer/domain/space/dto/SpaceWithMemberCount.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import jakarta.validation.constraints.NotNull;
55
import lombok.Getter;
66
import lombok.Setter;
7+
8+
import org.layer.domain.form.enums.FormTag;
79
import org.layer.domain.member.entity.Member;
810
import org.layer.domain.space.entity.SpaceCategory;
911
import org.layer.domain.space.entity.SpaceField;
@@ -29,12 +31,14 @@ public class SpaceWithMemberCount {
2931
@NotNull
3032
private Leader leader;
3133
private Long formId;
34+
private String formTag;
3235
private Long memberCount;
3336

3437
private String bannerUrl;
3538

3639
@QueryProjection
37-
public SpaceWithMemberCount(Long id, LocalDateTime createdAt, LocalDateTime updatedAt, SpaceCategory category, List<SpaceField> fieldList, String name, String introduction, Member leader, Long formId, Long memberCount, String bannerUrl) {
40+
public SpaceWithMemberCount(Long id, LocalDateTime createdAt, LocalDateTime updatedAt, SpaceCategory category, List<SpaceField> fieldList, String name, String introduction, Member leader, Long formId, FormTag formTag, Long memberCount, String bannerUrl) {
41+
3842
this.id = id;
3943
this.createdAt = createdAt;
4044
this.updatedAt = updatedAt;
@@ -44,6 +48,7 @@ public SpaceWithMemberCount(Long id, LocalDateTime createdAt, LocalDateTime upda
4448
this.introduction = introduction;
4549
this.leader = Leader.builder().id(leader.getId()).name(leader.getName()).build();
4650
this.formId = formId;
51+
this.formTag = formTag != null ? formTag.getTag() : null;
4752
this.memberCount = memberCount;
4853
this.bannerUrl = bannerUrl;
4954
}

layer-domain/src/main/java/org/layer/domain/space/repository/SpaceRepositoryImpl.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,17 @@ private JPAQuery<SpaceWithMemberCount> getSpaceWithMemberCountQuery() {
107107
space.introduction,
108108
member,
109109
space.formId,
110+
form.formTag,
110111
memberCountRelationTable.space.id.count().as("memberCount"),
111112
space.bannerUrl
112113
))
113114
.from(space)
114115
.leftJoin(memberSpaceRelation).on(space.id.eq(memberSpaceRelation.space.id))
115116
.leftJoin(memberCountRelationTable).on(space.id.eq(memberCountRelationTable.space.id))
116117
.leftJoin(member).on(space.leaderId.eq(member.id))
117-
.leftJoin(form).on(space.formId.eq(form.spaceId));
118+
.leftJoin(form).on(space.formId.eq(form.id))
119+
.orderBy(form.id.desc())
120+
.limit(1);
118121

119122
}
120123

0 commit comments

Comments
 (0)