From aa6e9c24e443c78ce07641be15336c0d6ec23a4c Mon Sep 17 00:00:00 2001 From: dainnida Date: Thu, 30 Jan 2025 23:06:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[#49]=20Feat:=20Record=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=EC=97=90=20=ED=9A=8D=EB=93=9D=ED=95=9C=20=EA=B2=BD?= =?UTF-8?q?=ED=97=98=EC=B9=98=20=EC=A0=80=EC=9E=A5=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cmc/mercury/domain/record/entity/Record.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cmc/mercury/domain/record/entity/Record.java b/src/main/java/com/cmc/mercury/domain/record/entity/Record.java index f401b64..bd1abf0 100644 --- a/src/main/java/com/cmc/mercury/domain/record/entity/Record.java +++ b/src/main/java/com/cmc/mercury/domain/record/entity/Record.java @@ -33,15 +33,19 @@ public class Record extends BaseEntity { @OneToOne(mappedBy = "record", cascade = CascadeType.ALL, orphanRemoval = true) private RecordDetail recordDetail; + @Column(nullable = false) + private int acquiredExp; + // 연관관계 메서드 public void setRecordDetail(RecordDetail recordDetail) { this.recordDetail = recordDetail; recordDetail.setRecord(this); } @Builder - public Record(User user, Book book) { + public Record(User user, Book book, int acquiredExp) { this.user = user; this.book = book; + this.acquiredExp = acquiredExp; } // 메모 생성, 수정 시 Record와 RecordDetail의 updatedAt을 함께 업데이트 From 4da4d42b9664a0b74c0e10cb47c5625a14519b40 Mon Sep 17 00:00:00 2001 From: dainnida Date: Thu, 30 Jan 2025 23:08:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[#49]=20Feat:=20Memo=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=EC=97=90=20=ED=9A=8D=EB=93=9D=ED=95=9C=20=EA=B2=BD?= =?UTF-8?q?=ED=97=98=EC=B9=98=EC=99=80=20=EC=B2=AB=20=EB=A9=94=EB=AA=A8?= =?UTF-8?q?=EC=9D=B8=EC=A7=80=20=EC=A0=80=EC=9E=A5=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cmc/mercury/domain/memo/entity/Memo.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cmc/mercury/domain/memo/entity/Memo.java b/src/main/java/com/cmc/mercury/domain/memo/entity/Memo.java index 588bfb4..893a81e 100644 --- a/src/main/java/com/cmc/mercury/domain/memo/entity/Memo.java +++ b/src/main/java/com/cmc/mercury/domain/memo/entity/Memo.java @@ -28,11 +28,20 @@ public class Memo extends BaseEntity { @JoinColumn(name = "record_detail_id", nullable = false) private RecordDetail recordDetail; + @Column(nullable = false) + private int acquiredExp; + + // 기록 생성 시 추가되는 메모는 경험치 획득하지 않으므로 이를 구분하기 위한 필드 + @Column(nullable = false) + private boolean isFirstMemo; + @Builder - public Memo(String content, int gauge, RecordDetail recordDetail) { + public Memo(String content, int gauge, RecordDetail recordDetail, int acquiredExp, boolean isFirstMemo) { this.content = content; this.gauge = gauge; this.recordDetail = recordDetail; + this.acquiredExp = acquiredExp; + this.isFirstMemo = isFirstMemo; } // RecordDetail와의 연관관계 메서드