Feature/#901 온보딩에서 활동 설정 시 관심태그도 함께 설정

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

@@ -8,7 +8,6 @@
 import com.emmsale.member.application.dto.DescriptionRequest;
 import com.emmsale.member.application.dto.MemberActivityAddRequest;
 import com.emmsale.member.application.dto.MemberActivityInitialRequest;
-import com.emmsale.member.application.dto.MemberActivityResponse;
 import com.emmsale.member.application.dto.MemberDetailResponse;
 import com.emmsale.member.application.dto.MemberImageResponse;
 import com.emmsale.member.domain.Member;
@@ -42,7 +41,7 @@ public ResponseEntity<Void> register(
       final Member member,
       @RequestBody final MemberActivityInitialRequest memberActivityInitialRequest
   ) {
-    memberActivityCommandService.registerActivities(member, memberActivityInitialRequest);
+    memberCommandService.initializeMember(member, memberActivityInitialRequest);
     return ResponseEntity.noContent().build();
   }
 

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

@@ -33,6 +33,17 @@ public List<InterestTagResponse> findInterestTags(final Long memberId) {
     return InterestTagResponse.convertAllFrom(interestTags);
   }
 
+  public void initializeInterestTags(final Member member, final List<String> tagNames) {
+    if (member.isOnboarded()) {
+      throw new MemberException(MemberExceptionType.ALREADY_ONBOARDING);
+    }
+    final List<Tag> tags = tagRepository.findByNameIn(tagNames);
+    final List<InterestTag> interestTags = tags.stream()
+        .map(tag -> new InterestTag(member, tag))
+        .collect(Collectors.toList());
+    interestTagRepository.saveAll(interestTags);
+  }
+
   public List<InterestTagResponse> addInterestTag(final Member member,
       final InterestTagAddRequest request) {
     final List<Long> tagIds = request.getTagIds();

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

@@ -6,7 +6,6 @@
 import com.emmsale.activity.domain.ActivityRepository;
 import com.emmsale.member.application.dto.MemberActivityAddRequest;
 import com.emmsale.member.application.dto.MemberActivityInitialRequest;
-import com.emmsale.member.application.dto.MemberActivityResponse;
 import com.emmsale.member.domain.Member;
 import com.emmsale.member.domain.MemberActivity;
 import com.emmsale.member.domain.MemberActivityRepository;
@@ -26,28 +25,27 @@ public class MemberActivityCommandService {
   private final MemberActivityRepository memberActivityRepository;
   private final ActivityRepository activityRepository;
 
-  public void registerActivities(
+  public List<MemberActivity> registerActivities(
       final Member member,
       final MemberActivityInitialRequest memberActivityInitialRequest
   ) {
     if (member.isOnboarded()) {
       throw new MemberException(MemberExceptionType.ALREADY_ONBOARDING);
     }
     final List<Long> activityIds = memberActivityInitialRequest.getActivityIds();
-    saveMemberActivities(member, activityIds);
-
-    member.updateName(memberActivityInitialRequest.getName());
+    return saveMemberActivities(member, activityIds);
   }
 
-  private void saveMemberActivities(final Member member, final List<Long> activityIds) {
+  private List<MemberActivity> saveMemberActivities(final Member member,
+      final List<Long> activityIds) {
     final List<MemberActivity> memberActivities = activityRepository.findAllById(activityIds)
         .stream()
         .map(it -> new MemberActivity(it, member))
         .collect(toUnmodifiableList());
 
     validateAllActivityIdsExist(activityIds, memberActivities);
-
     memberActivityRepository.saveAll(memberActivities);
+    return memberActivities;
   }
 
   private void validateAllActivityIdsExist(

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

@@ -2,12 +2,15 @@
 
 import com.emmsale.image.application.S3Client;
 import com.emmsale.member.application.dto.DescriptionRequest;
+import com.emmsale.member.application.dto.MemberActivityInitialRequest;
 import com.emmsale.member.application.dto.MemberImageResponse;
 import com.emmsale.member.domain.Member;
+import com.emmsale.member.domain.MemberActivity;
 import com.emmsale.member.domain.MemberRepository;
 import com.emmsale.member.exception.MemberException;
 import com.emmsale.member.exception.MemberExceptionType;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -19,8 +22,22 @@
 public class MemberCommandService {
 
   private final MemberRepository memberRepository;
+  private final MemberActivityCommandService memberActivityCommandService;
+  private final InterestTagService interestTagService;
   private final S3Client s3Client;
 
+  public void initializeMember(final Member member, final MemberActivityInitialRequest request) {
+    final List<MemberActivity> memberActivities = memberActivityCommandService.registerActivities(
+        member, request);
+    final List<String> activityNames = memberActivities.stream()
+        .filter(MemberActivity::isJobActivity)
+        .map(MemberActivity::getActivityName)
+        .collect(Collectors.toList());
+    interestTagService.initializeInterestTags(member, activityNames);
+
+    member.updateName(request.getName());
+  }
+
   public void updateDescription(final Member member, final DescriptionRequest descriptionRequest) {
     final String description = descriptionRequest.getDescription();
 

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

@@ -1,6 +1,7 @@
 package com.emmsale.member.domain;
 
 import com.emmsale.activity.domain.Activity;
+import com.emmsale.activity.domain.ActivityType;
 import com.emmsale.base.BaseEntity;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -34,4 +35,12 @@ public MemberActivity(final Activity activity, final Member member) {
     this.activity = activity;
     this.member = member;
   }
+
+  public String getActivityName() {
+    return activity.getName();
+  }
+
+  public Boolean isJobActivity() {
+    return activity.getActivityType() == ActivityType.JOB;
+  }
 }

backend/emm-sale/src/test/java/com/emmsale/member/application/InterestTagServiceTest.java

@@ -42,6 +42,7 @@ class InterestTagServiceTest extends ServiceIntegrationTestHelper {
   private TagRepository tagRepository;
 
   private Member 사용자;
+  private Member 새로운_사용자;
   private Tag 백엔드;
   private Tag 프론트엔드;
   private Tag 안드로이드;
@@ -50,6 +51,7 @@ class InterestTagServiceTest extends ServiceIntegrationTestHelper {
   @BeforeEach
   void init() {
     사용자 = memberRepository.findById(1L).get();
+    새로운_사용자 = memberRepository.findById(3L).get();
 
     백엔드 = tagRepository.save(백엔드());
     프론트엔드 = tagRepository.save(프론트엔드());
@@ -60,6 +62,23 @@ void init() {
     interestTagRepository.save(new InterestTag(사용자, 프론트엔드));
   }
 
+  @Test
+  @DisplayName("태그 이름을 입력받으면 부합하는 태그가 관심 태그로 설정된다.")
+  void initializeInterestTags() {
+    // given
+    final List<String> tagNames = List.of("백엔드", "프론트엔드");
+    final List<InterestTagResponse> expected = InterestTagResponse.convertAllFrom(
+        List.of(new InterestTag(새로운_사용자, 백엔드), new InterestTag(새로운_사용자, 프론트엔드)));
+
+    // when
+    interestTagService.initializeInterestTags(새로운_사용자, tagNames);
+    final List<InterestTagResponse> actual = interestTagService.findInterestTags(새로운_사용자.getId());
+    // then
+    assertThat(actual)
+        .usingRecursiveComparison()
+        .isEqualTo(expected);
+  }
+
   @Test
   @DisplayName("사용자 id를 입력으로 받으면 사용자의 관심 태그 리스트를 조회할 수 있다.")
   void findInterestTags() {

backend/emm-sale/src/test/java/com/emmsale/member/application/MemberActivityCommandServiceTest.java

@@ -2,19 +2,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.emmsale.activity.application.dto.ActivityResponse;
 import com.emmsale.helper.ServiceIntegrationTestHelper;
 import com.emmsale.member.application.dto.MemberActivityAddRequest;
 import com.emmsale.member.application.dto.MemberActivityInitialRequest;
 import com.emmsale.member.domain.Member;
+import com.emmsale.member.domain.MemberActivityRepository;
 import com.emmsale.member.domain.MemberRepository;
 import com.emmsale.member.exception.MemberException;
 import com.emmsale.member.exception.MemberExceptionType;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -25,28 +24,36 @@ class MemberActivityCommandServiceTest extends ServiceIntegrationTestHelper {
   @Autowired
   private MemberActivityCommandService memberActivityCommandService;
 
+  @Autowired
+  private MemberCommandService memberCommandService;
+
   @Autowired
   private MemberRepository memberRepository;
 
+  @Autowired
+  private MemberActivityRepository memberActivityRepository;
+
   @Test
-  @DisplayName("Activity의 id를 통해서, 사용자의 Activity를 등록하고 사용자의 이름을 수정할 수 있다.")
+  @DisplayName("Activity의 id를 통해서, 사용자의 Activity를 등록할 수 있다.")
   void registerActivities() throws Exception {
-    //given
-    final List<Long> activityIds = List.of(1L, 2L, 3L);
-    final long savedMemberId = 1L;
+    // given
+    final List<Long> expected = List.of(1L, 2L, 3L);
+    final long savedMemberId = 3L;
 
     final Member member = memberRepository.findById(savedMemberId).get();
     final String updateName = "우르";
 
     final MemberActivityInitialRequest request = new MemberActivityInitialRequest(updateName,
-        activityIds);
+        expected);
 
-    //when & then
-    assertAll(
-        () -> assertDoesNotThrow(
-            () -> memberActivityCommandService.registerActivities(member, request)),
-        () -> assertEquals(updateName, member.getName())
-    );
+    // when
+    memberActivityCommandService.registerActivities(member, request);
+    final List<Long> actual = memberActivityRepository.findAllByMember(member)
+        .stream()
+        .map(memberActivity -> memberActivity.getActivity().getId())
+        .collect(Collectors.toList());
+    // then
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -63,7 +70,7 @@ void registerActivities_fail() throws Exception {
         activityIds);
 
     // when
-    memberActivityCommandService.registerActivities(member, request);
+    memberCommandService.initializeMember(member, request);
     final ThrowingCallable actual = () -> memberActivityCommandService.registerActivities(member,
         request);
 

backend/emm-sale/src/test/java/com/emmsale/member/application/MemberCommandServiceTest.java

@@ -5,6 +5,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
@@ -13,10 +15,15 @@
 
 import com.emmsale.helper.ServiceIntegrationTestHelper;
 import com.emmsale.member.application.dto.DescriptionRequest;
+import com.emmsale.member.application.dto.MemberActivityInitialRequest;
+import com.emmsale.member.domain.InterestTagRepository;
 import com.emmsale.member.domain.Member;
 import com.emmsale.member.domain.MemberRepository;
 import com.emmsale.member.exception.MemberException;
 import com.emmsale.member.exception.MemberExceptionType;
+import com.emmsale.tag.domain.Tag;
+import com.emmsale.tag.domain.TagRepository;
+import java.util.List;
 import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -37,6 +44,34 @@ class MemberCommandServiceTest extends ServiceIntegrationTestHelper {
   private MemberCommandService memberCommandService;
   @Autowired
   private MemberRepository memberRepository;
+  @Autowired
+  private InterestTagRepository interestTagRepository;
+  @Autowired
+  private TagRepository tagRepository;
+
+  @Test
+  @DisplayName("Activity의 id를 통해서, 사용자의 Activity를 등록하고 사용자의 이름을 수정할 수 있다.")
+  void registerActivities() throws Exception {
+    //given
+    tagRepository.save(new Tag("Backend"));
+    final List<Long> activityIds = List.of(1L, 2L, 6L);
+    final long savedMemberId = 1L;
+
+    final Member member = memberRepository.findById(savedMemberId).get();
+    final String updateName = "우르";
+
+    final MemberActivityInitialRequest request = new MemberActivityInitialRequest(updateName,
+        activityIds);
+
+    //when & then
+    assertAll(
+        () -> assertDoesNotThrow(
+            () -> memberCommandService.initializeMember(member, request)),
+        () -> assertEquals(updateName, member.getName()),
+        () -> assertEquals(1,
+            interestTagRepository.findInterestTagsByMemberId(savedMemberId).size())
+    );
+  }
 
   @Nested
   @DisplayName("한줄 자기소개를 업데이트한다.")

backend/emm-sale/src/test/java/com/emmsale/member/application/MemberQueryServiceTest.java

@@ -45,7 +45,7 @@ void findOrCreateMemberTest() {
   @DisplayName("사용자를 조회하고 존재하지 않으므로 새로 생성하고 생성한 결과를 반환한다.")
   void findOrCreateMemberTestWithNewMember() {
     //given
-    final MemberQueryResponse expectResponse = new MemberQueryResponse(3L, false);
+    final MemberQueryResponse expectResponse = new MemberQueryResponse(4L, false);
 
     final GithubProfileResponse githubProfileFromGithub = new GithubProfileResponse("0", "name",
         "username", "https://imageUrl.com");

backend/emm-sale/src/test/java/com/emmsale/member/domain/MemberRepositoryTest.java

@@ -19,7 +19,7 @@ class MemberRepositoryTest extends JpaRepositorySliceTestHelper {
   @DisplayName("countMembersById() : 주어진 ids에서 존재하는 members의 개수를 구할 수 있다.")
   void test_existsMembersByInIds() throws Exception {
     //given
-    final List<Long> memberIds = List.of(1L, 2L, 3L);
+    final List<Long> memberIds = List.of(1L, 2L, 4L);
 
     //when
     final Long count = memberRepository.countMembersById(memberIds);
@@ -32,7 +32,7 @@ void test_existsMembersByInIds() throws Exception {
   @DisplayName("findAllByIdIn() : 주어진 id들에 속한 member들을 조회할 수 있다.")
   void test_findAllByIdIn() throws Exception {
     //given
-    final Set<Long> memberIds = Set.of(1L, 2L, 3L);
+    final Set<Long> memberIds = Set.of(1L, 2L, 4L);
 
     final List<Member> expected = List.of(
         memberRepository.findById(1L).get(),

backend/emm-sale/src/test/resources/data-test.sql

@@ -46,6 +46,11 @@ insert into member(id, name, image_url, open_profile_url, github_id, github_user
 values (2, 'member2', 'https://imageurl.com', 'https://openprofileurl.com', 2, 'amaran-th22',
         CURRENT_TIMESTAMP(),
         CURRENT_TIMESTAMP());
+insert into member(id, name, image_url, open_profile_url, github_id, github_username, created_at,
+                   updated_at)
+values (3, null, 'https://imageurl.com', 'https://openprofileurl.com', 33, 'amaran-th333',
+        CURRENT_TIMESTAMP(),
+        CURRENT_TIMESTAMP());
 
 insert into member_activity(id, activity_id, member_id, created_at, updated_at)
 values (1, 1, 1, CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());