Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[✨ feat/39] 연관관계 설정 #43

Merged
merged 3 commits into from
Feb 13, 2025
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
6 changes: 4 additions & 2 deletions src/main/java/org/noostak/appointment/domain/Appointment.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.noostak.appointment.domain.vo.AppointmentMemberCount;
import org.noostak.appointment.domain.vo.AppointmentStatus;
import org.noostak.global.entity.BaseTimeEntity;
import org.noostak.group.domain.Groups;

@Entity
@Getter
Expand All @@ -19,8 +20,9 @@ public class Appointment extends BaseTimeEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

// @ManyToOne(fetch = FetchType.LAZY)
// private Group group;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "groups_id")
private Groups groups;

private Long appointmentHostId;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.noostak.global.entity.BaseTimeEntity;

import java.time.LocalDateTime;

@Entity
@Getter
@RequiredArgsConstructor
public class AppointmentHostSelectionTimes {
public class AppointmentHostSelectionTimes extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -24,8 +25,7 @@ public class AppointmentHostSelectionTimes {
@Column
private LocalDateTime appointmentHostSelectionEndTime;

// TODO:
// @ManyToOne(fetch = FetchType.LAZY)
// @JoinColumn(name = "appointment_id")
// private Appointment appointment;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "appointment_id")
private Appointment appointment;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.noostak.appointment.domain.Appointment;
import org.noostak.appointmentmember.domain.vo.AppointmentAvailability;
import org.noostak.global.entity.BaseTimeEntity;
import org.noostak.member.domain.Member;

@Entity
@Getter
@RequiredArgsConstructor
public class AppointmentMember {
public class AppointmentMember extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -19,10 +21,9 @@ public class AppointmentMember {
@Column(name = "availability_availability")
private AppointmentAvailability appointmentAvailability;

// TODO:
// @ManyToOne(fetch = FetchType.LAZY)
// @JoinColumn(name = "appointment_id")
// private Appointment appointment;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "appointment_id")
private Appointment appointment;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.noostak.global.entity.BaseTimeEntity;
import org.noostak.member.domain.Member;

import java.time.LocalDateTime;

@Entity
@Getter
@RequiredArgsConstructor
public class AppointmentMemberAvailableTimes {
public class AppointmentMemberAvailableTimes extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.noostak.appointment.domain.Appointment;
import org.noostak.appointmentoption.domain.vo.AppointmentOptionStatus;
import org.noostak.global.entity.BaseTimeEntity;

import java.time.LocalDateTime;

@Entity
@Getter
@RequiredArgsConstructor
public class AppointmentOption {
public class AppointmentOption extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -29,8 +31,7 @@ public class AppointmentOption {
@Column
private LocalDateTime appointmentOptionEndTime;

// TODO:
// @ManyToOne(fetch = FetchType.LAZY)
// @JoinColumn(name = "appointment_id")
// private Appointment appointment;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "appointment_id")
private Appointment appointment;
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Entity
@Getter
@RequiredArgsConstructor
public class Group extends BaseTimeEntity {
public class Groups extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -36,15 +36,15 @@ public class Group extends BaseTimeEntity {

private Long groupHostId;

private Group(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
private Groups(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
this.groupHostId = groupHostId;
this.name = name;
this.key = key;
this.memberCount = GroupMemberCount.from(1L);
this.code = GroupInvitationCode.from(code);
}

public static Group of(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
return new Group(groupHostId, name, key, code);
public static Groups of(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
return new Groups(groupHostId, name, key, code);
}
}
19 changes: 11 additions & 8 deletions src/main/java/org/noostak/likes/domain/Likes.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.noostak.appointmentmember.domain.AppointmentMember;
import org.noostak.appointmentoption.domain.AppointmentOption;
import org.noostak.global.entity.BaseTimeEntity;
import org.noostak.likes.domain.vo.LikesCount;

@Entity
@Getter
@RequiredArgsConstructor
public class Likes {
public class Likes extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -18,11 +21,11 @@ public class Likes {
@AttributeOverride(name = "count", column = @Column(name = "likes_count"))
private LikesCount likesCount;

// @ManyToOne(fetch = FetchType.LAZY)
// @JoinColumn(name = "appointment_member_id")
// private AppointmentMember appointmentMember;
//
// @ManyToOne(fetch = FetchType.LAZY)
// @JoinColumn(name = "appointment_option_id")
// private AppointmentOption appointmentOption;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "appointment_member_id")
private AppointmentMember appointmentMember;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "appointment_option_id")
private AppointmentOption appointmentOption;
}
3 changes: 2 additions & 1 deletion src/main/java/org/noostak/member/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import jakarta.persistence.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.noostak.global.entity.BaseTimeEntity;
import org.noostak.member.domain.vo.*;

@Entity
@Getter
@RequiredArgsConstructor
public class Member {
public class Member extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

class GroupInvitationCodeTest {
class GroupsInvitationCodeTest {

@Nested
@DisplayName("성공 케이스")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

class GroupMemberCountTest {
class GroupsMemberCountTest {

@Nested
@DisplayName("성공 케이스")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

class GroupNameTest {
class GroupsNameTest {

@Nested
@DisplayName("성공 케이스")
Expand Down