Merge pull request #29 from DearGraduate/develop

🔀 develop브랜치 병합

Author: kimjy0117

.github/workflows/workflows.yml

@@ -0,0 +1,94 @@
+name: Build and Deploy
+
+on:
+  push:
+    branches: [ "cicd", "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      # Git 저장소 체크아웃
+      - uses: actions/checkout@v3
+
+      # JDK 17 설정
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      # Gradle 캐싱 (빌드 시간 단축)
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      # Gradle 실행 권한 부여
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      # Gradle 빌드
+      - name: Build with Gradle
+        run: ./gradlew clean build -x test
+
+      # Docker Hub 로그인
+      - name: Docker Hub Login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      # Docker 빌드, 푸쉬
+      - name: Docker Build & Push Docker Image
+        run: |
+          echo "🐳 Building Docker image"
+           docker build -t ${{ secrets.MY_DOCKER_ID }}/graduate:latest .
+          
+           echo "🚀 Pushing Docker image"
+           docker push ${{ secrets.MY_DOCKER_ID }}/graduate:latest
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      # 깃허브 레포지토리 코드 다운로드
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # 파일 복사
+      - name: Copy docker-compose.yml to Server
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SERVER_IP }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.PRIVATE_KEY }}
+          source: "docker-compose.yml,prometheus.yml"
+          target: "~/app/"  # 서버의 저장 경로
+
+      # 서버에 배포
+      - name: Deploy to Server
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SERVER_IP }} # EC2 퍼블릭 IP
+          username: ${{ secrets.USERNAME }}   # 홈서버 SSH 계정 (ex: ubuntu)
+          key: ${{ secrets.PRIVATE_KEY }}  # PEM 키
+          script: |
+            cd ~/app
+            
+            # Create .env file
+            printf "${{ secrets.ENV_FILE }}" > .env
+            
+            # 1️⃣ 최신 Docker 이미지 풀
+            docker compose pull
+            # 2️⃣ 이전 컨테이너 삭제
+            docker compose down
+            # 3️⃣ 컨테이너와 서비스를 Docker Compose로 실행
+            docker compose up -d
+            # 4️⃣ 불필요한 이미지 삭제
+            docker image prune -f

.gitignore

@@ -43,4 +43,5 @@ out/
 /src/main/resources/application*.properties
 
 ### env ###
-.env
+.env
+

Dockerfile

@@ -0,0 +1,7 @@
+# JDK 17을 베이스 이미지로 사용
+FROM openjdk:17-jdk-slim
+
+# 애플리케이션 JAR 파일을 복사
+COPY build/libs/*SNAPSHOT.jar /app.jar
+
+ENTRYPOINT ["java", "-jar", "/app.jar"]

build.gradle

@@ -60,6 +60,12 @@ dependencies {
 	testImplementation 'io.projectreactor:reactor-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	// OAuth2
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+	//s3
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -0,0 +1,85 @@
+services:
+  mysql:
+    image: mysql:latest
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      TZ: Asia/Seoul
+    volumes:
+      - ./mysql_data:/var/lib/mysql
+    ports:
+      - 3306:3306
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping" ] # MySQL이 healthy 한 지 판단할 수 있는 명령어
+      interval: 5s # 5초 간격으로 체크
+      retries: 10 # 10번까지 재시도
+
+  redis:
+    image: redis:latest
+    ports:
+      - 6379:6379
+    healthcheck:
+      test: [ "CMD", "redis-cli", "ping" ]
+      interval: 5s
+      retries: 10
+
+  graduate:
+    env_file:
+      - .env
+    image: ${DOCKER_USERNAME}/graduate:latest  # 이미지 이름을 명시적으로 설정
+    ports:
+      - 8080:8080
+    environment:
+      SPRING_PROFILES_ACTIVE: prod  # Spring 프로파일을 prod로 설정
+    depends_on:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./nginx/conf.d:/etc/nginx/conf.d
+      - /etc/letsencrypt:/etc/letsencrypt:ro  # SSL 인증서 공유
+    depends_on:
+      - graduate
+
+  dozzle:
+    image: amir20/dozzle:latest
+    container_name: dozzle
+    ports:
+      - "8081:8080"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock  # 로그 접근을 위한 도커 소켓 마운트
+    restart: unless-stopped
+
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    ports:
+      - "9090:9090"
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+
+  grafana:
+    image: grafana/grafana
+    container_name: grafana
+    ports:
+      - "3000:3000"
+    volumes:
+      - grafana-storage:/var/lib/grafana
+
+  node-exporter:
+    image: prom/node-exporter
+    container_name: node-exporter
+    ports:
+      - "9100:9100"
+
+volumes:
+  mysql_data:
+  grafana-storage:

prometheus.yml

@@ -0,0 +1,16 @@
+global:
+  scrape_interval: 5s
+
+scrape_configs:
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['prometheus:9090']
+
+  - job_name: 'graduate'
+    metrics_path: '/actuator/prometheus'
+    static_configs:
+      - targets: ['graduate:8080']
+
+  - job_name: 'node-exporter'
+    static_configs:
+      - targets: ['node-exporter:9100']

src/main/java/com/example/graduate/GraduateApplication.java

@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableJpaAuditing
 @SpringBootApplication
+@EnableScheduling
 public class GraduateApplication {
 
 	public static void main(String[] args) {

src/main/java/com/example/graduate/domain/album/controller/AlbumController.java

@@ -0,0 +1,63 @@
+package com.example.graduate.domain.album.controller;
+
+import com.example.graduate.domain.album.dto.AlbumRequestDTO;
+import com.example.graduate.domain.album.dto.AlbumResponseDTO;
+import com.example.graduate.domain.album.service.AlbumService;
+import com.example.graduate.global.apiPayload.ApiResponse;
+import com.example.graduate.domain.album.status.AlbumSuccessStatus;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import jakarta.validation.Valid;
+
+@RestController
+@RequestMapping("/api/albums")
+@RequiredArgsConstructor
+@Tag(name = "앨범 API", description = "앨범 관련 API입니다.")
+public class AlbumController {
+
+    private final AlbumService albumService;
+
+    @Operation(summary = "앨범 생성")
+    @PostMapping
+    public ResponseEntity<ApiResponse<?>> createAlbum(
+            @Valid @RequestBody AlbumRequestDTO dto) {
+        AlbumResponseDTO result = albumService.createAlbum(dto);
+        return ResponseEntity
+                .status(AlbumSuccessStatus._CREATE_ALBUM_SUCCESS.getHttpStatus())
+                .body(ApiResponse.of(AlbumSuccessStatus._CREATE_ALBUM_SUCCESS, result));
+    }
+
+    @Operation(summary = "앨범 수정")
+    @PatchMapping
+    public ResponseEntity<ApiResponse<?>> updateAlbum (
+            @Valid @RequestBody AlbumRequestDTO dto){
+        albumService.updateAlbum(dto);
+        return ResponseEntity
+                .status(AlbumSuccessStatus._UPDATE_ALBUM_SUCCESS.getHttpStatus())
+                .body(ApiResponse.of(AlbumSuccessStatus._UPDATE_ALBUM_SUCCESS));
+    }
+
+
+    @Operation(summary = "앨범 삭제")
+    @DeleteMapping
+    public ResponseEntity<ApiResponse<?>> deleteAlbum() {
+        albumService.deleteAlbum();
+        return ResponseEntity
+                .status(AlbumSuccessStatus._DELETE_ALBUM_SUCCESS.getHttpStatus())
+                .body(ApiResponse.of(AlbumSuccessStatus._DELETE_ALBUM_SUCCESS));
+    }
+
+    @Operation(summary = "앨범 조회")
+    @GetMapping
+    public ResponseEntity<ApiResponse<AlbumResponseDTO>> getAlbum() {
+        AlbumResponseDTO album = albumService.getAlbum();
+        return ResponseEntity
+                .status(AlbumSuccessStatus._GET_ALBUM_SUCCESS.getHttpStatus())
+                .body(ApiResponse.of(AlbumSuccessStatus._GET_ALBUM_SUCCESS, album));
+    }
+
+
+}

src/main/java/com/example/graduate/domain/album/domain/Album.java

@@ -0,0 +1,38 @@
+package com.example.graduate.domain.album.domain;
+
+import ch.qos.logback.core.Layout;
+import com.example.graduate.global.common.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "album")
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Album extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, unique = true)
+    private Long userId;
+
+    @Setter
+    @Column(nullable = false)
+    private LocalDate graduationDate;
+
+    @Setter
+    @Column(length = 5)
+    private String albumName;
+
+    @Setter
+    @Column(length = 20)
+    private String description;
+}
+

src/main/java/com/example/graduate/domain/album/dto/AlbumRequestDTO.java

@@ -0,0 +1,19 @@
+package com.example.graduate.domain.album.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDate;
+
+@Getter
+@Setter
+public class AlbumRequestDTO {
+    private LocalDate graduationDate;
+    @NotBlank(message = "앨범 제목은 비어 있을 수 없습니다.")
+    @Size(max = 5, message = "앨범 제목은 최대 5글자까지 입력 가능합니다.")
+    private String albumName;
+    @Size(max = 20, message = "앨범 설명은 최대 20글자까지 입력 가능합니다.")
+    private String description;
+}