Skip to content

Commit

Permalink
Merge pull request #59 from Kusitms-29th-Meetup-TeamE/fix/55/activity…
Browse files Browse the repository at this point in the history
…-dto

Fix: 활동 엔티티
  • Loading branch information
Jeongho427 authored May 19, 2024
2 parents 2d95757 + c355bf3 commit 8616ddc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class ActivityDetailsRes {

private String title;

private String description;

private String agency;

private String agencyType;
Expand All @@ -45,6 +47,7 @@ public static ActivityDetailsRes of(Activity activity) {
return ActivityDetailsRes.builder()
.id(activity.getId())
.title(activity.getTitle())
.description(activity.getDescription())
.agency(activity.getAgency())
.agencyType(activity.getAgencyType().getDescription())
.location(activity.getLocation())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public class Activity {
@Comment("활동 제목")
private String title;

@Comment("활동 설명")
private String description;

@Comment("활동 제공 기관")
private String agency;

Expand Down Expand Up @@ -65,9 +68,10 @@ public class Activity {
@OneToOne(mappedBy = "activity", cascade = CascadeType.ALL)
private GroupChatRoom groupChatRoom;

public static Activity of(String title, String location, LocalDateTime time, Long maxParticipants, List<Personality> personalities, String imageUrl) {
public static Activity of(String title, String description, String location, LocalDateTime time, Long maxParticipants, List<Personality> personalities, String imageUrl) {
return Activity.builder()
.title(title)
.description(description)
.location(location)
.time(time)
.currentParticipants(0L)
Expand Down

0 comments on commit 8616ddc

Please sign in to comment.