-
Notifications
You must be signed in to change notification settings - Fork 0
[Feat/crew update] 크루 정보 수정, 가입방식 수정, 폐쇄 api 구현 #86
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
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
0a86005
:sparkles: edit : edit get crew home and info page status code
jeeheaG fd92bbe
:recycle: refactor : rename CommandCrewService
jeeheaG 65d0106
:sparkles: feat : make dtos for UpdateCrewInfo api
jeeheaG 0138dc5
:sparkles: feat : make exception and error code for UpdateCrewInfo api
jeeheaG 34fe056
:sparkles: feat : make use case and service logic for UpdateCrewInfo api
jeeheaG cda039d
:sparkles: feat : make UpdateCrewInfo api
jeeheaG 5204e5f
:recycle: refactor : move crew owner checking logic to CommandCrewSer…
jeeheaG 5960a64
Merge branch 'main' of https://github.com/Run-Us/Run-Us-server into J…
jeeheaG 0f705e6
:bug: solve merge conflict
jeeheaG 6cf221f
:sparkles: make update crew join rule api
jeeheaG 707bbce
:sparkles: make close crew api
jeeheaG File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...n/java/com/run_us/server/domains/crew/controller/model/request/UpdateCrewInfoRequest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| 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; | ||
|
|
||
| public CrewDescription from(CrewDescription old) { | ||
| return CrewDescription.builder() | ||
| .title(this.title) | ||
| .intro(this.intro) | ||
| .location(this.location) | ||
| .profileImageUrl(this.profileImageUrl) | ||
| .themeType(this.crewType) | ||
| .joinQuestion(old.getJoinQuestion()) | ||
| .build(); | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
...va/com/run_us/server/domains/crew/controller/model/request/UpdateCrewJoinTypeRequest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; | ||
| } |
25 changes: 25 additions & 0 deletions
25
...main/java/com/run_us/server/domains/crew/controller/model/response/CloseCrewResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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(); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
...java/com/run_us/server/domains/crew/controller/model/response/UpdateCrewInfoResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package com.run_us.server.domains.crew.controller.model.response; | ||
|
|
||
| import lombok.AccessLevel; | ||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| @Getter | ||
| @NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
| public class UpdateCrewInfoResponse { | ||
| private String crewPublicId; | ||
|
|
||
| @Builder | ||
| public UpdateCrewInfoResponse(String crewPublicId) { | ||
| this.crewPublicId = crewPublicId; | ||
| } | ||
|
|
||
| public static UpdateCrewInfoResponse from(String crewPublicId) { | ||
| return UpdateCrewInfoResponse.builder() | ||
| .crewPublicId(crewPublicId) | ||
| .build(); | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
.../com/run_us/server/domains/crew/controller/model/response/UpdateCrewJoinRuleResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| 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.enums.CrewJoinType; | ||
| import lombok.AccessLevel; | ||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| @Getter | ||
| @NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
| public class UpdateCrewJoinRuleResponse { | ||
| private String crewPublicId; | ||
| private CrewJoinType joinType; | ||
| private String joinQuestion; | ||
|
|
||
| @Builder | ||
| public UpdateCrewJoinRuleResponse(String crewPublicId, CrewJoinType joinType, String joinQuestion) { | ||
| this.crewPublicId = crewPublicId; | ||
| this.joinType = joinType; | ||
| this.joinQuestion = joinQuestion; | ||
| } | ||
|
|
||
| public static UpdateCrewJoinRuleResponse from(Crew crew) { | ||
| return UpdateCrewJoinRuleResponse.builder() | ||
| .crewPublicId(crew.getPublicId()) | ||
| .joinType(crew.getJoinType()) | ||
| .joinQuestion(crew.getCrewDescription().getJoinQuestion()) | ||
| .build(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
src/main/java/com/run_us/server/domains/crew/exception/CrewException.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package com.run_us.server.domains.crew.exception; | ||
|
|
||
| import com.run_us.server.global.exception.BusinessException; | ||
| import com.run_us.server.global.exception.code.CustomResponseCode; | ||
|
|
||
| public class CrewException extends BusinessException { | ||
|
|
||
| protected CrewException(CustomResponseCode errorCode, String logMessage) { | ||
| super(errorCode, logMessage); | ||
| } | ||
|
|
||
| public CrewException(CustomResponseCode errorCode) { | ||
| super(errorCode); | ||
| } | ||
|
|
||
| public static CrewException of(CustomResponseCode errorCode) { | ||
| return new CrewException(errorCode); | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
src/main/java/com/run_us/server/domains/crew/service/CommandCrewService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package com.run_us.server.domains.crew.service; | ||
|
|
||
| import com.run_us.server.domains.crew.controller.model.enums.CrewErrorCode; | ||
| import com.run_us.server.domains.crew.controller.model.enums.CrewException; | ||
| import com.run_us.server.domains.crew.controller.model.request.CreateCrewRequest; | ||
| import com.run_us.server.domains.crew.controller.model.request.UpdateCrewInfoRequest; | ||
| import com.run_us.server.domains.crew.controller.model.request.UpdateCrewJoinTypeRequest; | ||
| 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.repository.CrewRepository; | ||
| import com.run_us.server.domains.user.domain.User; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class CommandCrewService { | ||
|
|
||
| private final CrewRepository crewRepository; | ||
|
|
||
| public Crew saveCrew(CreateCrewRequest requestDto, User creator) { | ||
| Crew crew = requestDto.toEntity(creator); | ||
| return crewRepository.save(crew); | ||
| } | ||
|
|
||
| public void updateCrewInfo(UpdateCrewInfoRequest requestDto, Crew crew, Integer userId) { | ||
| checkCrewOwner(crew, userId); | ||
|
|
||
| CrewDescription newCrewDescription = requestDto.from(crew.getCrewDescription()); | ||
| crew.updateCrewInfo(newCrewDescription); | ||
| } | ||
|
|
||
| public void updateCrewJoinRule(UpdateCrewJoinTypeRequest requestDto, Crew crew, Integer userId) { | ||
| checkCrewOwner(crew, userId); | ||
|
|
||
| crew.updateJoinRule(requestDto.getJoinType(), requestDto.getJoinQuestion()); | ||
| } | ||
|
|
||
| public void closeCrew(Crew crew, Integer userId) { | ||
| checkCrewOwner(crew, userId); | ||
|
|
||
| crew.close(); | ||
| } | ||
|
|
||
|
|
||
| private void checkCrewOwner(Crew crew, Integer userId) { | ||
| if (!crew.isOwner(userId)) { | ||
| throw new CrewException(CrewErrorCode.FORBIDDEN_UPDATE_CREW); | ||
| } | ||
| } | ||
| } |
20 changes: 0 additions & 20 deletions
20
src/main/java/com/run_us/server/domains/crew/service/CrewCommandService.java
This file was deleted.
Oops, something went wrong.
16 changes: 16 additions & 0 deletions
16
src/main/java/com/run_us/server/domains/crew/service/usecase/CommandCrewUseCase.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.run_us.server.domains.crew.service.usecase; | ||
|
|
||
| import com.run_us.server.domains.crew.controller.model.request.UpdateCrewInfoRequest; | ||
| import com.run_us.server.domains.crew.controller.model.request.UpdateCrewJoinTypeRequest; | ||
| import com.run_us.server.domains.crew.controller.model.response.CloseCrewResponse; | ||
| import com.run_us.server.domains.crew.controller.model.response.UpdateCrewInfoResponse; | ||
| import com.run_us.server.domains.crew.controller.model.response.UpdateCrewJoinRuleResponse; | ||
| import com.run_us.server.global.common.SuccessResponse; | ||
|
|
||
| public interface CommandCrewUseCase { | ||
| SuccessResponse<UpdateCrewInfoResponse> updateCrewInfo(String crewPublicId, UpdateCrewInfoRequest requestDto, String userPublicId); | ||
|
|
||
| SuccessResponse<UpdateCrewJoinRuleResponse> updateCrewJoinRule(String crewPublicId, UpdateCrewJoinTypeRequest requestDto, String userPublicId); | ||
|
|
||
| SuccessResponse<CloseCrewResponse> closeCrew(String crewPublicId, String userPublicId); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.