From 194b0b0a4ad48e051ab3d5fa85f1b6983791a245 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Sun, 18 May 2025 22:10:37 +0900
Subject: [PATCH 01/20] =?UTF-8?q?[feat]=20admin=20=EA=B3=BC=EC=A0=9C=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20api=20=EB=A1=9C=EC=A7=81=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=EB=B0=8F=20=EA=B3=BC=EC=A0=9C=20=EA=B4=80=EB=A0=A8?=
 =?UTF-8?q?=20API=EB=AA=85=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AssignmentController.java      | 55 ++++++++++++
 .../dto/request/AssignmentReq.java            |  5 +-
 .../dto/response/AssignmentDayRes.java        |  2 +-
 .../dto/response/AssignmentDetailRes.java     |  4 +-
 .../dto/response/AssignmentRes.java           |  6 +-
 .../dto/response/AssignmentWeekRes.java       |  4 +-
 .../Assignment/entity/Assignment.java         | 52 ++++++++++++
 .../Assignment/entity/AssignmentItem.java     | 32 +++++++
 .../entity/AssignmentStatus.java              |  2 +-
 .../repository/AssignmentItemRepository.java} | 10 +--
 .../repository/AssignmentRepository.java      |  9 ++
 .../Assignment/service/AssignmentService.java | 79 ++++++++++++++++++
 .../Deposit/service/DepositService.java       | 10 +--
 .../backend/pirocheck/User/entity/User.java   | 18 ++++
 .../controller/AssignmentController.java      | 36 --------
 .../assignment/entity/Assignment.java         | 49 -----------
 .../assignment/service/AssignmentService.java | 83 -------------------
 .../backend/pirocheck/config/WebConfig.java   |  4 +-
 18 files changed, 268 insertions(+), 192 deletions(-)
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
 rename backend/pirocheck/src/main/java/backend/pirocheck/{assignment => Assignment}/dto/request/AssignmentReq.java (60%)
 rename backend/pirocheck/src/main/java/backend/pirocheck/{assignment => Assignment}/dto/response/AssignmentDayRes.java (81%)
 rename backend/pirocheck/src/main/java/backend/pirocheck/{assignment => Assignment}/dto/response/AssignmentDetailRes.java (63%)
 rename backend/pirocheck/src/main/java/backend/pirocheck/{assignment => Assignment}/dto/response/AssignmentRes.java (66%)
 rename backend/pirocheck/src/main/java/backend/pirocheck/{assignment => Assignment}/dto/response/AssignmentWeekRes.java (62%)
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
 rename backend/pirocheck/src/main/java/backend/pirocheck/{assignment => Assignment}/entity/AssignmentStatus.java (60%)
 rename backend/pirocheck/src/main/java/backend/pirocheck/{assignment/repository/AssignmentRepository.java => Assignment/repository/AssignmentItemRepository.java} (50%)
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
 delete mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java
 delete mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/Assignment.java
 delete mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/assignment/service/AssignmentService.java

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
new file mode 100644
index 0000000..c6663e4
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
@@ -0,0 +1,55 @@
+package backend.pirocheck.Assignment.controller;
+
+import backend.pirocheck.Assignment.dto.request.AssignmentReq;
+import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
+import backend.pirocheck.Assignment.service.AssignmentService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class AssignmentController {
+
+    private final AssignmentService assignmentService;
+
+    // 과제 결과 확인 API
+    // 과제 주차별, 요일별 그룹화 JSON
+    @GetMapping("/assignment/{userId}")
+    public List<AssignmentWeekRes> getGroupedAssignments(@PathVariable Long userId) {
+        return assignmentService.search(userId);
+    }
+
+    // 과제 생성 API
+    @PostMapping("/admin/assignment/signup")
+    public String signupAssignment(@RequestBody AssignmentReq assignmentReq) {
+        return assignmentService.create(assignmentReq);
+    }
+
+    // 과제 삭제 API
+    @DeleteMapping("/admin/assignment/delete")
+    public String deleteAssignment(@RequestBody AssignmentReq assignmentReq) {
+        return null;
+    }
+
+    // 과제 수정 API
+    @PatchMapping("/admin/assignment/update")
+    public String updateAssignment(@RequestBody AssignmentReq assignmentReq) {
+        return null;
+    }
+
+    // 사용자별 과제 제출 여부 생성 API
+    @PostMapping("/admin/users/{userId}/assignments/{assignmentId}/submission")
+    public String submissionAssignment(@PathVariable Long userId, @PathVariable Long assignmentId) {
+        return null;
+    }
+
+    // 사용자별 과제 제출 여부 수정 API
+    @PatchMapping("/api/users/{userId}/assignments/{assignmentId}/submission")
+    public String updateSubmission(@PathVariable Long userId, @PathVariable Long assignmentId) {
+        return null;
+    }
+
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/request/AssignmentReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentReq.java
similarity index 60%
rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/request/AssignmentReq.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentReq.java
index 3d1cfd6..52e05a2 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/request/AssignmentReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentReq.java
@@ -1,6 +1,5 @@
-package backend.pirocheck.assignment.dto.request;
+package backend.pirocheck.Assignment.dto.request;
 
-import backend.pirocheck.assignment.entity.AssignmentStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -10,7 +9,7 @@ public class AssignmentReq {
 
     private String assignmentName;
     private Long week;
-    private Long section;
+    private String day;
     private Long orderNumber;
 
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDayRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDayRes.java
similarity index 81%
rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDayRes.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDayRes.java
index be325e6..2f46e6a 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDayRes.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDayRes.java
@@ -1,4 +1,4 @@
-package backend.pirocheck.assignment.dto.response;
+package backend.pirocheck.Assignment.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDetailRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDetailRes.java
similarity index 63%
rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDetailRes.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDetailRes.java
index 5a40dad..9c0f7f3 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentDetailRes.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentDetailRes.java
@@ -1,6 +1,6 @@
-package backend.pirocheck.assignment.dto.response;
+package backend.pirocheck.Assignment.dto.response;
 
-import backend.pirocheck.assignment.entity.AssignmentStatus;
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java
similarity index 66%
rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentRes.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java
index c924848..ef2ad37 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentRes.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentRes.java
@@ -1,6 +1,6 @@
-package backend.pirocheck.assignment.dto.response;
+package backend.pirocheck.Assignment.dto.response;
 
-import backend.pirocheck.assignment.entity.AssignmentStatus;
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -11,7 +11,7 @@ public class AssignmentRes {
 //    private Long userId;
     private String assignmentName;
     private Long week;
-    private Long section;
+    private String day;
     private Long orderNumber;
     private AssignmentStatus submitted;
 
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentWeekRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java
similarity index 62%
rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentWeekRes.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java
index 4be2d26..687505c 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/dto/response/AssignmentWeekRes.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java
@@ -1,4 +1,4 @@
-package backend.pirocheck.assignment.dto.response;
+package backend.pirocheck.Assignment.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -9,6 +9,6 @@
 @AllArgsConstructor
 public class AssignmentWeekRes {
     private Long week;
-    private String title; // 각 주차 주제 (e.g, Git / HTML / CSS)
+//    private String title; // 각 주차 주제 (e.g, Git / HTML / CSS)
     private List<AssignmentDayRes> days;
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
new file mode 100644
index 0000000..f9f8c8e
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
@@ -0,0 +1,52 @@
+package backend.pirocheck.Assignment.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Getter
+@Builder(access = AccessLevel.PRIVATE)
+@NoArgsConstructor
+@AllArgsConstructor
+public class Assignment {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // 과제명
+    private String assignmentName;
+
+    // 주차
+    private Long week;
+
+    // 요일
+    private String day;
+
+    // 과제 번호
+    private Long orderNumber;
+
+    // AssignmentItem 입장에서 "assignment" 필드의 외래 키를 가진 주인
+    // assignment를 참조하는 assignmentitem 컬랙션을 가짐
+    @OneToMany(mappedBy = "assignment", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<AssignmentItem> assignments = new ArrayList<>();
+
+    // 연관관계 편의 메서드 (양방향 시 자주 사용)
+    public void addAssignmentItem(AssignmentItem assignmentItem) {
+        this.assignments.add(assignmentItem);
+        assignmentItem.setAssignment(this);
+    }
+
+    // 관리자가 생성
+    public static Assignment create(String assignmentName, Long week, String day, Long orderNumber) {
+        return Assignment.builder()
+                .assignmentName(assignmentName)
+                .week(week)
+                .day(day)
+                .orderNumber(orderNumber)
+                .build();
+    }
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
new file mode 100644
index 0000000..bb88fae
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
@@ -0,0 +1,32 @@
+package backend.pirocheck.Assignment.entity;
+
+import backend.pirocheck.User.entity.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class AssignmentItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id; // 유저별 과제 정보를 저장하는 ID
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "assignment_id")
+    private Assignment assignment;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    // 과제 결과
+    @Enumerated(EnumType.STRING)
+    @Column(length = 100)
+    private AssignmentStatus submitted; // 수강생의 과제 제출여부
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/AssignmentStatus.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentStatus.java
similarity index 60%
rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/AssignmentStatus.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentStatus.java
index dcc9466..290cfea 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/AssignmentStatus.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentStatus.java
@@ -1,4 +1,4 @@
-package backend.pirocheck.assignment.entity;
+package backend.pirocheck.Assignment.entity;
 
 public enum AssignmentStatus {
     SUCCESS, INSUFFICIENT, FAILURE;
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/repository/AssignmentRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
similarity index 50%
rename from backend/pirocheck/src/main/java/backend/pirocheck/assignment/repository/AssignmentRepository.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
index c0048f9..9d01975 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/repository/AssignmentRepository.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
@@ -1,18 +1,18 @@
-package backend.pirocheck.assignment.repository;
+package backend.pirocheck.Assignment.repository;
 
 import backend.pirocheck.User.entity.User;
-import backend.pirocheck.assignment.entity.Assignment;
-import backend.pirocheck.assignment.entity.AssignmentStatus;
+import backend.pirocheck.Assignment.entity.AssignmentItem;
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface AssignmentRepository extends JpaRepository<Assignment, Integer> {
+public interface AssignmentItemRepository extends JpaRepository<AssignmentItem, Integer> {
 
     // 유저별 과제 목록 조회
-    List<Assignment> findByUserId(Long userId);
+    List<AssignmentItem> findByUserId(Long userId);
 
     // 보증금
     int countByUserAndSubmitted(User user, AssignmentStatus status);
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java
new file mode 100644
index 0000000..30fa1a1
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java
@@ -0,0 +1,9 @@
+package backend.pirocheck.Assignment.repository;
+
+import backend.pirocheck.Assignment.entity.Assignment;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AssignmentRepository extends JpaRepository<Assignment, Integer> {
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
new file mode 100644
index 0000000..606588b
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -0,0 +1,79 @@
+package backend.pirocheck.Assignment.service;
+
+import backend.pirocheck.Assignment.dto.request.AssignmentReq;
+import backend.pirocheck.Assignment.dto.response.AssignmentDayRes;
+import backend.pirocheck.Assignment.dto.response.AssignmentDetailRes;
+import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
+import backend.pirocheck.Assignment.entity.Assignment;
+import backend.pirocheck.Assignment.entity.AssignmentItem;
+import backend.pirocheck.Assignment.repository.AssignmentItemRepository;
+import backend.pirocheck.Assignment.repository.AssignmentRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AssignmentService {
+
+    private final AssignmentItemRepository assignmentItemRepository;
+    private final AssignmentRepository assignmentRepository;
+
+    public List<AssignmentWeekRes> search(Long userId) {
+
+        List<AssignmentItem> assignments = assignmentItemRepository.findByUserId(userId);
+        // week 기준으로 그룹화
+        Map<Long, List<AssignmentItem>> weekGroup = assignments.stream()
+                .collect(Collectors.groupingBy(item -> item.getAssignment().getWeek())); // assignmentItems를 week 별로 그룹핑
+
+        List<AssignmentWeekRes> assignmentResponses = new ArrayList<>();
+
+        for (Map.Entry<Long, List<AssignmentItem>> entry : weekGroup.entrySet()) {
+            Long week = entry.getKey();
+            List<AssignmentItem> assignmentList = entry.getValue();
+
+            // day를 기준으로 그룹핑
+            Map<String, List<AssignmentItem>> dayGroup = assignmentList.stream()
+                    .collect(Collectors.groupingBy(item -> item.getAssignment().getDay()));
+
+            List<AssignmentDayRes> assignmentDayResList = new ArrayList<>();
+
+            for (Map.Entry<String, List<AssignmentItem>> dayEntry : dayGroup.entrySet()) {
+                String day = dayEntry.getKey();
+                List<AssignmentItem> dayAssignmentList = dayEntry.getValue();
+
+                // 세부 과제명과 과제 결과를 리스트 형태로
+                List<AssignmentDetailRes> assignmentDetailResList = dayAssignmentList.stream()
+                        .map(assignmentItem -> new AssignmentDetailRes(
+                                assignmentItem.getAssignment().getAssignmentName(),
+                                assignmentItem.getSubmitted()
+                        ))
+                        .toList();
+                assignmentDayResList.add(new AssignmentDayRes(day, assignmentDetailResList));
+            }
+
+            assignmentResponses.add(new AssignmentWeekRes(week, assignmentDayResList));
+        }
+
+        return assignmentResponses;
+    }
+
+    public String create(AssignmentReq assignmentReq) {
+
+        Assignment assignment = Assignment.create(
+                assignmentReq.getAssignmentName(),
+                assignmentReq.getWeek(),
+                assignmentReq.getDay(),
+                assignmentReq.getOrderNumber());
+
+        assignment = assignmentRepository.save(assignment);
+
+        return assignment.getAssignmentName();
+    }
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java
index ce3da5f..66eafb1 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Deposit/service/DepositService.java
@@ -6,8 +6,8 @@
 import backend.pirocheck.Deposit.repository.DepositRepository;
 import backend.pirocheck.User.entity.User;
 import backend.pirocheck.User.repository.UserRepository;
-import backend.pirocheck.assignment.entity.AssignmentStatus;
-import backend.pirocheck.assignment.repository.AssignmentRepository;
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
+import backend.pirocheck.Assignment.repository.AssignmentItemRepository;
 import backend.pirocheck.Attendance.repository.AttendanceRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
@@ -20,7 +20,7 @@ public class DepositService {
     private final DepositRepository depositRepository;
     private final UserRepository userRepository;
     private final AttendanceRepository attendanceRepository;
-    private final AssignmentRepository assignmentRepository;
+    private final AssignmentItemRepository assignmentItemRepository;
 
     @Transactional
     public DepositResDto getDeposit(Long userId) {
@@ -34,8 +34,8 @@ public DepositResDto getDeposit(Long userId) {
         int descentAttendance = failAttendanceCount * 10_000;
 
         // 과제 실패
-        int failAssignmentCount = assignmentRepository.countByUserAndSubmitted(user, AssignmentStatus.FAILURE);
-        int weakAssignmentCount = assignmentRepository.countByUserAndSubmitted(user, AssignmentStatus.INSUFFICIENT);
+        int failAssignmentCount = assignmentItemRepository.countByUserAndSubmitted(user, AssignmentStatus.FAILURE);
+        int weakAssignmentCount = assignmentItemRepository.countByUserAndSubmitted(user, AssignmentStatus.INSUFFICIENT);
         int descentAssignment = failAssignmentCount * 20_000 + weakAssignmentCount * 10_000;
 
         // 방어권
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java b/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java
index ad215b0..65b6717 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/User/entity/User.java
@@ -1,11 +1,15 @@
 package backend.pirocheck.User.entity;
 
+import backend.pirocheck.Assignment.entity.AssignmentItem;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Entity
 @Getter
 @Table(name="users")
@@ -30,6 +34,20 @@ public class User {
     @Enumerated(EnumType.STRING)
     private Role role;  // MEMBER or ADMIN
 
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<AssignmentItem> assignmentItems = new ArrayList<>();
+
     private Integer generation;
 
+    // AssignmentItem 입장에서 "user" 필드의 외래 키를 가진 주인
+    // assignment를 참조하는 assignmentitem 컬랙션을 가짐
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<AssignmentItem> assignments = new ArrayList<>();
+
+    // 연관관계 편의 메서드 (양방향 시 자주 사용)
+    public void addAssignmentItem(AssignmentItem assignmentItem) {
+        this.assignments.add(assignmentItem);
+        assignmentItem.setUser(this);
+    }
+
 }
\ No newline at end of file
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java
deleted file mode 100644
index 0c1379f..0000000
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package backend.pirocheck.assignment.controller;
-
-import backend.pirocheck.assignment.dto.request.AssignmentReq;
-import backend.pirocheck.assignment.dto.response.AssignmentRes;
-import backend.pirocheck.assignment.dto.response.AssignmentWeekRes;
-import backend.pirocheck.assignment.service.AssignmentService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/assignment")
-@RequiredArgsConstructor
-public class AssignmentController {
-
-    private final AssignmentService assignmentService;
-
-    // 과제 결과 확인 API
-//    @GetMapping("/{userId}")
-//    public List<AssignmentRes> getAssignment(@PathVariable("userId") Long userId) {
-//        // 주차별 과제 제목, 요일별 과제 제목, 과제 상태 반환
-//        return assignmentService.search(userId);
-//    }
-    // 과제 주차별, 요일별 그룹화 JSON
-    @GetMapping("/grouped/{userId}")
-    public List<AssignmentWeekRes> getGroupedAssignments(@PathVariable Long userId) {
-        return assignmentService.search(userId);
-    }
-
-    // 과제 생성 API
-    @PostMapping("/signup")
-    public String signupAssignment(@RequestBody AssignmentReq assignmentReq) {
-        return assignmentService.create(assignmentReq);
-    }
-}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/Assignment.java
deleted file mode 100644
index 62aa724..0000000
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/entity/Assignment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package backend.pirocheck.assignment.entity;
-
-import backend.pirocheck.User.entity.User;
-import jakarta.persistence.*;
-import lombok.*;
-
-@Entity
-@Getter
-@Builder(access = AccessLevel.PRIVATE)
-@NoArgsConstructor
-@AllArgsConstructor
-public class Assignment {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    // user 정보와 과제 정보를 연결해 저장
-     @ManyToOne(fetch = FetchType.LAZY)
-     @JoinColumn(name = "user_id")
-     private User user; // user를 생성했을 때의 해당 user 엔티티
-
-    // 과제명
-    private String assignmentName;
-
-    // 주차
-    private Long week;
-
-    // 요일
-    private Long section;
-
-    // 과제 번호
-    private Long orderNumber;
-
-    // 과제 결과
-    @Enumerated(EnumType.STRING)
-    @Column(length = 100)
-    private AssignmentStatus submitted;
-
-    // 관리자가 생성
-    public static Assignment create(String assignmentName, Long week, Long section, Long orderNumber) {
-        return Assignment.builder()
-                .assignmentName(assignmentName)
-                .week(week)
-                .section(section)
-                .orderNumber(orderNumber)
-                .build();
-    }
-}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/assignment/service/AssignmentService.java
deleted file mode 100644
index d98b74b..0000000
--- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/service/AssignmentService.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package backend.pirocheck.assignment.service;
-
-import backend.pirocheck.assignment.dto.request.AssignmentReq;
-import backend.pirocheck.assignment.dto.response.AssignmentDayRes;
-import backend.pirocheck.assignment.dto.response.AssignmentDetailRes;
-import backend.pirocheck.assignment.dto.response.AssignmentRes;
-import backend.pirocheck.assignment.dto.response.AssignmentWeekRes;
-import backend.pirocheck.assignment.entity.Assignment;
-import backend.pirocheck.assignment.repository.AssignmentRepository;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Service
-@Transactional
-@RequiredArgsConstructor
-public class AssignmentService {
-
-    private final AssignmentRepository assignmentRepository;
-
-    // 그룹화 되지 않은 JSON 형식
-//    public List<AssignmentRes> search(Long userId) {
-//        // 각 유저별 전체 과제 목록 조회 (userId를 어떻게 넘길 것인가?) search의 인자로 넘긴다...
-//        List<Assignment> assignments = assignmentRepository.findByUserId(userId);
-//
-//        return assignments.stream()
-//                .map(assignment -> new AssignmentRes(assignment.getAssignmentName(), assignment.getWeek(), assignment.getSection(), assignment.getOrderNumber(), assignment.getSubmitted()))
-//                .toList();
-//    }
-    public List<AssignmentWeekRes> search(Long userId) {
-
-        List<Assignment> assignments = assignmentRepository.findByUserId(userId);
-        // week 기준으로 그룹화
-        Map<Long, List<Assignment>> weekGroup = assignments.stream()
-                .collect(Collectors.groupingBy(Assignment::getWeek)); // assignments를 week 별로 그룹핑
-
-        List<AssignmentWeekRes> assignmentResponses = new ArrayList<>();
-
-        for (Map.Entry<Long, List<Assignment>> entry : weekGroup.entrySet()) {
-            Long week = entry.getKey();
-            List<Assignment> assignmentList = entry.getValue();
-
-            // day를 기준으로 그룹핑
-            Map<Long, List<Assignment>> dayGroup = assignments.stream()
-                    .collect(Collectors.groupingBy(Assignment::getSection));
-
-            List<AssignmentDayRes> assignmentDayResList = new ArrayList<>();
-
-            for (Map.Entry<Long, List<Assignment>> dayEntry : dayGroup.entrySet()) {
-                Long day = dayEntry.getKey();
-                List<Assignment> dayAssignmentList = dayEntry.getValue();
-
-                // 세부 과제명과 과제 결과를 리스트 형태로
-                List<AssignmentDetailRes> assignmentDetailResList = dayAssignmentList.stream()
-                        .map(assignment -> new AssignmentDetailRes(
-                                assignment.getAssignmentName(),
-                                assignment.getSubmitted()
-                        ))
-                        .toList();
-            }
-        }
-
-        return assignmentResponses;
-    }
-
-    public String create(AssignmentReq assignmentReq) {
-
-        Assignment assignment = Assignment.create(
-                assignmentReq.getAssignmentName(),
-                assignmentReq.getWeek(),
-                assignmentReq.getSection(),
-                assignmentReq.getOrderNumber());
-
-        assignment = assignmentRepository.save(assignment);
-
-        return assignment.getAssignmentName();
-    }
-}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java
index f729c5c..1dcff3e 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java
@@ -12,7 +12,7 @@ public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용
                 .allowedOrigins("http://www.pirocheck.org") // 프론트 배포 URL
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") // 허용할 HTTP 메서드
-                .allowCredentials(true) // 세션 쿠키 주고받기 허용
-                .allowedHeaders("*");
+                .allowedHeaders("*")
+                .allowCredentials(true); // 세션 쿠키 주고받기 허용
     }
 }

From fdaf4a28e18c229b4d8162fef76acee5e1287973 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Sun, 18 May 2025 23:34:42 +0900
Subject: [PATCH 02/20] =?UTF-8?q?[feat]=20=EA=B3=BC=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AssignmentController.java      | 26 ++++++++++-------
 ...nmentReq.java => AssignmentCreateReq.java} |  2 +-
 .../dto/request/AssignmentUpdateReq.java      | 14 ++++++++++
 .../Assignment/entity/Assignment.java         |  8 ++++++
 .../repository/AssignmentItemRepository.java  |  4 +--
 .../repository/AssignmentRepository.java      |  2 +-
 .../Assignment/service/AssignmentService.java | 28 +++++++++++++++----
 .../service/ManageStudentsService.java        | 15 +++++-----
 8 files changed, 71 insertions(+), 28 deletions(-)
 rename backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/{AssignmentReq.java => AssignmentCreateReq.java} (87%)
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
index c6663e4..879b048 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
@@ -1,6 +1,7 @@
 package backend.pirocheck.Assignment.controller;
 
-import backend.pirocheck.Assignment.dto.request.AssignmentReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq;
 import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
 import backend.pirocheck.Assignment.service.AssignmentService;
 import lombok.RequiredArgsConstructor;
@@ -24,20 +25,25 @@ public List<AssignmentWeekRes> getGroupedAssignments(@PathVariable Long userId)
 
     // 과제 생성 API
     @PostMapping("/admin/assignment/signup")
-    public String signupAssignment(@RequestBody AssignmentReq assignmentReq) {
-        return assignmentService.create(assignmentReq);
+    public String signupAssignment(@RequestBody AssignmentCreateReq assignmentCreateReq) {
+        return assignmentService.createAssignment(assignmentCreateReq);
     }
 
     // 과제 삭제 API
-    @DeleteMapping("/admin/assignment/delete")
-    public String deleteAssignment(@RequestBody AssignmentReq assignmentReq) {
-        return null;
+    @DeleteMapping("/admin/assignment/{assignmentId}")
+    public String deleteAssignment(
+            @PathVariable Long assignmentId
+    ) {
+        return assignmentService.deleteAssignment(assignmentId);
     }
 
     // 과제 수정 API
-    @PatchMapping("/admin/assignment/update")
-    public String updateAssignment(@RequestBody AssignmentReq assignmentReq) {
-        return null;
+    @PutMapping("/admin/assignment/{assignmentId}")
+    public String updateAssignment(
+            @PathVariable("assignmentId") Long assignmentId,
+            @RequestBody AssignmentUpdateReq assignmentUpdateReq
+    ) {
+        return assignmentService.updateAssignment(assignmentId, assignmentUpdateReq);
     }
 
     // 사용자별 과제 제출 여부 생성 API
@@ -47,7 +53,7 @@ public String submissionAssignment(@PathVariable Long userId, @PathVariable Long
     }
 
     // 사용자별 과제 제출 여부 수정 API
-    @PatchMapping("/api/users/{userId}/assignments/{assignmentId}/submission")
+    @PutMapping("/api/users/{userId}/assignments/{assignmentId}/submission")
     public String updateSubmission(@PathVariable Long userId, @PathVariable Long assignmentId) {
         return null;
     }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
similarity index 87%
rename from backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentReq.java
rename to backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
index 52e05a2..123e16e 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
@@ -5,7 +5,7 @@
 
 @Getter
 @AllArgsConstructor
-public class AssignmentReq {
+public class AssignmentCreateReq {
 
     private String assignmentName;
     private Long week;
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
new file mode 100644
index 0000000..5941f88
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
@@ -0,0 +1,14 @@
+package backend.pirocheck.Assignment.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class AssignmentUpdateReq {
+
+    private String assignmentName;
+    private Long week;
+    private String day;
+    private Long orderNumber;
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
index f9f8c8e..c51b0d3 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
@@ -49,4 +49,12 @@ public static Assignment create(String assignmentName, Long week, String day, Lo
                 .orderNumber(orderNumber)
                 .build();
     }
+
+    // 과제 내용 업데이트
+    public void update(String assignmentName, Long week, String day, Long orderNumber) {
+        this.assignmentName = assignmentName;
+        this.week = week;
+        this.day = day;
+        this.orderNumber = orderNumber;
+    }
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
index 9d01975..1a39eec 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
@@ -1,15 +1,15 @@
 package backend.pirocheck.Assignment.repository;
 
-import backend.pirocheck.User.entity.User;
 import backend.pirocheck.Assignment.entity.AssignmentItem;
 import backend.pirocheck.Assignment.entity.AssignmentStatus;
+import backend.pirocheck.User.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface AssignmentItemRepository extends JpaRepository<AssignmentItem, Integer> {
+public interface AssignmentItemRepository extends JpaRepository<AssignmentItem, Long> {
 
     // 유저별 과제 목록 조회
     List<AssignmentItem> findByUserId(Long userId);
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java
index 30fa1a1..408e69c 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentRepository.java
@@ -5,5 +5,5 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface AssignmentRepository extends JpaRepository<Assignment, Integer> {
+public interface AssignmentRepository extends JpaRepository<Assignment, Long> {
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
index 606588b..d49cb12 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -1,6 +1,7 @@
 package backend.pirocheck.Assignment.service;
 
-import backend.pirocheck.Assignment.dto.request.AssignmentReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq;
 import backend.pirocheck.Assignment.dto.response.AssignmentDayRes;
 import backend.pirocheck.Assignment.dto.response.AssignmentDetailRes;
 import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
@@ -64,16 +65,31 @@ public List<AssignmentWeekRes> search(Long userId) {
         return assignmentResponses;
     }
 
-    public String create(AssignmentReq assignmentReq) {
+    public String createAssignment(AssignmentCreateReq assignmentCreateReq) {
 
         Assignment assignment = Assignment.create(
-                assignmentReq.getAssignmentName(),
-                assignmentReq.getWeek(),
-                assignmentReq.getDay(),
-                assignmentReq.getOrderNumber());
+                assignmentCreateReq.getAssignmentName(),
+                assignmentCreateReq.getWeek(),
+                assignmentCreateReq.getDay(),
+                assignmentCreateReq.getOrderNumber());
 
         assignment = assignmentRepository.save(assignment);
 
         return assignment.getAssignmentName();
     }
+
+    public String deleteAssignment(Long assignmentId) {
+        assignmentRepository.deleteById(assignmentId);
+        return "Assignment deleted successfully";
+    }
+
+    public String updateAssignment(Long assignmentId, AssignmentUpdateReq req) {
+        Assignment assignment = assignmentRepository.findById(assignmentId)
+                .orElseThrow(() -> new IllegalArgumentException("조회된 과제가 없습니다."));
+
+        assignment.update(req.getAssignmentName(), req.getWeek(), req.getDay(), req.getOrderNumber());
+        assignmentRepository.save(assignment);
+
+        return assignment.getAssignmentName();
+    }
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java b/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java
index e28c409..ed60489 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java
@@ -1,5 +1,7 @@
 package backend.pirocheck.ManageStudents.service;
 
+import backend.pirocheck.Assignment.entity.AssignmentItem;
+import backend.pirocheck.Assignment.repository.AssignmentItemRepository;
 import backend.pirocheck.Deposit.entity.Deposit;
 import backend.pirocheck.Deposit.repository.DepositRepository;
 import backend.pirocheck.ManageStudents.dto.response.ManageStudentDetailResDto;
@@ -7,8 +9,6 @@
 import backend.pirocheck.User.entity.Role;
 import backend.pirocheck.User.entity.User;
 import backend.pirocheck.User.repository.UserRepository;
-import backend.pirocheck.assignment.entity.Assignment;
-import backend.pirocheck.assignment.repository.AssignmentRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -21,17 +21,16 @@ public class ManageStudentsService {
 
     private final UserRepository userRepository;
     private final DepositRepository depositRepository;
-    private final AssignmentRepository assignmentRepository;
+    private final AssignmentItemRepository assignmentItemRepository;
 
     // 수강생 조회
     public List<ManageStudentsListResDto> searchMembers(String name) {
         List<User> users;
 
-        if(name == null || name.isBlank()) {
+        if (name == null || name.isBlank()) {
             // 검색어가 없으면 맴버 전체 조회
             users = userRepository.findByRole(Role.MEMBER);
-        }
-        else {
+        } else {
             // 이름 검색
             users = userRepository.findByNameContainingAndRole(name, Role.MEMBER);
         }
@@ -54,11 +53,11 @@ public ManageStudentDetailResDto getMemberDetail(Long studentId) {
         }
 
         // Assignment 리스트 조회
-        List<Assignment> assignments = assignmentRepository.findByUserId(studentId);
+        List<AssignmentItem> assignments = assignmentItemRepository.findByUserId(studentId);
 
         // 과제 제목만 리스트로 변환
         List<String> assignmentTitles = assignments.stream()
-                .map(Assignment::getAssignmentName)
+                .map(assignment -> assignment.getAssignment().getAssignmentName())
                 .toList();
 
         // ManageStudentDetailResDto 조립

From 191b49ebb8593f07f7155a8ef8510134927e4e90 Mon Sep 17 00:00:00 2001
From: NamKyeongMin <kyeongmin35@gachon.ac.kr>
Date: Sun, 18 May 2025 23:35:12 +0900
Subject: [PATCH 03/20] =?UTF-8?q?[fix]:=20ManageTask=20/=20ManageStudent?=
 =?UTF-8?q?=20Header=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.jsx                           |  2 +-
 frontend/src/api/students.js                   |  2 +-
 frontend/src/components/Header.jsx             |  8 ++++++--
 frontend/src/pages/admin/Admin.jsx             |  2 +-
 frontend/src/pages/admin/ManageTask.jsx        | 13 ++++++++++---
 frontend/src/pages/admin/ManageTask.module.css |  6 ++++++
 6 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/pages/admin/ManageTask.module.css

diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 0b549ed..979e239 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -23,7 +23,7 @@ function App() {
         <Route path="/deposit" element={<Deposit />} />
         <Route path="/admin" element={<Admin />} />
         <Route path="/managestudent" element={<ManageStudent />} />
-        <Route path="/magagetask" element={<ManageTask />} />
+        <Route path="/managetask" element={<ManageTask />} />
         <Route path="/attendancecode" element={<AttendanceCode />} />
       </Routes>
     </BrowserRouter>
diff --git a/frontend/src/api/students.js b/frontend/src/api/students.js
index eac3665..271ee4f 100644
--- a/frontend/src/api/students.js
+++ b/frontend/src/api/students.js
@@ -1,7 +1,7 @@
 import api from "./api";
 
 export const getStudentsByName = async (name) => {
-  const res = await api.get("/admin/managestudent", {
+  const res = await api.get(`/admin/managestudent`, {
     params: { name },
   });
   return res.data; // [{ id: ..., name: ... }]
diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx
index fe0403d..9530644 100644
--- a/frontend/src/components/Header.jsx
+++ b/frontend/src/components/Header.jsx
@@ -11,10 +11,14 @@ const Header = () => {
   else if (path.includes("deposit")) title = "DEPOSIT";
   else if (path.includes("attendance")) title = "ATTENDANCE\nCHECK";
   else if (path.includes("managestudent")) title = "수강생 관리";
-  else if (path.includes("magagetask")) title = "과제 관리";
+  else if (path.includes("managetask")) title = "과제 관리";
   else if (path.includes("attendancecode")) title = "출석코드 생성";
 
-  const showRightDeposit = !path.includes("deposit");
+  const showRightDeposit =
+    !path.includes("deposit") &&
+    !path.includes("managestudent") &&
+    !path.includes("managetask"); // 수강생 관리, 과제 관리 페이지 추가
+
   const showRightMagageStudent = path.includes("attendancecode");
 
   return (
diff --git a/frontend/src/pages/admin/Admin.jsx b/frontend/src/pages/admin/Admin.jsx
index 6b9e4e9..ddcbf85 100644
--- a/frontend/src/pages/admin/Admin.jsx
+++ b/frontend/src/pages/admin/Admin.jsx
@@ -15,7 +15,7 @@ const Admin = () => {
         </button>
         <button
           className={styles.button}
-          onClick={() => navigate("/magagetask")}
+          onClick={() => navigate("/managetask")}
         >
           <p>과제 관리</p>
         </button>
diff --git a/frontend/src/pages/admin/ManageTask.jsx b/frontend/src/pages/admin/ManageTask.jsx
index 7140e6e..713095d 100644
--- a/frontend/src/pages/admin/ManageTask.jsx
+++ b/frontend/src/pages/admin/ManageTask.jsx
@@ -1,4 +1,11 @@
-const MagageTask = () => {
-  return <p>과제 관리</p>;
+import Header from "../../components/Header";
+import style from "./ManageTask.module.css";
+
+const ManageTask = () => {
+  return (
+    <div className={style.managetask_wrapper}>
+      <Header />
+    </div>
+  );
 };
-export default MagageTask;
+export default ManageTask;
diff --git a/frontend/src/pages/admin/ManageTask.module.css b/frontend/src/pages/admin/ManageTask.module.css
new file mode 100644
index 0000000..9099a04
--- /dev/null
+++ b/frontend/src/pages/admin/ManageTask.module.css
@@ -0,0 +1,6 @@
+.managetask_wrapper {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+}

From cf79278e06fcd3362c991b31e9df27b934b81ae7 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Mon, 19 May 2025 00:27:27 +0900
Subject: [PATCH 04/20] =?UTF-8?q?[feat]=20swagger=20=EB=AC=B8=EC=84=9C?=
 =?UTF-8?q?=ED=99=94=20=EB=82=B4=EC=9A=A9=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AssignmentController.java      | 79 +++++++++++++++++--
 .../dto/request/AssignmentCreateReq.java      | 13 +++
 .../dto/request/AssignmentUpdateReq.java      | 14 ++++
 .../Assignment/entity/Assignment.java         |  2 +
 4 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
index 879b048..c74d85f 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
@@ -4,6 +4,12 @@
 import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq;
 import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
 import backend.pirocheck.Assignment.service.AssignmentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -12,49 +18,110 @@
 @RestController
 @RequestMapping("/api")
 @RequiredArgsConstructor
+@Tag(name = "과제관리", description = "과제 관련 API")
 public class AssignmentController {
 
     private final AssignmentService assignmentService;
 
     // 과제 결과 확인 API
     // 과제 주차별, 요일별 그룹화 JSON
+    @Operation(summary = "학생별 과제 결과 확인", description = "관리자가 채점한 과제의 결과를 학생들이 확인합니다.")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(responseCode = "200", description = "사용자별 과제 조회에 성공하였습니다."),
+                    @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.")
+            }
+    )
     @GetMapping("/assignment/{userId}")
-    public List<AssignmentWeekRes> getGroupedAssignments(@PathVariable Long userId) {
+    public List<AssignmentWeekRes> getGroupedAssignments(
+            @Parameter(description = "사용자 ID", example = "1")
+            @PathVariable Long userId
+    ) {
         return assignmentService.search(userId);
     }
 
     // 과제 생성 API
+    @Operation(summary = "과제 생성 API", description = "관리자가 과제를 생성합니다.")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(responseCode = "200", description = "과제 생성에 성공하였습니다."),
+                    @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.")
+            }
+    )
     @PostMapping("/admin/assignment/signup")
-    public String signupAssignment(@RequestBody AssignmentCreateReq assignmentCreateReq) {
+    public String signupAssignment(
+            @Valid
+            @RequestBody AssignmentCreateReq assignmentCreateReq
+    ) {
         return assignmentService.createAssignment(assignmentCreateReq);
     }
 
     // 과제 삭제 API
+    @Operation(summary = "과제 삭제 API", description = "관리자가 과제를 삭제합니다.")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(responseCode = "200", description = "과제 삭제에 성공하였습니다."),
+                    @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.")
+            }
+    )
     @DeleteMapping("/admin/assignment/{assignmentId}")
     public String deleteAssignment(
+            @Parameter(description = "과제 ID", example = "1")
             @PathVariable Long assignmentId
     ) {
         return assignmentService.deleteAssignment(assignmentId);
     }
 
     // 과제 수정 API
+    @Operation(summary = "과제 수정 API", description = "관리자가 과제의 잘못된 부분을 수정합니다.")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(responseCode = "200", description = "과제 수정에 성공하였습니다."),
+                    @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.")
+            }
+    )
     @PutMapping("/admin/assignment/{assignmentId}")
     public String updateAssignment(
+            @Parameter(description = "과제 ID", example = "1")
             @PathVariable("assignmentId") Long assignmentId,
             @RequestBody AssignmentUpdateReq assignmentUpdateReq
     ) {
         return assignmentService.updateAssignment(assignmentId, assignmentUpdateReq);
     }
 
-    // 사용자별 과제 제출 여부 생성 API
+    // 사용자별 과제 제출 결과 생성 API
+    @Operation(summary = "관리자 과제 채점 API", description = "관리자가 사용자들의 과제를 채점한 결과 저장합니다.")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(responseCode = "200", description = "사용자의 과제 채점 결과 저장에 성공하였습니다."),
+                    @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.")
+            }
+    )
     @PostMapping("/admin/users/{userId}/assignments/{assignmentId}/submission")
-    public String submissionAssignment(@PathVariable Long userId, @PathVariable Long assignmentId) {
+    public String submissionAssignment(
+            @Parameter(description = "사용자 ID", example = "1")
+            @PathVariable Long userId,
+            @Parameter(description = "과제 ID", example = "1")
+            @PathVariable Long assignmentId
+    ) {
         return null;
     }
 
     // 사용자별 과제 제출 여부 수정 API
-    @PutMapping("/api/users/{userId}/assignments/{assignmentId}/submission")
-    public String updateSubmission(@PathVariable Long userId, @PathVariable Long assignmentId) {
+    @Operation(summary = "관리자 과제 채점 내용 수정 API", description = "관리자가 사용자의 과제 결과를 수정하여 저장합니다.")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(responseCode = "200", description = "사용자 과제 채점 결과 수정에 성공하였습니다."),
+                    @ApiResponse(responseCode = "400", description = "잘못된 요청입니다.")
+            }
+    )
+    @PutMapping("/admin/users/{userId}/assignments/{assignmentId}/submission")
+    public String updateSubmission(
+            @Parameter(description = "사용자 ID", example = "1")
+            @PathVariable Long userId,
+            @Parameter(description = "과제 ID", example = "1")
+            @PathVariable Long assignmentId
+    ) {
         return null;
     }
 
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
index 123e16e..b12e833 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
@@ -1,5 +1,8 @@
 package backend.pirocheck.Assignment.dto.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -7,9 +10,19 @@
 @AllArgsConstructor
 public class AssignmentCreateReq {
 
+    @Schema(description = "과제명", example = "제로초 인강")
+    @NotNull(message = "과제명은 필수입니다.")
     private String assignmentName;
+
+    @Schema(description = "주차", example = "1")
+    @NotBlank(message = "주차를 입력해주세요.")
     private Long week;
+
+    @Schema(description = "요일", example = "화")
+    @NotBlank(message = "요일을 입력해주세요.")
     private String day;
+
+    @Schema(description = "해당 일자 과제 numbering", example = "1")
     private Long orderNumber;
 
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
index 5941f88..b4c1c29 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
@@ -1,5 +1,8 @@
 package backend.pirocheck.Assignment.dto.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -7,8 +10,19 @@
 @AllArgsConstructor
 public class AssignmentUpdateReq {
 
+    @Schema(description = "과제명", example = "제로초 인강")
+    @NotNull(message = "과제명은 필수입니다.")
     private String assignmentName;
+
+    @Schema(description = "주차", example = "1")
+    @NotBlank(message = "주차를 입력해주세요.")
     private Long week;
+
+    @Schema(description = "요일", example = "화")
+    @NotBlank(message = "요일을 입력해주세요.")
     private String day;
+
+    @Schema(description = "해당 일자 과제 numbering", example = "1")
     private Long orderNumber;
+
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
index c51b0d3..16d64f7 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
@@ -1,5 +1,6 @@
 package backend.pirocheck.Assignment.entity;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -11,6 +12,7 @@
 @Builder(access = AccessLevel.PRIVATE)
 @NoArgsConstructor
 @AllArgsConstructor
+@Tag(name = "과제 관리", description = "과제 관련 API")
 public class Assignment {
 
     @Id

From b86457c66e1ab235250a1470ac3863451ee179b6 Mon Sep 17 00:00:00 2001
From: NamKyeongMin <kyeongmin35@gachon.ac.kr>
Date: Mon, 19 May 2025 00:51:51 +0900
Subject: [PATCH 05/20] =?UTF-8?q?[add]:=20=EA=B3=BC=EC=A0=9C=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20base?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/public/assets/img/edit.png           | Bin 0 -> 10159 bytes
 frontend/src/components/TaskModal.jsx         |  62 ++++++++++++
 .../src/pages/admin/ManageStudent.module.css  |   5 +-
 frontend/src/pages/admin/ManageTask.jsx       |  41 ++++++++
 .../src/pages/admin/ManageTask.module.css     |  91 ++++++++++++++++++
 5 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 frontend/public/assets/img/edit.png
 create mode 100644 frontend/src/components/TaskModal.jsx

diff --git a/frontend/public/assets/img/edit.png b/frontend/public/assets/img/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..639f11ceea57143af051918dea86cee2d8c9fac5
GIT binary patch
literal 10159
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

literal 0
HcmV?d00001

diff --git a/frontend/src/components/TaskModal.jsx b/frontend/src/components/TaskModal.jsx
new file mode 100644
index 0000000..b3a3b6b
--- /dev/null
+++ b/frontend/src/components/TaskModal.jsx
@@ -0,0 +1,62 @@
+import { useState } from "react";
+import styles from "../pages/admin/ManageTask.module.css";
+
+const TaskModal = ({ weekInfo, onClose }) => {
+  const [topic, setTopic] = useState("");
+  const [day, setDay] = useState("");
+  const [taskList, setTaskList] = useState([""]);
+
+  const handleTaskChange = (index, value) => {
+    const newTasks = [...taskList];
+    newTasks[index] = value;
+    setTaskList(newTasks);
+  };
+
+  const handleAddTask = () => {
+    setTaskList([...taskList, ""]);
+  };
+
+  return (
+    <div className={styles.modal_overlay}>
+      <div className={styles.modal}>
+        <div className={styles.modal_header}>
+          <h3>{weekInfo.week}</h3>
+          <button className={styles.close_button} onClick={onClose}>
+            ×
+          </button>
+        </div>
+        <div className={styles.modal_body}>
+          <label>주제:</label>
+          <input
+            placeholder="주제를 입력하세요."
+            value={topic}
+            onChange={(e) => setTopic(e.target.value)}
+          />
+          <label>요일:</label>
+          <input
+            placeholder="요일을 입력하세요."
+            value={day}
+            onChange={(e) => setDay(e.target.value)}
+          />
+          <label>과제:</label>
+          {taskList.map((task, i) => (
+            <input
+              key={i}
+              placeholder="과제를 입력하세요."
+              value={task}
+              onChange={(e) => handleTaskChange(i, e.target.value)}
+            />
+          ))}
+          <button onClick={handleAddTask} className={styles.add_button}>
+            +
+          </button>
+        </div>
+        <div className={styles.modal_footer}>
+          <button className={styles.save_button}>save</button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default TaskModal;
diff --git a/frontend/src/pages/admin/ManageStudent.module.css b/frontend/src/pages/admin/ManageStudent.module.css
index 014c39f..931680a 100644
--- a/frontend/src/pages/admin/ManageStudent.module.css
+++ b/frontend/src/pages/admin/ManageStudent.module.css
@@ -21,11 +21,14 @@
   color: white;
   padding: 15px;
   border-radius: 8px;
-  border: 1px solid #39ff14;
+  border: 1px solid var(--fill-gray);
   text-align: left;
   font-size: 16px;
   width: 100%;
 }
+.student_button:hover {
+  border: 1px solid #39ff14;
+}
 .pagination {
   margin-top: 60px;
   display: flex;
diff --git a/frontend/src/pages/admin/ManageTask.jsx b/frontend/src/pages/admin/ManageTask.jsx
index 713095d..aa9424d 100644
--- a/frontend/src/pages/admin/ManageTask.jsx
+++ b/frontend/src/pages/admin/ManageTask.jsx
@@ -1,10 +1,51 @@
+import { useState } from "react";
 import Header from "../../components/Header";
 import style from "./ManageTask.module.css";
+import TaskModal from "../../components/TaskModal";
+
+const weekData = [
+  { week: "1주차", title: "", tasks: [] },
+  { week: "2주차", title: "JS개론/웹개론", tasks: [] },
+  { week: "3주차", title: "JS개론/웹개론", tasks: [] },
+  { week: "4주차", title: "Comming soon~", tasks: [] },
+  { week: "5주차", title: "Comming soon~", tasks: [] },
+];
 
 const ManageTask = () => {
+  const [selectedWeekIndex, setSelectedWeekIndex] = useState(null);
+  const [showModal, setShowModal] = useState(false);
+
+  const handleEditClick = (index) => {
+    setSelectedWeekIndex(index);
+    setShowModal(true);
+  };
+
+  const closeModal = () => setShowModal(false);
+
   return (
     <div className={style.managetask_wrapper}>
       <Header />
+      <div className={style.week_container}>
+        {weekData.map((week, index) => (
+          <div key={index} className={style.week_block}>
+            <button className={style.week_button}>
+              {week.week} {week.title && ` ${week.title}`}
+            </button>
+            <img
+              src="/assets/img/edit.png"
+              alt="edit"
+              className={style.edit_icon}
+              onClick={() => handleEditClick(index)}
+            />
+          </div>
+        ))}
+      </div>
+      {showModal && (
+        <TaskModal
+          weekInfo={weekData[selectedWeekIndex]}
+          onClose={closeModal}
+        />
+      )}
     </div>
   );
 };
diff --git a/frontend/src/pages/admin/ManageTask.module.css b/frontend/src/pages/admin/ManageTask.module.css
index 9099a04..b93d5eb 100644
--- a/frontend/src/pages/admin/ManageTask.module.css
+++ b/frontend/src/pages/admin/ManageTask.module.css
@@ -4,3 +4,94 @@
   flex-direction: column;
   align-items: center;
 }
+.week_container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+}
+.week_block {
+  display: flex;
+  align-items: center;
+  margin: 10px 0;
+  width: 100%;
+  justify-content: center;
+}
+.week_button {
+  background-color: #444;
+  color: white;
+  padding: 14px 16px;
+  border: none;
+  border-radius: 8px;
+  min-width: 250px;
+  margin-right: 8px;
+  font-size: 16px;
+}
+.edit_icon {
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+.modal_overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.6);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.modal {
+  background-color: #333;
+  border: 1px solid #4fff24;
+  border-radius: 12px;
+  padding: 20px;
+  width: 300px;
+  color: white;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+.modal_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.close_button {
+  background: none;
+  border: none;
+  color: white;
+  font-size: 20px;
+  cursor: pointer;
+}
+.modal_body label {
+  margin-block: 10px;
+  display: block;
+}
+.modal_body input {
+  width: 100%;
+  padding: 6px;
+  margin-bottom: 8px;
+  background-color: #555;
+  border: none;
+  border-radius: 4px;
+  color: white;
+}
+.add_button {
+  background: none;
+  border: none;
+  font-size: 24px;
+  color: white;
+  cursor: pointer;
+}
+.save_button {
+  margin-top: 10px;
+  padding: 8px 16px;
+  background-color: #666;
+  border: none;
+  border-radius: 6px;
+  color: white;
+  cursor: not-allowed;
+}

From 0ad52c3bb565c3fcdd2edb4c14e983573418910c Mon Sep 17 00:00:00 2001
From: NamKyeongMin <kyeongmin35@gachon.ac.kr>
Date: Mon, 19 May 2025 01:08:47 +0900
Subject: [PATCH 06/20] =?UTF-8?q?[add]:=20ManageTask=20+=20Modal=20form=20?=
 =?UTF-8?q?UI=EA=B9=8C=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/admin/ManageTask.jsx        | 8 ++++----
 frontend/src/pages/admin/ManageTask.module.css | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/admin/ManageTask.jsx b/frontend/src/pages/admin/ManageTask.jsx
index aa9424d..82075dc 100644
--- a/frontend/src/pages/admin/ManageTask.jsx
+++ b/frontend/src/pages/admin/ManageTask.jsx
@@ -4,9 +4,9 @@ import style from "./ManageTask.module.css";
 import TaskModal from "../../components/TaskModal";
 
 const weekData = [
-  { week: "1주차", title: "", tasks: [] },
-  { week: "2주차", title: "JS개론/웹개론", tasks: [] },
-  { week: "3주차", title: "JS개론/웹개론", tasks: [] },
+  { week: "1주차", title: "Comming soon~", tasks: [] },
+  { week: "2주차", title: "Comming soon~", tasks: [] },
+  { week: "3주차", title: "Comming soon~", tasks: [] },
   { week: "4주차", title: "Comming soon~", tasks: [] },
   { week: "5주차", title: "Comming soon~", tasks: [] },
 ];
@@ -29,7 +29,7 @@ const ManageTask = () => {
         {weekData.map((week, index) => (
           <div key={index} className={style.week_block}>
             <button className={style.week_button}>
-              {week.week} {week.title && ` ${week.title}`}
+              {week.week} {week.title && `  ${week.title}`}
             </button>
             <img
               src="/assets/img/edit.png"
diff --git a/frontend/src/pages/admin/ManageTask.module.css b/frontend/src/pages/admin/ManageTask.module.css
index b93d5eb..36906ff 100644
--- a/frontend/src/pages/admin/ManageTask.module.css
+++ b/frontend/src/pages/admin/ManageTask.module.css
@@ -26,6 +26,8 @@
   min-width: 250px;
   margin-right: 8px;
   font-size: 16px;
+  display: flex;
+  justify-content: flex-start;
 }
 .edit_icon {
   width: 20px;
@@ -53,11 +55,13 @@
   display: flex;
   flex-direction: column;
   gap: 10px;
+  align-items: center;
 }
 .modal_header {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  position: relative;
 }
 .close_button {
   background: none;
@@ -65,6 +69,11 @@
   color: white;
   font-size: 20px;
   cursor: pointer;
+  position: absolute;
+  left: 130px;
+}
+.modal_body {
+  width: 90%;
 }
 .modal_body label {
   margin-block: 10px;

From 102f632366034728187144862837449e5d4923c3 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Mon, 19 May 2025 01:25:30 +0900
Subject: [PATCH 07/20] =?UTF-8?q?[feat]=20=EA=B4=80=EB=A6=AC=EC=9E=90?=
 =?UTF-8?q?=EA=B0=80=20=EC=82=AC=EC=9A=A9=EC=9E=90=EC=9D=98=20=EA=B3=BC?=
 =?UTF-8?q?=EC=A0=9C=20=EC=B1=84=EC=A0=90=20=EA=B2=B0=EA=B3=BC=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=ED=95=98=EB=8A=94=20=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AssignmentController.java      |  9 ++++--
 .../dto/request/AssignmentItemCreateReq.java  | 22 +++++++++++++++
 .../Assignment/entity/AssignmentItem.java     | 22 +++++++++------
 .../Assignment/service/AssignmentService.java | 28 ++++++++++++++++++-
 4 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemCreateReq.java

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
index c74d85f..2759f31 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
@@ -1,8 +1,10 @@
 package backend.pirocheck.Assignment.controller;
 
 import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentItemCreateReq;
 import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq;
 import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
 import backend.pirocheck.Assignment.service.AssignmentService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -98,13 +100,14 @@ public String updateAssignment(
             }
     )
     @PostMapping("/admin/users/{userId}/assignments/{assignmentId}/submission")
-    public String submissionAssignment(
+    public AssignmentStatus submissionAssignment(
             @Parameter(description = "사용자 ID", example = "1")
             @PathVariable Long userId,
             @Parameter(description = "과제 ID", example = "1")
-            @PathVariable Long assignmentId
+            @PathVariable Long assignmentId,
+            @RequestBody AssignmentItemCreateReq req
     ) {
-        return null;
+        return assignmentService.createAssignmentItem(userId, assignmentId, req);
     }
 
     // 사용자별 과제 제출 여부 수정 API
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemCreateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemCreateReq.java
new file mode 100644
index 0000000..62fc718
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemCreateReq.java
@@ -0,0 +1,22 @@
+package backend.pirocheck.Assignment.dto.request;
+
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class AssignmentItemCreateReq {
+
+    private Long assignmentId;
+
+    private Long userId;
+
+    @Pattern(regexp = "SUCCESS/INSUFFICIENT/FAILURE", message = "status는 SUCCESS, INSUFFICIENT 혹은 FAILURE 여야 합니다.")
+    @Schema(description = "과제 결과", example = "SUCCESS")
+    private AssignmentStatus status;
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
index bb88fae..74719c7 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
@@ -2,14 +2,12 @@
 
 import backend.pirocheck.User.entity.User;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 @Entity
 @Getter
 @Setter
+@Builder(access = AccessLevel.PRIVATE)
 @AllArgsConstructor
 @NoArgsConstructor
 public class AssignmentItem {
@@ -17,16 +15,24 @@ public class AssignmentItem {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id; // 유저별 과제 정보를 저장하는 ID
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "assignment_id")
-    private Assignment assignment;
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "assignment_id")
+    private Assignment assignment;
+
     // 과제 결과
     @Enumerated(EnumType.STRING)
     @Column(length = 100)
     private AssignmentStatus submitted; // 수강생의 과제 제출여부
+
+    public static AssignmentItem create(User user, Assignment assignment, AssignmentStatus submitted) {
+        return AssignmentItem.builder()
+                .assignment(assignment)
+                .user(user)
+                .submitted(submitted)
+                .build();
+    }
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
index d49cb12..b8448c9 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -1,14 +1,18 @@
 package backend.pirocheck.Assignment.service;
 
 import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentItemCreateReq;
 import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq;
 import backend.pirocheck.Assignment.dto.response.AssignmentDayRes;
 import backend.pirocheck.Assignment.dto.response.AssignmentDetailRes;
 import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
 import backend.pirocheck.Assignment.entity.Assignment;
 import backend.pirocheck.Assignment.entity.AssignmentItem;
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
 import backend.pirocheck.Assignment.repository.AssignmentItemRepository;
 import backend.pirocheck.Assignment.repository.AssignmentRepository;
+import backend.pirocheck.User.entity.User;
+import backend.pirocheck.User.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +29,7 @@ public class AssignmentService {
 
     private final AssignmentItemRepository assignmentItemRepository;
     private final AssignmentRepository assignmentRepository;
+    private final UserRepository userRepository;
 
     public List<AssignmentWeekRes> search(Long userId) {
 
@@ -78,11 +83,13 @@ public String createAssignment(AssignmentCreateReq assignmentCreateReq) {
         return assignment.getAssignmentName();
     }
 
+    // 과제 삭제
     public String deleteAssignment(Long assignmentId) {
         assignmentRepository.deleteById(assignmentId);
-        return "Assignment deleted successfully";
+        return "과제가 성공적으로 삭제되었습니다.";
     }
 
+    // 과제 수정
     public String updateAssignment(Long assignmentId, AssignmentUpdateReq req) {
         Assignment assignment = assignmentRepository.findById(assignmentId)
                 .orElseThrow(() -> new IllegalArgumentException("조회된 과제가 없습니다."));
@@ -92,4 +99,23 @@ public String updateAssignment(Long assignmentId, AssignmentUpdateReq req) {
 
         return assignment.getAssignmentName();
     }
+
+    // 과제 채점 결과 저장
+    public AssignmentStatus createAssignmentItem(Long assignmentId, Long userId, AssignmentItemCreateReq req) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new IllegalArgumentException("조회된 사용자가 없습니다."));
+
+        Assignment assignment = assignmentRepository.findById(assignmentId)
+                .orElseThrow(() -> new IllegalArgumentException("조회된 과제가 없습니다."));
+
+        AssignmentItem assignmentItem = AssignmentItem.create(
+                user,
+                assignment,
+                req.getStatus()
+        );
+
+        assignmentItemRepository.save(assignmentItem);
+
+        return assignmentItem.getSubmitted();
+    }
 }

From 0284dc38d275e766d3222c1ac60c26641000255a Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Mon, 19 May 2025 01:37:10 +0900
Subject: [PATCH 08/20] =?UTF-8?q?[fix]=20=EA=B3=BC=EC=A0=9C=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20=EB=B0=8F=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B3=BC?=
 =?UTF-8?q?=EC=A0=9C=20=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=A0=84=EC=B2=B4=20=EC=A3=BC=EC=A0=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9D=98=EB=AF=B8=ED=95=98=EB=8A=94=20subject=20=ED=95=84?=
 =?UTF-8?q?=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

---
 .../Assignment/dto/request/AssignmentCreateReq.java      | 4 ++++
 .../Assignment/dto/request/AssignmentUpdateReq.java      | 4 ++++
 .../Assignment/dto/response/AssignmentWeekRes.java       | 2 +-
 .../backend/pirocheck/Assignment/entity/Assignment.java  | 9 +++++++--
 .../pirocheck/Assignment/service/AssignmentService.java  | 6 ++++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
index b12e833..d4faf7a 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
@@ -10,6 +10,10 @@
 @AllArgsConstructor
 public class AssignmentCreateReq {
 
+    @Schema(description = "과제 주제", example = "Git/HTML/CSS")
+    @NotNull(message = "과제 주제는 필수입니다.")
+    private String subject;
+
     @Schema(description = "과제명", example = "제로초 인강")
     @NotNull(message = "과제명은 필수입니다.")
     private String assignmentName;
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
index b4c1c29..06d1bb5 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
@@ -10,6 +10,10 @@
 @AllArgsConstructor
 public class AssignmentUpdateReq {
 
+    @Schema(description = "과제 주제", example = "Git/HTML/CSS")
+    @NotNull(message = "과제 주제는 필수입니다.")
+    private String subject;
+
     @Schema(description = "과제명", example = "제로초 인강")
     @NotNull(message = "과제명은 필수입니다.")
     private String assignmentName;
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java
index 687505c..b0d7721 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/response/AssignmentWeekRes.java
@@ -9,6 +9,6 @@
 @AllArgsConstructor
 public class AssignmentWeekRes {
     private Long week;
-//    private String title; // 각 주차 주제 (e.g, Git / HTML / CSS)
+    private String subject; // 각 주차 주제 (e.g, Git / HTML / CSS)
     private List<AssignmentDayRes> days;
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
index 16d64f7..410c522 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
@@ -19,6 +19,9 @@ public class Assignment {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    // 전체 주제
+    private String subject;
+
     // 과제명
     private String assignmentName;
 
@@ -43,8 +46,9 @@ public void addAssignmentItem(AssignmentItem assignmentItem) {
     }
 
     // 관리자가 생성
-    public static Assignment create(String assignmentName, Long week, String day, Long orderNumber) {
+    public static Assignment create(String subject, String assignmentName, Long week, String day, Long orderNumber) {
         return Assignment.builder()
+                .subject(subject)
                 .assignmentName(assignmentName)
                 .week(week)
                 .day(day)
@@ -53,7 +57,8 @@ public static Assignment create(String assignmentName, Long week, String day, Lo
     }
 
     // 과제 내용 업데이트
-    public void update(String assignmentName, Long week, String day, Long orderNumber) {
+    public void update(String subject, String assignmentName, Long week, String day, Long orderNumber) {
+        this.subject = subject;
         this.assignmentName = assignmentName;
         this.week = week;
         this.day = day;
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
index b8448c9..38dc73c 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -42,6 +42,7 @@ public List<AssignmentWeekRes> search(Long userId) {
 
         for (Map.Entry<Long, List<AssignmentItem>> entry : weekGroup.entrySet()) {
             Long week = entry.getKey();
+            String subject = String.valueOf(entry.getKey());
             List<AssignmentItem> assignmentList = entry.getValue();
 
             // day를 기준으로 그룹핑
@@ -64,7 +65,7 @@ public List<AssignmentWeekRes> search(Long userId) {
                 assignmentDayResList.add(new AssignmentDayRes(day, assignmentDetailResList));
             }
 
-            assignmentResponses.add(new AssignmentWeekRes(week, assignmentDayResList));
+            assignmentResponses.add(new AssignmentWeekRes(week, subject, assignmentDayResList));
         }
 
         return assignmentResponses;
@@ -73,6 +74,7 @@ public List<AssignmentWeekRes> search(Long userId) {
     public String createAssignment(AssignmentCreateReq assignmentCreateReq) {
 
         Assignment assignment = Assignment.create(
+                assignmentCreateReq.getSubject(),
                 assignmentCreateReq.getAssignmentName(),
                 assignmentCreateReq.getWeek(),
                 assignmentCreateReq.getDay(),
@@ -94,7 +96,7 @@ public String updateAssignment(Long assignmentId, AssignmentUpdateReq req) {
         Assignment assignment = assignmentRepository.findById(assignmentId)
                 .orElseThrow(() -> new IllegalArgumentException("조회된 과제가 없습니다."));
 
-        assignment.update(req.getAssignmentName(), req.getWeek(), req.getDay(), req.getOrderNumber());
+        assignment.update(req.getSubject(), req.getAssignmentName(), req.getWeek(), req.getDay(), req.getOrderNumber());
         assignmentRepository.save(assignment);
 
         return assignment.getAssignmentName();

From 4f28c1c4cee18eebb254272b409c19a499d74878 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Mon, 19 May 2025 01:51:32 +0900
Subject: [PATCH 09/20] =?UTF-8?q?[fix]=20subject=EA=B0=80=20week=20?=
 =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EC=B6=9C=EB=A0=A5=EB=90=98?=
 =?UTF-8?q?=EB=8D=98=20=EA=B1=B8=20assignment=EC=9D=98=20subject=20?=
 =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EC=98=AC=EB=B0=94=EB=A5=B4?=
 =?UTF-8?q?=EA=B2=8C=20=EC=B6=9C=EB=A0=A5=EB=90=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assignment/dto/request/AssignmentCreateReq.java        | 3 ++-
 .../Assignment/dto/request/AssignmentUpdateReq.java        | 3 ++-
 .../pirocheck/Assignment/service/AssignmentService.java    | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
index d4faf7a..65cbe2f 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentCreateReq.java
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -19,7 +20,7 @@ public class AssignmentCreateReq {
     private String assignmentName;
 
     @Schema(description = "주차", example = "1")
-    @NotBlank(message = "주차를 입력해주세요.")
+    @Positive
     private Long week;
 
     @Schema(description = "요일", example = "화")
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
index 06d1bb5..5caa73a 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentUpdateReq.java
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -19,7 +20,7 @@ public class AssignmentUpdateReq {
     private String assignmentName;
 
     @Schema(description = "주차", example = "1")
-    @NotBlank(message = "주차를 입력해주세요.")
+    @Positive
     private Long week;
 
     @Schema(description = "요일", example = "화")
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
index 38dc73c..c4c25cd 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -41,9 +41,10 @@ public List<AssignmentWeekRes> search(Long userId) {
         List<AssignmentWeekRes> assignmentResponses = new ArrayList<>();
 
         for (Map.Entry<Long, List<AssignmentItem>> entry : weekGroup.entrySet()) {
-            Long week = entry.getKey();
-            String subject = String.valueOf(entry.getKey());
-            List<AssignmentItem> assignmentList = entry.getValue();
+            Long week = entry.getKey(); // 주차 정보
+            List<AssignmentItem> assignmentList = entry.getValue(); // 주차에 해당하는 days의 list
+
+            String subject = assignmentList.get(0).getAssignment().getSubject();
 
             // day를 기준으로 그룹핑
             Map<String, List<AssignmentItem>> dayGroup = assignmentList.stream()

From ebd76370336173e653f3ed5e9b2a61b47c0d0cb9 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Mon, 19 May 2025 02:31:23 +0900
Subject: [PATCH 10/20] =?UTF-8?q?[fix]=20CORS=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20WebConfig.java=20=EB=82=B4=EC=9A=A9=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/backend/pirocheck/config/WebConfig.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java
index d149b66..430ff99 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java
@@ -10,7 +10,11 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용
-                .allowedOrigins("http://localhost:5173", "https://www.pirocheck.org") // 프론트 배포 URL
+                .allowedOrigins(
+                        "http://localhost:5173",
+                        "http://www.pirocheck.org",
+                        "https://www.pirocheck.org"
+                ) // 프론트 배포 URL
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") // 허용할 HTTP 메서드
                 .allowedHeaders("*")
                 .allowCredentials(true); // 세션 쿠키 주고받기 허용

From 7724f98f4a1e91c5fce8d13a3938f5f47f55c609 Mon Sep 17 00:00:00 2001
From: qkrxogmla <suk05553@naver.com>
Date: Mon, 19 May 2025 10:53:31 +0900
Subject: [PATCH 11/20] =?UTF-8?q?css=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/admin/AttendanceCode.module.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/admin/AttendanceCode.module.css b/frontend/src/pages/admin/AttendanceCode.module.css
index 09977f1..344ba58 100644
--- a/frontend/src/pages/admin/AttendanceCode.module.css
+++ b/frontend/src/pages/admin/AttendanceCode.module.css
@@ -36,4 +36,5 @@
   justify-content: center;
   align-items: center;
   margin-top: 60px;
+  gap: 20px;
 }

From 047b3e72aa78ab17fd3f11c20327635552066dcf Mon Sep 17 00:00:00 2001
From: qkrxogmla <suk05553@naver.com>
Date: Mon, 19 May 2025 11:04:53 +0900
Subject: [PATCH 12/20] =?UTF-8?q?=20url=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/admin/AttendanceCode.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/admin/AttendanceCode.jsx b/frontend/src/pages/admin/AttendanceCode.jsx
index 79e0002..9b9dde0 100644
--- a/frontend/src/pages/admin/AttendanceCode.jsx
+++ b/frontend/src/pages/admin/AttendanceCode.jsx
@@ -9,7 +9,7 @@ const AttendanceCode = () => {
   // 출석코드 생성
   const generateCode = async () => {
     try {
-      const res = await api.post("/attendance/start");
+      const res = await api.post("admin/attendance/start");
       const newCode = res.data.data.code;
       setCode(newCode);
     } catch (error) {
@@ -22,7 +22,7 @@ const AttendanceCode = () => {
   // 출석코드 만료
   const expireCode = async () => {
     try {
-      const res = await api.put("/attendance/expire-latest");
+      const res = await api.put("admin/attendance/expire-latest");
       alert(res.data.message || "출석코드가 만료되었습니다");
       setCode("");
     } catch (error) {

From b3ad105026b79bf50de28807bdfb14128dfa90cd Mon Sep 17 00:00:00 2001
From: qkrxogmla <suk05553@naver.com>
Date: Mon, 19 May 2025 11:32:06 +0900
Subject: [PATCH 13/20] =?UTF-8?q?=20=EC=B6=9C=EC=84=9D=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=A2=85=EB=A3=8C=20expire=20api=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Header.jsx          | 3 ++-
 frontend/src/pages/admin/AttendanceCode.jsx | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx
index 9530644..1a38ba6 100644
--- a/frontend/src/components/Header.jsx
+++ b/frontend/src/components/Header.jsx
@@ -17,7 +17,8 @@ const Header = () => {
   const showRightDeposit =
     !path.includes("deposit") &&
     !path.includes("managestudent") &&
-    !path.includes("managetask"); // 수강생 관리, 과제 관리 페이지 추가
+    !path.includes("managetask") &&
+    !path.includes("attendancecode");
 
   const showRightMagageStudent = path.includes("attendancecode");
 
diff --git a/frontend/src/pages/admin/AttendanceCode.jsx b/frontend/src/pages/admin/AttendanceCode.jsx
index 9b9dde0..8806d0e 100644
--- a/frontend/src/pages/admin/AttendanceCode.jsx
+++ b/frontend/src/pages/admin/AttendanceCode.jsx
@@ -19,10 +19,12 @@ const AttendanceCode = () => {
     }
   };
 
-  // 출석코드 만료
+  // 출석코드 만료 (직접 코드 전달 방식)
   const expireCode = async () => {
     try {
-      const res = await api.put("admin/attendance/expire-latest");
+      const res = await api.put("admin/attendance/expire", null, {
+        params: { code },
+      });
       alert(res.data.message || "출석코드가 만료되었습니다");
       setCode("");
     } catch (error) {

From 1b2996e56e34344b93b934df0a9984752e5ef5ec Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Mon, 19 May 2025 21:38:08 +0900
Subject: [PATCH 14/20] =?UTF-8?q?[fix]=20=EA=B3=BC=EC=A0=9C=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=20=EC=9E=90=EB=8F=99=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=97=90=EA=B2=8C=20=ED=95=A0=EB=8B=B9?=
 =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=A1=9C=EC=A7=81=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pirocheck/Assignment/entity/Assignment.java    |  1 +
 .../Assignment/service/AssignmentService.java      | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
index 410c522..eede8f9 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/Assignment.java
@@ -37,6 +37,7 @@ public class Assignment {
     // AssignmentItem 입장에서 "assignment" 필드의 외래 키를 가진 주인
     // assignment를 참조하는 assignmentitem 컬랙션을 가짐
     @OneToMany(mappedBy = "assignment", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
     private List<AssignmentItem> assignments = new ArrayList<>();
 
     // 연관관계 편의 메서드 (양방향 시 자주 사용)
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
index c4c25cd..f1ef8ef 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -83,6 +83,20 @@ public String createAssignment(AssignmentCreateReq assignmentCreateReq) {
 
         assignment = assignmentRepository.save(assignment);
 
+        // 전체 유저에게 과제 자동 할당
+        List<User> users = userRepository.findAll();
+
+        for (User user : users) {
+
+            AssignmentItem item = AssignmentItem.create(user, assignment, AssignmentStatus.INSUFFICIENT);
+
+            assignment.addAssignmentItem(item);
+            user.addAssignmentItem(item);
+
+//            assignmentItemRepository.save(item);
+// Cascade 설정이 되어있으므로 assignment = assignmentRepository.save(assignment); 이 코드를 실행할 때 연관된 AssignmentItem도 함께 저장 됨
+        }
+
         return assignment.getAssignmentName();
     }
 

From a152ef70b4058b1c7cd5500b14b9326d44d03030 Mon Sep 17 00:00:00 2001
From: qkrxogmla <suk05553@naver.com>
Date: Tue, 20 May 2025 02:51:08 +0900
Subject: [PATCH 15/20] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9B=84?=
 =?UTF-8?q?=20=EC=A0=91=EA=B7=BC=EA=B0=80=EB=8A=A5=ED=95=98=EA=B2=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.jsx                     | 83 +++++++++++++++++++++---
 frontend/src/components/RequireAdmin.jsx | 12 ++++
 frontend/src/components/RequireAuth.jsx  | 13 ++++
 3 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/components/RequireAdmin.jsx
 create mode 100644 frontend/src/components/RequireAuth.jsx

diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 3f48079..5d442d1 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -11,6 +11,8 @@ import ManageTask from "./pages/admin/ManageTask.jsx";
 import AttendanceCode from "./pages/admin/AttendanceCode";
 import Attendance from "./pages/generation/Attendance";
 import AdminStudentAttendance from "./pages/admin/AdminStudentAttendance";
+import RequireAuth from "./components/RequireAuth";
+import RequireAdmin from "./components/RequireAdmin";
 
 function App() {
   return (
@@ -18,15 +20,78 @@ function App() {
       <Routes>
         <Route path="/" element={<Intro />} />
         <Route path="/login" element={<Login />} />
-        <Route path="/home" element={<Home />} />
-        <Route path="/assignment" element={<Assignment />} />
-        <Route path="/attendance" element={<Attendance />} />
-        <Route path="/deposit" element={<Deposit />} />
-        <Route path="/admin" element={<Admin />} />
-        <Route path="/managestudent" element={<ManageStudent />} />
-        <Route path="/managetask" element={<ManageTask />} />
-        <Route path="/attendancecode" element={<AttendanceCode />} />
-        <Route path="/admin/attendance/:studentId" element={<AdminStudentAttendance />} />
+        <Route
+          path="/home"
+          element={
+            <RequireAuth>
+              <Home />
+            </RequireAuth>
+          }
+        />
+        <Route
+          path="/assignment"
+          element={
+            <RequireAuth>
+              <Assignment />
+            </RequireAuth>
+          }
+        />
+        <Route
+          path="/attendance"
+          element={
+            <RequireAuth>
+              <Attendance />
+            </RequireAuth>
+          }
+        />
+        <Route
+          path="/deposit"
+          element={
+            <RequireAuth>
+              <Deposit />
+            </RequireAuth>
+          }
+        />
+        <Route
+          path="/admin"
+          element={
+            <RequireAdmin>
+              <Admin />
+            </RequireAdmin>
+          }
+        />
+        <Route
+          path="/managestudent"
+          element={
+            <RequireAdmin>
+              <ManageStudent />
+            </RequireAdmin>
+          }
+        />
+        <Route
+          path="/managetask"
+          element={
+            <RequireAdmin>
+              <ManageTask />
+            </RequireAdmin>
+          }
+        />
+        <Route
+          path="/attendancecode"
+          element={
+            <RequireAdmin>
+              <AttendanceCode />
+            </RequireAdmin>
+          }
+        />
+        <Route
+          path="/admin/attendance/:studentId"
+          element={
+            <RequireAdmin>
+              <AdminStudentAttendance />
+            </RequireAdmin>
+          }
+        />
       </Routes>
     </BrowserRouter>
   );
diff --git a/frontend/src/components/RequireAdmin.jsx b/frontend/src/components/RequireAdmin.jsx
new file mode 100644
index 0000000..becbb4d
--- /dev/null
+++ b/frontend/src/components/RequireAdmin.jsx
@@ -0,0 +1,12 @@
+import { Navigate } from "react-router-dom";
+
+const RequireAdmin = ({ children }) => {
+  const user = JSON.parse(localStorage.getItem("user"));
+
+  if (!user) return <Navigate to="/login" replace />;
+  if (user.role !== "ADMIN") return <Navigate to="/home" replace />;
+
+  return children;
+};
+
+export default RequireAdmin;
diff --git a/frontend/src/components/RequireAuth.jsx b/frontend/src/components/RequireAuth.jsx
new file mode 100644
index 0000000..8a61988
--- /dev/null
+++ b/frontend/src/components/RequireAuth.jsx
@@ -0,0 +1,13 @@
+import { Navigate } from "react-router-dom";
+
+const RequireAuth = ({ children }) => {
+  const user = JSON.parse(localStorage.getItem("user"));
+
+  if (!user) {
+    return <Navigate to="/login" replace />;
+  }
+
+  return children;
+};
+
+export default RequireAuth;

From 905df9cb9bdcf2d90b59f1382071fd330f333d02 Mon Sep 17 00:00:00 2001
From: qkrxogmla <suk05553@naver.com>
Date: Tue, 20 May 2025 03:05:43 +0900
Subject: [PATCH 16/20] =?UTF-8?q?admin=EC=95=84=EB=8B=88=EB=A9=B4login?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/RequireAdmin.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/RequireAdmin.jsx b/frontend/src/components/RequireAdmin.jsx
index becbb4d..ef87dff 100644
--- a/frontend/src/components/RequireAdmin.jsx
+++ b/frontend/src/components/RequireAdmin.jsx
@@ -4,7 +4,7 @@ const RequireAdmin = ({ children }) => {
   const user = JSON.parse(localStorage.getItem("user"));
 
   if (!user) return <Navigate to="/login" replace />;
-  if (user.role !== "ADMIN") return <Navigate to="/home" replace />;
+  if (user.role !== "ADMIN") return <Navigate to="/login" replace />;
 
   return children;
 };

From f274e00176fe82787bda7deba4637c2acb771580 Mon Sep 17 00:00:00 2001
From: qkrxogmla <suk05553@naver.com>
Date: Tue, 20 May 2025 03:10:23 +0900
Subject: [PATCH 17/20] =?UTF-8?q?=EC=9B=B9=EC=82=AC=EC=9D=B4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/index.html b/frontend/index.html
index 79c4701..eadd9cb 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/assets/img/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React</title>
+    <title>pirocheck</title>
   </head>
   <body>
     <div id="root"></div>

From cbe231196e44fbe72c64330d72c00ae7f6308f30 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Tue, 20 May 2025 17:53:28 +0900
Subject: [PATCH 18/20] =?UTF-8?q?[fix]=20=EA=B3=BC=EC=A0=9C=20=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=20=EC=83=9D=EC=84=B1=20=EB=A1=9C=EC=A7=81=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pirocheck/Assignment/service/AssignmentService.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
index f1ef8ef..398e662 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -14,6 +14,7 @@
 import backend.pirocheck.User.entity.User;
 import backend.pirocheck.User.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +23,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+@Slf4j // 로그를 찍기위해 사용
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -118,7 +120,9 @@ public String updateAssignment(Long assignmentId, AssignmentUpdateReq req) {
     }
 
     // 과제 채점 결과 저장
-    public AssignmentStatus createAssignmentItem(Long assignmentId, Long userId, AssignmentItemCreateReq req) {
+    public AssignmentStatus createAssignmentItem(Long userId, Long assignmentId, AssignmentItemCreateReq req) {
+        log.info("userId 요청 값: {}", userId);
+
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new IllegalArgumentException("조회된 사용자가 없습니다."));
 

From a53a7221f36b1b55dc89a076db411732a83f19c7 Mon Sep 17 00:00:00 2001
From: l-wanderer01 <jhjjang0423@naver.com>
Date: Tue, 20 May 2025 18:28:39 +0900
Subject: [PATCH 19/20] =?UTF-8?q?[feat]=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EA=B3=BC=EC=A0=9C=20=EC=B1=84=EC=A0=90=20=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AssignmentController.java      |  8 +++++---
 .../dto/request/AssignmentItemUpdateReq.java  | 16 ++++++++++++++++
 .../Assignment/entity/AssignmentItem.java     |  6 ++++++
 .../repository/AssignmentItemRepository.java  |  5 +++++
 .../Assignment/service/AssignmentService.java | 19 +++++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemUpdateReq.java

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
index 2759f31..042c94d 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/controller/AssignmentController.java
@@ -2,6 +2,7 @@
 
 import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq;
 import backend.pirocheck.Assignment.dto.request.AssignmentItemCreateReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentItemUpdateReq;
 import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq;
 import backend.pirocheck.Assignment.dto.response.AssignmentWeekRes;
 import backend.pirocheck.Assignment.entity.AssignmentStatus;
@@ -119,13 +120,14 @@ public AssignmentStatus submissionAssignment(
             }
     )
     @PutMapping("/admin/users/{userId}/assignments/{assignmentId}/submission")
-    public String updateSubmission(
+    public AssignmentStatus updateSubmission(
             @Parameter(description = "사용자 ID", example = "1")
             @PathVariable Long userId,
             @Parameter(description = "과제 ID", example = "1")
-            @PathVariable Long assignmentId
+            @PathVariable Long assignmentId,
+            @RequestBody AssignmentItemUpdateReq req
     ) {
-        return null;
+        return assignmentService.updateAssignmentItem(userId, assignmentId, req);
     }
 
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemUpdateReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemUpdateReq.java
new file mode 100644
index 0000000..b917d54
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/dto/request/AssignmentItemUpdateReq.java
@@ -0,0 +1,16 @@
+package backend.pirocheck.Assignment.dto.request;
+
+import backend.pirocheck.Assignment.entity.AssignmentStatus;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Pattern;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class AssignmentItemUpdateReq {
+
+    @Pattern(regexp = "SUCCESS/INSUFFICIENT/FAILURE", message = "status는 SUCCESS, INSUFFICIENT 혹은 FAILURE 여야 합니다.")
+    @Schema(description = "과제 결과", example = "SUCCESS")
+    private AssignmentStatus status;
+}
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
index 74719c7..6a9dddf 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/entity/AssignmentItem.java
@@ -35,4 +35,10 @@ public static AssignmentItem create(User user, Assignment assignment, Assignment
                 .submitted(submitted)
                 .build();
     }
+
+    public void update(AssignmentStatus submitted) {
+
+        this.submitted = submitted;
+
+    }
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
index 1a39eec..f07c351 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/repository/AssignmentItemRepository.java
@@ -1,5 +1,6 @@
 package backend.pirocheck.Assignment.repository;
 
+import backend.pirocheck.Assignment.entity.Assignment;
 import backend.pirocheck.Assignment.entity.AssignmentItem;
 import backend.pirocheck.Assignment.entity.AssignmentStatus;
 import backend.pirocheck.User.entity.User;
@@ -7,6 +8,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface AssignmentItemRepository extends JpaRepository<AssignmentItem, Long> {
@@ -17,4 +19,7 @@ public interface AssignmentItemRepository extends JpaRepository<AssignmentItem,
     // 보증금
     int countByUserAndSubmitted(User user, AssignmentStatus status);
 
+    Optional<AssignmentItem> findByUserAndAssignment(User user, Assignment assignment);
+    // Optional 처리로 오류 발생 check
+
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
index 398e662..e589e2c 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Assignment/service/AssignmentService.java
@@ -2,6 +2,7 @@
 
 import backend.pirocheck.Assignment.dto.request.AssignmentCreateReq;
 import backend.pirocheck.Assignment.dto.request.AssignmentItemCreateReq;
+import backend.pirocheck.Assignment.dto.request.AssignmentItemUpdateReq;
 import backend.pirocheck.Assignment.dto.request.AssignmentUpdateReq;
 import backend.pirocheck.Assignment.dto.response.AssignmentDayRes;
 import backend.pirocheck.Assignment.dto.response.AssignmentDetailRes;
@@ -139,4 +140,22 @@ public AssignmentStatus createAssignmentItem(Long userId, Long assignmentId, Ass
 
         return assignmentItem.getSubmitted();
     }
+
+    // 과제 채점 결과 수정
+    public AssignmentStatus updateAssignmentItem(Long userId, Long assignmentId, AssignmentItemUpdateReq req) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new IllegalArgumentException("조회된 사용자가 없습니다."));
+
+        Assignment assignment = assignmentRepository.findById(assignmentId)
+                .orElseThrow(() -> new IllegalArgumentException("조회된 과제가 없습니다."));
+
+        AssignmentItem assignmentItem = assignmentItemRepository.findByUserAndAssignment(user, assignment)
+                .orElseThrow(() -> new IllegalArgumentException("해당 유저의 과제 채점 결과가 없습니다."));
+
+        assignmentItem.update(req.getStatus()); // 상태 업데이트
+
+        assignmentItemRepository.save(assignmentItem); // 상태 저장
+
+        return assignmentItem.getSubmitted();
+    }
 }

From f1f223ec4a874e6f36f189ffe795b658b347758c Mon Sep 17 00:00:00 2001
From: dietken1 <dietken1@ajou.ac.kr>
Date: Tue, 20 May 2025 21:22:17 +0900
Subject: [PATCH 20/20] =?UTF-8?q?feat:=20=EC=B6=9C=EC=84=9D=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20api=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminAttendanceController.java | 52 ++++++++++++++++++-
 .../request/UpdateAttendanceStatusReq.java    | 20 +++++++
 .../dto/response/UserAttendanceStatusRes.java | 34 ++++++++++++
 .../repository/AttendanceRepository.java      |  3 ++
 .../Attendance/service/AttendanceService.java | 41 ++++++++++++++-
 5 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/request/UpdateAttendanceStatusReq.java
 create mode 100644 backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/response/UserAttendanceStatusRes.java

diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/controller/AdminAttendanceController.java b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/controller/AdminAttendanceController.java
index f811f53..5b75a14 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/controller/AdminAttendanceController.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/controller/AdminAttendanceController.java
@@ -1,7 +1,9 @@
 package backend.pirocheck.Attendance.controller;
 
+import backend.pirocheck.Attendance.dto.request.UpdateAttendanceStatusReq;
 import backend.pirocheck.Attendance.dto.response.ApiResponse;
 import backend.pirocheck.Attendance.dto.response.AttendanceCodeResponse;
+import backend.pirocheck.Attendance.dto.response.UserAttendanceStatusRes;
 import backend.pirocheck.Attendance.entity.AttendanceCode;
 import backend.pirocheck.Attendance.service.AttendanceService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -12,8 +14,11 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
 @RestController
@@ -79,7 +84,7 @@ public ApiResponse<AttendanceCodeResponse> getActiveCode() {
     public ApiResponse<Void> expireAttendance(
             @Parameter(description = "만료할 출석 코드", required = true)
             @RequestParam String code) {
-        String result = attendanceService.exprireAttendanceCode(code);
+        String result = attendanceService.expireAttendanceCode(code);
         
         if (result.equals("출석 코드가 성공적으로 만료되었습니다")) {
             return ApiResponse.success(result, null);
@@ -104,4 +109,49 @@ public ApiResponse<Void> expireLatestAttendance() {
             return ApiResponse.error(result);
         }
     }
+    
+    // 출석 상태 변경 (관리자 전용)
+    @Operation(summary = "출석 상태 변경", description = "관리자가 특정 사용자의 출석 상태를 변경합니다.")
+    @ApiResponses({
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "출석 상태 변경 성공"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "잘못된 요청"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "출석 기록을 찾을 수 없음")
+    })
+    @PutMapping("/status")
+    public ApiResponse<Void> updateAttendanceStatus(
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(
+                description = "출석 상태 변경 요청", 
+                required = true, 
+                content = @Content(schema = @Schema(implementation = UpdateAttendanceStatusReq.class))
+            )
+            @RequestBody UpdateAttendanceStatusReq req) {
+        
+        boolean result = attendanceService.updateAttendanceStatus(
+                req.getAttendanceId(),
+                req.isStatus()
+        );
+        
+        if (result) {
+            return ApiResponse.success("출석 상태가 성공적으로 변경되었습니다", null);
+        } else {
+            return ApiResponse.error("출석 상태 변경에 실패했습니다. 출석 기록을 찾을 수 없습니다.");
+        }
+    }
+    
+    // 특정 날짜와 차수에 대한 모든 학생의 출석 현황 조회
+    @Operation(summary = "특정 날짜와 차수의 출석 현황 조회", description = "특정 날짜와 차수에 대한 모든 학생의 출석 현황을 조회합니다.")
+    @ApiResponses({
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "조회 성공"),
+        @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "잘못된 요청")
+    })
+    @GetMapping("/list")
+    public ApiResponse<List<UserAttendanceStatusRes>> getAllAttendanceByDateAndOrder(
+            @Parameter(description = "조회할 날짜 (YYYY-MM-DD)", required = true)
+            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
+            @Parameter(description = "조회할 차수", required = true)
+            @RequestParam int order) {
+        
+        List<UserAttendanceStatusRes> attendances = attendanceService.findAllByDateAndOrder(date, order);
+        return ApiResponse.success(attendances);
+    }
 } 
\ No newline at end of file
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/request/UpdateAttendanceStatusReq.java b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/request/UpdateAttendanceStatusReq.java
new file mode 100644
index 0000000..2c6973c
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/request/UpdateAttendanceStatusReq.java
@@ -0,0 +1,20 @@
+package backend.pirocheck.Attendance.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "출석 상태 수정 요청")
+public class UpdateAttendanceStatusReq {
+    @Schema(description = "출석 기록 ID", example = "1")
+    private Long attendanceId;
+    
+    @Schema(description = "변경할 출석 상태", example = "true")
+    private boolean status;
+} 
\ No newline at end of file
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/response/UserAttendanceStatusRes.java b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/response/UserAttendanceStatusRes.java
new file mode 100644
index 0000000..fcb624c
--- /dev/null
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/dto/response/UserAttendanceStatusRes.java
@@ -0,0 +1,34 @@
+package backend.pirocheck.Attendance.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "사용자 출석 상태 응답")
+public class UserAttendanceStatusRes {
+    @Schema(description = "출석 기록 ID", example = "1")
+    private Long attendanceId;
+    
+    @Schema(description = "사용자 ID", example = "1")
+    private Long userId;
+    
+    @Schema(description = "사용자 이름", example = "홍길동")
+    private String username;
+    
+    @Schema(description = "출석 날짜", example = "2023-10-20")
+    private LocalDate date;
+    
+    @Schema(description = "출석 차수", example = "1")
+    private int order;
+    
+    @Schema(description = "출석 상태", example = "true")
+    private boolean status;
+} 
\ No newline at end of file
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/repository/AttendanceRepository.java b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/repository/AttendanceRepository.java
index e06f6e9..783b90b 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/repository/AttendanceRepository.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/repository/AttendanceRepository.java
@@ -17,4 +17,7 @@ public interface AttendanceRepository extends JpaRepository<Attendance, Long> {
 
     // 출석 실패
     int countByUserAndStatusFalse(User user);
+    
+    // 특정 날짜와 차수에 대한 모든 출석 기록 조회
+    List<Attendance> findByDateAndOrder(LocalDate date, int order);
 }
diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/service/AttendanceService.java b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/service/AttendanceService.java
index ae2d5a8..4a1adb8 100644
--- a/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/service/AttendanceService.java
+++ b/backend/pirocheck/src/main/java/backend/pirocheck/Attendance/service/AttendanceService.java
@@ -6,6 +6,7 @@
 import backend.pirocheck.Attendance.dto.response.AttendanceMarkResponse;
 import backend.pirocheck.Attendance.dto.response.AttendanceSlotRes;
 import backend.pirocheck.Attendance.dto.response.AttendanceStatusRes;
+import backend.pirocheck.Attendance.dto.response.UserAttendanceStatusRes;
 import backend.pirocheck.Attendance.entity.Attendance;
 import backend.pirocheck.Attendance.entity.AttendanceCode;
 import backend.pirocheck.Attendance.repository.AttendanceCodeRepository;
@@ -104,7 +105,7 @@ public String expireLatestAttendanceCode() {
 
     // 출석코드 만료처리 함수
     @Transactional
-    public String exprireAttendanceCode(String code) {
+    public String expireAttendanceCode(String code) {
         Optional<AttendanceCode> codeOpt = attendanceCodeRepository.findByCodeAndDate(code, LocalDate.now());
 
         if (codeOpt.isEmpty()) {
@@ -208,4 +209,42 @@ public List<AttendanceSlotRes> findByUserIdAndDate(Long userId, LocalDate date)
                 .sorted(Comparator.comparingInt(AttendanceSlotRes::getOrder))
                 .toList();
     }
+    
+    // 관리자가 유저의 출석 상태를 변경하는 함수
+    @Transactional
+    public boolean updateAttendanceStatus(Long attendanceId, boolean status) {
+        Optional<Attendance> attendanceOpt = attendanceRepository.findById(attendanceId);
+        
+        if (attendanceOpt.isEmpty()) {
+            return false;
+        }
+        
+        // 출석 상태 변경
+        Attendance attendance = attendanceOpt.get();
+        attendance.setStatus(status);
+        attendanceRepository.save(attendance);
+        return true;
+    }
+
+    // 특정 날짜와 차수의 모든 학생 출석 현황 조회
+    public List<UserAttendanceStatusRes> findAllByDateAndOrder(LocalDate date, int order) {
+        // 해당 날짜와 차수에 대한 모든 출석 기록 조회
+        List<Attendance> attendances = attendanceRepository.findByDateAndOrder(date, order);
+        
+        // 사용자별로 DTO 변환
+        return attendances.stream()
+                .map(attendance -> {
+                    User user = attendance.getUser();
+                    return UserAttendanceStatusRes.builder()
+                            .userId(user.getId())
+                            .username(user.getName())
+                            .date(attendance.getDate())
+                            .order(attendance.getOrder())
+                            .status(attendance.isStatus())
+                            .attendanceId(attendance.getId())  // 출석 기록 ID 추가
+                            .build();
+                })
+                .sorted(Comparator.comparing(UserAttendanceStatusRes::getUsername))
+                .toList();
+    }
 }