Skip to content
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

Jump to bottom

fix: 반환할 때 태그도 받도록 수정 #117

Merged
merged 3 commits into from
Jul 27, 2023
Merged

fix: 반환할 때 태그도 받도록 수정 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d06a682
fix: 반환할 때 태그도 받도록 수정
hong-sile Jul 27, 2023
4d1eb4a
test: documentTest 오류 수정
hong-sile Jul 27, 2023
ff88a20
fix: event에서 초기에 tag를 빈 태그를 조기화 하는 기능 추가
hong-sile Jul 27, 2023
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
14 changes: 13 additions & 1 deletion backend/emm-sale/src/main/java/com/emmsale/event/application/dto/EventDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
package com.emmsale.event.application.dto;

import static java.util.stream.Collectors.toUnmodifiableList;

import com.emmsale.event.domain.Event;
import com.emmsale.event.domain.EventTag;
import com.emmsale.tag.domain.Tag;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

Expand All @@ -23,16 +28,23 @@ public class EventDetailResponse {
private final LocalDateTime endDate;
private final String location;
private final String status;
private final List<String> tags;

public static EventDetailResponse from(final Event event) {
final List<String> tagNames = event.getTags().stream()
.map(EventTag::getTag)
.map(Tag::getName)
.collect(toUnmodifiableList());

return new EventDetailResponse(
event.getId(),
event.getName(),
event.getInformationUrl(),
event.getStartDate(),
event.getEndDate(),
event.getLocation(),
calculateStatus(event.getStartDate(), event.getEndDate())
calculateStatus(event.getStartDate(), event.getEndDate()),
tagNames
);
}

Expand Down
3 changes: 2 additions & 1 deletion backend/emm-sale/src/main/java/com/emmsale/event/domain/Event.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.emmsale.comment.domain.Comment;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
Expand Down Expand Up @@ -35,7 +36,7 @@ public class Event extends BaseEntity {
@Column(nullable = false)
private String informationUrl;
@OneToMany(mappedBy = "event")
private List<EventTag> tags;
private List<EventTag> tags = new ArrayList<>();
@OneToMany(mappedBy = "event")
private List<Comment> comments;

Expand Down
8 changes: 5 additions & 3 deletions backend/emm-sale/src/test/java/com/emmsale/event/api/EventApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ void findEvent() throws Exception {
LocalDateTime.of(2023, 8, 15, 12, 0),
LocalDateTime.of(2023, 8, 15, 12, 0),
"코엑스",
"예정"
"예정",
List.of("코틀린", "백엔드", "안드로이드")
);

final ResponseFieldsSnippet responseFields = responseFields(
Expand All @@ -57,7 +58,8 @@ void findEvent() throws Exception {
fieldWithPath("startDate").type(JsonFieldType.STRING).description("시작일자"),
fieldWithPath("endDate").type(JsonFieldType.STRING).description("종료일자"),
fieldWithPath("location").type(JsonFieldType.STRING).description("장소"),
fieldWithPath("status").type(JsonFieldType.STRING).description("진행상태")
fieldWithPath("status").type(JsonFieldType.STRING).description("진행상태"),
fieldWithPath("tags[]").type(JsonFieldType.ARRAY).description("태그들")
);

when(eventService.findEvent(eventId)).thenReturn(eventDetailResponse);
Expand Down Expand Up @@ -116,4 +118,4 @@ void findEvents() throws Exception {
.andDo(document("find-events", requestParameters, responseFields));
}

}
}
Loading