🎨 스웨거 수정

.github/workflows/CI.yml

@@ -0,0 +1,48 @@
+name: CI with Gradle
+
+on:
+  push:
+    branches-ignore:
+      - main
+      - develop
+
+jobs:
+  CI:
+    name: Continuous Integration
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    services:
+      mongo:
+        image: mongo:6.0
+        ports:
+          - 27017:27017
+        env:
+          MONGO_INITDB_ROOT_USERNAME: test
+          MONGO_INITDB_ROOT_PASSWORD: testPW
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Wait for MongoDB to be ready
+        run: |
+          echo "Waiting for MongoDB to start..."
+          sleep 10 
+
+      - name: Build and Test with Gradle Wrapper
+        env:
+          SPRING_DATA_MONGODB_URI: "mongodb://test:testPW@localhost:27017/testdb"
+          FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+        run: |
+          ./gradlew build test

.github/workflows/CICD.yml

@@ -0,0 +1,142 @@
+name: CI/CD FOR DEVELOP
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+
+env:
+  DOCKERHUB_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
+  FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+
+jobs:
+  CI:
+    name: Continuous Integration
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    services:
+      mongo:
+        image: mongo:6.0
+        ports:
+          - 27017:27017
+        env:
+          MONGO_INITDB_ROOT_USERNAME: test
+          MONGO_INITDB_ROOT_PASSWORD: testPW
+
+    steps:
+      - name: Get short SHA
+        id: slug
+        run: echo "sha7=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Wait for MongoDB to start
+        run: sleep 10
+
+      - name: Build and Test with Gradle Wrapper
+        env:
+          SPRING_DATA_MONGODB_URI: "mongodb://test:testPW@localhost:27017/testdb"
+          FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+        run: |
+          ./gradlew build test
+
+      - name: Upload jar file to Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: jar_files
+          path: build/libs/*.jar
+
+      - name: Upload Dockerfile to Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Dockerfile
+          path: ./Dockerfile
+
+  CD_Delivery_to_DockerHub:
+    name: CD_Delivery_to_DockerHub
+    needs: CI
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Download jar file from Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: jar_files
+          path: build/libs
+
+      - name: Download Dockerfile file from Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: Dockerfile
+          path: ./
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Get short SHA
+        id: slug
+        run: echo "sha7=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+      - name: Build, tag, and push image to DockerHub
+        id: build-image
+        env:
+          USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          IMAGE_TAG: ${{ steps.slug.outputs.sha7 }}
+          FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+
+        run: |
+          docker build -t $USERNAME/$DOCKERHUB_REPOSITORY:$IMAGE_TAG -t $USERNAME/$DOCKERHUB_REPOSITORY:latest .
+          docker push $USERNAME/$DOCKERHUB_REPOSITORY --all-tags
+          echo "image=$USERNAME/$DOCKERHUB_REPOSITORY:$IMAGE_TAG&latest" >> $GITHUB_OUTPUT
+
+
+  CD_Deploy:
+    name: CD_Deploy
+    needs: CD_Delivery_to_DockerHub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get short SHA
+        id: slug
+        run: echo "sha7=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+      - name: Executing remote ssh commands
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.REMOTE_IP }}
+          username: ${{ secrets.REMOTE_USER }}
+          key: ${{ secrets.REMOTE_PRIVATE_KEY }}
+          port: ${{ secrets.REMOTE_SSH_PORT }}
+          script: |
+            export DOCKER_IMAGE="${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest"
+            export DOCKER_COMPOSE_PATH="${{ secrets.DOCKER_COMPOSE_PATH }}"
+            export FASTAPI_BASE_URL="${{ secrets.FASTAPI_BASE_URL }}"
+
+            cd /home/ubuntu/scripts
+            ./rolling-update.sh
+
+             echo "Stopping current containers..."
+            docker compose -f $DOCKER_COMPOSE_PATH down
+
+            echo "Pulling the latest image..."
+            docker compose -f $DOCKER_COMPOSE_PATH pull
+
+            echo "Starting new deployment..."
+            docker compose -f $DOCKER_COMPOSE_PATH up -d

Dockerfile

@@ -0,0 +1,4 @@
+FROM openjdk:17-alpine
+ARG JAR_FILE=build/libs/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "/app.jar"]

build.gradle

@@ -30,6 +30,10 @@ dependencies {
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	//swagger
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
+	//webflux
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 }
 
 tasks.named('test') {

init.js

@@ -0,0 +1,6 @@
+db = db.getSiblingDB('testdb');
+db.createUser({
+  user: "test",
+  pwd: "testPW",
+  roles: [{ role: "readWrite", db: "testdb" }]
+});

src/main/java/com/going/server/domain/word/controller/WordController.java

@@ -0,0 +1,34 @@
+package com.going.server.domain.word.controller;
+
+import com.going.server.domain.word.dto.WordResponseDto;
+import com.going.server.domain.word.service.WordService;
+import com.going.server.global.response.SuccessResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/words")
+@RequiredArgsConstructor
+public class WordController {
+    private final WordService wordService;
+
+    //대표어휘 조회
+    @GetMapping()
+    public SuccessResponse<List<WordResponseDto>> getWords() {
+        List<WordResponseDto> response = wordService.getWords();
+        return SuccessResponse.of(response);
+    }
+
+    //구성어휘 조회
+    @GetMapping("/composition-word")
+    public SuccessResponse<List<WordResponseDto>> getCompositionWords() {
+        List<WordResponseDto> response = wordService.getCompositionWords();
+        return SuccessResponse.of(response);
+    }
+
+}

src/main/java/com/going/server/domain/word/dto/CompositionClusterResponseDto.java

@@ -0,0 +1,15 @@
+package com.going.server.domain.word.dto;
+
+import lombok.*;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CompositionClusterResponseDto {
+    private Integer clusterId; // 클러스터 ID
+    private List<CompositionWordResponseDto> words; // 해당 클러스터의 단어 목록
+}

src/main/java/com/going/server/domain/word/dto/CompositionWordResponseDto.java

@@ -0,0 +1,21 @@
+package com.going.server.domain.word.dto;
+
+import com.going.server.domain.word.entity.CompositionWord;
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CompositionWordResponseDto {
+    private String compositionWord;
+    private Boolean isRepresent;
+
+    public static CompositionWordResponseDto of(CompositionWord compositionWord) {
+        return new CompositionWordResponseDto(
+                compositionWord.getCompositionWord(),
+                compositionWord.getIsRepresent()
+        );
+    }
+}

src/main/java/com/going/server/domain/word/dto/WordResponseDto.java

@@ -0,0 +1,14 @@
+package com.going.server.domain.word.dto;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class WordResponseDto {
+    private Integer clusterId; // 클러스터 ID 추가
+    private String word;
+    private String result_img;
+}

src/main/java/com/going/server/domain/word/entity/CompositionWord.java

@@ -0,0 +1,31 @@
+package com.going.server.domain.word.entity;
+
+import lombok.*;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Document(collection = "composition_words")
+public class CompositionWord {
+    @Id
+    private String compositionId;
+
+    @Field(name = "composition_word")
+    private String compositionWord;
+
+    @Field(name = "is_represent")
+    private Boolean isRepresent;
+
+    // ID를 자동으로 생성하는 생성자 추가
+    public CompositionWord(String word) {
+        this.compositionId = new ObjectId().toString();  // MongoDB의 ObjectId를 자동으로 생성
+        this.compositionWord = word;
+        this.isRepresent = false;
+    }
+}

src/main/java/com/going/server/domain/word/entity/Word.java

@@ -0,0 +1,30 @@
+package com.going.server.domain.word.entity;
+
+import com.going.server.global.common.BaseEntity;
+import lombok.*;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.bson.types.ObjectId;
+
+@Document(collection = "words") // MongoDB 컬렉션 지정
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class Word extends BaseEntity {
+
+    @Id
+    private String id;  // MongoDB에서 자동 생성될 ObjectId를 String으로 저장
+
+    @Field(name = "word")
+    private String word;
+
+    // ID를 자동으로 생성하는 생성자 추가
+    public Word(String word) {
+        this.id = new ObjectId().toString();  // MongoDB의 ObjectId를 자동으로 생성
+        this.word = word;
+    }
+
+}

src/main/java/com/going/server/domain/word/repository/WordRepository.java

@@ -0,0 +1,7 @@
+package com.going.server.domain.word.repository;
+
+import com.going.server.domain.word.entity.Word;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+public interface WordRepository extends MongoRepository<Word,Long> {
+}

src/main/java/com/going/server/domain/word/service/WordService.java

@@ -0,0 +1,11 @@
+package com.going.server.domain.word.service;
+
+import com.going.server.domain.word.dto.WordResponseDto;
+
+import java.util.List;
+
+public interface WordService {
+    List<WordResponseDto> getWords();
+
+    List<WordResponseDto> getCompositionWords();
+}