[FEAT] 자가진단표 api 구현

src/main/java/com/onebridge/ouch/apiPayload/code/error/DiagnosisErrorCode.java

@@ -0,0 +1,21 @@
+package com.onebridge.ouch.apiPayload.code.error;
+
+import org.springframework.http.HttpStatus;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum DiagnosisErrorCode implements ErrorCode {
+
+	USER_NOT_FOUND(HttpStatus.NOT_FOUND, "DIAGNOSIS400", "User not found."),
+	SYMPTOM_NOT_FOUND(HttpStatus.NOT_FOUND, "DIAGNOSIS401", "Symptom not found."),
+	DIAGNOSIS_NOT_FOUND(HttpStatus.NOT_FOUND, "DIAGNOSIS402", "Diagnosis not found."),
+	SYMPTOM_ALREADY_ADDED(HttpStatus.BAD_REQUEST, "DIAGNOSIS403", "Symptom already added."),
+	;
+
+	private final HttpStatus httpStatus;
+	private final String code;
+	private final String message;
+}

src/main/java/com/onebridge/ouch/apiPayload/code/error/UserErrorCode.java

@@ -0,0 +1,18 @@
+package com.onebridge.ouch.apiPayload.code.error;
+
+import org.springframework.http.HttpStatus;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserErrorCode implements ErrorCode {
+
+	USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER400", "User not found."),
+	;
+
+	private final HttpStatus httpStatus;
+	private final String code;
+	private final String message;
+}

src/main/java/com/onebridge/ouch/controller/selfDiagnosis/SelfDiagnosisController.java

@@ -0,0 +1,104 @@
+package com.onebridge.ouch.controller.selfDiagnosis;
+
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.onebridge.ouch.apiPayload.ApiResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.request.AddSymptomsToDiagnosisRequest;
+import com.onebridge.ouch.dto.selfDiagnosis.request.DiagnosisCreateRequest;
+import com.onebridge.ouch.dto.selfDiagnosis.request.DiagnosisUpdateRequest;
+import com.onebridge.ouch.dto.selfDiagnosis.response.DiagnosisCreateResponseDetailed;
+import com.onebridge.ouch.dto.selfDiagnosis.response.DiagnosisUpdateResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisByUserIdResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.response.GetSymptomsOfDiagnosisResponse;
+import com.onebridge.ouch.security.authorization.UserId;
+import com.onebridge.ouch.service.selfDiagnosis.SelfDiagnosisService;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/self-diagnosis")
+@RequiredArgsConstructor
+public class SelfDiagnosisController {
+
+	private final SelfDiagnosisService selfDiagnosisService;
+
+	//자가진단표 생성
+	@PostMapping
+	public ResponseEntity<ApiResponse<DiagnosisCreateResponseDetailed>> createDiagnosis( //request dto 에 userid 지우기
+		@RequestBody @Valid DiagnosisCreateRequest request,
+		@UserId Long userId
+	) {
+		DiagnosisCreateResponseDetailed response = selfDiagnosisService.createDiagnosis(request, userId);
+		return ResponseEntity.ok(ApiResponse.created(response));
+	}
+
+	//(자가진단표)id로 자가진단표 조회
+	@GetMapping("/{diagnosisId}")
+	public ResponseEntity<ApiResponse<GetDiagnosisResponse>> getDiagnosisById(
+		@PathVariable Long diagnosisId,
+		@UserId Long userId
+	) {
+		GetDiagnosisResponse response = selfDiagnosisService.getDiagnosis(diagnosisId, userId);
+		return ResponseEntity.ok(ApiResponse.success(response));
+	}
+
+	//사용자 모든 자가진단표 조회
+	@GetMapping
+	public ResponseEntity<ApiResponse<List<GetDiagnosisByUserIdResponse>>> getAllDiagnosisByUserId(
+		@UserId Long userId
+	) {
+		List<GetDiagnosisByUserIdResponse> list = selfDiagnosisService.getAllDiagnosisByUserId(userId);
+		return ResponseEntity.ok(ApiResponse.success(list));
+	}
+
+	//자가진단표 삭제
+	@DeleteMapping("/{diagnosisId}")
+	public ResponseEntity<ApiResponse<Void>> deleteDiagnosis(@PathVariable Long diagnosisId,
+		@UserId Long userId
+	) {
+		selfDiagnosisService.deleteDiagnosis(diagnosisId, userId);
+		return ResponseEntity.ok(ApiResponse.successWithNoData());
+	}
+
+	//특정 자가진단표의 증상 목록 조회
+	@GetMapping("/{diagnosisId}/symptoms")
+	public ResponseEntity<ApiResponse<GetSymptomsOfDiagnosisResponse>> getSymptomsOfDiagnosis(
+		@PathVariable Long diagnosisId,
+		@UserId Long userId
+	) {
+		GetSymptomsOfDiagnosisResponse response = selfDiagnosisService.getSymptomsOfDiagnosis(diagnosisId, userId);
+		return ResponseEntity.ok(ApiResponse.success(response));
+	}
+
+	//자가진단표 수정
+	@PutMapping("/{diagnosisId}")
+	public ResponseEntity<ApiResponse<DiagnosisUpdateResponse>> updateDiagnosis(@PathVariable Long diagnosisId,
+		@RequestBody @Valid DiagnosisUpdateRequest request,
+		@UserId Long userId
+	) {
+		DiagnosisUpdateResponse response = selfDiagnosisService.updateDiagnosis(diagnosisId, userId, request);
+		return ResponseEntity.ok(ApiResponse.success(response));
+	}
+
+	//자가진단표에 증상 추가
+	@PostMapping("/{diagnosisId}/symptoms")
+	public ResponseEntity<ApiResponse<Void>> addSymptomsToSelfDiagnosis(@PathVariable Long diagnosisId,
+		@RequestBody @Valid AddSymptomsToDiagnosisRequest request,
+		@UserId Long userId
+	) {
+		selfDiagnosisService.addSymptomsToSelfDiagnosis(diagnosisId, request, userId);
+		return ResponseEntity.ok(ApiResponse.successWithNoData());
+	}
+}

src/main/java/com/onebridge/ouch/controller/symptom/SymptomController.java

@@ -0,0 +1,29 @@
+package com.onebridge.ouch.controller.symptom;
+
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.onebridge.ouch.apiPayload.ApiResponse;
+import com.onebridge.ouch.dto.symptom.response.GetSymptomResponse;
+import com.onebridge.ouch.service.symptom.SymptomService;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/symptoms")
+@RequiredArgsConstructor
+public class SymptomController {
+
+	private final SymptomService symptomService;
+
+	//증상 목록 조회
+	@GetMapping
+	public ResponseEntity<ApiResponse<List<GetSymptomResponse>>> getSymptomsList() {
+		List<GetSymptomResponse> list = symptomService.getSymptomsList();
+		return ResponseEntity.ok(ApiResponse.success(list));
+	}
+}

src/main/java/com/onebridge/ouch/controller/user/UserController.java

@@ -1,83 +1,58 @@
 package com.onebridge.ouch.controller.user;
 
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.onebridge.ouch.dto.MessageResponse;
-import com.onebridge.ouch.dto.MessageResponseDetailed;
-import com.onebridge.ouch.dto.user.request.MypageUserInfoUpdateRequest;
-import com.onebridge.ouch.dto.user.response.MypageUserInfoResponse;
+import com.onebridge.ouch.apiPayload.ApiResponse;
 import com.onebridge.ouch.dto.user.response.UserInfoResponse;
+import com.onebridge.ouch.security.userDetail.OuchUserDetails;
 import com.onebridge.ouch.service.user.UserService;
 
-import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
 
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/user")
+@RequiredArgsConstructor
 public class UserController {
 
 	private final UserService userService;
 
-	public UserController(UserService userService) {
-		this.userService = userService;
-	}
-
 	//유저 조회(테스트용)
-	@GetMapping("/users/{userId}")
-	public UserInfoResponse getUserInfo(@PathVariable Long userId) {
-		return userService.getUserInfo(userId);
+	// @GetMapping("/{userId}") //테스트를 위해 주석으로 남겨두겠습니다.
+	@GetMapping
+	public ResponseEntity<ApiResponse<UserInfoResponse>> getUserInfo(
+		// @PathVariable Long userId
+		@AuthenticationPrincipal OuchUserDetails userDetails) {
+		Long userId = userDetails.getDatabaseId();
+		UserInfoResponse response = userService.getUserInfo(userId);
+		return ResponseEntity.ok(ApiResponse.success(response));
 	}
 
 	//유저 탈퇴(비활성화)
-	@PatchMapping("/users/{userId}")
-	public ResponseEntity<?> deactivateUser(@PathVariable Long userId) {
+	// @PatchMapping("/{userId}")
+	@PatchMapping
+	public ResponseEntity<ApiResponse<Void>> deactivateUser(
+		// @PathVariable Long userId
+		@AuthenticationPrincipal OuchUserDetails userDetails) {
+		Long userId = userDetails.getDatabaseId();
 		userService.deactivateUser(userId);
-		MessageResponse body = new MessageResponse("Your account has been deactivated.");
-		HttpHeaders header = new HttpHeaders();
-		header.add(HttpHeaders.CONTENT_TYPE, "application/json");
-
-		return new ResponseEntity<>(body, header, HttpStatus.OK);
+		return ResponseEntity.ok(ApiResponse.successWithNoData());
 	}
 
 	//유저 삭제(테스트용)
-	@DeleteMapping("/users/{userId}")
-	public ResponseEntity<?> deleteUser(@PathVariable Long userId) {
+	// @DeleteMapping("/{userId}")
+	@DeleteMapping
+	public ResponseEntity<ApiResponse<Void>> deleteUser(
+		// @PathVariable Long userId
+		@AuthenticationPrincipal OuchUserDetails userDetails) {
+		Long userId = userDetails.getDatabaseId();
 		userService.deleteUser(userId);
-		MessageResponse body = new MessageResponse("Your account has been deleted.");
-		HttpHeaders header = new HttpHeaders();
-		header.add(HttpHeaders.CONTENT_TYPE, "application/json");
-
-		return new ResponseEntity<>(body, header, HttpStatus.OK);
-	}
-
-	//마이페이지(내 정보) 조회
-	@GetMapping("/mypage/users/{userId}")
-	public MypageUserInfoResponse myPageGetUserInfo(@PathVariable Long userId) {
-		return userService.myPageGetUserInfo(userId);
-	}
-
-	//내 정보 수정 (사용자로부터 모든 필드의 값을 받아 put 요청 처리)
-	@PutMapping("/mypage/users/{userId}")
-	public ResponseEntity<MessageResponseDetailed<String>> myPageUpdateUserInfo(@PathVariable Long userId,
-		@RequestBody @Valid MypageUserInfoUpdateRequest request) {
-		// System.out.println("userId = " + userId);
-		userService.myPageUpdateUserInfo(userId, request);
-		MessageResponseDetailed<String> body = new MessageResponseDetailed<>(
-			true,
-			"COMMON200",
-			"요청이 성공적으로 처리되었습니다.",
-			"유저 정보가 성공적으로 수정되었습니다."
-		);
-		return ResponseEntity.ok(body);
+		return ResponseEntity.ok(ApiResponse.successWithNoData());
 	}
 }
 

src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java

@@ -0,0 +1,109 @@
+package com.onebridge.ouch.converter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.onebridge.ouch.domain.SelfDiagnosis;
+import com.onebridge.ouch.domain.Symptom;
+import com.onebridge.ouch.domain.User;
+import com.onebridge.ouch.domain.mapping.SelfSymptom;
+import com.onebridge.ouch.domain.mapping.compositeKey.DiagnosisSymptomPK;
+import com.onebridge.ouch.dto.selfDiagnosis.request.DiagnosisCreateRequest;
+import com.onebridge.ouch.dto.selfDiagnosis.request.DiagnosisUpdateRequest;
+import com.onebridge.ouch.dto.selfDiagnosis.response.DiagnosisCreateResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.response.DiagnosisCreateResponseDetailed;
+import com.onebridge.ouch.dto.selfDiagnosis.response.DiagnosisUpdateResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisByUserIdResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisResponse;
+import com.onebridge.ouch.dto.selfDiagnosis.response.GetSymptomsOfDiagnosisResponse;
+
+@Component
+public class SelfDiagnosisConverter {
+
+	public DiagnosisUpdateResponse diagnosisToDiagnosisUpdateResponse(SelfDiagnosis updatedDiagnosis) {
+		List<String> symptoms = new ArrayList<>();
+		for (SelfSymptom symptom : updatedDiagnosis.getSelfSymptomList()) {
+			symptoms.add(symptom.getSymptom().getName());
+		}
+		return new DiagnosisUpdateResponse(updatedDiagnosis.getId(), updatedDiagnosis.getVisitType(), symptoms,
+			updatedDiagnosis.getDuration(), updatedDiagnosis.getPainSeverity(), updatedDiagnosis.getAdditionalNote(),
+			updatedDiagnosis.getCreatedAt().toString());
+	}
+
+	public DiagnosisCreateResponseDetailed diagnosisToDiagnosisCreateResponseDetailed(SelfDiagnosis diagnosis) {
+		List<String> symotimList = new ArrayList<>();
+		for (SelfSymptom symptom : diagnosis.getSelfSymptomList()) {
+			symotimList.add(symptom.getSymptom().getName());
+		}
+		return new DiagnosisCreateResponseDetailed(diagnosis.getId(),
+			diagnosis.getVisitType(), symotimList, diagnosis.getDuration(), diagnosis.getPainSeverity(),
+			diagnosis.getAdditionalNote(), diagnosis.getCreatedAt().toString());
+	}
+
+	public DiagnosisCreateResponse diagnosisToDiagnosisCreateResponse(SelfDiagnosis diagnosis) {
+		return new DiagnosisCreateResponse(diagnosis.getId(), "Self-diagnosis submitted successfully.");
+	}
+
+	public GetDiagnosisResponse diagnosisToGetDiagnosisResponse(SelfDiagnosis diagnosis) {
+		List<String> selfSymotimList = new ArrayList<>();
+		for (SelfSymptom symptom : diagnosis.getSelfSymptomList()) {
+			selfSymotimList.add(symptom.getSymptom().getName());
+		}
+		return new GetDiagnosisResponse(diagnosis.getUser().getId(), diagnosis.getVisitType(), selfSymotimList,
+			diagnosis.getDuration(),
+			diagnosis.getPainSeverity(), diagnosis.getAdditionalNote(), diagnosis.getCreatedAt().toString());
+	}
+
+	public GetDiagnosisByUserIdResponse diagnosisToGetDiagnosisByUserIdResponse(SelfDiagnosis diagnosis) {
+		List<String> selfSymotimList = new ArrayList<>();
+		for (SelfSymptom symptom : diagnosis.getSelfSymptomList()) {
+			selfSymotimList.add(symptom.getSymptom().getName());
+		}
+		return new GetDiagnosisByUserIdResponse(diagnosis.getId(), diagnosis.getVisitType(), selfSymotimList,
+			diagnosis.getDuration(), diagnosis.getPainSeverity(), diagnosis.getAdditionalNote(),
+			diagnosis.getCreatedAt().toString());
+	}
+
+	public GetSymptomsOfDiagnosisResponse diagnosisToGetSymptomsOfDiagnosisResponse(SelfDiagnosis diagnosis) {
+		List<String> symptoms = new ArrayList<>();
+		for (SelfSymptom symptom : diagnosis.getSelfSymptomList()) {
+			symptoms.add(symptom.getSymptom().getName());
+		}
+		return new GetSymptomsOfDiagnosisResponse(symptoms);
+	}
+
+	public SelfDiagnosis DiagnosisCreateRequestToSelfDiagnosis(DiagnosisCreateRequest request, User user) {
+		return SelfDiagnosis.builder()
+			.user(user)
+			.visitType(request.getVisitType())
+			.selfSymptomList(new ArrayList<>())
+			.duration(request.getDuration())
+			.painSeverity(request.getPainSeverity())
+			.additionalNote(request.getAdditionalNote())
+			.build();
+	}
+
+	public SelfSymptom SelfSymptomWithSelfDiagnosis(SelfDiagnosis selfDiagnosis, Symptom foundSymptom) {
+		return SelfSymptom.builder()
+			.selfDiagnosis(selfDiagnosis)
+			.symptom(foundSymptom)
+			.diagnosisSymptomPk(new DiagnosisSymptomPK(selfDiagnosis.getId(),
+				foundSymptom.getId()))
+			.build();
+	}
+
+	public SelfDiagnosis DiagnosisUpdateRequestToSelfDiagnosis(SelfDiagnosis diagnosis, User user,
+		DiagnosisUpdateRequest request) {
+		return diagnosis.toBuilder()
+			.user(user)
+			.visitType(request.getVisitType())
+			.selfSymptomList(new ArrayList<>())
+			.duration(request.getDuration())
+			.painSeverity(request.getPainSeverity())
+			.additionalNote(request.getAdditionalNote())
+			.createdAt(diagnosis.getCreatedAt())
+			.build();
+	}
+}