Skip to content

메인 머지 #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilyyang0077 merged 3 commits into from
Jun 27, 2026
Merged

메인 머지 #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b997298
feat: 5,000원 차감 상태 추가
Jun 27, 2026
22d06ec
feat: 프론트 상태 5,000원 차감 추가
Jun 27, 2026
24506a0
Merge pull request #264 from pirogramming/feat/263
lilyyang0077 Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...nd/src/main/java/com/example/Piroin/project/domain/assignment/enums/AssignmentStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ public enum AssignmentStatus {

SUCCESS, // 정상 제출 (0원)

INSUFFICIENT_5000,

INSUFFICIENT_MINOR, // 경미한 불충분 (-10000)

INSUFFICIENT_15000,
Expand Down
2 changes: 2 additions & 0 deletions backend/src/main/java/com/example/Piroin/project/domain/user/service/AdminUserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ private int calculateAssignmentPenalty(AssignmentStatus status) {

case SUCCESS, PENDING -> 0;

case INSUFFICIENT_5000 -> 5_000;

case INSUFFICIENT_MINOR -> 10_000;

case INSUFFICIENT_15000 -> 15_000;
Expand Down
17 changes: 17 additions & 0 deletions backend/src/main/resources/db/migration/V13__update_assignment_status_check_5000.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ALTER TABLE assignment_item
DROP CONSTRAINT chk_assignment_item_submitted;

ALTER TABLE assignment_item
ADD CONSTRAINT chk_assignment_item_submitted
CHECK (
submitted IN (
'SUCCESS',
'INSUFFICIENT_5000',
'INSUFFICIENT_MINOR',
'INSUFFICIENT_15000',
'INSUFFICIENT_MAJOR',
'INSUFFICIENT_25000',
'FAILURE',
'PENDING'
)
);
2 changes: 2 additions & 0 deletions frontend/src/pages/pirocheck/students/StudentDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const dayLabel = { TUESDAY: 'TUE', THURSDAY: 'THU', SATURDAY: 'SAT' };
const statusOptions = [
'PENDING',
'SUCCESS',
'INSUFFICIENT_5000',
'INSUFFICIENT_MINOR',
'INSUFFICIENT_15000',
'INSUFFICIENT_MAJOR',
Expand All @@ -22,6 +23,7 @@ const statusOptions = [
const statusLabel = {
PENDING: '채점 중',
SUCCESS: '성공',
INSUFFICIENT_5000: '미달 (-0.5)',
INSUFFICIENT_MINOR: '미달 (-1)',
INSUFFICIENT_15000: '미달 (-1.5)',
INSUFFICIENT_MAJOR: '미달 (-2)',
Expand Down
Loading