Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion backend/src/main/java/moadong/club/entity/ClubAward.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import moadong.club.enums.SemesterTerm;

import java.util.List;

Expand All @@ -13,7 +14,9 @@
@NoArgsConstructor
public class ClubAward {

private String semester;
private int year;

private SemesterTerm semesterTerm;

private List<String> achievements;
}
12 changes: 8 additions & 4 deletions backend/src/main/java/moadong/club/payload/dto/ClubAwardDto.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,27 @@

import jakarta.validation.constraints.Size;
import moadong.club.entity.ClubAward;
import moadong.club.enums.SemesterTerm;
import org.hibernate.validator.constraints.Range;

import java.util.List;

public record ClubAwardDto(
@Size(max = 50)
String semester,
@Range(min = 1900, max = 2050)
int year,
SemesterTerm semesterTerm,

List<@Size(max = 100) String> achievements
) {
public static ClubAwardDto from(ClubAward clubAward) {
if (clubAward == null) return null;
return new ClubAwardDto(clubAward.getSemester(), clubAward.getAchievements());
return new ClubAwardDto(clubAward.getYear(), clubAward.getSemesterTerm(), clubAward.getAchievements());
}

public ClubAward toEntity() {
return ClubAward.builder()
.semester(semester)
.year(year)
.semesterTerm(semesterTerm)
.achievements(achievements)
.build();
}
Expand Down
Loading