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.

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

Feature2 #3

Merged
merged 2 commits into from
Dec 20, 2023
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
8 changes: 4 additions & 4 deletions src/main/java/Donggukthon/santa/service/MemberSevice.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public List<MemberNSubmissionResponseDTO> getDonatePeopleList() {
.name(member.getName())
.nickname(member.getNickname())
.gender(member.getGender())
.phoneNumber(member.getPhoneNumber())
.createdAt(member.getCreatedAt())
.phone_number(member.getPhoneNumber())
.created_at(member.getCreatedAt())
.build();


Expand Down Expand Up @@ -80,8 +80,8 @@ public Optional<CertificationResponseDTO> getDonatePersonCertification(Long id)
.name(member.get().getName())
.nickname(member.get().getNickname())
.gender(member.get().getGender())
.phoneNumber(member.get().getPhoneNumber())
.createdAt(member.get().getCreatedAt())
.phone_number(member.get().getPhoneNumber())
.created_at(member.get().getCreatedAt())
.build();

CertificationResponseDTO certificationResponseDTO = CertificationResponseDTO.builder()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/Donggukthon/santa/service/TreeService.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private DecorationResponseDTO convertToDecorationResponseDTO(MemberDecorationRel
.location(decoration.getLocation())
// .color("Some color") // Populate appropriately
.scale(decoration.getScale())
.createdAt(decoration.getCreatedAt().toString())
.created_at(decoration.getCreatedAt().toString())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ public class DecorationResponseDTO {
private int scale;
private int degree;
private String floor;
private String createdAt;
private String created_at;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public class MemberDTO {
private String name;
private String nickname;
private String gender;
private String phoneNumber;
private LocalDateTime createdAt;
private String phone_number;
private LocalDateTime created_at;

private List<Submission> submissions = new ArrayList<>();
private List<DesignatedPerson> designatedpersons = new ArrayList<>();
Expand All @@ -36,8 +36,8 @@ public static MemberDTO toMemberDto(Member member){
memberDto.setPassword(member.getPassword());
memberDto.setName(member.getName());
memberDto.setGender(member.getGender());
memberDto.setPhoneNumber(member.getPhoneNumber());
memberDto.setCreatedAt(member.getCreatedAt());
memberDto.setPhone_number(member.getPhoneNumber());
memberDto.setCreated_at(member.getCreatedAt());

return memberDto;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ public final class MemberResponseDTO {
private String name;
private String nickname;
private String gender;
private String phoneNumber;
private LocalDateTime createdAt;
private String phone_number;
private LocalDateTime created_at;
}