From 479649a98771e14597d435bfd4062001e7c44eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=A0=95=EB=AF=BC?= Date: Fri, 9 Aug 2024 10:25:24 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20qna=20=EC=A1=B0=ED=9A=8C=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 --- .../edufocus/report/controller/ReportController.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java b/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java index 3feb224..7edb3b3 100644 --- a/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java +++ b/backend/src/main/java/com/edufocus/edufocus/report/controller/ReportController.java @@ -63,10 +63,7 @@ public class ReportController { return new ResponseEntity<>(detailReport, HttpStatus.OK); } -<<<<<<< HEAD -======= ->>>>>>> 935331e7e93d9c25ec6f32ba6155ed19b5fd60f9 @GetMapping("/teacher/reportSet/{lectureId}") public ResponseEntity> searchReportSets(@PathVariable("lectureId") long lectureId) { List reportSetResponses = reportService.findReportSets(lectureId); @@ -88,7 +85,7 @@ public class ReportController { } @DeleteMapping("/teacher/report/{reportSetId}") - public ResponseEntity deleteReportSet(@PathVariable("reportSetId") UUID reportSetId, HttpServletRequest request){ + public ResponseEntity deleteReportSet(@PathVariable("reportSetId") UUID reportSetId, HttpServletRequest request) { String token = request.getHeader("Authorization"); long userId = Long.parseLong(jwtUtil.getUserId(token));