Merge pull request #59 from Tave100Shot/develop

fix develop to main 존재하지 않는 번호에 대한 예외처리

.github/workflows/develop-ecs.yml

@@ -83,4 +83,4 @@ jobs:
           task-definition: ${{ steps.task-def.outputs.task-definition }}
           service: ${{ env.ECS_SERVICE }}
           cluster: ${{ env.ECS_CLUSTER }}
-          wait-for-service-stability: true
+          wait-for-service-stability: true

build.gradle

@@ -67,9 +67,13 @@ dependencies {
 	// redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'io.lettuce:lettuce-core'
-	
+
 	// jsoup
 	implementation 'org.jsoup:jsoup:1.15.4'
+
+	// csv
+	implementation 'com.opencsv:opencsv:5.5.2'
+	implementation 'commons-io:commons-io:2.11.0'
 }
 
 tasks.named('bootBuildImage') {
@@ -83,5 +87,4 @@ tasks.named('test') {
 // for queryDSL
 clean {
 	delete file('src/main/generated')
-}
-
+}

src/main/java/com/api/TaveShot/domain/compiler/controller/CompilerController.java

@@ -0,0 +1,48 @@
+package com.api.TaveShot.domain.compiler.controller;
+
+import com.api.TaveShot.domain.compiler.dto.ProblemDto;
+import com.api.TaveShot.domain.compiler.service.ProblemService;
+import com.api.TaveShot.global.success.SuccessResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/compile")
+public class CompilerController {
+
+    private final ProblemService problemService;
+    //private final CompilerService compilerService;
+
+    @Operation(summary = "문제 정보 가져오기", description = "해당 문제 번호의 문제 정보들을 보여줍니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "문제 정보 가져오기 성공",
+                    content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = ProblemDto.class)))
+    })
+    @GetMapping("/problems/{id}")
+    public SuccessResponse<ProblemDto> getProblem(@PathVariable String id) {
+        ProblemDto problemDto = problemService.getProblemById(id);
+        return new SuccessResponse<>(problemDto);
+    }
+
+    /*@Operation(summary = "코드 컴파일링 및 채점", description = "해당 문제 풀이에 대한 채점 결과를 보여줍니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "채점 성공",
+                    content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = String.class)))
+    })
+
+    @PostMapping("/submit")
+    public SuccessResponse<String> submitCode(@RequestBody @Validated SubmissionRequestDto submissionRequestDto) {
+        String result = compilerService.submitCode(submissionRequestDto);
+        return new SuccessResponse<>(result);
+    }*/
+}

src/main/java/com/api/TaveShot/domain/compiler/converter/ProblemConverter.java

@@ -0,0 +1,36 @@
+package com.api.TaveShot.domain.compiler.converter;
+
+import com.api.TaveShot.domain.compiler.domain.BojProblem;
+import com.api.TaveShot.domain.compiler.dto.ProblemDto;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+public class ProblemConverter {
+
+    public static Optional<ProblemDto> convertToDto(BojProblem bojProblem) {
+        return Optional.ofNullable(bojProblem)
+                .map(bp -> ProblemDto.builder()
+                        .id(bp.getId())
+                        .title(bp.getTitle())
+                        .description(bp.getDescription())
+                        .inputDescription(bp.getInputDescription())
+                        .outputDescription(bp.getOutputDescription())
+                        .sampleInput(bp.getSampleInput())
+                        .sampleOutput(bp.getSampleOutput())
+                        .build());
+    }
+
+    public static Optional<BojProblem> convertToEntity(ProblemDto problemDto) {
+        return Optional.ofNullable(problemDto)
+                .map(pd -> BojProblem.builder()
+                        .id(pd.getId())
+                        .title(pd.getTitle())
+                        .description(pd.getDescription())
+                        .inputDescription(pd.getInputDescription())
+                        .outputDescription(pd.getOutputDescription())
+                        .sampleInput(pd.getSampleInput())
+                        .sampleOutput(pd.getSampleOutput())
+                        .build());
+    }
+}

src/main/java/com/api/TaveShot/domain/compiler/domain/BojProblem.java

@@ -0,0 +1,38 @@
+package com.api.TaveShot.domain.compiler.domain;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Table(name = "bog_problems")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+@AllArgsConstructor
+@Builder
+public class BojProblem {
+
+    @Id
+    @Column(name = "ID", columnDefinition = "TEXT")
+    private String id;
+
+    @Column(name = "Title", columnDefinition = "TEXT")
+    private String title;
+
+    @Lob
+    @Column(name = "Description")
+    private String description;
+
+    @Lob
+    @Column(name = "Input Description")
+    private String inputDescription;
+
+    @Column(name = "Output Description", columnDefinition = "TEXT")
+    private String outputDescription;
+
+    @Column(name = "Sample Input", columnDefinition = "TEXT")
+    private String sampleInput;
+
+    @Column(name = "Sample Output", columnDefinition = "TEXT")
+    private String sampleOutput;
+
+}

src/main/java/com/api/TaveShot/domain/compiler/dto/ProblemDto.java

@@ -0,0 +1,42 @@
+package com.api.TaveShot.domain.compiler.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRawValue;
+import com.opencsv.bean.CsvBindByName;
+import lombok.*;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ProblemDto {
+
+    @JsonProperty("ID")
+    private String id;
+
+    @JsonProperty("Title")
+    private String title;
+
+    @JsonProperty("Description")
+    private String description;
+
+    @JsonProperty("Input Description")
+    private String inputDescription;
+
+    @JsonProperty("Output Description")
+    private String outputDescription;
+
+    @JsonProperty("Sample Input")
+    private String sampleInput;
+
+    @JsonProperty("Sample Output")
+    private String sampleOutput;
+
+    private String problemUrl;
+
+    public String getProblemUrl(){
+        this.problemUrl = "https://www.acmicpc.net/problem/" + this.id;
+        return this.problemUrl;
+    }
+
+}

src/main/java/com/api/TaveShot/domain/compiler/dto/SubmissionRequestDto.java

@@ -0,0 +1,24 @@
+/*package com.api.TaveShot.domain.compiler.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SubmissionRequestDto {
+
+    @NotEmpty
+    private String problemId;
+
+    @NotEmpty
+    private String language;
+
+    @NotEmpty
+    private String sourceCode;
+
+}*/

src/main/java/com/api/TaveShot/domain/compiler/repository/ProblemRepository.java

@@ -0,0 +1,6 @@
+package com.api.TaveShot.domain.compiler.repository;
+
+import com.api.TaveShot.domain.compiler.domain.BojProblem;
+import org.springframework.data.jpa.repository.JpaRepository;
+public interface ProblemRepository extends JpaRepository<BojProblem, String> {
+}

src/main/java/com/api/TaveShot/domain/compiler/service/CompilerService.java

@@ -0,0 +1,43 @@
+/*package com.api.TaveShot.domain.compiler.service;
+
+import com.api.TaveShot.domain.compiler.dto.SubmissionRequestDto;
+import com.api.TaveShot.global.exception.ApiException;
+import com.api.TaveShot.global.exception.ErrorType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import java.util.Map;
+
+@Service
+public class CompilerService {
+
+    private static final String SUBMIT_CODE_URL = "http://43.202.52.177/submitCode";
+    private static final String RESULT_URL = "http://43.202.52.177/result/";
+    private static final int MAX_ATTEMPTS = 10;
+    private static final long SLEEP_TIME_MILLIS = 5000;
+
+    public String submitCode(SubmissionRequestDto submissionRequestDto) {
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> submitResponse = restTemplate.postForEntity(SUBMIT_CODE_URL, submissionRequestDto, Map.class);
+        String submissionId = (String) submitResponse.getBody().get("submission_id");
+
+        String result = "결과 처리 중";
+        int attempts = 0;
+        while (result.equals("결과 처리 중") && attempts < MAX_ATTEMPTS) {
+            ResponseEntity<Map> resultResponse = restTemplate.getForEntity(RESULT_URL + submissionId, Map.class);
+            result = (String) resultResponse.getBody().get("result");
+            if (result.contains("정답이 준비되지 않아, 코드를 제출할 수 없습니다.")) {
+                throw new ApiException(ErrorType._SUBMIT_PAGE_NOT_FOUND);
+            }
+            try {
+                Thread.sleep(SLEEP_TIME_MILLIS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            attempts++;
+        }
+
+        return result;
+    }
+}*/

src/main/java/com/api/TaveShot/domain/compiler/service/ProblemService.java

@@ -0,0 +1,28 @@
+package com.api.TaveShot.domain.compiler.service;
+
+import com.api.TaveShot.domain.compiler.converter.ProblemConverter;
+import com.api.TaveShot.domain.compiler.domain.BojProblem;
+import com.api.TaveShot.domain.compiler.dto.ProblemDto;
+import com.api.TaveShot.domain.compiler.repository.ProblemRepository;
+import com.api.TaveShot.global.exception.ApiException;
+import com.api.TaveShot.global.exception.ErrorType;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+
+@Service
+@RequiredArgsConstructor
+public class ProblemService {
+
+    private final ProblemRepository problemRepository;
+
+    public ProblemDto getProblemById(String id) {
+        BojProblem bojProblem = problemRepository.findById(id)
+                .orElseThrow(() -> new ApiException(ErrorType._PROBLEM_NOT_FOUND));
+
+        return ProblemConverter.convertToDto(bojProblem).orElseThrow(() -> new ApiException(ErrorType._PROBLEM_CONVERSION_ERROR));
+    }
+}

src/main/java/com/api/TaveShot/domain/recommend/repository/ProblemElementRepository.java

@@ -11,6 +11,6 @@
 public interface ProblemElementRepository extends JpaRepository<ProblemElement, Long> {
 
     @Query("select p from ProblemElement as p where p.problemId=:problemId")
-    ProblemElement findByProblemId(Integer problemId);
+    Optional<ProblemElement> findByProblemId(Integer problemId);
 
 }

src/main/java/com/api/TaveShot/domain/recommend/service/CrawlingService.java

@@ -20,10 +20,10 @@ public class CrawlingService {
 
     // 첫번째 크롤링, 사용자의 순위, 랭크, 맞춘 문제 수, 틀린 문제 수, 맞춘 문제 리스트
     public UserCrawlingDto getUserInfo(String userName) throws IOException {
-        String rank = null;
-        String tier = null;
-        String rightCnt = null;
-        String wrongCnt = null;
+        String rank = "0";
+        String tier = "0";
+        String rightCnt = "0";
+        String wrongCnt = "0";
         List<String> list = new ArrayList<>();
 
         String url = baekURL + userName;

src/main/java/com/api/TaveShot/domain/recommend/service/RecommendService.java

@@ -76,6 +76,8 @@ public RecResponseDto getListByProblem(int solvedRecentId) throws IOException {
                 .baseUrl(lambda2)
                 .build();
 
+        ProblemElement problemElement = problemElementRepository.findByProblemId(solvedRecentId).orElseThrow( () -> new ApiException(ErrorType._PROBLEM_NOT_FOUND));
+
         RecProRequestDto requestDto = RecProRequestDto.builder()
                 .solvedRecentId(solvedRecentId)
                 .build();
@@ -158,7 +160,7 @@ private List<RecProDetailResponseDto> getProblemDetail(RecProResponseDto proList
             Integer num = Integer.parseInt(result.get(i));
             log.info("num:{}", num);
             try {
-                ProblemElement problemElement = problemElementRepository.findByProblemId(num);
+                ProblemElement problemElement = problemElementRepository.findByProblemId(Integer.parseInt(String.valueOf(num))).orElseThrow( () -> new ApiException(ErrorType._PROBLEM_NOT_FOUND));
                 log.info("{}, {}, {}", problemElement.getProblemId(), problemElement.getBojLevel(), problemElement.getBojKey());
                 String tierName = getTierName(problemElement.getBojLevel());
                 List<String> tags = extractWords(problemElement.getBojKey());

src/main/java/com/api/TaveShot/domain/search/service/SearchService.java

@@ -1,8 +1,12 @@
 package com.api.TaveShot.domain.search.service;
 
+import com.api.TaveShot.domain.recommend.domain.ProblemElement;
+import com.api.TaveShot.domain.recommend.repository.ProblemElementRepository;
 import com.api.TaveShot.domain.search.dto.GoogleItemDto;
 import com.api.TaveShot.domain.search.dto.GoogleListResponseDto;
 import com.api.TaveShot.domain.search.dto.GoogleResponseDto;
+import com.api.TaveShot.global.exception.ApiException;
+import com.api.TaveShot.global.exception.ErrorType;
 import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,6 +19,7 @@
 import reactor.core.publisher.Mono;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 
@@ -30,8 +35,12 @@ public class SearchService {
     @Value("${google.secret.cx}")
     private String CX;
 
+    private final ProblemElementRepository problemElementRepository;
 
     public GoogleListResponseDto findBlog(String query, int index) {
+
+        ProblemElement problemElement = problemElementRepository.findByProblemId(Integer.parseInt(query)).orElseThrow( () -> new ApiException(ErrorType._PROBLEM_NOT_FOUND));
+
         WebClient webClient = WebClient.builder()
                 .baseUrl("https://www.googleapis.com/customsearch/v1")
                 .build();