Frontend admin sj

backend/pirocheck/src/main/java/backend/pirocheck/Deposit/entity/Deposit.java

@@ -2,13 +2,11 @@
 
 import backend.pirocheck.User.entity.User;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Entity
 @Getter
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
@@ -37,4 +35,12 @@ public void updateAmounts(int descentAssignment, int descentAttendance, int asce
         this.amount = Math.min(calculateAmount, 120000);  // 12만원 넘어가지 않도록
     }
 
+    // 방어권 업데이트
+    public void updateDefence(int newAscentDefence) {
+        this.ascentDefence = newAscentDefence;
+        int calculateAmount = 120000 - this.descentAssignment - this.descentAttendance + newAscentDefence;
+        this.amount = Math.min(calculateAmount, 120000);
+
+    }
+
 }

backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/Controller/ManageStudentsController.java

@@ -0,0 +1,37 @@
+package backend.pirocheck.ManageStudents.Controller;
+
+import backend.pirocheck.ManageStudents.dto.request.DefenceUpdateReqDto;
+import backend.pirocheck.ManageStudents.dto.response.ManageStudentDetailResDto;
+import backend.pirocheck.ManageStudents.dto.response.ManageStudentsListResDto;
+import backend.pirocheck.ManageStudents.service.ManageStudentsService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admin/managestudent")
+@RequiredArgsConstructor
+public class ManageStudentsController {
+
+    private final ManageStudentsService manageStudentsService;
+
+    // 수강생 리스트 조회
+    @GetMapping("")
+    public List<ManageStudentsListResDto> getStudents(@RequestParam(required = false) String name) {
+        return manageStudentsService.searchMembers(name);
+    }
+
+    // 수강생 상세 조회
+    @GetMapping("/{studentId}")
+    public ManageStudentDetailResDto getStudentDetail(@PathVariable Long studentId) {
+        return manageStudentsService.getMemberDetail(studentId);
+    }
+
+    // 방어권 업데이트
+    @PatchMapping("/{studentId}/defence")
+    public void updateDefence(@PathVariable Long studentId, @RequestBody DefenceUpdateReqDto req) {
+        manageStudentsService.updateDefence(studentId, req.getDefence());
+    }
+
+}

backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/dto/request/DefenceUpdateReqDto.java

@@ -0,0 +1,11 @@
+package backend.pirocheck.ManageStudents.dto.request;
+
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DefenceUpdateReqDto {
+    private int defence;
+}

backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/dto/response/ManageStudentDetailResDto.java

@@ -0,0 +1,16 @@
+package backend.pirocheck.ManageStudents.dto.response;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@Builder
+public class ManageStudentDetailResDto {
+
+    private String name;
+    private int deposit;
+    private int defence; // 방어권
+    private List<String> assignmentTitles; // 과제 제목 리스트
+}

backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/dto/response/ManageStudentsListResDto.java

@@ -0,0 +1,13 @@
+package backend.pirocheck.ManageStudents.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class ManageStudentsListResDto {
+
+    private Long id;
+    private String name;
+
+}

backend/pirocheck/src/main/java/backend/pirocheck/ManageStudents/service/ManageStudentsService.java

@@ -0,0 +1,86 @@
+package backend.pirocheck.ManageStudents.service;
+
+import backend.pirocheck.Deposit.entity.Deposit;
+import backend.pirocheck.Deposit.repository.DepositRepository;
+import backend.pirocheck.ManageStudents.dto.response.ManageStudentDetailResDto;
+import backend.pirocheck.ManageStudents.dto.response.ManageStudentsListResDto;
+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;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class ManageStudentsService {
+
+    private final UserRepository userRepository;
+    private final DepositRepository depositRepository;
+    private final AssignmentRepository assignmentRepository;
+
+    // 수강생 조회
+    public List<ManageStudentsListResDto> searchMembers(String name) {
+        List<User> users;
+
+        if(name == null || name.isBlank()) {
+            // 검색어가 없으면 맴버 전체 조회
+            users = userRepository.findByRole(Role.MEMBER);
+        }
+        else {
+            // 이름 검색
+            users = userRepository.findByNameContainingAndRole(name, Role.MEMBER);
+        }
+
+        return users.stream()
+                .map(user -> new ManageStudentsListResDto(user.getId(), user.getName()))
+                .collect(Collectors.toList());
+    }
+
+    // 수강생 상세 조회
+    public ManageStudentDetailResDto getMemberDetail(Long studentId) {
+        // User 조회
+        User user = userRepository.findById(studentId)
+                .orElseThrow(() -> new RuntimeException("해당 맴버가 존재하지 않습니다."));
+
+        // deposit 조회
+        Deposit deposit = depositRepository.findByUser(user);
+        if (deposit == null) {
+            throw new RuntimeException("해당 수강생의 보증금 정보가 없습니다.");
+        }
+
+        // Assignment 리스트 조회
+        List<Assignment> assignments = assignmentRepository.findByUserId(studentId);
+
+        // 과제 제목만 리스트로 변환
+        List<String> assignmentTitles = assignments.stream()
+                .map(Assignment::getAssignmentName)
+                .toList();
+
+        // ManageStudentDetailResDto 조립
+        return ManageStudentDetailResDto.builder()
+                .name(user.getName())
+                .deposit(deposit.getAmount())
+                .defence(deposit.getAscentDefence())
+                .assignmentTitles(assignmentTitles)
+                .build();
+    }
+
+    // 방어권 업데이트
+    public void updateDefence(Long studentId, int defence) {
+        User user = userRepository.findById(studentId)
+                .orElseThrow(() -> new RuntimeException("해당 수강생의 보증금 정보가 없습니다."));
+        Deposit deposit = depositRepository.findByUser(user);
+
+        // 업데이트
+        deposit.updateDefence(defence);
+
+        // 저장
+        depositRepository.save(deposit);
+
+    }
+}

backend/pirocheck/src/main/java/backend/pirocheck/User/exception/GlobalExceptionHandler.java

@@ -16,4 +16,12 @@ public ResponseEntity<ApiResponse<?>> handleInvalidLoginException(InvalidLoginEx
                 .status(HttpStatus.UNAUTHORIZED) // 401 상태 코드
                 .body(ApiResponse.error(e.getMessage())); // 에러 메시지 전달
     }
+
+    // RuntimeException (유저관리 상세페이지)
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseEntity<ApiResponse<?>> handleRuntimeException(RuntimeException ex) {
+        return ResponseEntity
+                .status(HttpStatus.BAD_REQUEST) // 404
+                .body(ApiResponse.error(ex.getMessage()));
+    }
 }

backend/pirocheck/src/main/java/backend/pirocheck/User/repository/UserRepository.java

@@ -12,4 +12,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByName(String name);
 
     List<User> findByRole(Role role);
+
+    // 학생 이름으로 검색기능
+    List<User> findByNameContainingAndRole(String name, Role role);
 }

backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java

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

frontend/src/App.jsx

@@ -1,15 +1,16 @@
 import React from "react";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import Login from "./Login";
-import Home from "./pages/admin/Home";
+import Home from "./pages/generation/Home";
 import Assignment from "./pages/generation/Assignment";
 import Deposit from "./pages/generation/Deposit";
 import Intro from "./Intro";
 import Admin from "./pages/admin/Admin";
-import MagageStudent from "./pages/admin/MagageStudent";
-import MagageTask from "./pages/admin/MagageTask";
+import MagageStudent from "./pages/admin/ManageStudent.jsx";
+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";
 
 function App() {
   return (
@@ -23,8 +24,9 @@ function App() {
         <Route path="/deposit" element={<Deposit />} />
         <Route path="/admin" element={<Admin />} />
         <Route path="/magagestudent" element={<MagageStudent />} />
-        <Route path="/magagetask" element={<MagageTask />} />
+        <Route path="/magagetask" element={<ManageTask />} />
         <Route path="/attendancecode" element={<AttendanceCode />} />
+        <Route path="/admin/attendance/:studentId" element={<AdminStudentAttendance />} />
       </Routes>
     </BrowserRouter>
   );

frontend/src/api/api.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 
 const api = axios.create({
-  baseURL: "http://api.:8080/api",
+  baseURL: "http://api.pirocheck.org:8080/api",
   withCredentials: true,
 });
 

frontend/src/components/AdminDailyAttendanceCard.jsx

@@ -0,0 +1,112 @@
+import React, { useEffect, useState } from "react";
+import "./componentsCss/AdminDailyAttendanceCard.css";
+import api from "../api/api";
+
+const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {
+  const [slots, setSlots] = useState([]);
+  const [modified, setModified] = useState([]);
+
+  useEffect(() => {
+    const fetchSlots = async () => {
+      /*
+           {
+      //  개발용 더미 데이터
+      const dummySlots = [
+        { id: 1, status: true },
+        { id: 2, status: false },
+        { id: 3, status: true },
+      ];
+      setSlots(dummySlots);
+      setModified(Array(dummySlots.length).fill(false));
+      return;
+    }
+      */
+      try {
+        const res = await api.get("/attendance/user/date", {
+          params: { userId: studentId, date },
+          withCredentials: true,
+        });
+
+        const rawSlots = res.data.data?.[0]?.slots || [];
+        setSlots(rawSlots);
+        setModified(Array(rawSlots.length).fill(false));
+      } catch (err) {
+        console.error("슬롯 정보 불러오기 실패:", err);
+      }
+    };
+
+    fetchSlots();
+  }, [date, studentId]);
+
+  const handleToggle = (idx) => {
+    const newSlots = [...slots];
+    newSlots[idx].status = !newSlots[idx].status;
+    setSlots(newSlots);
+
+    const newModified = [...modified];
+    newModified[idx] = true;
+    setModified(newModified);
+  };
+
+  const handleSave = async (idx) => {
+    try {
+      const slotId = slots[idx].id;
+      await api.put(`/attendance/slot/${slotId}`, {
+        status: slots[idx].status,
+      }, { withCredentials: true });
+
+      const newModified = [...modified];
+      newModified[idx] = false;
+      setModified(newModified);
+    } catch (err) {
+      console.error("슬롯 저장 실패:", err);
+      alert("저장 실패");
+    }
+  };
+
+  const handleSubmit = async () => {
+    try {
+      for (let i = 0; i < slots.length; i++) {
+        if (modified[i]) {
+          await handleSave(i);
+        }
+      }
+      alert("전체 저장 완료");
+    } catch (err) {
+      console.error("전체 저장 실패:", err);
+    }
+  };
+
+  return (
+    <div className="daily-card">
+      <div className="card-header">
+        <p>{date} 출석 수정</p>
+        <button onClick={onClose}>❌</button>
+      </div>
+      <div className="card-body">
+        {slots.map((slot, idx) => (
+          <div key={slot.id} className="slot-row">
+            <span>{idx + 1}차 출석</span>
+            <select value={slot.status} onChange={(e) => handleChange(idx, e.target.value)}>
+              <option value="SUCCESS">성공</option>
+              <option value="FAILURE">실패</option>
+            </select>
+
+            <button
+              className="save-btn"
+              onClick={() => handleSave(idx)}
+              disabled={!modified[idx]}
+            >
+              save
+            </button>
+          </div>
+        ))}
+      </div>
+      <button className="submit-btn" onClick={handleSubmit}>
+        submit
+      </button>
+    </div>
+  );
+};
+
+export default AdminDailyAttendanceCard;