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

Refactor: DTO record type으로 변경 #223

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Refactor: DTO record type으로 변경 #223

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
5881cfd
Refactor: DTO record type으로 변경
yumzen Sep 5, 2024
3f6a36e
#222 Refactor: DTO record type으로 변경
yumzen Sep 5, 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
2 changes: 1 addition & 1 deletion src/main/java/com/codiary/backend/global/converter/CommentConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static CommentResponseDTO.DeleteCommentResultDTO toDeleteCommentResultDTO
public static CommentResponseDTO.CountCommentsResultDTO toCountCommentsResultDTO(Long postId, int countComments) {
return CommentResponseDTO.CountCommentsResultDTO.builder()
.postId(postId)
.countComments(countComments)
.countComment(countComments)
.build();
}

Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/codiary/backend/global/converter/PostConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ public class PostConverter {
public static Post toPost(PostRequestDTO.CreatePostRequestDTO request, TeamRepository teamRepository, ProjectRepository projectRepository) {
Team team = null;
Project project = null;
if (request.getTeamId() != null) {
team = teamRepository.findById(request.getTeamId()).orElseThrow(() -> new IllegalArgumentException("Team not found with id: " + request.getTeamId()));
if (request.teamId() != null) {
team = teamRepository.findById(request.teamId()).orElseThrow(() -> new IllegalArgumentException("Team not found with id: " + request.teamId()));
}
// projectId가 제공된 경우에만 Project 객체를 조회
if (request.getProjectId() != null) {
project = projectRepository.findById(request.getProjectId()).orElseThrow(() -> new IllegalArgumentException("Project not found with id: " + request.getProjectId()));
if (request.projectId() != null) {
project = projectRepository.findById(request.projectId()).orElseThrow(() -> new IllegalArgumentException("Project not found with id: " + request.projectId()));
}
return Post.builder()
.postTitle(request.getPostTitle())
.postBody(request.getPostBody())
.postTitle(request.postTitle())
.postBody(request.postBody())
.team(team)
.project(project)
.postStatus(request.getPostStatus())
.postAccess(request.getPostAccess())
.postStatus(request.postStatus())
.postAccess(request.postAccess())
.build();
}

Expand Down Expand Up @@ -438,7 +438,7 @@ public static PostResponseDTO.UpdatePostResultDTO toSetPostCategoriesResultDTO(P
// 게시글에 댓글 작성하기
public static Comment toComment(PostRequestDTO.CommentDTO request) {
return Comment.builder()
.commentBody(request.getCommentBody())
.commentBody(request.commentBody())
.build();
}

Expand All @@ -456,7 +456,7 @@ public static PostResponseDTO.CreateCommentResultDTO toCreateCommentResultDTO(Co
// 게시글에 대댓글 작성하기
public static Comment toCommentReply(PostRequestDTO.CommentReplyDTO request) {
return Comment.builder()
.commentBody(request.getCommentReplyBody())
.commentBody(request.commentReplyBody())
.build();
}

Expand Down
14 changes: 3 additions & 11 deletions src/main/java/com/codiary/backend/global/converter/PostFileConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,13 @@ public static PostFile toPostFile(String fileUrl, Post post, String fileName) {
}

public static PostFileResponseDTO.PostFileListDTO toPostFileListDTO(List<PostFile> postFileList) {
PostFileResponseDTO.PostFileListDTO postFileListDTO = new PostFileResponseDTO.PostFileListDTO();
postFileListDTO.setPostFileList(new ArrayList<>());

for (PostFile postFile:postFileList) {
postFileListDTO.getPostFileList().add(toPostFileDTO(postFile));
}
PostFileResponseDTO.PostFileListDTO postFileListDTO = new PostFileResponseDTO.PostFileListDTO(postFileList);

return postFileListDTO;
}

public static PostFileResponseDTO.postFileDTO toPostFileDTO(PostFile postFile) {
PostFileResponseDTO.postFileDTO postFileDTO = new PostFileResponseDTO.postFileDTO();

postFileDTO.setName(postFile.getFileName());
postFileDTO.setUrl(postFile.getFileUrl());
public static PostFileResponseDTO.PostFileDTO toPostFileDTO(PostFile postFile) {
PostFileResponseDTO.PostFileDTO postFileDTO = new PostFileResponseDTO.PostFileDTO(postFile.getFileName(), postFile.getFileUrl());

return postFileDTO;
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/codiary/backend/global/domain/entity/Post.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ public class Post extends BaseEntity {
public void setProject(Project project) { this.project = project;}

public void update(PostRequestDTO.UpdatePostDTO request) {
this.postTitle = request.getPostTitle();
this.postBody = request.getPostBody();
this.postAccess = request.getPostAccess();
this.postStatus = request.getPostStatus();
this.postTitle = request.postTitle();
this.postBody = request.postBody();
this.postAccess = request.postAccess();
this.postStatus = request.postStatus();
}

public void setMember(Member member) { this.member = member;}
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/codiary/backend/global/service/CommentService/CommentCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public Comment patchComment(Long commentId, CommentRequestDTO.PatchCommentDTO re
.orElseThrow(() -> new GeneralException(ErrorStatus.COMMENT_NOT_FOUND));

if (request != null) {
comment.patchComment(request.getCommentBody());
comment.patchComment(request.commentBody());
}

CommentConverter.toPatchCommentResultDTO(comment);
Expand Down
2 changes: 1 addition & 1 deletion ...odiary/backend/global/service/MemberCategoryService/MemberCategoryCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public MemberCategory patchMemberCategory(Long memberCategoryId, MemberCategoryR
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBERCATEGORY_NOT_FOUND));

if (request != null) {
Categories categories = categoryRepository.findById(request.getCategoryId())
Categories categories = categoryRepository.findById(request.categoryId())
.orElseThrow(() -> new GeneralException(ErrorStatus.CATEGORY_NOT_FOUND));

memberCategory.patchCategories(categories);
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/com/codiary/backend/global/service/MemberService/MemberCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ public class MemberCommandServiceImpl implements MemberCommandService {
public ApiResponse<String> signUp(MemberRequestDTO.MemberSignUpRequestDTO signUpRequest) {
signUpRequest.isCorrect();

if (memberRepository.existsByEmail(signUpRequest.getEmail())
|| memberRepository.existsByNickname(signUpRequest.getNickname())) {
if (memberRepository.existsByEmail(signUpRequest.email())
|| memberRepository.existsByNickname(signUpRequest.nickname())) {
throw new MemberHandler(ErrorStatus.MEMBER_ALREADY_EXISTS);
}

Member member = Member.builder()
.email(signUpRequest.getEmail())
.password(passwordEncoder.encode(signUpRequest.getPassword()))
.nickname(signUpRequest.getNickname())
.birth(signUpRequest.getBirth().toString())
.email(signUpRequest.email())
.password(passwordEncoder.encode(signUpRequest.password()))
.nickname(signUpRequest.nickname())
.birth(signUpRequest.birth().toString())
.gender(Member.Gender.Female)
.github(signUpRequest.getGithub())
.linkedin(signUpRequest.getLinkedin())
.discord(signUpRequest.getDiscord())
.github(signUpRequest.github())
.linkedin(signUpRequest.linkedin())
.discord(signUpRequest.discord())
.image(null)
.build();
memberRepository.save(member);
Expand Down Expand Up @@ -108,7 +108,7 @@ public ApiResponse<MemberResponseDTO.MemberTokenResponseDTO> login(MemberRequest
.authenticate(authenticationToken);

// 3. 인증 정보를 기반으로 JWT 토큰 생성
Member getMember = memberRepository.findByEmail(loginRequest.getEmail()).orElseThrow();
Member getMember = memberRepository.findByEmail(loginRequest.email()).orElseThrow();
TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication, getMember.getMemberId());

return ApiResponse.of(SuccessStatus.MEMBER_OK, MemberResponseDTO.MemberTokenResponseDTO.builder()
Expand Down Expand Up @@ -168,7 +168,7 @@ public ApiResponse<MemberResponseDTO.MemberImageDTO> updateProfileImage(Member m

String uuid = UUID.randomUUID().toString();
Uuid savedUuid = uuidRepository.save(Uuid.builder().uuid(uuid).build());
String fileUrl = s3Manager.uploadFile(s3Manager.generatePostName(savedUuid), request.getImage());
String fileUrl = s3Manager.uploadFile(s3Manager.generatePostName(savedUuid), request.image());

MemberImage memberImage = MemberImage.builder()
.imageUrl(fileUrl)
Expand Down Expand Up @@ -256,11 +256,11 @@ public MemberResponseDTO.ProjectsDTO setProjects(Long memberId, String projectNa
@Override
public Member updateMemberInfo(Member member, MemberRequestDTO.MemberInfoRequestDTO request){
Member updatedMember = member.toBuilder()
.birth(request.getBirth())
.introduction(request.getIntroduction())
.github(request.getGithub())
.linkedin(request.getLinkedin())
.discord(request.getDiscord())
.birth(request.birth())
.introduction(request.introduction())
.github(request.github())
.linkedin(request.linkedin())
.discord(request.discord())
.build();

return memberRepository.save(updatedMember);
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/codiary/backend/global/service/PostService/PostCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public Post createPost(PostRequestDTO.CreatePostRequestDTO request) {
Post tempPost = postRepository.save(newPost);
tempPost.setPostFileList(new ArrayList<>());

if (request.getPostFiles() != null) {
for (MultipartFile file : request.getPostFiles()) {
if (request.postFiles() != null) {
for (MultipartFile file : request.postFiles()) {
if (file.isEmpty()) {
continue;
}
Expand All @@ -79,7 +79,7 @@ public Post createPost(PostRequestDTO.CreatePostRequestDTO request) {
}

// 대표 사진 설정
String thumbnailImageName = request.getThumbnailImageName();
String thumbnailImageName = request.thumbnailImageName();
for (PostFile postFile : tempPost.getPostFileList()) {
if (postFile.getFileName().equals(thumbnailImageName)) {
tempPost.setThumbnailImage(postFile);
Expand All @@ -100,8 +100,8 @@ public Post updatePost(Long postId, PostRequestDTO.UpdatePostDTO request) {
updatePost.update(request);

// 새로운 이미지 추가
if (request.getAddedPostFiles() != null) {
for (MultipartFile file : request.getAddedPostFiles()) {
if (request.addedPostFiles() != null) {
for (MultipartFile file : request.addedPostFiles()) {
if (file.isEmpty()) {
continue;
}
Expand All @@ -117,7 +117,7 @@ public Post updatePost(Long postId, PostRequestDTO.UpdatePostDTO request) {
}

// 대표 사진 설정
String thumbnailImageName = request.getThumbnailImageName();
String thumbnailImageName = request.thumbnailImageName();
for (PostFile postFile : updatePost.getPostFileList()) {
if (postFile.getFileName() == thumbnailImageName) {
updatePost.setThumbnailImage(postFile);
Expand Down Expand Up @@ -145,7 +145,7 @@ public Post updateVisibility(Long postId, PostRequestDTO.UpdateVisibilityRequest
.orElseThrow(() -> new IllegalArgumentException("Post not found"));
Member getMember = memberCommandService.getRequester();

post.setPostStatus(request.getPostStatus());
post.setPostStatus(request.postStatus());
return postRepository.save(post);
}

Expand All @@ -159,7 +159,7 @@ public Post updateCoauthors(Long postId, PostRequestDTO.UpdateCoauthorRequestDTO
post.getAuthorsList().clear();

// 새로운 공동 저자 리스트 추가
Set<Authors> coauthors = request.getMemberIds().stream()
Set<Authors> coauthors = request.memberIds().stream()
.map(newCoauthorId -> {
Member newCoauthor = memberRepository.findById(newCoauthorId)
.orElseThrow(() -> new IllegalArgumentException("Member not found: " + newCoauthorId));
Expand Down
10 changes: 5 additions & 5 deletions ...va/com/codiary/backend/global/service/TeamMemberService/TeamMemberCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public TeamMember addMemberToTeam(Member member, Team team, MemberRole role, Str
@Override
@Transactional
public TeamMember addMember(TeamMemberRequestDTO.AddMemberDTO request) {
Team team = teamRepository.findById(request.getTeamId())
Team team = teamRepository.findById(request.teamId())
.orElseThrow(() -> new IllegalArgumentException("Invalid team ID"));

Member currentMember = getRequester();
Expand All @@ -55,16 +55,16 @@ public TeamMember addMember(TeamMemberRequestDTO.AddMemberDTO request) {
throw new GeneralException(ErrorStatus.TEAM_ADMIN_UNAUTHORIZED);
}

Member member = memberRepository.findById(request.getMemberId())
Member member = memberRepository.findById(request.memberId())
.orElseThrow(() -> new IllegalArgumentException("Invalid member ID"));

return addMemberToTeam(member, team, request.getMemberRole(), request.getMemberPosition());
return addMemberToTeam(member, team, request.memberRole(), request.memberPosition());
}

@Override
@Transactional
public void removeMember(TeamMemberRequestDTO.RemoveMemberDTO request) {
Team team = teamRepository.findById(request.getTeamId())
Team team = teamRepository.findById(request.teamId())
.orElseThrow(() -> new IllegalArgumentException("Invalid team ID"));

Member currentMember = getRequester();
Expand All @@ -79,7 +79,7 @@ public void removeMember(TeamMemberRequestDTO.RemoveMemberDTO request) {
throw new GeneralException(ErrorStatus.TEAM_ADMIN_UNAUTHORIZED);
}

Member member = memberRepository.findById(request.getMemberId())
Member member = memberRepository.findById(request.memberId())
.orElseThrow(() -> new IllegalArgumentException("Invalid member ID"));

TeamMember teamMember = teamMemberRepository.findByTeamAndMember(team, member)
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/com/codiary/backend/global/service/TeamService/TeamCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ public Team createTeam(TeamRequestDTO.CreateTeamRequestDTO request) {
Member currentMember = getRequester();

Team team = Team.builder()
.name(request.getName())
.intro(request.getIntro())
.github(request.getGithub())
.email(request.getEmail())
.linkedin(request.getLinkedIn())
.instagram(request.getInstagram())
.name(request.name())
.intro(request.intro())
.github(request.github())
.email(request.email())
.linkedin(request.linkedIn())
.instagram(request.instagram())
.teamMemberList(new ArrayList<>())
.bannerImage(null)
.profileImage(null)
Expand All @@ -72,11 +72,11 @@ public Team createTeam(TeamRequestDTO.CreateTeamRequestDTO request) {
public Team updateTeam(Long teamId, TeamRequestDTO.UpdateTeamDTO request) {
Team team = teamRepository.findById(teamId).orElseThrow(() -> new IllegalArgumentException("Invalid team ID"));

team.setName(request.getName());
team.setIntro(request.getIntro());
team.setGithub(request.getGithub());
team.setLinkedin(request.getLinkedIn());
team.setInstagram(request.getInstagram());
team.setName(request.name());
team.setIntro(request.intro());
team.setGithub(request.github());
team.setLinkedin(request.linkedIn());
team.setInstagram(request.instagram());

return teamRepository.save(team);
}
Expand Down Expand Up @@ -168,7 +168,7 @@ public ApiResponse<TeamResponseDTO.TeamImageDTO> updateTeamBannerImage(Long team

String uuid = UUID.randomUUID().toString();
Uuid savedUuid = uuidRepository.save(Uuid.builder().uuid(uuid).build());
String fileUrl = s3Manager.uploadFile(s3Manager.generatePostName(savedUuid), request.getImage());
String fileUrl = s3Manager.uploadFile(s3Manager.generatePostName(savedUuid), request.image());

TeamBannerImage bannerImage = TeamBannerImage.builder()
.imageUrl(fileUrl)
Expand All @@ -191,7 +191,7 @@ public ApiResponse<TeamResponseDTO.TeamImageDTO> updateTeamProfileImage(Long tea

String uuid = UUID.randomUUID().toString();
Uuid savedUuid = uuidRepository.save(Uuid.builder().uuid(uuid).build());
String fileUrl = s3Manager.uploadFile(s3Manager.generatePostName(savedUuid), request.getImage());
String fileUrl = s3Manager.uploadFile(s3Manager.generatePostName(savedUuid), request.image());

TeamProfileImage profileImage = TeamProfileImage.builder()
.imageUrl(fileUrl)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/codiary/backend/global/web/controller/PostController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public ApiResponse<PostResponseDTO.UpdatePostResultDTO> setPostTeam(@PathVariabl
Member member = memberCommandService.getRequester();
jwtTokenProvider.isValidToken(member.getMemberId());

Post updatedPost = postCommandService.setPostTeam(postId, request.getTeamId());
Post updatedPost = postCommandService.setPostTeam(postId, request.teamId());
return ApiResponse.onSuccess(SuccessStatus.POST_OK, PostConverter.toUpdatePostResultDTO(updatedPost));
}

Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/codiary/backend/global/web/controller/SocialLoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public class SocialLoginController {

@PostMapping("/login/kakao")
@Operation(summary = "카카오 로그인")
public ApiResponse<Oauth2ResponseDTO.SocialLoginDTO> kakaoLogin() {
public ApiResponse<Oauth2ResponseDTO> kakaoLogin() {
String url = socialLoginService.getKakaoRedirectUrl();
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO.SocialLoginDTO(url));
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO(url));
}

@GetMapping("/login/kakao")
Expand All @@ -33,9 +33,9 @@ public ApiResponse<MemberResponseDTO.MemberTokenResponseDTO> kakaoToken(@Request

@PostMapping("/login/naver")
@Operation(summary = "네이버 로그인")
public ApiResponse<Oauth2ResponseDTO.SocialLoginDTO> naverLogin() {
public ApiResponse<Oauth2ResponseDTO> naverLogin() {
String url = socialLoginService.getNaverRedirectUrl();
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO.SocialLoginDTO(url));
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO(url));
}

@GetMapping("/login/naver")
Expand All @@ -49,9 +49,9 @@ public ApiResponse<MemberResponseDTO.MemberTokenResponseDTO> naverToken(

@PostMapping("/login/github")
@Operation(summary = "깃허브 로그인")
public ApiResponse<Oauth2ResponseDTO.SocialLoginDTO> githubLogin() {
public ApiResponse<Oauth2ResponseDTO> githubLogin() {
String url = socialLoginService.getGithubRedirectUrl();
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO.SocialLoginDTO(url));
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO(url));
}

@GetMapping("/login/github")
Expand All @@ -64,9 +64,9 @@ public ApiResponse<MemberResponseDTO.MemberTokenResponseDTO> githubToken(

@PostMapping("/login/google")
@Operation(summary = "구글 로그인")
public ApiResponse<Oauth2ResponseDTO.SocialLoginDTO> googleLogin() {
public ApiResponse<Oauth2ResponseDTO> googleLogin() {
String url = socialLoginService.getGoogleRedirectUrl();
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO.SocialLoginDTO(url));
return ApiResponse.onSuccess(SuccessStatus.MEMBER_OK, new Oauth2ResponseDTO(url));
}

@GetMapping("/login/google")
Expand Down
Loading