Skip to content

Commit 7d2e9f3

Browse files
committed
[PC-380] feat: 머지 충돌 수정
1 parent 0f3b262 commit 7d2e9f3

File tree

1 file changed

+45
-19
lines changed

1 file changed

+45
-19
lines changed

common/domain/src/main/java/org/yapp/domain/match/MatchInfo.java

+45-19
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,56 @@
1515
@Getter
1616
public class MatchInfo {
1717

18-
@Id
19-
@GeneratedValue(strategy = GenerationType.IDENTITY)
20-
private Long id;
18+
@Id
19+
@GeneratedValue(strategy = GenerationType.IDENTITY)
20+
private Long id;
2121

22-
@Column(name = "date")
23-
private LocalDate date;
22+
@Column(name = "date")
23+
private LocalDate date;
2424

25-
@ManyToOne
26-
@JoinColumn(name = "user_1")
27-
private User user1;
25+
@ManyToOne
26+
@JoinColumn(name = "user_1")
27+
private User user1;
2828

29-
@Column(name = "user_1_piece_checked")
30-
private Boolean user1PieceChecked;
29+
@Column(name = "user_1_piece_checked")
30+
private Boolean user1PieceChecked = false;
3131

32-
@Column(name = "user_1_accept")
33-
private Boolean user1Accepted;
32+
@Column(name = "user_1_accept")
33+
private Boolean user1Accepted = false;
3434

35-
@ManyToOne
36-
@JoinColumn(name = "user_2")
37-
private User user2;
35+
@ManyToOne
36+
@JoinColumn(name = "user_2")
37+
private User user2;
3838

39-
@Column(name = "user_2_piece_checked")
40-
private Boolean user2PieceChecked;
39+
@Column(name = "user_2_piece_checked")
40+
private Boolean user2PieceChecked = false;
4141

42-
@Column(name = "user_2_accept")
43-
private Boolean user2Accepted;
42+
@Column(name = "user_2_accept")
43+
private Boolean user2Accepted = false;
44+
45+
public MatchInfo(LocalDate date, User user1, User user2) {
46+
this.date = date;
47+
this.user1 = user1;
48+
this.user2 = user2;
49+
}
50+
51+
public static MatchInfo createMatchInfo(User user1, User user2) {
52+
return new MatchInfo(LocalDate.now(), user1, user2);
53+
}
54+
55+
public void checkPiece(Long userId) {
56+
if (user1.getId().equals(userId)) {
57+
user1PieceChecked = true;
58+
} else {
59+
user2PieceChecked = true;
60+
}
61+
}
62+
63+
public void acceptPiece(Long userId) {
64+
if (user1.getId().equals(userId)) {
65+
user1Accepted = true;
66+
} else {
67+
user2Accepted = true;
68+
}
69+
}
4470
}

0 commit comments

Comments
 (0)