Merge pull request #44 from parentsgowork/refactor/#43

[#43] Refactor: 북마크 조회 기능

Author: sehyeo

src/main/java/com/parentsgowork/server/apiPayload/code/status/ErrorStatus.java

@@ -17,7 +17,7 @@ public enum ErrorStatus implements BaseErrorCode {
     _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."),
 
     //멤버 관련 에러
-    USER_NOT_FOUND(HttpStatus.UNAUTHORIZED, "USER4001", "이메일 또는 패스워드가 일치하지 않습니다."),
+    USER_NOT_FOUND(HttpStatus.NOT_FOUND, "USER4001", "회원을 찾을 수 없습니다."),
     EMAIL_ALREADY_EXISTS(HttpStatus.CONFLICT, "USER4002", "이미 존재하는 이메일입니다."),
     USER_STATUS_INACTIVE(HttpStatus.FORBIDDEN, "USER4003", "탈퇴한 회원입니다."),
 
@@ -45,18 +45,10 @@ public enum ErrorStatus implements BaseErrorCode {
     EMAIL_SEND_FAIL(HttpStatus.INTERNAL_SERVER_ERROR, "AUTH5001", "이메일 전송에 실패했습니다."),
     EMAIL_ENCODING_FAIL(HttpStatus.INTERNAL_SERVER_ERROR, "AUTH5002", "이메일 내용 인코딩에 실패했습니다."),
 
-    // 크롤링 관련 에러
-    CRAWLING_DRIVER_NOT_FOUND(HttpStatus.INTERNAL_SERVER_ERROR, "CRAWLING4001", "크롬 드라이버 경로가 설정되지 않았습니다."),
-    CRAWLING_PAGE_LOAD_FAIL(HttpStatus.INTERNAL_SERVER_ERROR,"CRAWLING4002", "페이지 로딩 중 오류가 발생했습니다."),
-    CRAWLING_ELEMENT_NOT_FOUND(HttpStatus.NOT_FOUND,"CRAWLING4003", "요소를 찾을 수 없습니다."),
-    CRAWLING_TIMEOUT(HttpStatus.INTERNAL_SERVER_ERROR,"CRAWLING4004", "페이지 로딩 시간이 초과되었습니다."),
-    CRAWLING_SESSION_FAIL(HttpStatus.INTERNAL_SERVER_ERROR,"CRAWLING4005", "크롬 드라이버 세션을 시작할 수 없습니다."),
-    CRAWLING_INVALID_SELECTOR(HttpStatus.BAD_REQUEST,"CRAWLING4006", "유효하지 않은 셀렉터입니다."),
-    CRAWLING_NO_RESULTS(HttpStatus.NOT_FOUND,"CRAWLING4007", "크롤링 결과가 존재하지 않습니다."),
-    CRAWLING_UNKNOWN_ERROR(HttpStatus.INTERNAL_SERVER_ERROR,"CRAWLING4008", "알 수 없는 크롤링 오류가 발생했습니다."),
-
     // 북마크 관련 에러
-    BOOKMARK_NOT_FOUND(HttpStatus.NOT_FOUND, "BOOKMARK4001", "북마크가 존재하지 않습니다.");
+    EDUCATION_INFO_NOT_FOUND(HttpStatus.NOT_FOUND, "BOOKMARK4001", "북마크한 교육정보가 존재하지 않습니다."),
+    POLICY_INFO_NOT_FOUND(HttpStatus.NOT_FOUND, "BOOKMARK4002", "북마크한 정책정보가 존재하지 않습니다.");
+
 
 
 

src/main/java/com/parentsgowork/server/apiPayload/exception/EducationInfoHandler.java

@@ -0,0 +1,9 @@
+package com.parentsgowork.server.apiPayload.exception;
+
+import com.parentsgowork.server.apiPayload.code.BaseErrorCode;
+
+public class EducationInfoHandler extends GeneralException {
+    public EducationInfoHandler(BaseErrorCode code) {
+        super(code);
+    }
+}

…piPayload/exception/BookmarkHandler.java …Payload/exception/PolicyInfoHandler.javasrc/main/java/com/parentsgowork/server/apiPayload/exception/BookmarkHandler.java renamed to src/main/java/com/parentsgowork/server/apiPayload/exception/PolicyInfoHandler.java src/main/java/com/parentsgowork/server/apiPayload/exception/BookmarkHandler.java renamed to src/main/java/com/parentsgowork/server/apiPayload/exception/PolicyInfoHandler.java

@@ -2,9 +2,8 @@
 
 import com.parentsgowork.server.apiPayload.code.BaseErrorCode;
 
-public class BookmarkHandler extends GeneralException {
-    public BookmarkHandler(BaseErrorCode code) {
+public class PolicyInfoHandler extends GeneralException {
+    public PolicyInfoHandler(BaseErrorCode code) {
         super(code);
     }
-
 }

src/main/java/com/parentsgowork/server/converter/BookmarkConverter.java

@@ -0,0 +1,36 @@
+package com.parentsgowork.server.converter;
+
+import com.parentsgowork.server.domain.EducationInfo;
+import com.parentsgowork.server.web.dto.EducationInfoDTO.EducationInfoResponseDTO;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class EducationInfoConverter {
+
+    public static List<EducationInfoResponseDTO.EducationInfoListDTO> getEducationInfoListDTO(List<EducationInfo> educationInfos) {
+        return educationInfos.stream()
+                .map(education -> EducationInfoResponseDTO.EducationInfoListDTO.builder()
+                        .id(education.getId())
+                        .title(education.getTitle())
+                        .url(education.getUrl())
+                        .build())
+                .collect(Collectors.toList());
+    }
+
+    public static EducationInfoResponseDTO.EducationInfoDetailDTO getEducationInfoDetailDTO(EducationInfo educationInfo) {
+        return EducationInfoResponseDTO.EducationInfoDetailDTO.builder()
+                .id(educationInfo.getId())
+                .title(educationInfo.getTitle())
+                .url(educationInfo.getUrl())
+                .build();
+    }
+
+
+    public static EducationInfoResponseDTO.DeleteEducationInfoDTO DeleteEducationInfoDTO(EducationInfo educationInfo) {
+        return EducationInfoResponseDTO.DeleteEducationInfoDTO.builder()
+                .id(educationInfo.getId())
+                .message("저장한 교육정보를 삭제하였습니다.")
+                .build();
+    }
+}

src/main/java/com/parentsgowork/server/converter/EducationInfoConverter.java

@@ -0,0 +1,35 @@
+package com.parentsgowork.server.converter;
+
+import com.parentsgowork.server.domain.PolicyInfo;
+import com.parentsgowork.server.web.dto.PolicyInfoDTO.PolicyInfoResponseDTO;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class PolicyInfoConverter {
+    public static List<PolicyInfoResponseDTO.PolicyInfoListDTO> getPolicyInfoListDTO(List<PolicyInfo> policyInfos) {
+        return policyInfos.stream()
+                .map(policy -> PolicyInfoResponseDTO.PolicyInfoListDTO.builder()
+                        .id(policy.getId())
+                        .title(policy.getTitle())
+                        .url(policy.getUrl())
+                        .build())
+                .collect(Collectors.toList());
+    }
+
+    public static PolicyInfoResponseDTO.PolicyInfoDetailDTO getPolicyInfoDetailDTO(PolicyInfo policyInfo) {
+        return PolicyInfoResponseDTO.PolicyInfoDetailDTO.builder()
+                .id(policyInfo.getId())
+                .title(policyInfo.getTitle())
+                .url(policyInfo.getUrl())
+                .build();
+    }
+
+
+    public static PolicyInfoResponseDTO.DeletePolicyInfoDTO DeletePolicyInfoDTO(PolicyInfo policyInfo) {
+        return PolicyInfoResponseDTO.DeletePolicyInfoDTO.builder()
+                .id(policyInfo.getId())
+                .message("저장한 정책정보를 삭제하였습니다.")
+                .build();
+    }
+}

src/main/java/com/parentsgowork/server/converter/PolicyInfoConverter.java

@@ -0,0 +1,17 @@
+package com.parentsgowork.server.repository;
+
+import com.parentsgowork.server.domain.EducationInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface EducationInfoRepository extends JpaRepository<EducationInfo, Long>  {
+    @Query("SELECT ei FROM EducationInfo ei " +
+            "WHERE ei. user.id = :userId")
+    List<EducationInfo> findEducationInfoList(@Param("userId") Long userId);
+
+    Optional<EducationInfo> findByIdAndUserId(@Param("educationInfoId") Long educationInfoId, @Param("userId") Long userId);
+}

src/main/java/com/parentsgowork/server/crawling/JobInfoCrawling.java

@@ -0,0 +1,18 @@
+package com.parentsgowork.server.repository;
+
+import com.parentsgowork.server.domain.PolicyInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface PolicyInfoRepository  extends JpaRepository<PolicyInfo, Long> {
+
+    @Query("SELECT pi FROM PolicyInfo pi " +
+            "WHERE pi. user.id = :userId")
+    List<PolicyInfo> findPolicyInfoList(@Param("userId") Long userId);
+
+    Optional<PolicyInfo> findByIdAndUserId(@Param("policyInfoId") Long policyInfoId, @Param("userId") Long userId);
+}