Skip to content

[refac] 코드리뷰 리팩토링 #45

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

Merged
merged 3 commits into from
Jan 11, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@RequiredArgsConstructor
public class MeetingController {

private static final String GROUP_ID = "Group-Id";
private static final String GROUP_ID = "X-Group-Id";
private final MeetingService meetingService;
private final UserMeetingService userMeetingService;
private final PinService pinService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ public class PinController {
private final PinService pinService;

@GetMapping
public ApiResponse<List<PinResponse>> getPinList (@PathVariable("teamId") Long teamId, @Nullable @RequestParam("category")MCategory category) {
return ApiResponse.success(SuccessMessage.OK, pinService.getPinListFilterByCategory(teamId, category));
public ApiResponse<List<PinResponse>> getPins (@PathVariable("teamId") Long teamId, @Nullable @RequestParam("category")MCategory category) {
return ApiResponse.success(SuccessMessage.OK, pinService.getPinsFilterByCategory(teamId, category));

}

@GetMapping("/{pinId}/meetings")
public ApiResponse<List<MeetingResponse>> getMeetingList(@UserId Long userId, @PathVariable("pinId") Long pinId) {
return ApiResponse.success(SuccessMessage.OK, pinService.getMeetingDetailList(userId, pinId));
public ApiResponse<List<MeetingResponse>> getMeetings(@UserId Long userId, @PathVariable("pinId") Long pinId) {
return ApiResponse.success(SuccessMessage.OK, pinService.getMeetingsDetail(userId, pinId));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.pingle.pingleserver.dto.common.ApiResponse;
import org.pingle.pingleserver.dto.request.TeamRegisterRequest;
import org.pingle.pingleserver.dto.response.SelectedTeamResponse;
import org.pingle.pingleserver.dto.response.TeamRegistResponse;
import org.pingle.pingleserver.dto.response.TeamRegisterResponse;
import org.pingle.pingleserver.dto.response.TeamSearchResultResponse;
import org.pingle.pingleserver.dto.type.SuccessMessage;
import org.pingle.pingleserver.service.TeamService;
Expand All @@ -32,10 +32,10 @@ public ApiResponse<SelectedTeamResponse> getTeam(@PathVariable Long teamId){
}

@PostMapping("/{teamId}/register")
public ApiResponse<TeamRegistResponse> registerTeam(
public ApiResponse<TeamRegisterResponse> registerTeam(
@UserId Long userId,
@PathVariable Long teamId,
@Valid @RequestBody TeamRegisterRequest request){
return ApiResponse.success(SuccessMessage.OK, teamService.registTeam(userId, teamId, request));
return ApiResponse.success(SuccessMessage.OK, teamService.registerTeam(userId, teamId, request));
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.pingle.pingleserver.dto.response;

public record TeamRegisterResponse(Long id, String name) {
public static TeamRegisterResponse of(Long id, String name) {
return new TeamRegisterResponse(id, name);
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/pingle/pingleserver/service/PinService.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ public class PinService {
private final TeamRepository teamRepository;
private final UserMeetingRepository userMeetingRepository;

public List<PinResponse> getPinListFilterByCategory(Long teamId, MCategory category) {
public List<PinResponse> getPinsFilterByCategory(Long teamId, MCategory category) {
Team team = teamRepository.findByIdOrThrow(teamId);
List<Pin> pinList = pinRepository.findAllByTeam(team);
if(category == null) return pinList.stream().map(PinResponse::of).toList();
return pinList.stream().filter(pin -> checkMeetingsCategoryOfPin(pin, category)).map(PinResponse::of).toList();
}

public List<MeetingResponse> getMeetingDetailList(Long userId, Long pinId) {
public List<MeetingResponse> getMeetingsDetail(Long userId, Long pinId) {
Pin pin = pinRepository.findById(pinId).orElseThrow(() -> new CustomException(ErrorMessage.RESOURCE_NOT_FOUND));
Comparator<Meeting> comparator = Comparator.comparing(Meeting::getStartAt);
List<Meeting> meetingList = pin.getMeetingList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.pingle.pingleserver.dto.request.TeamRegisterRequest;
import org.pingle.pingleserver.dto.response.SelectedTeamResponse;
import org.pingle.pingleserver.dto.response.TeamDetailDto;
import org.pingle.pingleserver.dto.response.TeamRegistResponse;
import org.pingle.pingleserver.dto.response.TeamRegisterResponse;
import org.pingle.pingleserver.dto.response.TeamSearchResultResponse;
import org.pingle.pingleserver.dto.type.ErrorMessage;
import org.pingle.pingleserver.exception.CustomException;
Expand Down Expand Up @@ -48,7 +48,7 @@ public SelectedTeamResponse getTeam(Long teamId) {
}

@Transactional
public TeamRegistResponse registTeam(Long userId, Long teamId, TeamRegisterRequest request) {
public TeamRegisterResponse registerTeam(Long userId, Long teamId, TeamRegisterRequest request) {
Team team = teamRepository.findByIdOrThrow(teamId);
if (!team.getCode().equals(request.code())) {
throw new CustomException(ErrorMessage.INVALID_GROUP_CODE);
Expand All @@ -64,6 +64,6 @@ public TeamRegistResponse registTeam(Long userId, Long teamId, TeamRegisterReque
.teamRole(TRole.PARTICIPANT)
.build();
userTeamRepository.save(newUserTeam);
return TeamRegistResponse.of(team.getId(), team.getName());
return TeamRegisterResponse.of(team.getId(), team.getName());
}
}