Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

@Entity
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
Expand All @@ -38,25 +37,32 @@ public class Attendance extends BasePostgresEntity {
private AttendanceRound attendanceRound;

@Enumerated(EnumType.STRING)
@lombok.Setter
private AttendanceStatus attendanceStatus;

@CreationTimestamp
@Column(name = "checked_at")
@lombok.Setter
private LocalDateTime checkedAt;

@Column(name = "awarded_points")
@lombok.Setter
private Integer awardedPoints;

@Column(length = 500)
@lombok.Setter
private String note;

@Embedded
@lombok.Setter
private Location checkInLocation;

@Column(name = "device_info")
@lombok.Setter
private String deviceInfo;

@Column(name = "anonymous_user_name", length = 100)
@lombok.Setter
private String anonymousUserName;

// 지각 여부 계산 / 상태 업데이트
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import lombok.*;
import org.sejongisc.backend.common.entity.postgres.BasePostgresEntity;

import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -50,7 +49,12 @@ public class AttendanceSession extends BasePostgresEntity {
@Builder.Default
private List<AttendanceRound> rounds = new ArrayList<>();

@OneToMany(mappedBy = "attendanceSession", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@OneToMany(mappedBy = "attendanceSession", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
@JsonManagedReference
@Builder.Default
private List<SessionUser> sessionUsers = new ArrayList<>();

@OneToMany(mappedBy = "attendanceSession", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
@JsonManagedReference
@Builder.Default
private List<Attendance> attendances = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package org.sejongisc.backend.attendance.entity;

import com.fasterxml.jackson.annotation.JsonBackReference;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.*;
import org.sejongisc.backend.common.entity.postgres.BasePostgresEntity;
import org.sejongisc.backend.user.entity.User;

Expand Down Expand Up @@ -43,13 +41,15 @@ public class SessionUser extends BasePostgresEntity {

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "session_id", nullable = false)
@JsonBackReference
private AttendanceSession attendanceSession;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id", nullable = false)
private User user;

@Column(name = "user_name", length = 100, nullable = false)
@lombok.Setter
private String userName; // 저장 시점의 user.name 캐시 (나중에 user.name이 변경되어도 유지)

/**
Expand Down