Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0a86005
:sparkles: edit : edit get crew home and info page status code
jeeheaG Jan 1, 2025
fd92bbe
:recycle: refactor : rename CommandCrewService
jeeheaG Jan 1, 2025
65d0106
:sparkles: feat : make dtos for UpdateCrewInfo api
jeeheaG Jan 1, 2025
0138dc5
:sparkles: feat : make exception and error code for UpdateCrewInfo api
jeeheaG Jan 1, 2025
34fe056
:sparkles: feat : make use case and service logic for UpdateCrewInfo api
jeeheaG Jan 1, 2025
cda039d
:sparkles: feat : make UpdateCrewInfo api
jeeheaG Jan 1, 2025
5204e5f
:recycle: refactor : move crew owner checking logic to CommandCrewSer…
jeeheaG Jan 2, 2025
5960a64
Merge branch 'main' of https://github.com/Run-Us/Run-Us-server into J…
jeeheaG Jan 2, 2025
0f705e6
:bug: solve merge conflict
jeeheaG Feb 3, 2025
6cf221f
:sparkles: make update crew join rule api
jeeheaG Feb 5, 2025
707bbce
:sparkles: make close crew api
jeeheaG Feb 5, 2025
7894813
:sparkles: add : make monthlyRecord field
jeeheaG Mar 6, 2025
8e862b2
:sparkles: add : make type field in RunningPreview
jeeheaG Mar 6, 2025
c2d5a50
:sparkles: add : make RunTopMessage logic by strategy pattern
jeeheaG Mar 6, 2025
b8a83ac
:sparkles: add : make findFirstForCrewCard query method
jeeheaG Mar 6, 2025
3719ea5
:sparkles: add : make existsByCrewIdAndStatus query method
jeeheaG Mar 6, 2025
a67cde6
:sparkles: add : make getUserByInternalId method
jeeheaG Mar 6, 2025
4fab857
:sparkles: add : move validate logic to CrewValidator
jeeheaG Mar 6, 2025
a84760a
:sparkles: add : make getCrewCardRun service logic
jeeheaG Mar 6, 2025
a0bb901
:sparkles: add : make existNewJoinRequest service logic
jeeheaG Mar 6, 2025
b2fc5e4
:sparkles: feat : make getCrewHome api
jeeheaG Mar 6, 2025
3472c5f
:sparkles: edit : change to use @CurrentUser
jeeheaG Mar 6, 2025
b9f082c
:bug: fix : add exception throwing when user profile is null
jeeheaG Mar 7, 2025
4fc6d5f
:bug: fix : use service model UpdateCrewInfo instead of request dto
jeeheaG Mar 7, 2025
1f2838e
:bulb: comment : delete TODO comment
jeeheaG Mar 7, 2025
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
@@ -1,11 +1,10 @@
package com.run_us.server.domains.crew.controller;

import com.run_us.server.domains.crew.controller.model.request.CreateJoinRequest;
import com.run_us.server.domains.crew.controller.model.request.ReviewJoinRequest;
import com.run_us.server.domains.crew.controller.model.request.*;
import com.run_us.server.domains.crew.controller.model.response.*;
import com.run_us.server.domains.crew.domain.enums.CrewJoinRequestStatus;
import com.run_us.server.domains.crew.service.usecase.CommandCrewUseCase;
import com.run_us.server.domains.crew.service.usecase.CrewJoinUseCase;
import com.run_us.server.domains.crew.controller.model.request.CreateCrewRequest;
import com.run_us.server.domains.crew.controller.model.response.CreateCrewResponse;
import com.run_us.server.domains.crew.service.usecase.CreateCrewUseCase;
import com.run_us.server.domains.crew.service.usecase.CrewMemberUseCase;
Expand All @@ -30,19 +29,51 @@ public class CrewController {
private final CrewJoinUseCase crewJoinUseCase;
private final CreateCrewUseCase createCrewUseCase;
private final CrewMemberUseCase crewMemberUseCase;
private final CommandCrewUseCase commandCrewUseCase;


@PostMapping
public ResponseEntity<SuccessResponse<CreateCrewResponse>> createCrew(
@RequestBody CreateCrewRequest requestDto,
@RequestAttribute("publicUserId") String userId) {
log.info("action=create_crew user_id={}", userId);
@CurrentUser String currentUserPublicId) {
log.info("action=create_crew user_id={}", currentUserPublicId);

SuccessResponse<CreateCrewResponse> response = createCrewUseCase.createCrew(requestDto, userId);
SuccessResponse<CreateCrewResponse> response = createCrewUseCase.createCrew(requestDto, currentUserPublicId);

return ResponseEntity.status(HttpStatus.CREATED).body(response);
}

@PatchMapping("/{crewPublicId}")
public ResponseEntity<SuccessResponse<UpdateCrewInfoResponse>> updateCrewInfo(
@PathVariable String crewPublicId,
@RequestBody UpdateCrewInfoRequest requestDto,
@CurrentUser String currentUserPublicId){
log.info("action=update_crew_info userPublicId={}, crewPublicId={}", currentUserPublicId, crewPublicId);

SuccessResponse<UpdateCrewInfoResponse> response = commandCrewUseCase.updateCrewInfo(crewPublicId, requestDto, currentUserPublicId);
return ResponseEntity.ok().body(response);
}

@PatchMapping("/{crewPublicId}/join-rule")
public ResponseEntity<SuccessResponse<UpdateCrewJoinRuleResponse>> updateCrewJoinRule(
@PathVariable String crewPublicId,
@RequestBody UpdateCrewJoinTypeRequest requestDto,
@CurrentUser String currentUserPublicId){
log.info("action=update_crew_join_rule userPublicId={}, crewPublicId={}", currentUserPublicId, crewPublicId);

SuccessResponse<UpdateCrewJoinRuleResponse> response = commandCrewUseCase.updateCrewJoinRule(crewPublicId, requestDto, currentUserPublicId);
return ResponseEntity.ok().body(response);
}

@DeleteMapping("/{crewPublicId}")
public ResponseEntity<SuccessResponse<CloseCrewResponse>> closeCrew(
@PathVariable String crewPublicId,
@CurrentUser String currentUserPublicId){
log.info("action=delete_crew userPublicId={}, crewPublicId={}", currentUserPublicId, crewPublicId);

SuccessResponse<CloseCrewResponse> response = commandCrewUseCase.closeCrew(crewPublicId, currentUserPublicId);
return ResponseEntity.ok().body(response);
}

@PostMapping("/{crewPublicId}/join-requests")
public ResponseEntity<SuccessResponse<CreateJoinRequestResponse>> requestJoin(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.run_us.server.domains.crew.controller;

import com.run_us.server.domains.crew.controller.model.response.GetCrewHomeResponse;
import com.run_us.server.domains.crew.service.usecase.QueryCrewUseCase;
import com.run_us.server.global.common.SuccessResponse;
import com.run_us.server.global.security.annotation.CurrentUser;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
@RestController
@RequestMapping("/crews")
@RequiredArgsConstructor
public class QueryCrewController {
private final QueryCrewUseCase queryCrewUseCase;

@GetMapping("/{crewPublicId}/home")
public ResponseEntity<SuccessResponse<GetCrewHomeResponse>> getCrewHome(
@PathVariable String crewPublicId,
@CurrentUser String currentUserPublicId) {
log.info("action=get_crew_home crew_public_id={}, user_id={}", crewPublicId, currentUserPublicId);

SuccessResponse<GetCrewHomeResponse> response = queryCrewUseCase.getCrewHome(crewPublicId, currentUserPublicId);
return ResponseEntity.ok().body(response);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public enum CrewErrorCode implements CustomResponseCode {


// 403
RECENTLY_REJECTED_REQUEST("CEH4032","Recently rejected request","Recently rejected request",HttpStatus.FORBIDDEN)
RECENTLY_REJECTED_REQUEST("CEH4032","Recently rejected request","Recently rejected request",HttpStatus.FORBIDDEN),
FORBIDDEN_UPDATE_CREW("CEH4033","Forbidden update crew", "Forbidden update crew",HttpStatus.FORBIDDEN)
;

private final String code;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
@RequiredArgsConstructor
public enum CrewHttpResponseCode implements CustomResponseCode {
CREW_CREATED("CSH2011", HttpStatus.CREATED, "크루 생성 성공", "크루 생성 성공"),
CREW_HOME_INFO_FETCHED("CSH2002", HttpStatus.OK, "크루 홈 데이터 조회 성공", "크루 홈 데이터 조회 성공"),
CREW_FETCHED("CSH2003", HttpStatus.OK, "크루 정보 조회 성공", "크루 정보 조회 성공"),
CREW_HOME_FETCHED("CSH2002", HttpStatus.OK, "크루 홈 조회 성공", "크루 홈 조회 성공"),
CREW_INFO_PAGE_FETCHED("CSH2003", HttpStatus.OK, "크루 정보 페이지 조회 성공", "크루 정보 페이지 조회 성공"),
CREW_UPDATED("CSH2004", HttpStatus.OK, "크루 정보 수정 성공", "크루 정보 수정 성공"),
CREW_JOIN_RULE_UPDATED("CSH2005", HttpStatus.OK, "크루 가입 방식 수정 성공", "크루 가입 방식 수정 성공"),
CREW_SEARCH_SUCCESS("CSH2006", HttpStatus.OK, "크루 검색 성공", "크루 검색 성공"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.run_us.server.domains.crew.domain.Crew;
import com.run_us.server.domains.crew.domain.CrewDescription;
import com.run_us.server.domains.crew.domain.CrewMembership;
import com.run_us.server.domains.crew.domain.CrewMonthlyRecord;
import com.run_us.server.domains.crew.domain.enums.CrewJoinType;
import com.run_us.server.domains.crew.domain.enums.CrewMembershipRole;
import com.run_us.server.domains.crew.domain.enums.CrewThemeType;
Expand Down Expand Up @@ -37,11 +38,17 @@ public Crew toEntity(User creator) {
.userId(creator.getId())
.role(CrewMembershipRole.OWNER)
.build();
CrewMonthlyRecord monthlyRecord = CrewMonthlyRecord.builder()
.totalRunningCount(0)
.totalDistance(0)
.totalTime(0)
.build();
return Crew.builder()
.crewDescription(description)
.joinType(CrewJoinType.valueOf(this.joinType))
.owner(creator)
.crewMemberships(List.of(ownerMembership))
.monthlyRecord(monthlyRecord)
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.run_us.server.domains.crew.controller.model.request;

import com.run_us.server.domains.crew.domain.CrewDescription;
import com.run_us.server.domains.crew.domain.enums.CrewThemeType;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class UpdateCrewInfoRequest {
private String title;
private String intro;
private String location;
private String profileImageUrl;
private CrewThemeType crewType;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.run_us.server.domains.crew.controller.model.request;

import com.run_us.server.domains.crew.domain.CrewDescription;
import com.run_us.server.domains.crew.domain.enums.CrewJoinType;
import com.run_us.server.domains.crew.domain.enums.CrewThemeType;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class UpdateCrewJoinTypeRequest {
private CrewJoinType joinType;
private String joinQuestion;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.run_us.server.domains.crew.controller.model.response;

import com.run_us.server.domains.crew.domain.Crew;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;


@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class CloseCrewResponse {
private String crewPublicId;

@Builder
private CloseCrewResponse(String crewPublicId) {
this.crewPublicId = crewPublicId;
}

public static CloseCrewResponse from(Crew crew) {
return CloseCrewResponse.builder()
.crewPublicId(crew.getPublicId())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.run_us.server.domains.crew.controller.model.response;

import com.run_us.server.domains.crew.domain.CrewMonthlyRecord;
import lombok.Builder;
import lombok.Getter;

@Getter
public class CrewThisMonthRecord {
private Integer totalRunningCount;
private Integer totalDistance;
private Integer totalTime;

@Builder
CrewThisMonthRecord(Integer totalRunningCount, Integer totalDistance, Integer totalTime){
this.totalRunningCount = totalRunningCount;
this.totalDistance = totalDistance;
this.totalTime = totalTime;
}

public static CrewThisMonthRecord from(CrewMonthlyRecord monthlyRecord){
return CrewThisMonthRecord.builder()
.totalRunningCount(monthlyRecord.getTotalRunningCount())
.totalDistance(monthlyRecord.getTotalDistance())
.totalTime(monthlyRecord.getTotalTime())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package com.run_us.server.domains.crew.controller.model.response;

import com.run_us.server.domains.crew.domain.Crew;
import com.run_us.server.domains.crew.domain.CrewDescription;
import com.run_us.server.domains.crew.domain.enums.CrewJoinType;
import com.run_us.server.domains.crew.domain.enums.CrewThemeType;
import com.run_us.server.domains.crew.service.model.CrewRunCardInfo;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import java.time.ZonedDateTime;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class GetCrewHomeResponse {
private String crewPublicId;
private String title;
private String profileImg;
private String location;
private String intro;
private CrewJoinType joinType;
private String joinQuestion;
private CrewThemeType crewType;
private Integer memberCount;
private ZonedDateTime createdAt;
private SimpleUserInfo crewOwner;
private Boolean existNewJoinRequest;
private CrewThisMonthRecord thisMonthRecord;
private RunCardInfo regularRunning;
private RunCardInfo irregularRunning;

@Builder
public GetCrewHomeResponse(
String crewPublicId, String title, String profileImg, String location, String intro,
CrewJoinType joinType, String joinQuestion, CrewThemeType crewType,
Integer memberCount, ZonedDateTime createdAt, SimpleUserInfo crewOwner,
Boolean existNewJoinRequest, CrewThisMonthRecord thisMonthRecord,
RunCardInfo regularRunning, RunCardInfo irregularRunning
) {
this.crewPublicId = crewPublicId;
this.title = title;
this.profileImg = profileImg;
this.location = location;
this.intro = intro;
this.joinType = joinType;
this.joinQuestion = joinQuestion;
this.crewType = crewType;
this.memberCount = memberCount;
this.createdAt = createdAt;
this.crewOwner = crewOwner;
this.existNewJoinRequest = existNewJoinRequest;
this.thisMonthRecord = thisMonthRecord;
this.regularRunning = regularRunning;
this.irregularRunning = irregularRunning;
}


public static GetCrewHomeResponse from(Crew crew, boolean existNewJoinRequest, CrewRunCardInfo cardRunInfo) {
CrewDescription description = crew.getCrewDescription();

GetCrewHomeResponseBuilder builder = GetCrewHomeResponse.builder()
.crewPublicId(crew.getPublicId())
.title(description.getTitle())
.profileImg(description.getProfileImageUrl())
.location(description.getLocation())
.intro(description.getIntro())
.joinType(crew.getJoinType())
.joinQuestion(description.getJoinQuestion())
.crewType(description.getThemeType())
.memberCount(crew.getMemberCount())
.createdAt(crew.getCreatedAt())

.crewOwner(SimpleUserInfo.from(crew.getOwner()))
.existNewJoinRequest(existNewJoinRequest)
.thisMonthRecord(CrewThisMonthRecord.from(crew.getMonthlyRecord()));

if (cardRunInfo.getIrregularRunCard() != null) {
builder.irregularRunning(cardRunInfo.getIrregularRunCard());
}
if (cardRunInfo.getRegularRunCard() != null) {
builder.regularRunning(cardRunInfo.getRegularRunCard());
}

return builder.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package com.run_us.server.domains.crew.controller.model.response;

import com.run_us.server.domains.running.run.domain.Run;
import com.run_us.server.domains.running.run.domain.RunPace;
import com.run_us.server.domains.running.run.domain.RunningPreview;
import com.run_us.server.domains.user.domain.User;
import com.run_us.server.global.common.GlobalConst;
import lombok.Builder;
import lombok.Getter;

import java.time.format.DateTimeFormatter;
import java.util.List;

@Getter
public class RunCardInfo {
private String runningPublicId;
private String topMessage;
private String title;
private String description;
private String startAt;
private List<RunPace> paceList;
private Integer participantCount;
private SimpleUserInfo createdBy;


@Builder
private RunCardInfo(
String runningPublicId,
String topMessage, String title, String description, String startAt,
List<RunPace> paceList, Integer participantCount, SimpleUserInfo createdBy) {
this.runningPublicId = runningPublicId;
this.topMessage = topMessage;
this.title = title;
this.description = description;
this.startAt = startAt;
this.paceList = paceList;
this.participantCount = participantCount;
this.createdBy = createdBy;
}

public static RunCardInfo from(Run run, String topMessage, User createdUser) {
RunningPreview preview = run.getPreview();

return RunCardInfo.builder()
.runningPublicId(run.getPublicId())
.topMessage(topMessage)
.title(preview.getTitle())
.description(preview.getDescription())
.startAt(preview.getBeginTime().format(DateTimeFormatter.ofPattern(GlobalConst.TIME_FORMAT_PATTERN)))
.paceList(run.getPaceCategories())
.createdBy(SimpleUserInfo.from(createdUser))
.build();
}

}
Loading