diff --git a/src/main/java/com/example/umc3_teamproject/controller/InterviewController.java b/src/main/java/com/example/umc3_teamproject/controller/InterviewController.java index 8321a94..4aae6ea 100644 --- a/src/main/java/com/example/umc3_teamproject/controller/InterviewController.java +++ b/src/main/java/com/example/umc3_teamproject/controller/InterviewController.java @@ -1,11 +1,13 @@ package com.example.umc3_teamproject.controller; +import com.example.umc3_teamproject.config.resTemplate.ResponseException; import com.example.umc3_teamproject.domain.dto.request.InterviewRequestDto; import com.example.umc3_teamproject.domain.dto.response.InterviewResponseDto; import com.example.umc3_teamproject.domain.item.Interview; import com.example.umc3_teamproject.domain.item.Script; import com.example.umc3_teamproject.repository.InterviewRepository; import com.example.umc3_teamproject.service.InterviewService; +import com.example.umc3_teamproject.service.JwtService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,6 +32,7 @@ public class InterviewController { private final InterviewService interviewService; private final InterviewRepository interviewRepository; private final InterviewResponseDto interviewResponseDto; + private final JwtService jwtService; @PostMapping("/new") public ResponseEntity writeInterview(@Validated InterviewRequestDto.Register write){ @@ -50,8 +54,9 @@ public ResponseEntity readScriptById(@PathVariable("id") Long id) { return null; } - @GetMapping("/user/{userId}") - public ResponseEntity readScriptByUser(@PathVariable("userId") Long userId) { + @GetMapping("/user/me") + public ResponseEntity readScriptByUser() throws IOException, ResponseException { + Long userId = jwtService.getmemberId(); List interviewList=null; diff --git a/src/main/java/com/example/umc3_teamproject/controller/ScriptController.java b/src/main/java/com/example/umc3_teamproject/controller/ScriptController.java index 9815825..48d82a9 100644 --- a/src/main/java/com/example/umc3_teamproject/controller/ScriptController.java +++ b/src/main/java/com/example/umc3_teamproject/controller/ScriptController.java @@ -1,9 +1,11 @@ package com.example.umc3_teamproject.controller; +import com.example.umc3_teamproject.config.resTemplate.ResponseException; import com.example.umc3_teamproject.domain.dto.request.ScriptRequestDto; import com.example.umc3_teamproject.domain.dto.response.ScriptResponseDto; import com.example.umc3_teamproject.domain.item.Script; import com.example.umc3_teamproject.repository.ScriptRepository; +import com.example.umc3_teamproject.service.JwtService; import com.example.umc3_teamproject.service.ScriptService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; @@ -35,7 +37,7 @@ public class ScriptController { private final ScriptService scriptService; private final ScriptRepository scriptRepository; private final ScriptResponseDto scriptResponseDto; - + private final JwtService jwtService; @PostMapping("/new") public ResponseEntity writeScript(@RequestBody ScriptRequestDto.Register script ){ @@ -54,10 +56,11 @@ public ResponseEntity readScriptById(@PathVariable("id") Long id) { return null; } - @GetMapping("/member/{memberId}") - public ResponseEntity findScriptByUser(@PathVariable("memberId") Long memberId) { + @GetMapping("/member/me") + public ResponseEntity findScriptByUser() throws ResponseException { // @PageableDefault(page=0, size=10, sort="id", direction = Sort.Direction.DESC) Pageable pageable) { + Long memberId = jwtService.getmemberId(); List