From 9069e7684c6c7015b4618070d0d2a24abac662f5 Mon Sep 17 00:00:00 2001 From: lilyyang0077 Date: Sun, 24 May 2026 16:12:09 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B3=B4=EC=A6=9D=EA=B8=88=20=EC=B5=9C?= =?UTF-8?q?=EB=8C=80=ED=95=9C=EB=8F=84=2010=EB=A7=8C=EC=9B=90=20=EC=97=94?= =?UTF-8?q?=ED=8B=B0=ED=8B=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/deposit/entity/Deposit.java | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/backend/src/main/java/com/example/Piroin/project/domain/deposit/entity/Deposit.java b/backend/src/main/java/com/example/Piroin/project/domain/deposit/entity/Deposit.java index a921f42..b3508b3 100644 --- a/backend/src/main/java/com/example/Piroin/project/domain/deposit/entity/Deposit.java +++ b/backend/src/main/java/com/example/Piroin/project/domain/deposit/entity/Deposit.java @@ -40,16 +40,21 @@ public class Deposit { @Column(name = "ascent_defence", nullable = false) private Integer ascentDefence; - // 출석 차감액만 새로 계산할 때 사용 - public void updateAttendanceAmount(Integer descentAttendance) { - this.descentAttendance = descentAttendance; + private static final int BASE_AMOUNT = 100_000; - int baseAmount = 100_000; - - this.amount = baseAmount + private int calculateAmount() { + int calculatedAmount = BASE_AMOUNT - this.descentAssignment - this.descentAttendance + this.ascentDefence; + + return Math.min(BASE_AMOUNT, calculatedAmount); + } + + // 출석 차감액만 새로 계산할 때 사용 + public void updateAttendanceAmount(Integer descentAttendance) { + this.descentAttendance = descentAttendance; + this.amount = calculateAmount(); } // 과제 차감 + 출석 차감을 한 번에 재계산할 때 사용 @@ -59,25 +64,13 @@ public void updateDepositAmount( ) { this.descentAssignment = descentAssignment; this.descentAttendance = descentAttendance; - - int baseAmount = 100_000; - - this.amount = baseAmount - - this.descentAssignment - - this.descentAttendance - + this.ascentDefence; + this.amount = calculateAmount(); } - // 보증금 계산 + // 보증금 방어권 수정 public void updateDefenceAmount(Integer ascentDefence) { this.ascentDefence = ascentDefence; - - int baseAmount = 100_000; - - this.amount = baseAmount - - this.descentAssignment - - this.descentAttendance - + this.ascentDefence; + this.amount = calculateAmount(); }