Merge pull request #229 from CSE-Shaco/develop

refactor: 출석 관리 DB 스키마 및 서비스 구조 재정비(관계 정규화)

Author: CSE-Shaco

src/main/java/inha/gdgoc/domain/core/attendance/entity/AttendanceRecord.java

@@ -1,39 +1,36 @@
-// src/main/java/inha/gdgoc/domain/core/attendance/entity/AttendanceRecord.java
 package inha.gdgoc.domain.core.attendance.entity;
 
 import inha.gdgoc.domain.user.entity.User;
 import jakarta.persistence.*;
 import lombok.*;
-import java.time.LocalDate;
+
 import java.time.OffsetDateTime;
 
 @Entity
-@Table(
-        name = "attendance_records",
-        uniqueConstraints = {
-                @UniqueConstraint(name = "uq_attendance", columnNames = {"meeting_date", "user_id"})
-        },
-        indexes = {
-                @Index(name = "idx_attendance_user_date", columnList = "user_id, meeting_date DESC"),
-                @Index(name = "idx_attendance_date_only", columnList = "meeting_date DESC")
-        }
-)
-@Getter @Setter
-@NoArgsConstructor @AllArgsConstructor @Builder
+@Table(name = "attendance_records", uniqueConstraints = {@UniqueConstraint(name = "uq_attendance", columnNames = {"meeting_id", "user_id"})}, indexes = {@Index(name = "idx_attendance_user_meeting", columnList = "user_id, meeting_id"), @Index(name = "idx_attendance_meeting_only", columnList = "meeting_id")})
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class AttendanceRecord {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    /** FK → meetings(meeting_date) */
-    @Column(name = "meeting_date", nullable = false)
-    private LocalDate meetingDate;
+    /**
+     * FK → meetings(id)
+     */
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "meeting_id", nullable = false, foreignKey = @ForeignKey(name = "fk_attendance_meeting"))
+    private Meeting meeting;
 
-    /** FK → users(id) */
+    /**
+     * FK → users(id)
+     */
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @JoinColumn(name = "user_id", nullable = false,
-            foreignKey = @ForeignKey(name = "fk_attendance_user"))
+    @JoinColumn(name = "user_id", nullable = false, foreignKey = @ForeignKey(name = "fk_attendance_user"))
     private User user;
 
     @Column(name = "present", nullable = false)
@@ -42,13 +39,15 @@ public class AttendanceRecord {
     @Column(name = "updated_at", nullable = false)
     private OffsetDateTime updatedAt;
 
-    /** 마지막 수정자(선택) */
+    /**
+     * 마지막 수정자(선택)
+     */
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "updated_by",
-            foreignKey = @ForeignKey(name = "fk_attendance_updated_by"))
+    @JoinColumn(name = "updated_by", foreignKey = @ForeignKey(name = "fk_attendance_updated_by"))
     private User updatedBy;
 
-    @PrePersist @PreUpdate
+    @PrePersist
+    @PreUpdate
     void onUpdate() {
         updatedAt = OffsetDateTime.now();
     }

src/main/java/inha/gdgoc/domain/core/attendance/entity/Meeting.java

@@ -2,17 +2,26 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 
 @Entity
-@Table(name = "meetings")
-@Getter @Setter
-@NoArgsConstructor @AllArgsConstructor @Builder
+@Table(name = "meetings", uniqueConstraints = {@UniqueConstraint(name = "uq_meeting_date", columnNames = "meeting_date")}, indexes = {@Index(name = "idx_meeting_date", columnList = "meeting_date")})
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class Meeting {
 
-    /** 단일 날짜 = 단일 회의 정책 → 날짜를 PK로 */
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 도메인 식별자: 날짜는 유니크로 강제
+     */
     @Column(name = "meeting_date", nullable = false)
     private LocalDate meetingDate;
 

src/main/java/inha/gdgoc/domain/core/attendance/repository/AttendanceRecordRepository.java

@@ -1,36 +1,36 @@
 package inha.gdgoc.domain.core.attendance.repository;
 
 import inha.gdgoc.domain.core.attendance.entity.AttendanceRecord;
-import java.time.LocalDate;
-import java.util.List;
-import org.springframework.data.jpa.repository.*;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface AttendanceRecordRepository extends JpaRepository<AttendanceRecord, Long> {
 
-    /* 조회: 특정 날짜의 (userId, present) 목록 */
+    /* 조회: 특정 meetingId의 (userId, present) 목록 */
     @Query("""
-        select ar.user.id, ar.present
-        from AttendanceRecord ar
-        where ar.meetingDate = :date
-    """)
-    List<Object[]> findPresencePairsByDate(@Param("date") LocalDate date);
+                select ar.user.id, ar.present
+                from AttendanceRecord ar
+                where ar.meeting.id = :meetingId
+            """)
+    List<Object[]> findPresencePairsByMeetingId(@Param("meetingId") Long meetingId);
 
-    /* 삭제: 해당 날짜의 출석 레코드 전체 삭제 */
-    void deleteByMeetingDate(LocalDate date);
+    /* 삭제: 해당 meetingId의 출석 레코드 전체 삭제 */
+    void deleteByMeeting_Id(Long meetingId);
 
-    /* 배치 업서트(ON CONFLICT) — 고성능로 present를 일괄 반영 */
+    /* 배치 업서트(ON CONFLICT) — meeting_id 기준 */
     @Modifying
     @Query(value = """
-        INSERT INTO public.attendance_records (meeting_date, user_id, present, updated_at)
-        SELECT :date, u, :present, NOW()
-        FROM unnest(:userIds) AS u
-        ON CONFLICT (meeting_date, user_id)
-        DO UPDATE SET present = EXCLUDED.present, updated_at = NOW()
-    """, nativeQuery = true)
-    int upsertBatch(@Param("date") LocalDate date,
-                    @Param("userIds") List<Long> userIds,
-                    @Param("present") boolean present);
+                INSERT INTO public.attendance_records (meeting_id, user_id, present, updated_at)
+                SELECT :meetingId, u, :present, NOW()
+                FROM unnest(:userIds) AS u
+                ON CONFLICT (meeting_id, user_id)
+                DO UPDATE SET present = EXCLUDED.present, updated_at = NOW()
+            """, nativeQuery = true)
+    int upsertBatchByMeetingId(@Param("meetingId") Long meetingId, @Param("userIds") List<Long> userIds, @Param("present") boolean present);
 }

src/main/java/inha/gdgoc/domain/core/attendance/repository/MeetingRepository.java

@@ -2,8 +2,9 @@
 
 import inha.gdgoc.domain.core.attendance.entity.Meeting;
 import org.springframework.data.jpa.repository.JpaRepository;
-
 import java.time.LocalDate;
+import java.util.Optional;
 
-public interface MeetingRepository extends JpaRepository<Meeting, LocalDate> {
+public interface MeetingRepository extends JpaRepository<Meeting, Long> {
+    Optional<Meeting> findByMeetingDate(LocalDate meetingDate);
 }

src/main/java/inha/gdgoc/domain/core/attendance/service/CoreAttendanceService.java

@@ -41,18 +41,17 @@ public List<String> getDates() {
     @Transactional
     public void addDate(String date) {
         LocalDate d = LocalDate.parse(date);
-        if (!meetingRepository.existsById(d)) {
-            meetingRepository.save(Meeting.builder().meetingDate(d).build());
-        }
+        meetingRepository.findByMeetingDate(d)
+                .orElseGet(() -> meetingRepository.save(Meeting.builder().meetingDate(d).build()));
     }
 
     @Transactional
     public void deleteDate(String date) {
         LocalDate d = LocalDate.parse(date);
-        // FK ON DELETE CASCADE가 걸려있다면 아래 한 줄로 충분
-        meetingRepository.deleteById(d);
-        // 만약 FK cascade가 없다면 다음 라인을 활성화
-        // attendanceRecordRepository.deleteByMeetingDate(d);
+        meetingRepository.findByMeetingDate(d).ifPresent(m -> {
+            // FK ON DELETE CASCADE라면 meeting만 지우면 attendance도 함께 삭제됨
+            meetingRepository.deleteById(m.getId());
+        });
     }
 
     /* ===================== Teams ===================== */
@@ -114,12 +113,8 @@ public long setAttendance(String date, List<Long> userIds, boolean present) {
         if (userIds == null || userIds.isEmpty()) return 0L;
 
         LocalDate d = LocalDate.parse(date);
-        // 회의가 없으면 생성 (idempotent)
-        if (!meetingRepository.existsById(d)) {
-            meetingRepository.save(Meeting.builder().meetingDate(d).build());
-        }
-        int affected = attendanceRecordRepository.upsertBatch(d, userIds, present);
-        // batch 결과는 행수에 대한 DB 드라이버 의존이 있어 절대값으로 환산
+        Long meetingId = ensureMeetingAndGetId(d);
+        int affected = attendanceRecordRepository.upsertBatchByMeetingId(meetingId, userIds, present);
         return Math.max(affected, 0);
     }
 
@@ -219,11 +214,25 @@ public String buildSummaryCsv(String date, TeamType teamOrNull) {
 
     /* ===================== helpers ===================== */
 
+    /** date로 meeting을 보장하고 meetingId 반환 */
+    @Transactional
+    protected Long ensureMeetingAndGetId(LocalDate date) {
+        return meetingRepository.findByMeetingDate(date)
+                .map(Meeting::getId)
+                .orElseGet(() -> meetingRepository.save(
+                        Meeting.builder().meetingDate(date).build()
+                ).getId());
+    }
+
+    /** 특정 날짜의 출석 맵(userId → present) */
     @Transactional(readOnly = true)
     protected Map<Long, Boolean> getPresenceMap(LocalDate date) {
         Map<Long, Boolean> map = new HashMap<>();
-        attendanceRecordRepository.findPresencePairsByDate(date).forEach(row -> {
-            // row[0]=userId(Long/Number), row[1]=present(Boolean)
+        var meetingOpt = meetingRepository.findByMeetingDate(date);
+        if (meetingOpt.isEmpty()) return map;
+
+        Long meetingId = meetingOpt.get().getId();
+        attendanceRecordRepository.findPresencePairsByMeetingId(meetingId).forEach(row -> {
             Long uid = ((Number) row[0]).longValue();
             Boolean present = (Boolean) row[1];
             map.put(uid, present != null && present);