메인 반영

.github/workflows/deploy.yml

@@ -0,0 +1,42 @@
+name: Deploy on Merge to main
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+jobs:
+  deploy:
+    name: Deploy to EC2
+    if: github.event.pull_request.merged == true # PR이 머지된 경우만 실행
+    runs-on: ubuntu-latest
+    concurrency:
+      group: deploy
+      cancel-in-progress: true # 이전 실행 중인 워크플로를 취소
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up SSH
+      run: |
+        mkdir -p ~/.ssh
+        echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        ssh-keyscan -H "${{ vars.EC2_HOST }}" >> ~/.ssh/known_hosts
+
+    - name: Execute Deployment Script on EC2
+      run: |
+        ssh ec2-user@${{ vars.EC2_HOST }} << 'EOF'
+        cd /home/ec2-user/starchive/scripts
+
+        git checkout main
+        # 스프링 배포 스크립트 실행
+        ./spring-deploy.sh
+
+        # nestjs 배포 스크립트 실행
+        ./nestjs-deploy.sh
+
+        EOF

.github/workflows/nestjs-deploy.yml

@@ -0,0 +1,42 @@
+name: NestJS Deploy on Merge to develop
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+    paths:
+      - 'BACK/nest-app/**'
+
+jobs:
+  deploy:
+    name: Deploy to EC2
+    if: github.event.pull_request.merged == true # PR이 머지된 경우만 실행
+    runs-on: ubuntu-latest
+    concurrency:
+      group: deploy-nestjs
+      cancel-in-progress: true # 이전 실행 중인 워크플로를 취소
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up SSH
+      run: |
+        mkdir -p ~/.ssh
+        echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        ssh-keyscan -H "${{ vars.EC2_HOST }}" >> ~/.ssh/known_hosts
+
+    - name: Execute Deployment Script on EC2
+      run: |
+        ssh ec2-user@${{ vars.EC2_HOST }} << 'EOF'
+        cd /home/ec2-user/starchive/scripts
+
+        git checkout develop
+
+        # nestjs 배포 스크립트 실행
+        ./nestjs-deploy.sh
+
+        EOF

.github/workflows/nestjs.yml

@@ -0,0 +1,45 @@
+name: NestJS CI
+
+on:
+  pull_request:
+    branches: 
+      - develop
+    paths:  
+      - 'BACK/nest-app/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+    # 1. 코드 체크아웃
+    - uses: actions/checkout@v4
+
+    # 2. Node.js 설정
+    - name: Set up Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '22' # 사용하려는 Node.js 버전
+        cache: 'npm'
+        cache-dependency-path: 'BACK/nest-app/package-lock.json'
+
+    # 3. 의존성 설치
+    - name: Install dependencies
+      run: |
+        cd BACK/nest-app/
+        npm install
+
+    # 4. NestJS 빌드
+    - name: Build the project
+      run: |
+        cd BACK/nest-app/
+        npm run build
+
+    # 5. 테스트 실행
+    #- name: Run tests
+    #  run: |
+    #    cd BACK/nest-app/
+    #    npm run test

.github/workflows/spring-delploy.yml

@@ -0,0 +1,53 @@
+name: Spring Deploy on Merge to develop
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - develop
+    paths:
+      - 'BACK/spring-app/**'
+
+jobs:
+  deploy:
+    name: Deploy to EC2
+    if: github.event.pull_request.merged == true # PR이 머지된 경우만 실행
+    runs-on: ubuntu-latest
+    concurrency:
+      group: deploy-spring
+      cancel-in-progress: true # 이전 실행 중인 워크플로를 취소
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Create application properties files
+      run: |
+        mkdir -p BACK/spring-app/src/main/resources
+        echo "${{ secrets.APPLICATION_PROPERTIES_FOR_TEST }}" > BACK/spring-app/src/main/resources/application-test.properties
+        echo "${{ secrets.APPLICATION_PROPERTIES_FOR_PROD }}" > BACK/spring-app/src/main/resources/application-prod.properties
+
+    - name: Set up SSH
+      run: |
+        mkdir -p ~/.ssh
+        echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        ssh-keyscan -H "${{ vars.EC2_HOST }}" >> ~/.ssh/known_hosts
+
+    - name: Transfer properties files to EC2
+      run: |
+        scp BACK/spring-app/src/main/resources/application-test.properties ec2-user@${{ vars.EC2_HOST }}:/home/ec2-user/starchive/BACK/spring-app/src/main/resources/
+        scp BACK/spring-app/src/main/resources/application-prod.properties ec2-user@${{ vars.EC2_HOST }}:/home/ec2-user/starchive/BACK/spring-app/src/main/resources/
+
+
+    - name: Execute Deployment Script on EC2
+      run: |
+        ssh ec2-user@${{ vars.EC2_HOST }} << 'EOF'  
+        cd /home/ec2-user/starchive/scripts
+
+        git checkout develop
+        # 스프링 배포 스크립트 실행
+        ./spring-deploy.sh
+
+        EOF

.github/workflows/spring-integration.yml

@@ -0,0 +1,41 @@
+name: Spring CI
+
+on:
+  pull_request:
+    branches: 
+      - develop 
+    paths:
+      - 'BACK/spring-app/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+
+    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+    - name: Set application-test.properties
+      run: |
+        mkdir -p BACK/spring-app/src/main/resources
+        cat <<EOF > BACK/spring-app/src/main/resources/application-test.properties
+        ${{ secrets.APPLICATION_PROPERTIES_FOR_TEST }}
+        EOF
+
+    - name: Build with Gradle
+      run: |
+        cd BACK/spring-app/
+        chmod +x ./gradlew
+        ./gradlew build

BACK/nest-app/prisma/schema.prisma

@@ -14,21 +14,46 @@ datasource db {
 }
 
 model Category {
-  categoryId BigInt  @id @default(autoincrement()) // 기본 키
+  categoryId BigInt  @id @default(autoincrement()) 
   name       String  @db.VarChar(100)
-  parentId   BigInt? // 상위 카테고리 (nullable)
+  parentId   BigInt? 
 
-  @@map("Categories") // 실제 테이블 이름과 매핑
+  posts Post[] 
+
+  @@map("Categorys") 
 }
 
 model Post {
-  postId    BigInt  @id @default(autoincrement()) // 기본 키
+  postId    BigInt  @id @default(autoincrement())
   categoryId BigInt
   title     String  @db.VarChar(64)
   content   String  @db.Text
   author    String  @db.VarChar(32)
   password  String  @db.VarChar(128)
   createAt  DateTime
 
-  @@map("Posts") // 실제 테이블 이름과 매핑
+  category Category @relation(fields: [categoryId], references: [categoryId]) 
+  postHashTags PostHashTag[] 
+
+  @@map("Posts") 
+}
+
+model PostHashTag {
+  postHashTagId BigInt  @id @default(autoincrement()) 
+  postId        BigInt                              
+  hashTagId     BigInt  
+
+  post    Post    @relation(fields: [postId], references: [postId])   
+  hashTag HashTag @relation(fields: [hashTagId], references: [hashTagId])         
+
+  @@map("PostHashTag") 
+}
+
+model HashTag {
+  hashTagId BigInt  @id @default(autoincrement()) 
+  name      String  @db.VarChar(32)              
+
+  postHashTags PostHashTag[]
+
+  @@map("HashTags")
 }

BACK/nest-app/src/post/post.controller.ts

@@ -1,17 +1,22 @@
-import { Controller, Get, Param, ParseIntPipe, Query } from '@nestjs/common';
+import { Controller, Get, Query } from '@nestjs/common';
 import { PostService } from './post.service';
 
 @Controller('posts')
 export class PostController {
   constructor(private readonly postService: PostService) {}
 
   @Get()
-  async getPostsByCategory(@Query('category') categoryId: string) {
-    // 카테고리 ID가 전달되지 않은 경우 전체 조회
-    if (!categoryId) {
-      return this.postService.getAllPosts();
-    }
-
-    return this.postService.getPostsByCategory(BigInt(categoryId));
+  async getPostsByCategory(
+    @Query('category') categoryId: string,
+    @Query('tag') hashTagId: string,
+    @Query('page') page: string = '1',
+    @Query('pageSize') pageSize: string = '10',
+  ) {
+    return this.postService.getPosts(
+      categoryId ? BigInt(categoryId) : null,
+      hashTagId ? BigInt(hashTagId) : null,
+      parseInt(page, 10),
+      parseInt(pageSize, 10),
+    );
   }
 }