Merge pull request #59 from ssu-student-union/feat/54-onBoarding

[fix] : OnBoarding 관련 메소드 수정
ssu-student-union · Aug 16, 2024 · 2bf1315 · 2bf1315
2 parents b9f5138 + b602d3a
commit 2bf1315
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 13 deletions.
diff --git a/src/main/java/ussum/homepage/application/user/service/OnBoardingService.java b/src/main/java/ussum/homepage/application/user/service/OnBoardingService.java
@@ -38,15 +38,14 @@ public class OnBoardingService {
 
     @Transactional
     public void saveUserOnBoarding(Long userId, OnBoardingRequest request){
-        User user = userReader.getUserWithId(userId);
+//        User user = userReader.getUserWithId(userId);
         String studentId = request.getStudentId();
 //        studentCsvReader.getStudentWithStudentId(Long.valueOf(studentId), request)
 //                .orElseThrow(() -> new GeneralException(USER_NOT_FOUND));
 
         userModifier.updateOnBoardingUser(request);
-        memberAppender.saveMember(Member.of(null, false,
-                request.getMemberCode(), request.getMajorCode(),
-                userId, null));
+        Member member = Member.createMember(false, request.getMemberCode(), request.getMajorCode(), userId);
+        memberAppender.saveMember(member);
     }
 
     public void sendEmail(OnBoardingEmailRequest onBoardingEmailRequest) {

diff --git a/src/main/java/ussum/homepage/domain/member/Member.java b/src/main/java/ussum/homepage/domain/member/Member.java
@@ -24,4 +24,13 @@ public static Member of(Long id, Boolean isAdmin, String memberCode, String majo
                 .build();
     }
 
+    public static Member createMember(Boolean isAdmin, String memberCode, String majorCode, Long userId) {
+        return Member.builder()
+                .isAdmin(isAdmin)
+                .memberCode(memberCode)
+                .majorCode(majorCode)
+                .userId(userId)
+                .build();
+    }
+
 }
diff --git a/src/main/java/ussum/homepage/domain/member/MemberRepository.java b/src/main/java/ussum/homepage/domain/member/MemberRepository.java
@@ -5,5 +5,5 @@
 public interface MemberRepository {
     Optional<Member> findByUserId(Long userId);
     Optional<Member> findCentralOperationCommitteeMember(Long userId);
-    Member save(Member member);
+    void save(Member member);
 }
diff --git a/src/main/java/ussum/homepage/infra/jpa/member/MemberMapper.java b/src/main/java/ussum/homepage/infra/jpa/member/MemberMapper.java
@@ -17,18 +17,28 @@ public Member toDomain(MemberEntity memberEntity) {
                 String.valueOf(memberEntity.getMemberCode()),
                 String.valueOf(memberEntity.getMajorCode()),
                 memberEntity.getUserEntity().getId(),
-                memberEntity.getGroupEntity().getId()
+                memberEntity.getGroupEntity() == null ? null : memberEntity.getGroupEntity().getId()
         );
     }
 
     public MemberEntity toEntity(Member member) {
+//        if(member.getGroupId() == null) {
+//            return MemberEntity.nullGroup(
+//                    member.getId(),
+//                    member.getIsAdmin(),
+//                    MemberCode.getEnumMemberCodeFromStringMemberCode(member.getMemberCode()),
+//                    MajorCode.getEnumMajorCodeFromStringMajorCode(member.getMajorCode()),
+//                    UserEntity.from(member.getUserId())
+//            );
+//        }
+
         return MemberEntity.of(
                 member.getId(),
                 member.getIsAdmin(),
                 MemberCode.getEnumMemberCodeFromStringMemberCode(member.getMemberCode()),
                 MajorCode.getEnumMajorCodeFromStringMajorCode(member.getMajorCode()),
                 UserEntity.from(member.getUserId()),
-                GroupEntity.from(member.getGroupId())
+                member.getGroupId() == null ? null : GroupEntity.from(member.getGroupId())
         );
     }
 }
diff --git a/src/main/java/ussum/homepage/infra/jpa/member/MemberRepositoryImpl.java b/src/main/java/ussum/homepage/infra/jpa/member/MemberRepositoryImpl.java
@@ -27,7 +27,7 @@ public Optional<Member> findCentralOperationCommitteeMember(Long userId) {
     }
 
     @Override
-    public Member save(Member member) {
-        return memberMapper.toDomain(memberJpaRepository.save(memberMapper.toEntity(member)));
+    public void save(Member member) {
+        memberJpaRepository.save(memberMapper.toEntity(member));
     }
 }
diff --git a/src/main/java/ussum/homepage/infra/jpa/member/entity/MemberEntity.java b/src/main/java/ussum/homepage/infra/jpa/member/entity/MemberEntity.java
@@ -1,11 +1,11 @@
 package ussum.homepage.infra.jpa.member.entity;
+
 import jakarta.persistence.*;
 import lombok.*;
 import ussum.homepage.infra.jpa.BaseEntity;
 import ussum.homepage.infra.jpa.group.entity.GroupEntity;
 import ussum.homepage.infra.jpa.user.entity.UserEntity;
 
-
 @Entity
 @Table(name = "member")
 @Getter
@@ -28,15 +28,18 @@ public class MemberEntity extends BaseEntity {
     @JoinColumn(name = "user_id")
     private UserEntity userEntity;
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) // 일단  cascade = CascadeType.PERSIST 추가, 영속화 문제 해결
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "groups_id")
     private GroupEntity groupEntity;
 
     public static MemberEntity of(Long id, Boolean isAdmin, MemberCode memberCode, MajorCode majorCode, UserEntity userEntity, GroupEntity groupEntity) {
         return new MemberEntity(id, isAdmin, memberCode, majorCode, userEntity, groupEntity);
-    } // ?
+    }
+    public static MemberEntity nullGroup(Long id, Boolean isAdmin, MemberCode memberCode, MajorCode majorCode, UserEntity userEntity) {
+        return new MemberEntity(id, isAdmin, memberCode, majorCode, userEntity, null);
+    }
 
     public static MemberEntity from(Long id) {
         return new MemberEntity(id, null, null, null, null, null);
-    } // ?
+    }
 }