Merge branch 'main' of https://github.com/9oormthon-univ/2024_DANPOON…

…G_TEAM_21_BE

.github/workflows/CICD.yml

@@ -0,0 +1,55 @@
+# 1 워크플로의 이름 지정
+name: CI and Deploy to Amazon EC2
+# 2 워크플로가 시작될 조건 지정
+env:
+  AWS_REGION: ap-northeast-2
+  S3_BUCKET_NAME: easy-deploy
+  CODE_DEPLOY_APPLICATION_NAME: easy-deploy
+  CODE_DEPLOY_DEPLOYMENT_GROUP_NAME: easy-deploy-group
+permissions:
+  contents: read
+on:
+  push:
+    branches: [ main ]
+jobs:
+  build:
+    runs-on: ubuntu-latest # 3 실행 환경 지정
+    #4 실행스텝지정
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      # db.properties 파일 생성
+      - name: Make application.properties
+        run: |
+          cd ./src/main/resources
+          echo "${{ secrets.SECRET_PROPERTIES }}" > ./application-prod.yml
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew clean build
+      # (4) AWS 인증 (IAM 사용자 Access Key, Secret Key 활용)
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+      # (5) 빌드 결과물을 S3 버킷에 업로드
+      - name: Upload to AWS S3
+        run: |
+          aws deploy push \
+            --application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
+            --s3-location s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \
+            --source .
+        # (6) S3 버킷에 있는 파일을 대상으로 CodeDeploy 실행
+      - name: Deploy to AWS EC2 from S3
+        run: |
+          aws deploy create-deployment \
+            --application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
+            --deployment-config-name CodeDeployDefault.AllAtOnce \
+            --deployment-group-name ${{ env.CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} \
+            --s3-location bucket=$S3_BUCKET_NAME,key=$GITHUB_SHA.zip,bundleType=zip

scripts/start.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+PROJECT_ROOT="/home/ubuntu"
+JAR_FILE="$PROJECT_ROOT/easy-0.0.1-SNAPSHOT.jar"
+
+APP_LOG="$PROJECT_ROOT/application.log"
+ERROR_LOG="$PROJECT_ROOT/error.log"
+DEPLOY_LOG="$PROJECT_ROOT/deploy.log"
+
+TIME_NOW=$(date +%c)
+
+# build 파일 복사
+echo "$TIME_NOW > $JAR_FILE 파일 복사" >> $DEPLOY_LOG
+cp $PROJECT_ROOT/build/build/libs/billage-0.0.1-SNAPSHOT.jar $JAR_FILE
+
+# jar 파일 실행
+echo "$TIME_NOW > $JAR_FILE 파일 실행" >> $DEPLOY_LOG
+nohup java -jar $JAR_FILE > $APP_LOG 2> $ERROR_LOG &
+
+CURRENT_PID=$(pgrep -f $JAR_FILE)
+echo "$TIME_NOW > 실행된 프로세스 아이디 $CURRENT_PID 입니다." >> $DEPLOY_LOG

scripts/stop.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+PROJECT_ROOT="/home/ubuntu"
+JAR_FILE="easy-0.0.1-SNAPSHOT.jar"
+
+DEPLOY_LOG="$PROJECT_ROOT/deploy.log"
+
+TIME_NOW=$(date +%c)
+
+# 현재 구동 중인 애플리케이션 pid 확인
+CURRENT_PID=$(pgrep -f $JAR_FILE)
+
+# 프로세스가 켜져 있으면 종료
+if [ -z $CURRENT_PID ]; then
+  echo "$TIME_NOW > 현재 실행중인 애플리케이션이 없습니다" >> $DEPLOY_LOG
+else
+  echo "$TIME_NOW > 실행중인 $CURRENT_PID 애플리케이션 종료 " >> $DEPLOY_LOG
+  kill -15 $CURRENT_PID
+fi

src/main/java/com/jojoidu/book/easy/dictionary/repository/WordRepository.java

@@ -4,21 +4,25 @@
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import com.jojoidu.book.easy.dictionary.entity.Word;
 import com.jojoidu.book.easy.dictionary.entity.WordType;
 
 public interface WordRepository extends JpaRepository<Word, Long>{
-
-	List<Word> findByType(WordType type);
-
-
 	// 전체 검색 (ALL)
 	List<Word> findByWordContainingOrDescriptionContaining(String wordKeyword, String descriptionKeyword);
 
 	// 타입과 키워드로 검색
-	List<Word> findByTypeAndWordContainingOrTypeAndDescriptionContaining(
-		WordType type1, String wordKeyword1,
-		WordType type2, String descriptionKeyword2
+	@Query("""
+    SELECT w 
+    FROM Word w 
+    WHERE w.type = :type 
+    AND (w.word LIKE %:keyword% OR w.description LIKE %:keyword%)
+""")
+	List<Word> findByTypeAndKeywordInWordOrDescription(
+		@Param("type") WordType type,
+		@Param("keyword") String keyword
 	);
 }

src/main/java/com/jojoidu/book/easy/dictionary/service/DictionaryService.java

@@ -22,13 +22,9 @@ public WordTypeResDto getDictionary(WordReqType type, String keyword) {
 		if (type == WordReqType.ALL) {
 			dto.setByWords(wordRepository.findByWordContainingOrDescriptionContaining(keyword, keyword));
 		} else {
-			dto.setByWords(wordRepository.findByType(WordType.from(type)));
-			dto.setByWords(wordRepository.findByTypeAndWordContainingOrTypeAndDescriptionContaining(
-				WordType.from(type), keyword,
-				WordType.from(type), keyword
-			));
+			dto.setByWords(wordRepository.findByTypeAndKeywordInWordOrDescription(
+				WordType.from(type), keyword));
 		}
 		return dto;
 	}
-
 }

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
 springdoc:
   packages-to-scan: com.jojoidu.book.easy
   default-consumes-media-type: application/json;charset=UTF-8

src/test/java/com/jojoidu/book/easy/EasyApplicationTests.java

@@ -3,11 +3,11 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
-class EasyApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}
+// @SpringBootTest
+// class EasyApplicationTests {
+//
+// 	@Test
+// 	void contextLoads() {
+// 	}
+//
+// }