From 3ddfa71f7c49394e5699cfa50a140db2d283e9ed Mon Sep 17 00:00:00 2001 From: yummygyudon Date: Sat, 30 Mar 2024 03:26:56 +0900 Subject: [PATCH] =?UTF-8?q?HOT=20FIX()=20:=2034=EA=B8=B0=20=EC=B6=9C?= =?UTF-8?q?=EC=84=9D=20=EC=A0=90=EC=88=98=20=EC=97=B0=EC=82=B0=20=EB=B0=A9?= =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation/attendance/domain/Attendance.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/operation-domain/src/main/java/org/sopt/makers/operation/attendance/domain/Attendance.java b/operation-domain/src/main/java/org/sopt/makers/operation/attendance/domain/Attendance.java index 8398cca1..ce8fab55 100644 --- a/operation-domain/src/main/java/org/sopt/makers/operation/attendance/domain/Attendance.java +++ b/operation-domain/src/main/java/org/sopt/makers/operation/attendance/domain/Attendance.java @@ -79,9 +79,15 @@ public AttendanceStatus getStatus() { val second = getSubAttendanceByRound(2); return switch (this.lecture.getAttribute()) { - case SEMINAR -> second.getStatus().equals(ATTENDANCE) - ? first.getStatus().equals(ATTENDANCE) ? ATTENDANCE : TARDY - : ABSENT; + case SEMINAR -> { + if (first.getStatus().equals(ATTENDANCE) && second.getStatus().equals(ATTENDANCE)) { + yield ATTENDANCE; + } + yield first.getStatus().equals(ABSENT) && second.getStatus().equals(ABSENT) ? ABSENT : TARDY; + } +// case SEMINAR -> second.getStatus().equals(ATTENDANCE) +// ? first.getStatus().equals(ATTENDANCE) ? ATTENDANCE : TARDY +// : ABSENT; case EVENT -> second.getStatus().equals(ATTENDANCE) ? ATTENDANCE : ABSENT; case ETC -> second.getStatus().equals(ATTENDANCE) ? PARTICIPATE : NOT_PARTICIPATE; };