-
Notifications
You must be signed in to change notification settings - Fork 2
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
Feature/#69 내 커리어를 조회하는 api 구현 #70
Merged
The head ref may contain hidden characters: "Feature/#69-\uB0B4_\uCEE4\uB9AC\uC5B4\uB97C_\uC870\uD68C\uD558\uB294_API_\uAD6C\uD604"
Merged
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7c336a6
feat : member id로 사용자의 memberCareer들을 조회하는 기능 추가
java-saeng 9f6731e
feat : 내 명함에서 활동을 추가하는 API 구현
java-saeng 8b8e36a
docs : 내 명함에서 활동을 추가하는 http 테스트 추가
java-saeng a997ffc
refactor : MemberCareerRequest -> MemberCareerAddRequest로 변경
java-saeng 8485bb6
feat : 내 명함에서 활동을 삭제하는 API 구현
java-saeng 6330966
feat : 내 명함에서 활동을 삭제하는 http 테스트 추가
java-saeng 15ab790
refactor : member Id를 통해 memberCareer를 조회하지 않고 member를 통해 memberCaree…
java-saeng 0d98894
Merge branch 'main' of https://github.com/woowacourse-teams/2023-emms…
java-saeng 56fb089
feat : 요청한 career id가 유효하지 않을 때 Exception 추가
java-saeng aee6b17
feat : 커리어 추가 및 삭제 API 문서화
java-saeng cec893d
Merge branch 'main' of https://github.com/woowacourse-teams/2023-emms…
java-saeng 2f75d32
feat : 존재하는 커리어 전체 조회 API 문서화
java-saeng 4738ad9
feat : 초기 사용자 등록 API 문서화
java-saeng 0f2cde7
feat : 사용자의 커리어 조회 API 구현
java-saeng 1592b37
feat : 사용자의 커리어 조회 API 문서화 테스트 작성
java-saeng 87e635a
docs : 사용자 커리어 조회 API 문서 추가
java-saeng e688db5
refactor: findCareer -> findCareers로 메서드 네이밍 변경
hong-sile 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 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 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 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
12 changes: 12 additions & 0 deletions
12
...end/emm-sale/src/main/java/com/emmsale/member/application/dto/MemberActivityResponse.java
This file contains 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,12 @@ | ||
package com.emmsale.member.application.dto; | ||
|
||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Getter | ||
@RequiredArgsConstructor | ||
public class MemberActivityResponse { | ||
|
||
private final Long id; | ||
private final String name; | ||
} |
16 changes: 16 additions & 0 deletions
16
...end/emm-sale/src/main/java/com/emmsale/member/application/dto/MemberCareerAddRequest.java
This file contains 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.emmsale.member.application.dto; | ||
|
||
import java.util.List; | ||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Getter | ||
@RequiredArgsConstructor | ||
public class MemberCareerAddRequest { | ||
|
||
private final List<Long> careerIds; | ||
|
||
private MemberCareerAddRequest() { | ||
this(null); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
.../emm-sale/src/main/java/com/emmsale/member/application/dto/MemberCareerDeleteRequest.java
This file contains 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.emmsale.member.application.dto; | ||
|
||
import java.util.List; | ||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Getter | ||
@RequiredArgsConstructor | ||
public class MemberCareerDeleteRequest { | ||
|
||
private final List<Long> careerIds; | ||
|
||
private MemberCareerDeleteRequest() { | ||
this(null); | ||
} | ||
} |
60 changes: 60 additions & 0 deletions
60
backend/emm-sale/src/main/java/com/emmsale/member/application/dto/MemberCareerResponse.java
This file contains 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,60 @@ | ||
package com.emmsale.member.application.dto; | ||
|
||
import static java.util.Comparator.comparing; | ||
import static java.util.stream.Collectors.groupingBy; | ||
import static java.util.stream.Collectors.toList; | ||
|
||
import com.emmsale.career.domain.ActivityType; | ||
import com.emmsale.career.domain.Career; | ||
import com.emmsale.member.domain.MemberCareer; | ||
import java.util.ArrayList; | ||
import java.util.EnumMap; | ||
import java.util.List; | ||
import java.util.Map.Entry; | ||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
|
||
@Getter | ||
@RequiredArgsConstructor | ||
public class MemberCareerResponse { | ||
|
||
private final String activityName; | ||
private final List<MemberActivityResponse> memberActivityResponses; | ||
|
||
public static List<MemberCareerResponse> from(final List<MemberCareer> memberCareers) { | ||
final EnumMap<ActivityType, List<Career>> groupByActivityType = | ||
groupingByActivityTypeAndSortedByCareerName(memberCareers); | ||
|
||
final List<MemberCareerResponse> responses = new ArrayList<>(); | ||
|
||
for (final Entry<ActivityType, List<Career>> entry : groupByActivityType.entrySet()) { | ||
final List<MemberActivityResponse> activityResponse = | ||
mapToMemberActivityResponses(entry); | ||
|
||
responses.add(new MemberCareerResponse(entry.getKey().getValue(), activityResponse)); | ||
} | ||
|
||
return responses; | ||
} | ||
|
||
private static List<MemberActivityResponse> mapToMemberActivityResponses( | ||
final Entry<ActivityType, List<Career>> entry | ||
) { | ||
return entry.getValue() | ||
.stream() | ||
.map(it -> new MemberActivityResponse(it.getId(), it.getName())) | ||
.collect(toList()); | ||
} | ||
|
||
private static EnumMap<ActivityType, List<Career>> groupingByActivityTypeAndSortedByCareerName( | ||
final List<MemberCareer> memberCareers | ||
) { | ||
return memberCareers | ||
.stream() | ||
.map(MemberCareer::getCareer) | ||
.sorted(comparing(career -> career.getName().toLowerCase())) | ||
.collect( | ||
groupingBy(Career::getActivityType, () -> new EnumMap<>(ActivityType.class), toList()) | ||
); | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
backend/emm-sale/src/main/java/com/emmsale/member/domain/MemberCareerRepository.java
This file contains 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 |
---|---|---|
@@ -1,7 +1,20 @@ | ||
package com.emmsale.member.domain; | ||
|
||
import java.util.List; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.data.jpa.repository.Query; | ||
import org.springframework.data.repository.query.Param; | ||
|
||
public interface MemberCareerRepository extends JpaRepository<MemberCareer, Long> { | ||
|
||
@Query("select mc from MemberCareer mc where mc.member = :member") | ||
List<MemberCareer> findAllByMember(@Param("member") final Member member); | ||
|
||
@Query("select mc from MemberCareer mc " | ||
+ "where mc.member = :member " | ||
+ "and mc.career.id in :deleteCareerIds") | ||
List<MemberCareer> findAllByMemberAndCareerIds( | ||
@Param("member") final Member member, | ||
@Param("deleteCareerIds") final List<Long> deleteCareerIds | ||
); | ||
} |
This file contains 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
리스트로 복수개의 커리어를 반환하니 메서드명도 복수로 짓는건 어떨까요?
나중에 하나의 커리어만 조회하는 기능이 생겼을 때 메서드 명이 겹칠 수도 있을 것 같아요!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
반영했습니다!