feat: 참가자 추가 - 기존 갱신과 생성 구분

wafflestudio · Mar 31, 2024 · 5f2fe3c · 5f2fe3c
1 parent 1f0036c
commit 5f2fe3c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/src/main/java/com/waruru/areyouhere/attendee/domain/entity/Attendee.java b/src/main/java/com/waruru/areyouhere/attendee/domain/entity/Attendee.java
@@ -24,7 +24,8 @@ public class Attendee {
     private String note;
 
     @Builder
-    public Attendee(Course course, String name, String note){
+    public Attendee(Long id, Course course, String name, String note){
+        this.id = id;
         this.course = course;
         this.name = name;
         this.note = note;

diff --git a/src/main/java/com/waruru/areyouhere/attendee/dto/request/NewAttendeesRequestDto.java b/src/main/java/com/waruru/areyouhere/attendee/dto/request/NewAttendeesRequestDto.java
@@ -1,6 +1,7 @@
 package com.waruru.areyouhere.attendee.dto.request;
 
 import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeInfo;
 import java.util.List;
 import lombok.Data;
 
@@ -9,6 +10,6 @@
 public class NewAttendeesRequestDto {
     private Long courseId;
 
-    List<AttendeeData> newAttendees;
+    List<AttendeeInfo> newAttendees;
 }
 
diff --git a/src/main/java/com/waruru/areyouhere/attendee/service/AttendeeService.java b/src/main/java/com/waruru/areyouhere/attendee/service/AttendeeService.java
@@ -1,6 +1,5 @@
 package com.waruru.areyouhere.attendee.service;
 
-import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
 import com.waruru.areyouhere.attendee.service.dto.AttendeeDetailDto;
 import com.waruru.areyouhere.attendee.service.dto.AttendeeInfo;
 import com.waruru.areyouhere.attendee.service.dto.ClassAttendees;
@@ -16,7 +15,7 @@ public interface AttendeeService {
 
     public List<ClassAttendees> getClassAttendeesIfExistsOrEmpty(Long courseId);
 
-    public void createAll(Long courseId, List<AttendeeData> newAttendees);
+    public void createAll(Long courseId, List<AttendeeInfo> newAttendees);
 
     public void deleteAll(List<Long> deleteAttendees);
 

diff --git a/src/main/java/com/waruru/areyouhere/attendee/service/AttendeeServiceImpl.java b/src/main/java/com/waruru/areyouhere/attendee/service/AttendeeServiceImpl.java
@@ -7,11 +7,9 @@
 import com.waruru.areyouhere.attendee.domain.repository.dto.AttendeeAttendDetailInfo;
 import com.waruru.areyouhere.attendee.domain.repository.dto.ClassAttendeeInfo;
 import com.waruru.areyouhere.attendee.domain.repository.dto.SessionAttendeeInfo;
-import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
 import com.waruru.areyouhere.attendee.service.dto.AttendeeDetailDto;
 import com.waruru.areyouhere.attendee.exception.ClassAttendeesEmptyException;
 import com.waruru.areyouhere.attendee.exception.SessionAttendeesEmptyException;
-import com.waruru.areyouhere.attendee.service.dto.AttendeeAttendanceInfo;
 import com.waruru.areyouhere.attendee.service.dto.AttendeeInfo;
 import com.waruru.areyouhere.attendee.service.dto.ClassAttendees;
 import com.waruru.areyouhere.attendee.service.dto.DuplicateAttendees;
@@ -43,7 +41,7 @@ public class AttendeeServiceImpl implements AttendeeService{
     private final AttendeeBatchRepository attendeeBatchRepository;
     private final CourseRepository courseRepository;
 
-    public void createAll(Long courseId, List<AttendeeData> newAttendees){
+    public void createAll(Long courseId, List<AttendeeInfo> newAttendees){
         Course course = courseRepository.findById(courseId)
                 .orElseThrow(CourseIdNotFoundException::new);
 
@@ -56,16 +54,28 @@ public void createAll(Long courseId, List<AttendeeData> newAttendees){
             throw new AttendeesNotUniqueException("참여자 이름이 중복되었습니다.");
         }
 
+        List<Attendee> attendeeToUpdate = new LinkedList<>();
+        List<Attendee> attendeesToSave = new LinkedList<>();
+
+        newAttendees.forEach(attendeeInfo -> {
+            if(attendeeInfo.getId() != null){
+                attendeeToUpdate.add(Attendee.builder()
+                        .id(attendeeInfo.getId())
+                        .course(course)
+                        .name(attendeeInfo.getName())
+                        .note(attendeeInfo.getNote())
+                        .build());
+            }else{
+                attendeesToSave.add(Attendee.builder()
+                        .course(course)
+                        .name(attendeeInfo.getName())
+                        .note(attendeeInfo.getNote())
+                        .build());
+            }
+        });
 
-        List<Attendee> attendees = newAttendees.stream()
-                .map(newAttendee -> Attendee.builder()
-                                        .course(course)
-                                        .name(newAttendee.getName())
-                                        .note(newAttendee.getNote())
-                                    .build())
-                .toList();
-
-        attendeeBatchRepository.insertAttendeesBatch(attendees);
+        attendeeRepository.saveAll(attendeeToUpdate);
+        attendeeBatchRepository.insertAttendeesBatch(attendeesToSave);
     }
 
     @Override

diff --git a/src/main/java/com/waruru/areyouhere/manager/service/SessionManagerService.java b/src/main/java/com/waruru/areyouhere/manager/service/SessionManagerService.java
@@ -86,6 +86,7 @@ public void update(Long userId, String name, String password){
     }
 
     public void delete(Long userId){
+
         managerRepository.deleteById(userId);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         public void delete(Long userId){
             managerRepository.deleteById(userId);
         }
     }