Merge branch 'BE/userinfo' into 'backend'
feat: qna 조회 수정 See merge request s11-webmobile1-sub2/S11P12A701!129
This commit is contained in:
commit
dca8f9a553
@ -63,10 +63,7 @@ public class ReportController {
|
||||
return new ResponseEntity<>(detailReport, HttpStatus.OK);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 935331e7e93d9c25ec6f32ba6155ed19b5fd60f9
|
||||
@GetMapping("/teacher/reportSet/{lectureId}")
|
||||
public ResponseEntity<List<ReportSetResponse>> searchReportSets(@PathVariable("lectureId") long lectureId) {
|
||||
List<ReportSetResponse> 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));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user