Feature/#49 내 명함에서 활동을 추가 삭제하는 기능

backend/emm-sale/src/docs/asciidoc/index.adoc

@@ -1,7 +1,9 @@
 = EMM-SALE API Docs
 :doctype: book
+:icons: font
 :source-highlighter: highlightjs
 :toc: left
+:toclevels: 2
 :sectlinks:
 
 == Product
@@ -87,3 +89,33 @@ 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[]

backend/emm-sale/src/main/java/com/emmsale/member/api/MemberApi.java

@@ -1,10 +1,16 @@
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,4 +29,21 @@ 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));
+  }
 }

backend/emm-sale/src/main/java/com/emmsale/member/application/MemberCareerService.java

@@ -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;
@@ -19,17 +25,61 @@ 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));
+  }
 }
 

backend/emm-sale/src/main/java/com/emmsale/member/application/dto/MemberActivityResponse.java

@@ -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;
+}

backend/emm-sale/src/main/java/com/emmsale/member/application/dto/MemberCareerAddRequest.java

@@ -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);
+  }
+}

backend/emm-sale/src/main/java/com/emmsale/member/application/dto/MemberCareerDeleteRequest.java

@@ -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);
+  }
+}

backend/emm-sale/src/main/java/com/emmsale/member/application/dto/MemberCareerResponse.java

@@ -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())
+        );
+  }
+}

backend/emm-sale/src/main/java/com/emmsale/member/domain/MemberCareerRepository.java

@@ -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
+  );
 }

backend/emm-sale/src/main/java/com/emmsale/member/exception/MemberExceptionType.java

@@ -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;

backend/emm-sale/src/main/resources/http/member.http

@@ -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]
+}