Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ResponseEntity<?> getCaseVideo(@PathVariable("id") int id, HttpSession se
public ResponseEntity<?> updateCaseState(@PathVariable("id") int id,
@RequestBody StateRequest request,
HttpSession session) {
Map<Integer, String> message = dashboardService.updateCaseState(id, request, session);
Map<String, String> message = dashboardService.updateCaseState(id, request, session);
return ResponseEntity.ok(message);
}

Expand All @@ -45,7 +45,7 @@ public ResponseEntity<?> updateCaseState(@PathVariable("id") int id,
public ResponseEntity<?> completeCase(@PathVariable("id") int id,
@RequestBody SurveyRequest surveyRequest,
HttpSession session) {
Map<Integer, String> completedCase = dashboardService.completeCase(id, surveyRequest, session);
Map<String, String> completedCase = dashboardService.completeCase(id, surveyRequest, session);
return ResponseEntity.ok(completedCase);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public Map<String, String> getCaseVideo(int id, HttpSession session) {
}

// ์ถœ๋™, ๋ฏธ์ถœ๋™ ์ƒํƒœ ๋ณ€๊ฒฝ
public Map<Integer, String> updateCaseState(int id, StateRequest request, HttpSession session) {
public Map<String, String> updateCaseState(int id, StateRequest request, HttpSession session) {
CaseEntity caseEntity = getAuthorizedCase(id, session);
int policeId = getAuthenticatedPoliceId(session);

Expand Down Expand Up @@ -131,7 +131,7 @@ public Map<Integer, String> updateCaseState(int id, StateRequest request, HttpSe

dashboardRepository.save(caseEntity);

return Collections.singletonMap(id, "์ง€๊ธˆ ์ถœ๋™ํ•ฉ๋‹ˆ๋‹ค.");
return Collections.singletonMap("message", "์ง€๊ธˆ ์ถœ๋™ํ•ฉ๋‹ˆ๋‹ค.");
} else {
// ๋ฏธ์ถœ๋™ ์ฒ˜๋ฆฌ
caseEntity.setState(CaseEntity.CaseState.๋ฏธ์ถœ๋™);
Expand All @@ -143,12 +143,12 @@ public Map<Integer, String> updateCaseState(int id, StateRequest request, HttpSe

dashboardRepository.save(caseEntity);

return Collections.singletonMap(id, "๋ฏธ์ถœ๋™ ์‚ฌ๊ฑด์œผ๋กœ ๋ณ€๊ฒฝํ•ฉ๋‹ˆ๋‹ค.");
return Collections.singletonMap("message", "๋ฏธ์ถœ๋™ ์‚ฌ๊ฑด์œผ๋กœ ๋ณ€๊ฒฝํ•ฉ๋‹ˆ๋‹ค.");
}
}

// ์ถœ๋™ ์ค‘์ธ ์‚ฌ๊ฑด ํ•ด๊ฒฐ ์ฒ˜๋ฆฌ
public Map<Integer, String> completeCase(int id, SurveyRequest surveyRequest, HttpSession session) {
public Map<String, String> completeCase(int id, SurveyRequest surveyRequest, HttpSession session) {
CaseEntity caseEntity = getAuthorizedCase(id, session);

if (caseEntity.getState() != CaseEntity.CaseState.์ถœ๋™) {
Expand All @@ -164,6 +164,6 @@ public Map<Integer, String> completeCase(int id, SurveyRequest surveyRequest, Ht

dashboardRepository.save(caseEntity);

return Collections.singletonMap(id, "ํ•ด๋‹น ์‚ฌ๊ฑด์ด ํ•ด๊ฒฐ ์ฒ˜๋ฆฌ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.");
return Collections.singletonMap("message", "ํ•ด๋‹น ์‚ฌ๊ฑด์ด ํ•ด๊ฒฐ ์ฒ˜๋ฆฌ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.Collections;

@RestController
@RequestMapping("/api/v1")
@RequiredArgsConstructor
Expand All @@ -33,4 +35,18 @@ public ResponseEntity<?> getSessionUser(HttpSession session) {
}
return ResponseEntity.ok(user);
}

// ๋กœ๊ทธ์•„์›ƒ API
@PostMapping("/logout")
public ResponseEntity<?> authLogout(HttpSession session) {
// ์„ธ์…˜์—์„œ ์‚ฌ์šฉ์ž ์ •๋ณด ๊ฐ€์ ธ์˜ค๊ธฐ
UserResponseDto user = (UserResponseDto) session.getAttribute("user");
if (user == null) {
throw new IllegalStateException("์ด๋ฏธ ๋กœ๊ทธ์•„์›ƒ ์ƒํƒœ์ž…๋‹ˆ๋‹ค.");
}
// ์„ธ์…˜์— ์‚ฌ์šฉ์ž ์ •๋ณด ์‚ญ์ œ
session.removeAttribute("user");

return ResponseEntity.ok(Collections.singletonMap("message", "๋กœ๊ทธ์•„์›ƒ ์„ฑ๊ณต"));
}
}
Loading