[PC-380] feat: 머지 충돌 수정

YAPP-Github · Jan 25, 2025 · 7d2e9f3 · 7d2e9f3
1 parent 0f3b262
commit 7d2e9f3
Showing 1 changed file with 45 additions and 19 deletions.
diff --git a/common/domain/src/main/java/org/yapp/domain/match/MatchInfo.java b/common/domain/src/main/java/org/yapp/domain/match/MatchInfo.java
@@ -15,30 +15,56 @@
 @Getter
 public class MatchInfo {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
 
-    @Column(name = "date")
-    private LocalDate date;
+  @Column(name = "date")
+  private LocalDate date;
 
-    @ManyToOne
-    @JoinColumn(name = "user_1")
-    private User user1;
+  @ManyToOne
+  @JoinColumn(name = "user_1")
+  private User user1;
 
-    @Column(name = "user_1_piece_checked")
-    private Boolean user1PieceChecked;
+  @Column(name = "user_1_piece_checked")
+  private Boolean user1PieceChecked = false;
 
-    @Column(name = "user_1_accept")
-    private Boolean user1Accepted;
+  @Column(name = "user_1_accept")
+  private Boolean user1Accepted = false;
 
-    @ManyToOne
-    @JoinColumn(name = "user_2")
-    private User user2;
+  @ManyToOne
+  @JoinColumn(name = "user_2")
+  private User user2;
 
-    @Column(name = "user_2_piece_checked")
-    private Boolean user2PieceChecked;
+  @Column(name = "user_2_piece_checked")
+  private Boolean user2PieceChecked = false;
 
-    @Column(name = "user_2_accept")
-    private Boolean user2Accepted;
+  @Column(name = "user_2_accept")
+  private Boolean user2Accepted = false;
+
+  public MatchInfo(LocalDate date, User user1, User user2) {
+    this.date = date;
+    this.user1 = user1;
+    this.user2 = user2;
+  }
+
+  public static MatchInfo createMatchInfo(User user1, User user2) {
+    return new MatchInfo(LocalDate.now(), user1, user2);
+  }
+
+  public void checkPiece(Long userId) {
+    if (user1.getId().equals(userId)) {
+      user1PieceChecked = true;
+    } else {
+      user2PieceChecked = true;
+    }
+  }
+
+  public void acceptPiece(Long userId) {
+    if (user1.getId().equals(userId)) {
+      user1Accepted = true;
+    } else {
+      user2Accepted = true;
+    }
+  }
 }