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.

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
Merged
Show file tree
Hide file tree
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 Jul 18, 2023
9f6731e
feat : 내 명함에서 활동을 추가하는 API 구현
java-saeng Jul 18, 2023
8b8e36a
docs : 내 명함에서 활동을 추가하는 http 테스트 추가
java-saeng Jul 18, 2023
a997ffc
refactor : MemberCareerRequest -> MemberCareerAddRequest로 변경
java-saeng Jul 18, 2023
8485bb6
feat : 내 명함에서 활동을 삭제하는 API 구현
java-saeng Jul 18, 2023
6330966
feat : 내 명함에서 활동을 삭제하는 http 테스트 추가
java-saeng Jul 18, 2023
15ab790
refactor : member Id를 통해 memberCareer를 조회하지 않고 member를 통해 memberCaree…
java-saeng Jul 18, 2023
0d98894
Merge branch 'main' of https://github.com/woowacourse-teams/2023-emms…
java-saeng Jul 19, 2023
56fb089
feat : 요청한 career id가 유효하지 않을 때 Exception 추가
java-saeng Jul 20, 2023
aee6b17
feat : 커리어 추가 및 삭제 API 문서화
java-saeng Jul 20, 2023
cec893d
Merge branch 'main' of https://github.com/woowacourse-teams/2023-emms…
java-saeng Jul 20, 2023
2f75d32
feat : 존재하는 커리어 전체 조회 API 문서화
java-saeng Jul 20, 2023
4738ad9
feat : 초기 사용자 등록 API 문서화
java-saeng Jul 20, 2023
0f2cde7
feat : 사용자의 커리어 조회 API 구현
java-saeng Jul 20, 2023
1592b37
feat : 사용자의 커리어 조회 API 문서화 테스트 작성
java-saeng Jul 20, 2023
87e635a
docs : 사용자 커리어 조회 API 문서 추가
java-saeng Jul 20, 2023
e688db5
refactor: findCareer -> findCareers로 메서드 네이밍 변경
hong-sile Jul 23, 2023
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
67 changes: 67 additions & 0 deletions backend/emm-sale/src/docs/asciidoc/index.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
= EMM-SALE API Docs
:doctype: book
:icons: font
:source-highlighter: highlightjs
:toc: left
:toclevels: 2
:sectlinks:

== Product
Expand Down Expand Up @@ -87,3 +89,68 @@ include::{snippets}/wish-with-no-authentication-products/request-headers.adoc[]

.HTTP response
include::{snippets}/wish-with-no-authentication-products/http-response.adoc[]

== Career
=== `POST`: 커리어 등록 API

.HTTP request 설명
include::{snippets}/add-career/request-fields.adoc[]

.HTTP request
include::{snippets}/add-career/http-request.adoc[]

.HTTP response
include::{snippets}/add-career/http-response.adoc[]

.HTTP response 설명
include::{snippets}/add-career/response-fields.adoc[]


=== `DELETE`: 커리어 삭제 API

.HTTP request 설명
include::{snippets}/delete-career/request-fields.adoc[]

.HTTP request
include::{snippets}/delete-career/http-request.adoc[]

.HTTP response
include::{snippets}/delete-career/http-response.adoc[]

.HTTP response 설명
include::{snippets}/delete-career/response-fields.adoc[]

=== `GET`: 존재하는 커리어 전체 조회

.HTTP request
include::{snippets}/findAll-career/http-request.adoc[]

.HTTP response
include::{snippets}/findAll-career/http-response.adoc[]

.HTTP response 설명
include::{snippets}/findAll-career/response-fields.adoc[]

=== `GET`: 사용자의 커리어 조회

.HTTP request
include::{snippets}/find-career/http-request.adoc[]

.HTTP response
include::{snippets}/find-career/http-response.adoc[]

.HTTP response 설명
include::{snippets}/find-career/response-fields.adoc[]

== Member

=== `POST`: 초기 사용자 등록

.HTTP request 설명
include::{snippets}/initial-register-member/request-fields.adoc[]

.HTTP request
include::{snippets}/initial-register-member/http-request.adoc[]

.HTTP response
include::{snippets}/initial-register-member/http-response.adoc[]
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
package com.emmsale.member.api;

import com.emmsale.member.application.MemberCareerService;
import com.emmsale.member.application.dto.MemberCareerDeleteRequest;
import com.emmsale.member.application.dto.MemberCareerInitialRequest;
import com.emmsale.member.application.dto.MemberCareerAddRequest;
import com.emmsale.member.application.dto.MemberCareerResponse;
import com.emmsale.member.domain.Member;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
Expand All @@ -23,4 +30,26 @@ public ResponseEntity<Void> register(
memberCareerService.registerCareer(member, memberCareerInitialRequest);
return ResponseEntity.noContent().build();
}

@PostMapping("/members/careers")
public ResponseEntity<List<MemberCareerResponse>> addCareer(
final Member member,
@RequestBody final MemberCareerAddRequest memberCareerAddRequest
) {
return ResponseEntity.status(HttpStatus.CREATED)
.body(memberCareerService.addCareer(member, memberCareerAddRequest));
}

@DeleteMapping("/members/careers")
public ResponseEntity<List<MemberCareerResponse>> deleteCareer(
final Member member,
@RequestBody final MemberCareerDeleteRequest memberCareerDeleteRequest
) {
return ResponseEntity.ok(memberCareerService.deleteCareer(member, memberCareerDeleteRequest));
}

@GetMapping("/members/careers")
public ResponseEntity<List<MemberCareerResponse>> findCareer(final Member member) {
return ResponseEntity.ok(memberCareerService.findCareer(member));
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
package com.emmsale.member.application;

import static java.util.stream.Collectors.toList;

import com.emmsale.career.domain.CareerRepository;
import com.emmsale.member.application.dto.MemberCareerAddRequest;
import com.emmsale.member.application.dto.MemberCareerDeleteRequest;
import com.emmsale.member.application.dto.MemberCareerInitialRequest;
import com.emmsale.member.application.dto.MemberCareerResponse;
import com.emmsale.member.domain.Member;
import com.emmsale.member.domain.MemberCareer;
import com.emmsale.member.domain.MemberCareerRepository;
import com.emmsale.member.exception.MemberException;
import com.emmsale.member.exception.MemberExceptionType;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -19,17 +25,66 @@ public class MemberCareerService {
private final MemberCareerRepository memberCareerRepository;
private final CareerRepository careerRepository;

public void registerCareer(final Member member, final MemberCareerInitialRequest memberCareerInitialRequest) {
public void registerCareer(
final Member member,
final MemberCareerInitialRequest memberCareerInitialRequest
) {
final List<Long> careerIds = memberCareerInitialRequest.getCareerIds();
saveMemberCareers(member, careerIds);

member.updateName(memberCareerInitialRequest.getName());
}

private void saveMemberCareers(final Member member, final List<Long> careerIds) {
final List<MemberCareer> memberCareers = careerRepository.findAllById(careerIds)
.stream()
.map(it -> new MemberCareer(it, member))
.collect(Collectors.toList());
.collect(toList());

member.updateName(memberCareerInitialRequest.getName());
validateAllCareerIdsExist(careerIds, memberCareers);

memberCareerRepository.saveAll(memberCareers);
}

private void validateAllCareerIdsExist(
final List<Long> careerIds,
final List<MemberCareer> memberCareers
) {
if (memberCareers.size() != careerIds.size()) {
throw new MemberException(MemberExceptionType.INVALID_CAREER_IDS);
}
}

public List<MemberCareerResponse> addCareer(
final Member member,
final MemberCareerAddRequest memberCareerAddRequest
) {
final List<Long> careerIds = memberCareerAddRequest.getCareerIds();
saveMemberCareers(member, careerIds);

return MemberCareerResponse.from(memberCareerRepository.findAllByMember(member));
}

public List<MemberCareerResponse> deleteCareer(
final Member member,
final MemberCareerDeleteRequest memberCareerDeleteRequest
) {
final List<Long> deleteCareerIds = memberCareerDeleteRequest.getCareerIds();

final List<Long> savedMemberCareerIds =
memberCareerRepository.findAllByMemberAndCareerIds(member, deleteCareerIds)
.stream()
.map(MemberCareer::getId)
.collect(toList());

memberCareerRepository.deleteAllByIdInBatch(savedMemberCareerIds);

return MemberCareerResponse.from(memberCareerRepository.findAllByMember(member));
}

@Transactional(readOnly = true)
public List<MemberCareerResponse> findCareer(final Member member) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

리스트로 복수개의 커리어를 반환하니 메서드명도 복수로 짓는건 어떨까요?
나중에 하나의 커리어만 조회하는 기능이 생겼을 때 메서드 명이 겹칠 수도 있을 것 같아요!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

반영했습니다!

return MemberCareerResponse.from(memberCareerRepository.findAllByMember(member));
}
}

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;
}
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);
}
}
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);
}
}
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())
);
}
}
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
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ public enum MemberExceptionType implements BaseExceptionType {
NOT_FOUND_MEMBER(
HttpStatus.NOT_FOUND,
"해당 멤버는 존재하지 않습니다."
),

INVALID_CAREER_IDS(
HttpStatus.BAD_REQUEST,
"요청한 career id들 중에 유효하지 않은 값이 존재합니다"
);

private final HttpStatus httpStatus;
Expand Down
16 changes: 16 additions & 0 deletions backend/emm-sale/src/main/resources/http/member.http
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,19 @@ Content-Type: application/json
"name": "우르",
"careerIds": [1, 2]
}

### 사용자 커리어 추가
POST http://localhost:8080/members/careers
Content-Type: application/json

{
"careerIds": [4, 5, 6]
}

### 사용자 커리어 제거
DELETE http://localhost:8080/members/careers
Content-Type: application/json

{
"careerIds": [1, 2]
}
Loading
Loading