Merge: develop branch 병합

src/main/java/com/gaseng/checklist/controller/ChecklistApiController.java

@@ -1,10 +1,11 @@
 package com.gaseng.checklist.controller;
 
-import com.gaseng.checklist.dto.ChecklistResponse;
 import com.gaseng.checklist.dto.ChecklistRequest;
+import com.gaseng.checklist.dto.ChecklistResponse;
 import com.gaseng.checklist.service.ChecklistService;
 import com.gaseng.global.annotation.ExtractPayload;
 import com.gaseng.global.common.BaseResponse;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
@@ -19,18 +20,22 @@
 public class ChecklistApiController {
     private final ChecklistService checklistService;
 
+    @PreAuthorize("hasRole('USER')")
+    @Operation(summary = "체크리스트 생성", description = "사용자가 체크리스트를 등록합니다.")
     @PostMapping(value = "")
     public BaseResponse<Long> create(@RequestParam Long memId, @RequestBody @Valid ChecklistRequest request){
         return new BaseResponse<>(checklistService.create(memId, request.toChecklist()));
     }
 
     @PreAuthorize("hasRole('USER')")
+    @Operation(summary = "체크리스트 수정", description = "사용자가 체크리스트를 수정합니다.")
     @PutMapping(value = "")
     public BaseResponse<Long> update(@ExtractPayload Long memId, @RequestBody @Valid ChecklistRequest request) {
         return new BaseResponse<>(checklistService.update(memId, request.toChecklist()));
     }
 
     @PreAuthorize("hasRole('USER')")
+    @Operation(summary = "체크리스트 조회", description = "사용자가 체크리스트를 조회합니다.")
     @GetMapping(value = "")
     public BaseResponse<ChecklistResponse> get(@ExtractPayload Long memId) {
         return new BaseResponse<>(checklistService.get(memId));

src/main/java/com/gaseng/kyc/controller/KycManageApiController.java

@@ -1,49 +1,85 @@
 package com.gaseng.kyc.controller;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.gaseng.global.common.BaseResponse;
 import com.gaseng.kyc.dto.KycRequireResponse;
 import com.gaseng.kyc.dto.KycRequireSummaryResponse;
 import com.gaseng.kyc.dto.KycSaveRequest;
 import com.gaseng.kyc.service.KycManageService;
-
 import io.swagger.annotations.Api;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 @Api(tags = "Kyc Api")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/kyc")
 public class KycManageApiController {
 	private final KycManageService kycManageService;
-
+
+	@PreAuthorize("hasRole('ADMIN')")
 	@Operation(summary = "kyc 요청 조회", description = "kyc 요청서를 조회합니다.")
+	@ApiResponses(value = {
+			@ApiResponse(responseCode = "200", description = "요청에 성공했습니다."),
+			@ApiResponse(responseCode = "404", description = "KYC 요청을 찾을 수 없습니다."),
+			@ApiResponse(responseCode = "500", description = "서버와의 연결에 실패했습니다.")
+	})
 	@GetMapping("")
-	public BaseResponse<KycRequireResponse> get(@RequestParam Long kycrId) {
+	public BaseResponse<KycRequireResponse> get(
+			@Parameter(description = "kyc require id", required = true, example = "1")
+			@RequestParam Long kycrId
+	) {
 		return new BaseResponse<>(kycManageService.get(kycrId));
 	}
-
-	@Operation(summary = "kyc 요청 전체 조회", description = "kyc 요청서를 조회합니다.")
+
+	@PreAuthorize("hasRole('ADMIN')")
+	@Operation(summary = "kyc 요청 전체 조회", description = "kyc 요청서 목록을 조회합니다.")
+	@ApiResponses(value = {
+			@ApiResponse(responseCode = "200", description = "요청에 성공했습니다."),
+			@ApiResponse(responseCode = "500", description = "서버와의 연결에 실패했습니다.")
+	})
 	@GetMapping("/all")
 	public BaseResponse<List<KycRequireSummaryResponse>> getAll() {
 		return new BaseResponse<>(kycManageService.getAll());
 	}
-
+
+	@PreAuthorize("hasRole('ADMIN')")
 	@Operation(summary = "kyc 저장", description = "kyc를 저장합니다.")
+	@ApiResponses(value = {
+			@ApiResponse(responseCode = "200", description = "요청에 성공했습니다."),
+			@ApiResponse(responseCode = "404", description = "KYC 요청을 찾을 수 없습니다. / 비활성화된 KYC 요청입니다."),
+			@ApiResponse(responseCode = "500", description = "서버와의 연결에 실패했습니다.")
+	})
 	@PostMapping("")
-	public BaseResponse<Long> save(@RequestParam Long kycrId, @RequestBody @Valid KycSaveRequest request) throws Exception {
+	public BaseResponse<Long> save(
+			@Parameter(description = "kyc require id", required = true, example = "1")
+			@RequestParam Long kycrId,
+			@RequestBody @Valid KycSaveRequest request
+	) throws Exception {
 		return new BaseResponse<>(kycManageService.save(kycrId, request));
 	}
+
+	@PreAuthorize("hasRole('ADMIN')")
+	@Operation(summary = "범죄 이력 조회", description = "kyc 인증을 요청한 사용자의 범죄 이력을 조회합니다.")
+	@ApiResponses(value = {
+			@ApiResponse(responseCode = "200", description = "요청에 성공했습니다."),
+			@ApiResponse(responseCode = "404", description = "KYC 요청을 찾을 수 없습니다. / 일치하는 회원이 없습니다."),
+			@ApiResponse(responseCode = "500", description = "서버와의 연결에 실패했습니다.")
+	})
+	@GetMapping("/criminal-records/{kycrId}")
+	public BaseResponse<String> getCriminalRecord(
+			@Parameter(description = "kyc require id", required = true, example = "1")
+			@PathVariable Long kycrId
+	) {
+		return new BaseResponse<>(kycManageService.getCriminalRecord(kycrId));
+	}
 
 }

src/main/java/com/gaseng/kyc/domain/CriminalRecord.java

@@ -0,0 +1,23 @@
+package com.gaseng.kyc.domain;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@Table(name = "criminal_record")
+public class CriminalRecord {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long cmrId;
+
+    private String cmrName;
+
+    private String cmrPhone;
+
+    private String cmrContent;
+}

src/main/java/com/gaseng/kyc/dto/KycRequireSummaryResponse.java

@@ -1,12 +1,18 @@
 package com.gaseng.kyc.dto;
 
-import java.time.LocalDateTime;
-
 import com.gaseng.kyc.domain.KycRequire;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
 
 public record KycRequireSummaryResponse (
+		@Schema(description = "kyc require id", example = "1")
 		Long id,
+
+		@Schema(description = "kyc require member name", example = "홍길동")
 		String name,
+
+		@Schema(description = "kyc require created date", example = "2023-11-08T06:49:55.451533")
 		LocalDateTime createdAt
 ) {
 	public static KycRequireSummaryResponse toResponse(KycRequire require) {

src/main/java/com/gaseng/kyc/dto/KycSaveRequest.java

@@ -5,10 +5,14 @@
 import com.gaseng.kyc.domain.KycNoticeStatus;
 import com.gaseng.kyc.domain.KycRequire;
 import com.gaseng.member.domain.Member;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 public record KycSaveRequest (
 		@ValidEnum(enumClass = KycNoticeStatus.class)
+		@Schema(description = "kyc notice status", example = "0 반려 / 1 거절 / 2 승인")
 		KycNoticeStatus status,
+
+		@Schema(description = "kyc notice description", example = "kyc 공지 내용입니다.")
 		String description
 ) {
 	public KycNotice toEntity(Member member, KycRequire require) {

src/main/java/com/gaseng/kyc/exception/KycErrorCode.java

@@ -11,6 +11,7 @@ public enum KycErrorCode implements ErrorCode {
 	KYC_REQUIRE_NOT_FOUND(HttpStatus.NOT_FOUND, "KYC_001", "KYC 요청을 찾을 수 없습니다."),
 	KYC_REQUIRE_INACTIVE(HttpStatus.NOT_FOUND, "KYC_002", "비활성화된 KYC 요청입니다."),
 	KYC_NOTICE_NOT_FOUND(HttpStatus.NOT_FOUND, "KYC_003", "공지가 없습니다."),
+    KYC_REQUIRE_MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "KYC_004", "일치하는 회원이 없습니다."),
     ;
 
     private final HttpStatus status;

src/main/java/com/gaseng/kyc/repository/CriminalRecordRepository.java

@@ -0,0 +1,8 @@
+package com.gaseng.kyc.repository;
+
+import com.gaseng.kyc.domain.CriminalRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CriminalRecordRepository extends JpaRepository<CriminalRecord, Long> {
+    boolean existsByCmrNameAndCmrPhone(String name, String phone);
+}

src/main/java/com/gaseng/kyc/service/KycManageService.java

@@ -1,11 +1,5 @@
 package com.gaseng.kyc.service;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.gaseng.global.exception.BaseException;
 import com.gaseng.kyc.domain.Kyc;
 import com.gaseng.kyc.domain.KycNotice;
@@ -15,13 +9,19 @@
 import com.gaseng.kyc.dto.KycRequireSummaryResponse;
 import com.gaseng.kyc.dto.KycSaveRequest;
 import com.gaseng.kyc.exception.KycErrorCode;
+import com.gaseng.kyc.repository.CriminalRecordRepository;
 import com.gaseng.kyc.repository.KycNoticeRepository;
 import com.gaseng.kyc.repository.KycRepository;
 import com.gaseng.kyc.repository.KycRequireRepository;
 import com.gaseng.member.domain.Member;
 import com.gaseng.member.domain.MemberStatus;
-
+import com.gaseng.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(readOnly = true)
@@ -31,9 +31,13 @@ public class KycManageService {
 	private final KycRequireRepository kycRequireRepository;
 	private final KycNoticeRepository kycNoticeRepository;
 	private final KycInterface kycInterface;
+	private final CriminalRecordRepository criminalRecordRepository;
+	private final MemberRepository memberRepository;
 
 	public static int STATUS_ACTIVE = 0;
 	public static int STATUS_INACTIVE = 1;
+	public static String EXISTS_CRIMINAL_RECORD = "범죄 이력이 있습니다.";
+	public static String NOT_EXISTS_CRIMINAL_RECORD = "범죄 이력이 없습니다.";
 
 	@Transactional
 	public KycRequireResponse get(Long kycrId) {
@@ -92,6 +96,20 @@ public Long save(Long kycrId, KycSaveRequest request) throws Exception {
 		return kycNoticeRepository.save(noticeEntity).getKycnId();
 
 	}
+
+	public String getCriminalRecord(Long kycrId) {
+
+		KycRequire kycRequire = kycRequireRepository.findById(kycrId)
+				.orElseThrow(() -> BaseException.type(KycErrorCode.KYC_REQUIRE_NOT_FOUND));
+
+		String kycrName = kycRequire.getKycrName();
+		String memPhone = kycRequire.getMember().getMemPhone();
+
+		validateIsExistsMember(kycrName, memPhone);
+
+		return validateCriminalRecord(kycrName, memPhone);
+
+	}
 
 	private void saveKyc(Member member) {
 
@@ -104,4 +122,21 @@ private void saveKyc(Member member) {
 
 	}
 
+	private void validateIsExistsMember(String kycrName, String memPhone) {
+
+		if (!memberRepository.existsByMemNameAndMemPhone(kycrName, memPhone)) {
+			throw BaseException.type(KycErrorCode.KYC_REQUIRE_MEMBER_NOT_FOUND);
+		}
+
+	}
+
+	private String validateCriminalRecord(String kycrName, String memPhone) {
+
+		boolean isExists = criminalRecordRepository.existsByCmrNameAndCmrPhone(kycrName, memPhone);
+
+		return isExists
+				? EXISTS_CRIMINAL_RECORD
+				: NOT_EXISTS_CRIMINAL_RECORD;
+	}
+
 }

src/main/java/com/gaseng/member/repository/MemberRepository.java

@@ -18,6 +18,7 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByMemEmail(Email memEmail);
     Optional<Member> findByMemId(Long id);
     Member findByMemPhone(String memPhone);
+    boolean existsByMemNameAndMemPhone(String kycrName, String memPhone);
 
     @Query("SELECT m.memId AS memId, m.memName AS memName FROM Member m WHERE m.memRole = :memRole ")
     List<MemberListQueryProjection> findMemberByMemRole(@Param("memRole") Role memRole);

src/main/java/com/gaseng/sharehouse/controller/SharehouseApiController.java

@@ -2,7 +2,6 @@
 
 import com.gaseng.global.annotation.ExtractPayload;
 import com.gaseng.global.common.BaseResponse;
-import com.gaseng.sharehouse.domain.Sharehouse;
 import com.gaseng.sharehouse.dto.*;
 import com.gaseng.sharehouse.service.SharehouseService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -34,15 +33,14 @@ public BaseResponse<SharehouseDetailResponse> get(
     	return new BaseResponse<>(sharehouseService.get(shrId));
     }
 
-    @Operation(summary = "쉐어하우스 글 목록 조회", description = "사용자가 쉐어하우스 글 목록을 조회합니다.")
+    @Operation(summary = "쉐어하우스 글 목록 조회", description = "사용자가 쉐어하우스 글 전체 목록을 조회합니다.")
     @GetMapping(value = "/all")
     public BaseResponse<List<SharehouseResponse>> getAll(
             @Parameter(description = "size of page", required = true, example = "10")
             @RequestParam(value = "page") int pageSize,
             @Parameter(description = "last sharehouse id in the list (default = -1)", example = "10")
-            @RequestParam(value = "index", defaultValue = "-1", required = false) Long lastShrId) {
-
-
+            @RequestParam(value = "index", defaultValue = "-1", required = false) Long lastShrId
+    ) {
     	return new BaseResponse<>(sharehouseService.getAll(pageSize, lastShrId));
     }
 
@@ -78,14 +76,17 @@ public BaseResponse<Long> delete(
     public BaseResponse<Slice<SharehouseListResponse>> mySharehouse(
             @ExtractPayload Long memId,
             @RequestParam(value = "page", defaultValue = "0") int page,
-            @RequestParam(value = "size", defaultValue = "5") int size) {
+            @RequestParam(value = "size", defaultValue = "5") int size
+    ) {
         Pageable pageable = PageRequest.of(page, size);
         return new BaseResponse<> (sharehouseService.mySharehouse(memId, pageable));
     }
-
+
+    @Operation(summary = "내가 쓴 글 조회", description = "사용자가 내가 쓴 글 목록을 조회합니다.")
     @GetMapping("/my-share")
     public BaseResponse<List<SharehouseListResponse>> getMyShareHouse(
-            @ExtractPayload Long memId) {
+            @ExtractPayload Long memId
+    ) {
         return new BaseResponse<> (sharehouseService.getMySharehouse(memId));
     }
 }