[DDING-000] 동아리원 명단 업로드 로직 수정 (#333)

KoSeonJe · web-flow · commit c632a35b2d1f · 2025-10-08T15:16:23.000+09:00
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/clubmember/repository/ClubMemberRepository.java b/src/main/java/ddingdong/ddingdongBE/domain/clubmember/repository/ClubMemberRepository.java
@@ -4,10 +4,16 @@
 import java.util.Collection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 public interface ClubMemberRepository extends JpaRepository<ClubMember, Long> {
 
     List<ClubMember> findByIdIn(Collection<Long> ids);
 
     List<ClubMember> findByClubId(Long clubId);
+
+    @Modifying(clearAutomatically = true)
+    @Query("UPDATE ClubMember cm SET cm.deletedAt = CURRENT_TIMESTAMP WHERE cm.club.id = :clubId AND cm.deletedAt IS NULL")
+    void deleteAllByClubId(Long clubId);
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/ClubMemberService.java b/src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/ClubMemberService.java
@@ -15,7 +15,5 @@ public interface ClubMemberService {
 
     void save(ClubMember clubMember);
 
-    void updateAll(List<ClubMember> updateClubMemberInfos);
-
-    List<ClubMember> getByClubId(Long clubId);
+    void deleteAllByClubId(Long clubId);
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/FacadeCentralClubMemberServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/FacadeCentralClubMemberServiceImpl.java
@@ -8,10 +8,7 @@
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.command.UpdateClubMemberListCommand;
 import ddingdong.ddingdongBE.domain.clubmember.service.dto.query.AllClubMemberInfoQuery;
 import ddingdong.ddingdongBE.file.service.ExcelFileService;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -43,22 +40,10 @@ public AllClubMemberInfoQuery getAllMyClubMember(Long userId) {
     @Transactional
     public void updateMemberList(UpdateClubMemberListCommand command) {
         Club club = clubService.getByUserId(command.userId());
-        List<ClubMember> updateClubMemberInfos =
+        List<ClubMember> updateClubMember =
                 excelFileService.extractClubMembersInformation(club, command.clubMemberListFile());
-        List<ClubMember> clubMembers = clubMemberService.getByClubId(club.getId());
-        Set<Long> updatedMemberInfoIds = updateClubMemberInfos.stream()
-                .map(ClubMember::getId)
-                .collect(Collectors.toSet());
-        Set<Long> currentMemberIds = clubMembers.stream()
-                .map(ClubMember::getId)
-                .collect(Collectors.toSet());
-
-        clubMemberService.saveAll(filterCreatedMembers(updateClubMemberInfos, updatedMemberInfoIds, currentMemberIds));
-        clubMemberService.updateAll(filterUpdatedMembers(updateClubMemberInfos, updatedMemberInfoIds, currentMemberIds));
-
-        List<ClubMember> deletedMembers = filterDeletedMembers(clubMembers, updatedMemberInfoIds, currentMemberIds);
-        club.removeAll(deletedMembers);
-        clubMemberService.deleteAll(deletedMembers);
+        clubMemberService.deleteAllByClubId(club.getId());
+        clubMemberService.saveAll(updateClubMember);
     }
 
     @Override
@@ -85,32 +70,4 @@ public void create(final CreateClubMemberCommand command) {
         clubMemberService.save(clubMember);
         club.addClubMember(clubMember);
     }
-
-    private List<ClubMember> filterCreatedMembers(List<ClubMember> updatedClubMembers, Set<Long> updatedMemberIds,
-                                                  Set<Long> currentMemberIds) {
-        Set<Long> createdMemberIds = new HashSet<>(updatedMemberIds);
-        createdMemberIds.removeAll(currentMemberIds);
-        return updatedClubMembers.stream()
-                .filter(member -> createdMemberIds.contains(member.getId()))
-                .toList();
-    }
-
-    private List<ClubMember> filterUpdatedMembers(List<ClubMember> updatedClubMembers, Set<Long> updatedMemberIds,
-            Set<Long> currentMemberIds) {
-        Set<Long> willUpdateMemberIds = new HashSet<>(currentMemberIds);
-        willUpdateMemberIds.retainAll(updatedMemberIds);
-        return updatedClubMembers.stream()
-                .filter(member -> willUpdateMemberIds.contains(member.getId()))
-                .toList();
-    }
-
-    private List<ClubMember> filterDeletedMembers(List<ClubMember> clubMembers, Set<Long> updatedMemberIds,
-                                                  Set<Long> currentMemberIds) {
-        Set<Long> deletedMemberIds = new HashSet<>(currentMemberIds);
-        deletedMemberIds.removeAll(updatedMemberIds);
-        System.out.println(deletedMemberIds);
-        return clubMembers.stream()
-                .filter(member -> deletedMemberIds.contains(member.getId()))
-                .toList();
-    }
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/GeneralClubMemberService.java b/src/main/java/ddingdong/ddingdongBE/domain/clubmember/service/GeneralClubMemberService.java
@@ -4,9 +4,6 @@
 import ddingdong.ddingdongBE.domain.clubmember.entity.ClubMember;
 import ddingdong.ddingdongBE.domain.clubmember.repository.ClubMemberRepository;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,17 +47,7 @@ public void save(ClubMember clubMember) {
 
     @Override
     @Transactional
-    public void updateAll(final List<ClubMember> updateClubMemberInfos) {
-        Map<Long, ClubMember> updatedMemberMap = updateClubMemberInfos.stream()
-                .collect(Collectors.toMap(ClubMember::getId, Function.identity()));
-
-        clubMemberRepository.findByIdIn(updatedMemberMap.keySet())
-                .forEach(member ->
-                        member.updateInformation(updatedMemberMap.get(member.getId())));
-    }
-
-    @Override
-    public List<ClubMember> getByClubId(final Long clubId) {
-        return clubMemberRepository.findByClubId(clubId);
+    public void deleteAllByClubId(final Long clubId) {
+        clubMemberRepository.deleteAllByClubId(clubId);
     }
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/file/service/dto/ExcelClubMemberDto.java b/src/main/java/ddingdong/ddingdongBE/file/service/dto/ExcelClubMemberDto.java
@@ -44,7 +44,6 @@ private ExcelClubMemberDto(Long id, String name, String studentNumber, String ph
 
     public ClubMember toEntity(Club club) {
         return ClubMember.builder()
-                .id(id)
                 .club(club)
                 .name(name)
                 .studentNumber(studentNumber)
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -8,17 +8,31 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: 1234
+  flyway:
+    enabled: false
 
   jpa:
     hibernate:
-      ddl-auto: validate
+      ddl-auto: update
     properties:
       hibernate:
         format_sql: true
         show-sql: true
-    defer-datasource-initialization: false
-
+    defer-datasource-initialization: true
+  sql:
+    init:
+      mode: always
 logging:
   level:
     org.springframework.cache: TRACE
     org.springframework.cache.interceptor.CacheInterceptor: TRACE
+    org:
+      hibernate:
+        SQL: DEBUG
+        type:
+          descriptor:
+            sql:
+              BasicBinder: TRACE
+        orm:
+          jdbc:
+            bind: TRACE
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
@@ -1,35 +1,37 @@
 insert into users(name, password, role, auth_id)
 values ('ddingdong', '$2a$12$9BIi3IGc79rU3Xgbnxq/X.T37Hlfrf/lSc2/g0HLeM1g7HmFXE8v.', 'ADMIN', 'ddingdong11'),
        ('cow', '$2a$12$9BIi3IGc79rU3Xgbnxq/X.T37Hlfrf/lSc2/g0HLeM1g7HmFXE8v.', 'CLUB', 'cow11');
-
-INSERT INTO club(name,
-                 category,
-                 leader,
-                 tag,
-                 score,
-                 phone_number,
-                 location,
-                 user_id,
-                 start_recruit_period,
-                 end_recruit_period,
-                 regular_meeting,
-                 introduction,
-                 activity,
-                 ideal,
-                 form_url)
-VALUES ('카우',
-        '학술',
-        '김세빈',
-        'IT',
-        0,
-        '010-0000-0000',
-        'S1350',
-        2,
-        NULL,
-        NULL,
-        '매주 월요일 18:00시',
-        '동아리 소개입니다.',
-        '동아리 활동내용입니다.',
-        NULL,
-        NULL
-       );
+-- PhoneNumber, Location, Score가 각각 단일 컬럼으로 매핑됨
+INSERT INTO club (
+    user_id,
+    name,
+    category,
+    tag,
+    leader,
+    phone_number,           -- PhoneNumber.number
+    location,               -- Location.value
+    regular_meeting,
+    introduction,
+    activity,
+    ideal,
+    score,                  -- Score.value
+    created_at,
+    updated_at,
+    deleted_at
+) VALUES (
+             2,                      -- user_id
+             '테스트 동아리',         -- name
+             '문화예술',              -- category
+             '음악,공연',             -- tag
+             '홍길동',                -- leader
+             '010-1234-5678',        -- phone_number (형식: \d{2,3}-\d{3,4}-\d{4})
+             'S1234',                -- location (형식: S[0-9]{4,5})
+             '매주 수요일 18:00',     -- regular_meeting
+             '음악을 사랑하는 모임',   -- introduction
+             '정기 공연, 버스킹',     -- activity
+             '음악으로 하나되는 캠퍼스', -- ideal
+             0.00,                   -- score (BigDecimal)
+             NOW(),                  -- created_at
+             NOW(),                  -- updated_at
+             NULL                    -- deleted_at
+         );

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,5 @@ public interface ClubMemberService {`
`15`	`15`
`16`	`16`	`void save(ClubMember clubMember);`
`17`	`17`
`18`		`- void updateAll(List<ClubMember> updateClubMemberInfos);`
`19`		`-`
`20`		`- List<ClubMember> getByClubId(Long clubId);`
	`18`	`+ void deleteAllByClubId(Long clubId);`
`21`	`19`	`}`