[feat] : 자치기구 회원가입 수정

ssu-student-union · Aug 29, 2024 · fd849a9 · fd849a9
2 parents eda2f44 + e7b1ac3
commit fd849a9
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 11 deletions.
diff --git a/src/main/java/ussum/homepage/application/admin/service/AdminService.java b/src/main/java/ussum/homepage/application/admin/service/AdminService.java
@@ -8,14 +8,13 @@
 import ussum.homepage.application.admin.service.dto.request.CouncilSignInRequest;
 import ussum.homepage.domain.group.Group;
 import ussum.homepage.domain.group.service.GroupReader;
-import ussum.homepage.domain.member.Member;
 import ussum.homepage.domain.member.service.MemberAppender;
 import ussum.homepage.domain.user.User;
 import ussum.homepage.domain.user.service.UserAppender;
 import ussum.homepage.infra.csvBatch.JobLauncherRunner;
 import ussum.homepage.infra.utils.S3utils;
 
-import java.nio.file.attribute.GroupPrincipal;
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
@@ -41,10 +40,9 @@ public void uploadCsvFromS3ToProject(String fileName) {
 
     public void councilSignIn(CouncilSignInRequest request){
         String password = passwordEncoder.encode(request.password());
-        User user = User.createCouncilUser(request.accountId(), password);
+        User user = User.createCouncilUser(request, password);
         User savedUser = userAppender.createUser(user);
-        Group group = groupReader.getGroupByGroupId(request.groupId());
-        Member member = Member.of(null, true, request.memberCode(), request.majorCode(), savedUser.getId(), group.getId());
-        memberAppender.saveMember(member);
+        List<Group> groupList = groupReader.getGroupsByGroupIdList(request.groupIdList());
+        memberAppender.saveMemberList(groupList, request, savedUser);
     }
 }
diff --git a/src/main/java/ussum/homepage/application/admin/service/dto/request/CouncilSignInRequest.java b/src/main/java/ussum/homepage/application/admin/service/dto/request/CouncilSignInRequest.java
@@ -1,9 +1,12 @@
 package ussum.homepage.application.admin.service.dto.request;
 
+import java.util.List;
+
 public record CouncilSignInRequest(
         String accountId,
         String password,
-        Long groupId,
+        String councilName,
+        List<Long> groupIdList,
         String memberCode,
         String majorCode
 ) {

diff --git a/src/main/java/ussum/homepage/domain/group/GroupRepository.java b/src/main/java/ussum/homepage/domain/group/GroupRepository.java
@@ -2,9 +2,11 @@
 
 import ussum.homepage.infra.jpa.group.entity.GroupCode;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface GroupRepository {
     Optional<Group> findByGroupId(Long groupId);
     Optional<Group> findByGroupCode(GroupCode groupCodeEnum);
+    List<Group> findAllByGroupIdList(List<Long> groupIdList);
 }
diff --git a/src/main/java/ussum/homepage/domain/group/service/GroupReader.java b/src/main/java/ussum/homepage/domain/group/service/GroupReader.java
@@ -7,6 +7,8 @@
 import ussum.homepage.domain.group.exception.GroupNotFoundException;
 import ussum.homepage.infra.jpa.group.entity.GroupCode;
 
+import java.util.List;
+
 import static ussum.homepage.global.error.status.ErrorStatus.GROUP_NOT_FOUND;
 
 @Service
@@ -18,6 +20,10 @@ public Group getGroupByGroupId(Long groupId) {
         return groupRepository.findByGroupId(groupId).orElseThrow(() -> new GroupNotFoundException(GROUP_NOT_FOUND));
     }
 
+    public List<Group> getGroupsByGroupIdList(List<Long> groupIdList) {
+        return groupRepository.findAllByGroupIdList(groupIdList);
+    }
+
     public Group getGroupByGroupCode(GroupCode groupCodeEnum) {
         return groupRepository.findByGroupCode(groupCodeEnum).orElseThrow(() -> new GroupNotFoundException(GROUP_NOT_FOUND));
     }

diff --git a/src/main/java/ussum/homepage/domain/member/service/MemberAppender.java b/src/main/java/ussum/homepage/domain/member/service/MemberAppender.java
@@ -1,11 +1,14 @@
 package ussum.homepage.domain.member.service;
 
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import ussum.homepage.application.user.service.dto.request.OnBoardingRequest;
+import ussum.homepage.application.admin.service.dto.request.CouncilSignInRequest;
+import ussum.homepage.domain.group.Group;
 import ussum.homepage.domain.member.Member;
 import ussum.homepage.domain.member.MemberRepository;
+import ussum.homepage.domain.user.User;
+
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
@@ -15,4 +18,19 @@ public class MemberAppender {
     public void saveMember(Member member) {
         memberRepository.save(member);
     }
+
+    public void saveMemberList(List<Group> groupList, CouncilSignInRequest request, User savedUser) {
+        List<Member> memberList = groupList.stream()
+                .map(group -> Member.of(
+                        null,
+                        true,
+                        request.memberCode(),
+                        request.majorCode(),
+                        savedUser.getId(),
+                        group.getId()
+                ))
+                .toList();
+
+        memberList.forEach(this::saveMember);
+    }
 }
diff --git a/src/main/java/ussum/homepage/domain/user/User.java b/src/main/java/ussum/homepage/domain/user/User.java
@@ -38,10 +38,11 @@ public static User createUser(KakaoUserInfoResponseDto userInfoResponseDto) {
                 .build();
     }
 
-    public static User createCouncilUser(String accountId, String password){
+    public static User createCouncilUser(CouncilSignInRequest request, String password){
         return User.builder()
-                .accountId(accountId)
+                .accountId(request.accountId())
                 .password(password)
+                .name(request.councilName())
                 .build();
     }
 }
diff --git a/src/main/java/ussum/homepage/infra/jpa/group/GroupRepositoryImpl.java b/src/main/java/ussum/homepage/infra/jpa/group/GroupRepositoryImpl.java
@@ -1,19 +1,24 @@
 package ussum.homepage.infra.jpa.group;
 
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import ussum.homepage.domain.group.Group;
 import ussum.homepage.domain.group.GroupRepository;
 import ussum.homepage.infra.jpa.group.entity.GroupCode;
 import ussum.homepage.infra.jpa.group.repository.GroupJpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 
+import static ussum.homepage.infra.jpa.group.entity.QGroupEntity.groupEntity;
+
 @Repository
 @RequiredArgsConstructor
 public class GroupRepositoryImpl implements GroupRepository{
     private final GroupJpaRepository groupJpaRepository;
     private final GroupMapper groupMapper;
+    private final JPAQueryFactory queryFactory;
 
     @Override
     public Optional<Group> findByGroupId(Long groupId) {
@@ -25,4 +30,15 @@ public Optional<Group> findByGroupCode(GroupCode groupCodeEnum) {
         return groupJpaRepository.findByGroupCode(groupCodeEnum).map(groupMapper::toDomain);
     }
 
+    @Override
+    public List<Group> findAllByGroupIdList(List<Long> groupIdList) {
+        return queryFactory
+                .selectFrom(groupEntity)
+                .where(groupEntity.id.in(groupIdList))
+                .fetch()
+                .stream()
+                .map(groupMapper::toDomain)
+                .toList();
+    }
+
 }