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

✨ [Feature] Agenda isRanking 필드 추가 #899 #900

Merged
merged 2 commits into from
Jul 24, 2024
Merged

✨ [Feature] Agenda isRanking 필드 추가 #899 #900

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
839cf06
feat: add isRanking
yhames Jul 23, 2024
c54c781
feat: add isRanking
yhames Jul 23, 2024
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
6 changes: 5 additions & 1 deletion gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/controller/response/AgendaResDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,16 @@ public class AgendaResDto {

private Boolean isOfficial;

private Boolean isRanking;

private String announcementTitle;

@Builder
public AgendaResDto(String agendaTitle, String agendaContents, LocalDateTime agendaDeadLine,
LocalDateTime agendaStartTime, LocalDateTime agendaEndTime, int agendaMinTeam, int agendaMaxTeam,
int agendaCurrentTeam, int agendaMinPeople, int agendaMaxPeople, String agendaPoster, String agendaHost,
Location agendaLocation, AgendaStatus agendaStatus, LocalDateTime createdAt, String announcementTitle,
boolean isOfficial) {
Boolean isOfficial, Boolean isRanking) {
this.agendaTitle = agendaTitle;
this.agendaContents = agendaContents;
this.agendaDeadLine = agendaDeadLine;
Expand All @@ -75,6 +77,7 @@ public AgendaResDto(String agendaTitle, String agendaContents, LocalDateTime age
this.createdAt = createdAt;
this.announcementTitle = announcementTitle;
this.isOfficial = isOfficial;
this.isRanking = isRanking;
}

@Mapper
Expand All @@ -98,6 +101,7 @@ public interface MapStruct {
@Mapping(target = "agendaStatus", source = "agenda.status")
@Mapping(target = "createdAt", source = "agenda.createdAt")
@Mapping(target = "isOfficial", source = "agenda.isOfficial")
@Mapping(target = "isRanking", source = "agenda.isRanking")
@Mapping(target = "announcementTitle", source = "announcementTitle")
AgendaResDto toDto(Agenda agenda, String announcementTitle);
}
Expand Down
6 changes: 5 additions & 1 deletion ...a-api/src/main/java/gg/agenda/api/user/agenda/controller/response/AgendaSimpleResDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ public class AgendaSimpleResDto {

private Boolean isOfficial;

private Boolean isRanking;

@Builder
public AgendaSimpleResDto(String agendaTitle, LocalDateTime agendaDeadLine, LocalDateTime agendaStartTime,
LocalDateTime agendaEndTime, int agendaCurrentTeam, int agendaMaxTeam, int agendaMinPeople,
int agendaMaxPeople, Location agendaLocation, UUID agendaKey, boolean isOfficial) {
int agendaMaxPeople, Location agendaLocation, UUID agendaKey, Boolean isOfficial, Boolean isRanking) {
this.agendaTitle = agendaTitle;
this.agendaDeadLine = agendaDeadLine;
this.agendaStartTime = agendaStartTime;
Expand All @@ -54,6 +56,7 @@ public AgendaSimpleResDto(String agendaTitle, LocalDateTime agendaDeadLine, Loca
this.agendaLocation = agendaLocation;
this.agendaKey = agendaKey;
this.isOfficial = isOfficial;
this.isRanking = isRanking;
}

@Mapper
Expand All @@ -71,6 +74,7 @@ public interface MapStruct {
@Mapping(target = "agendaLocation", source = "location")
@Mapping(target = "agendaKey", source = "agendaKey")
@Mapping(target = "isOfficial", source = "isOfficial")
@Mapping(target = "isRanking", source = "isRanking")
AgendaSimpleResDto toDto(Agenda agenda);
}
}
Loading