Skip to content

Commit 66fc8dc

Browse files
ImggagguImggaggu
authored
Merge pull request #282 from pirogramming/deploy
운영진 출석 관리 수정
2 parents ec7261d + aca843e commit 66fc8dc

11 files changed

Lines changed: 195 additions & 67 deletions

File tree

‎backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
import backend.pirocheck.Assignment.entity.AssignmentStatus;
1414
import backend.pirocheck.Assignment.repository.AssignmentItemRepository;
1515
import backend.pirocheck.Assignment.repository.AssignmentRepository;
16+
import backend.pirocheck.Deposit.entity.Deposit;
17+
import backend.pirocheck.Deposit.repository.DepositRepository;
18+
import backend.pirocheck.Deposit.service.DepositService;
1619
import backend.pirocheck.User.entity.Role;
1720
import backend.pirocheck.User.entity.User;
1821
import backend.pirocheck.User.repository.UserRepository;
@@ -33,6 +36,7 @@ public class AssignmentService {
3336
private final AssignmentItemRepository assignmentItemRepository;
3437
private final AssignmentRepository assignmentRepository;
3538
private final UserRepository userRepository;
39+
private final DepositService depositService;
3640

3741
public List<AssignmentWeekRes> search(Long userId) {
3842

@@ -95,14 +99,18 @@ public String createAssignment(AssignmentCreateReq assignmentCreateReq) {
9599

96100
for (User user : users) {
97101

98-
AssignmentItem item = AssignmentItem.create(user, assignment, AssignmentStatus.INSUFFICIENT);
102+
AssignmentItem item = AssignmentItem.create(user, assignment, AssignmentStatus.SUCCESS);
99103

100104
assignment.addAssignmentItem(item);
101105
user.addAssignmentItem(item);
102106

103107
// assignmentItemRepository.save(item);
104108
// Cascade 설정이 되어있으므로 assignment = assignmentRepository.save(assignment); 이 코드를 실행할 때 연관된 AssignmentItem도 함께 저장 됨
105109
}
110+
// assignment 저장 후 모든 유저 보증금 재계산
111+
for (User user : users) {
112+
depositService.recalculateDeposit(user.getId());
113+
}
106114

107115
return assignment.getAssignmentName();
108116
}
@@ -132,6 +140,13 @@ public List<AssignmentRes> searchAssignment(AssignmentRes assignmentRes) {
132140
// 과제 삭제
133141
public String deleteAssignment(Long assignmentId) {
134142
assignmentRepository.deleteById(assignmentId);
143+
144+
// 모든 MEMBER 유저 보증금 재계산
145+
List<User> members = userRepository.findByRole(Role.MEMBER);
146+
for (User user : members) {
147+
depositService.recalculateDeposit(user.getId());
148+
}
149+
135150
return "과제가 성공적으로 삭제되었습니다.";
136151
}
137152

@@ -163,6 +178,9 @@ public AssignmentStatus createAssignmentItem(Long userId, Long assignmentId, Ass
163178

164179
assignmentItemRepository.save(assignmentItem);
165180

181+
// 보증금 즉시 재계산
182+
depositService.recalculateDeposit(userId);
183+
166184
return assignmentItem.getSubmitted();
167185
}
168186

@@ -177,10 +195,12 @@ public AssignmentStatus updateAssignmentItem(Long userId, Long assignmentId, Ass
177195
AssignmentItem assignmentItem = assignmentItemRepository.findByUserAndAssignment(user, assignment)
178196
.orElseThrow(() -> new IllegalArgumentException("해당 유저의 과제 채점 결과가 없습니다."));
179197

180-
assignmentItem.update(req.getStatus()); // 상태 업데이트
181198

199+
assignmentItem.update(req.getStatus()); // 상태 업데이트
182200
assignmentItemRepository.save(assignmentItem); // 상태 저장
183201

202+
// 보증금 즉시 재계산
203+
depositService.recalculateDeposit(userId);
184204
return assignmentItem.getSubmitted();
185205
}
186206
}

‎backend/pirocheck/src/main/java/backend/pirocheck/Attendance/repository/AttendanceRepository.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ public interface AttendanceRepository extends JpaRepository<Attendance, Long> {
2020

2121
// 특정 날짜와 차수에 대한 모든 출석 기록 조회
2222
List<Attendance> findByDateAndOrder(LocalDate date, int order);
23+
24+
// 보증금
25+
List<Attendance> findByDateAndOrderAndStatusFalse(LocalDate date, int order);
2326
}

‎backend/pirocheck/src/main/java/backend/pirocheck/Attendance/service/AttendanceService.java‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package backend.pirocheck.Attendance.service;
22

3+
import backend.pirocheck.Deposit.entity.Deposit;
4+
import backend.pirocheck.Deposit.repository.DepositRepository;
5+
import backend.pirocheck.Deposit.service.DepositService;
36
import backend.pirocheck.User.entity.Role;
47
import backend.pirocheck.User.entity.User;
58
import backend.pirocheck.User.repository.UserRepository;
@@ -30,6 +33,7 @@ public class AttendanceService {
3033
private final AttendanceRepository attendanceRepository;
3134
private final AttendanceCodeRepository attendanceCodeRepository;
3235
private final UserRepository userRepository;
36+
private final DepositService depositService;
3337

3438
// 출석코드 생성 함수
3539
@Transactional
@@ -121,6 +125,13 @@ public String expireAttendanceCode(String code) {
121125
attendanceCode.setExpired(true);
122126
attendanceCodeRepository.save(attendanceCode);
123127

128+
// 보증금
129+
List<Attendance> absents = attendanceRepository.findByDateAndOrderAndStatusFalse(
130+
attendanceCode.getDate(), attendanceCode.getOrder());
131+
132+
for (Attendance attendance : absents) {
133+
depositService.recalculateDeposit(attendance.getUser().getId());
134+
}
124135
return "출석 코드가 성공적으로 만료되었습니다";
125136
}
126137

@@ -171,6 +182,9 @@ public AttendanceMarkResponse markAttendance(Long userId, String inputCode) {
171182
attendance.setStatus(true);
172183
attendanceRepository.save(attendance);
173184

185+
//보증금 재계산
186+
depositService.recalculateDeposit(userId);
187+
174188
return AttendanceMarkResponse.success();
175189
}
176190

@@ -223,6 +237,10 @@ public boolean updateAttendanceStatus(Long attendanceId, boolean status) {
223237
Attendance attendance = attendanceOpt.get();
224238
attendance.setStatus(status);
225239
attendanceRepository.save(attendance);
240+
241+
// 출석 변경 → 보증금 재계산
242+
depositService.recalculateDeposit(attendance.getUser().getId());
243+
226244
return true;
227245
}
228246

@@ -279,8 +297,14 @@ public boolean deleteAttendance(Long attendanceId) {
279297
if (attendanceOpt.isEmpty()) {
280298
return false;
281299
}
282-
283-
attendanceRepository.delete(attendanceOpt.get());
300+
301+
Attendance attendance = attendanceOpt.get(); // 변수로 저장
302+
Long userId = attendance.getUser().getId();
303+
304+
attendanceRepository.delete(attendance);
305+
306+
// 출석 삭제 후 보증금 재계산
307+
depositService.recalculateDeposit(userId);
284308
return true;
285309
}
286310

‎backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,40 @@ public DepositResDto getDeposit(Long userId) {
2828
.orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다."));
2929

3030
Deposit deposit = depositRepository.findByUser(user);
31+
calculateAndSave(user, deposit);
3132

32-
// 출석 실패
33+
return DepositResDto.builder()
34+
.amount(deposit.getAmount())
35+
.descentAssignment(deposit.getDescentAssignment())
36+
.descentAttendance(deposit.getDescentAttendance())
37+
.ascentDefence(deposit.getAscentDefence())
38+
.build();
39+
}
40+
41+
// 보증금 재계산 (내부 로직만 수행)
42+
@Transactional
43+
public void recalculateDeposit(Long userId) {
44+
User user = userRepository.findById(userId)
45+
.orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다."));
46+
47+
Deposit deposit = depositRepository.findByUser(user);
48+
calculateAndSave(user, deposit);
49+
}
50+
51+
// 공통 계산 로직
52+
private void calculateAndSave(User user, Deposit deposit) {
53+
//출석
3354
int failAttendanceCount = attendanceRepository.countByUserAndStatusFalse(user);
3455
int descentAttendance = failAttendanceCount * 10_000;
3556

36-
// 과제 실패
57+
//과제
3758
int failAssignmentCount = assignmentItemRepository.countByUserAndSubmitted(user, AssignmentStatus.FAILURE);
3859
int weakAssignmentCount = assignmentItemRepository.countByUserAndSubmitted(user, AssignmentStatus.INSUFFICIENT);
3960
int descentAssignment = failAssignmentCount * 20_000 + weakAssignmentCount * 10_000;
4061

41-
// 방어권
4262
int ascentDefence = deposit.getAscentDefence();
4363

44-
// 보증금 업데이트
4564
deposit.updateAmounts(descentAssignment, descentAttendance, ascentDefence);
4665
depositRepository.save(deposit);
47-
48-
return DepositResDto.builder()
49-
.amount(deposit.getAmount())
50-
.descentAssignment(deposit.getDescentAssignment())
51-
.descentAttendance(deposit.getDescentAttendance())
52-
.ascentDefence(deposit.getAscentDefence())
53-
.build();
54-
5566
}
5667
}

‎frontend/src/components/AdminDailyAttendanceCard.jsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import "./componentsCss/AdminDailyAttendanceCard.css";
33
import api from "../api/api";
44
import { getStudentAttendance,updateAttendanceStatus } from "../api/adminattendance";
55

6-
const AdminDailyAttendanceCard = ({ date, order,studentId, onClose, onRefresh }) => {
6+
const AdminDailyAttendanceCard = ({ date, studentId, onClose, onRefresh }) => {
77
const [slots, setSlots] = useState([]);
88
const [modified, setModified] = useState([]);
99

@@ -34,22 +34,22 @@ const AdminDailyAttendanceCard = ({ date, order,studentId, onClose, onRefresh }
3434
*/
3535
const rawSlots = rawData
3636
.filter((d) => d.date === date) // 해당 날짜의 출석만 필터
37-
.sort((a, b) => a.order - b.order) // order 순으로 정렬
37+
//.sort((a, b) => a.order - b.order) // order 순으로 정렬
3838
.map((d) => ({
39-
date: d.date,
39+
//date: d.date,
4040
id: d.attendanceId, // 출석 ID
41-
order: d.order, // 회차 표시용
41+
//order: d.order, // 회차 표시용
4242
status: d.status ? "SUCCESS" : "FAILURE", // 드롭다운에 맞게 변환
4343
}));
4444

4545
const filledSlots =
4646
rawSlots.length > 0
4747
? rawSlots
4848
: [1, 2, 3].map((order) => ({
49-
date,
49+
//date,
5050
id: null, // 새 출석이므로 아직 id 없음
51-
order,
52-
status: "EMPTY",//기본값
51+
//order,
52+
status: "FAILURE",//기본값
5353
}));
5454

5555
setSlots(filledSlots);
@@ -63,9 +63,9 @@ const AdminDailyAttendanceCard = ({ date, order,studentId, onClose, onRefresh }
6363
}
6464
};
6565

66-
fetchSlots();
66+
if (date) fetchSlots();
6767
}, [date, studentId]);
68-
68+
6969
const handleChange = (idx, newValue) => {
7070
const newSlots = [...slots];
7171
newSlots[idx].status = newValue;
@@ -91,8 +91,8 @@ const AdminDailyAttendanceCard = ({ date, order,studentId, onClose, onRefresh }
9191

9292
console.log("📝 저장 요청", {
9393
id: slot.id,
94-
order: slot.order,
95-
date: slot.date,
94+
//order: slot.order,
95+
//date: slot.date,
9696
status: slot.status,
9797
});
9898

@@ -126,7 +126,7 @@ const AdminDailyAttendanceCard = ({ date, order,studentId, onClose, onRefresh }
126126
</div>
127127
<div className="card-body">
128128
{slots.map((slot, idx) => (
129-
<div key={`${slot.date}-${slot.order}`} className="slot-row">
129+
<div key={slot.id || `${date}-${idx}`} className="slot-row">
130130
<span>{idx + 1}차 출석</span>
131131
<select value={slot.status} onChange={(e) => handleChange(idx, e.target.value)}>
132132
<option value="SUCCESS">성공</option>

‎frontend/src/components/AdminWeeklyAttendanceList.jsx‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,19 @@ const statusImageMap = {
1111
const AdminWeeklyAttendanceList = ({ attendanceData, onSelectDate }) => {
1212
return (
1313
<div className="weekly-container">
14-
{attendanceData.map(({ week, classes }) => (
14+
{attendanceData.map(({ week, days}) => (
1515
<div key={week} className="eachWeekInfo" /*onClick={() => onSelectWeek(week)}*/>
1616
<p className="weekInfo">{week}주차</p>
1717
<div className="coin_img_container">
18-
{classes.map((cls, idx) => (
19-
<img key={idx}
20-
src={statusImageMap[cls.status]}
21-
style={{ cursor: "pointer" }}
22-
/*
23-
onClick={() => {
24-
console.log("🧪 클릭됨!", cls.date);
25-
cls.date && onSelectDate(cls.date);
26-
}}
27-
*/
28-
onClick={() => {
29-
console.log("🧪 클릭됨!", cls.date, cls.order);
30-
if (cls.date) onSelectDate({ date: cls.date, order: cls.order });
31-
}}
18+
{days.map((day, idx) => (
19+
<img
20+
key={idx}
21+
src={statusImageMap[day.status]}
22+
style={{ cursor: "pointer" }}
23+
onClick={() => {
24+
console.log("🧪 클릭됨!", day.date);
25+
if (day.date) onSelectDate(day.date );
26+
}}
3227
/>
3328
))}
3429
</div>

‎frontend/src/components/AttendanceWeekInfo.jsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ const AttendanceWeekInfo = ({ week, classes }) => {
66
<div className="eachWeekInfo">
77
<p className="weekInfo">{week}주차</p>
88
<div className="coin_img_container">
9-
{classes.map((cls, idx) => (
10-
<img key={idx} src={cls.image} alt={`${idx + 1}번째 수업`} />
11-
))}
9+
{classes.map((cls, idx) => {
10+
console.log(`week ${week}, idx ${idx}, image:`, cls.image);
11+
return <img key={idx} src={cls.image} alt={`${idx + 1}번째 수업`} />;
12+
})}
1213
</div>
1314
</div>
1415
);

‎frontend/src/pages/admin/AdminStudentAssignment.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const AdminStudentAssignment = () => {
6464
});
6565
}, [studentId, week]);
6666

67-
const handleStatusChange = (weekIdx, dayIdx, taskIdx, newStatus) => {
67+
const handleStatusChange = (weekNum, dayIdx, taskIdx, newStatus) => {
6868
const weekIdx = weeks.findIndex(w => Number(w.week) === Number(weekNum));
6969
if (weekIdx === -1) return;
7070

@@ -137,7 +137,7 @@ const AdminStudentAssignment = () => {
137137
value={task.status}
138138
onChange={(e) =>
139139
handleStatusChange(
140-
weekIdx,
140+
weekItem.week,
141141
dayIdx,
142142
taskIdx,
143143
e.target.value

0 commit comments

Comments
 (0)