[FEAT] Aihub / JobInfo api (Notion) 구현 완료

.github/workflows/CI.yml

@@ -41,6 +41,7 @@ jobs:
         run: |
           echo "${{ secrets.OAUTH_YML }}" | base64 --decode > src/main/resources/application-oauth.yml
           echo "${{ secrets.MINIO_YML }}" | base64 --decode > src/main/resources/application-minio.yml
+          echo "${{ secrets.NOTION_YML }}" | base64 --decode > src/main/resources/application-notion.yml
           find src
 
       - name: gradlew 권한 부여

src/docs/asciidoc/aihub-controller-test.adoc

@@ -0,0 +1,16 @@
+== AI HUB API
+:source-highlighter: highlightjs
+
+---
+
+=== AI HUB 모델 리스트 조회 (POST /aihub/models)
+
+====
+operation::ai-hub-controller-test/get-ai-hub-models[snippets="query-parameters,request-fields,http-request,http-response,response-fields"]
+====
+
+=== AI HUB 데이터셋 리스트 조회 (POST /aihub/datasets)
+
+====
+operation::ai-hub-controller-test/get-ai-hub-datasets[snippets="query-parameters,request-fields,http-request,http-response,response-fields"]
+====

src/docs/asciidoc/index.adoc

@@ -18,4 +18,6 @@ include::eventNotice.adoc[]
 include::eventPeriod.adoc[]
 include::gallery.adoc[]
 include::application.adoc[]
-include::project.adoc[]
+include::project.adoc[]
+include::aihub-controller-test.adoc[]
+include::jobInfo-controller-test.adoc[]

src/docs/asciidoc/jobInfo-controller-test.adoc

@@ -0,0 +1,10 @@
+== JOB INFO API
+:source-highlighter: highlightjs
+
+---
+
+=== JOB INFO 리스트 조회 (POST /jobInfos)
+
+====
+operation::job-info-controller-test/get-job-infos[snippets="query-parameters,request-fields,http-request,http-response,response-fields"]
+====

src/main/java/com/scg/stop/aihub/controller/AiHubController.java

@@ -0,0 +1,43 @@
+package com.scg.stop.aihub.controller;
+
+import com.scg.stop.aihub.dto.request.AiHubDatasetRequest;
+import com.scg.stop.aihub.dto.request.AiHubModelRequest;
+import com.scg.stop.aihub.dto.response.AiHubDatasetResponse;
+import com.scg.stop.aihub.dto.response.AiHubModelResponse;
+import com.scg.stop.aihub.service.AiHubService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/aihub")
+@RequiredArgsConstructor
+public class AiHubController {
+
+    private final AiHubService aiHubService;
+
+    // Get the paginated list of models
+    @PostMapping("/models")
+    public ResponseEntity<Page<AiHubModelResponse>> getAiHubModels(
+            @RequestBody AiHubModelRequest request,
+            @PageableDefault(page = 0, size = 10) Pageable pageable) {
+        Page<AiHubModelResponse> models = aiHubService.getAiHubModels(request, pageable);
+        return ResponseEntity.status(HttpStatus.OK).body(models);
+    }
+
+    // Get the paginated list of datasets
+    @PostMapping("/datasets")
+    public ResponseEntity<Page<AiHubDatasetResponse>> getAiHubDatasets(
+            @RequestBody AiHubDatasetRequest request,
+            @PageableDefault(page = 0, size = 10) Pageable pageable) {
+        Page<AiHubDatasetResponse> datasets = aiHubService.getAiHubDatasets(request, pageable);
+        return ResponseEntity.status(HttpStatus.OK).body(datasets);
+    }
+}

src/main/java/com/scg/stop/aihub/dto/request/AiHubDatasetRequest.java

@@ -0,0 +1,21 @@
+package com.scg.stop.aihub.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class AiHubDatasetRequest {
+
+    private String title; // 제목 : text
+    private List<String> dataTypes; // 데이터 유형 : multiselect
+    private List<String> topics;  // 주제 분류 : multiselect
+    private List<Integer> developmentYears;  // 구축 년도 : multiselect
+    private String professor; // 담당 교수 : text
+    private List<String> participants; // 참여 학생 : text (comma separated)
+}
+

src/main/java/com/scg/stop/aihub/dto/request/AiHubModelRequest.java

@@ -0,0 +1,21 @@
+package com.scg.stop.aihub.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class AiHubModelRequest {
+
+    private String title; // 제목 : text
+    private List<String> learningModels;  // 학습 모델 : multiselect
+    private List<String> topics;  // 주제 분류 : multiselect
+    private List<Integer> developmentYears;  // 개발 년도 : multiselect
+    private String professor; // 담당 교수 : text
+    private List<String> participants; // 참여 학생 : text (comma separated)
+}
+

src/main/java/com/scg/stop/aihub/dto/response/AiHubDatasetResponse.java

@@ -0,0 +1,115 @@
+package com.scg.stop.aihub.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AiHubDatasetResponse {
+    private String object;
+    private String id; // 페이지 id
+    private String cover; // 커버 이미지
+    private String title; // 제목
+    private List<String> dataTypes = new ArrayList<>(); // 데이터 유형
+    private List<String> topics = new ArrayList<>(); // 주제 분류
+    private List<Integer> developmentYears = new ArrayList<>(); // 구축 년도
+    private String professor; // 담당 교수
+    private List<String> participants = new ArrayList<>(); // 참여 학생
+    private String url; // redirect url
+
+    @JsonProperty("object")
+    public void setObject(String object) {
+        this.object = object;
+    }
+
+    @JsonProperty("id")
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @JsonProperty("cover")
+    public void setCover(JsonNode cover) {
+        if (cover != null) {
+            if (cover.has("external")) { // external cover image
+                this.cover = cover.get("external").get("url").asText();
+            } else if (cover.has("file")) { // file cover image
+                this.cover = cover.get("file").get("url").asText();
+            }
+        }
+    }
+
+    // Extract properties from the JSON response and set the fields of response dto
+    @JsonProperty("properties")
+    public void setProperties(JsonNode properties) {
+        if (properties != null) {
+            this.title = extractTextFromProperty(properties, "제목", "title");
+            this.dataTypes = extractMultiSelect(properties, "데이터 유형");
+            this.topics = extractMultiSelect(properties, "주제 분류");
+            this.developmentYears = extractIntegerMultiSelect(properties, "구축 년도");
+            this.professor = extractTextFromProperty(properties, "담당 교수", "rich_text");
+            this.participants = extractParticipants(properties);
+        }
+    }
+
+    @JsonProperty("url")
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    // Helper methods
+    // Extract text from the text property
+    private String extractTextFromProperty(JsonNode properties, String fieldName, String textType) {
+        if (properties.has(fieldName)) {
+            JsonNode fieldNode = properties.get(fieldName).get(textType);
+            if (fieldNode.isArray() && fieldNode.size() > 0) {
+                return fieldNode.get(0).get("text").get("content").asText();
+            }
+        }
+        return null;
+    }
+
+    // Extract participants from the comma-separated text property
+    private List<String> extractParticipants(JsonNode properties) {
+        String participantsString = extractTextFromProperty(properties, "참여 학생", "rich_text");
+        if (participantsString != null && !participantsString.isEmpty()) {
+            return Arrays.asList(participantsString.split("\\s*,\\s*"));
+        }
+        return new ArrayList<>();
+    }
+
+    // Extract multi-select property
+    private List<String> extractMultiSelect(JsonNode properties, String fieldName) {
+        List<String> result = new ArrayList<>();
+        if (properties.has(fieldName)) {
+            JsonNode multiSelectNode = properties.get(fieldName).get("multi_select");
+            if (multiSelectNode.isArray()) {
+                multiSelectNode.forEach(node -> result.add(node.get("name").asText()));
+            }
+        }
+        return result;
+    }
+
+    // Extract multi-select property as integers
+    private List<Integer> extractIntegerMultiSelect(JsonNode properties, String fieldName) {
+        List<Integer> result = new ArrayList<>();
+        if (properties.has(fieldName)) {
+            JsonNode multiSelectNode = properties.get(fieldName).get("multi_select");
+            if (multiSelectNode.isArray()) {
+                multiSelectNode.forEach(node -> result.add(Integer.parseInt(node.get("name").asText())));
+            }
+        }
+        return result;
+    }
+}

src/main/java/com/scg/stop/aihub/dto/response/AiHubModelResponse.java

@@ -0,0 +1,115 @@
+package com.scg.stop.aihub.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AiHubModelResponse {
+    private String object;
+    private String id; // 페이지 id
+    private String cover; // 커버 이미지
+    private String title; // 제목
+    private List<String> learningModels = new ArrayList<>(); // 학습 모델
+    private List<String> topics = new ArrayList<>(); // 주제 분류
+    private List<Integer> developmentYears = new ArrayList<>(); // 개발 년도 (now List<Integer>)
+    private String professor; // 담당 교수
+    private List<String> participants = new ArrayList<>(); // 참여 학생
+    private String url;
+
+    @JsonProperty("object")
+    public void setObject(String object) {
+        this.object = object;
+    }
+
+    @JsonProperty("id")
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @JsonProperty("cover")
+    public void setCover(JsonNode cover) {
+        if (cover != null) {
+            if (cover.has("external")) { // external cover image
+                this.cover = cover.get("external").get("url").asText();
+            } else if (cover.has("file")) { // file cover image
+                this.cover = cover.get("file").get("url").asText();
+            }
+        }
+    }
+
+    // Extract properties from the JSON response and set the fields of response dto
+    @JsonProperty("properties")
+    public void setProperties(JsonNode properties) {
+        if (properties != null) {
+            this.title = extractTextFromProperty(properties, "제목", "title");
+            this.learningModels = extractMultiSelect(properties, "학습 모델");
+            this.topics = extractMultiSelect(properties, "주제 분류");
+            this.developmentYears = extractIntegerMultiSelect(properties, "개발 년도");
+            this.professor = extractTextFromProperty(properties, "담당 교수", "rich_text");
+            this.participants = extractParticipants(properties);
+        }
+    }
+
+    @JsonProperty("url")
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    // Helper methods
+    // Extract text from the text property
+    private String extractTextFromProperty(JsonNode properties, String fieldName, String textType) {
+        if (properties.has(fieldName)) {
+            JsonNode fieldNode = properties.get(fieldName).get(textType);
+            if (fieldNode.isArray() && fieldNode.size() > 0) {
+                return fieldNode.get(0).get("text").get("content").asText();
+            }
+        }
+        return null;
+    }
+
+    // Extract participants from the comma-separated text property
+    private List<String> extractParticipants(JsonNode properties) {
+        String participantsString = extractTextFromProperty(properties, "참여 학생", "rich_text");
+        if (participantsString != null && !participantsString.isEmpty()) {
+            return Arrays.asList(participantsString.split("\\s*,\\s*"));
+        }
+        return new ArrayList<>();
+    }
+
+    // Extract multi-select property
+    private List<String> extractMultiSelect(JsonNode properties, String fieldName) {
+        List<String> result = new ArrayList<>();
+        if (properties.has(fieldName)) {
+            JsonNode multiSelectNode = properties.get(fieldName).get("multi_select");
+            if (multiSelectNode.isArray()) {
+                multiSelectNode.forEach(node -> result.add(node.get("name").asText()));
+            }
+        }
+        return result;
+    }
+
+    // Extract multi-select property as Integer
+    private List<Integer> extractIntegerMultiSelect(JsonNode properties, String fieldName) {
+        List<Integer> result = new ArrayList<>();
+        if (properties.has(fieldName)) {
+            JsonNode multiSelectNode = properties.get(fieldName).get("multi_select");
+            if (multiSelectNode.isArray()) {
+                multiSelectNode.forEach(node -> result.add(Integer.parseInt(node.get("name").asText())));
+            }
+        }
+        return result;
+    }
+}