Skip to content

Commit

Permalink
Merge pull request #64 from local-mood/feat/63-member-candidate
Browse files Browse the repository at this point in the history
Feat: ๋ฉค๋ฒ„ ํ›„๋ณด์ž ์—ฌ๋ถ€ ํ•„๋“œ ์ถ”๊ฐ€
  • Loading branch information
yeni-choi authored Dec 26, 2023
2 parents 65e3e51 + 7b127ac commit a3c568a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/main/java/com/ceos/vote/domain/member/dto/MemberDto.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ public class MemberDto {
private String name;
private String teamName;
private Integer voteCnt;
private Boolean isCandidate;

@Builder
public MemberDto(Member member) {
this.id = member.getId();
this.name = member.getUsername();
this.teamName = member.getTeam().getName();
this.voteCnt = member.getVoteCnt();
this.isCandidate = member.getIsCandidate();
}

}

4 changes: 3 additions & 1 deletion src/main/java/com/ceos/vote/domain/member/entity/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class Member {
private String email;
private String password;

private Boolean isCandidate;
private Boolean voteFlagBe;
private Boolean voteFlagFe;
private Boolean voteFlagTeam;
Expand All @@ -39,12 +40,13 @@ public class Member {
private Role role;

@Builder
public Member(Long id, String username, String userid, String email, String password, Boolean voteFlagBe, Boolean voteFlagFe, Boolean voteFlagTeam, Integer voteCnt, Team team, DevPart devPart) {
public Member(Long id, String username, String userid, String email, String password, Boolean isCandidate, Boolean voteFlagBe, Boolean voteFlagFe, Boolean voteFlagTeam, Integer voteCnt, Team team, DevPart devPart) {
this.id = id;
this.username = username;
this.userid = userid;
this.email = email;
this.password = password;
this.isCandidate = false;
this.voteFlagBe = voteFlagBe;
this.voteFlagFe = voteFlagFe;
this.voteFlagTeam = voteFlagTeam;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spring:
hibernate:
properties:
hibernate.format_sql: true
ddl-auto: validate
ddl-auto: update

mvc:
pathmatch:
Expand Down

0 comments on commit a3c568a

Please sign in to comment.