feat: 비대면에서 대면으로 전환하는 기능 구현

IT-Cotato · Aug 8, 2024 · 8c273b4 · 8c273b4
1 parent 8803713
commit 8c273b4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/main/java/org/cotato/csquiz/domain/attendance/entity/AttendanceRecord.java b/src/main/java/org/cotato/csquiz/domain/attendance/entity/AttendanceRecord.java
@@ -78,4 +78,8 @@ public static AttendanceRecord offlineRecord(Attendance attendance, Long memberI
                 attendance
         );
     }
+
+    public void updateAttendanceType(AttendanceType attendanceType) {
+        this.attendanceType = attendanceType;
+    }
 }
diff --git a/src/main/java/org/cotato/csquiz/domain/attendance/repository/AttendanceRecordRepository.java b/src/main/java/org/cotato/csquiz/domain/attendance/repository/AttendanceRecordRepository.java
@@ -1,8 +1,10 @@
 package org.cotato.csquiz.domain.attendance.repository;
 
 import java.util.List;
+import java.util.Optional;
 import org.cotato.csquiz.domain.attendance.entity.Attendance;
 import org.cotato.csquiz.domain.attendance.entity.AttendanceRecord;
+import org.cotato.csquiz.domain.attendance.enums.AttendanceStatus;
 import org.cotato.csquiz.domain.attendance.enums.AttendanceType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -13,4 +15,6 @@ public interface AttendanceRecordRepository extends JpaRepository<AttendanceReco
     List<AttendanceRecord> findAllByAttendanceIdsInQuery(@Param("attendances") List<Attendance> attendances);
 
     boolean existsByAttendanceIdAndMemberIdAndAttendanceType(Long attendanceId, Long memberId, AttendanceType attendanceType);
+
+    Optional<AttendanceRecord> findByIdAndAttendanceStatus(Long id, AttendanceStatus attendanceStatus);
 }
diff --git a/src/main/java/org/cotato/csquiz/domain/attendance/service/OfflineAttendClient.java b/src/main/java/org/cotato/csquiz/domain/attendance/service/OfflineAttendClient.java
@@ -35,8 +35,14 @@ public AttendResponse request(AttendanceParams params, Long memberId, Attendance
         Double accuracy = attendance.getLocation().calculateAccuracy(request.getLocation());
         validateAccuracy(accuracy);
 
-        attendanceRecordRepository.save(
-                AttendanceRecord.offlineRecord(attendance, memberId, accuracy, attendanceStatus));
+        attendanceRecordRepository.findByIdAndAttendanceStatus(memberId, attendanceStatus).ifPresentOrElse(
+                record -> {
+                    record.updateAttendanceType(request.attendanceType());
+                    attendanceRecordRepository.save(record);
+                },
+                () -> attendanceRecordRepository.save(
+                                AttendanceRecord.offlineRecord(attendance, memberId, accuracy, attendanceStatus))
+        );
 
         return AttendResponse.from(attendanceStatus);
     }