[FEAT] 배포 환경 구성 (Flyway / Redis / InfluxDB / docker-compose / CI-CD)

.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ develop, main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Run tests
+        run: ./gradlew test

.github/workflows/deploy.yml

@@ -0,0 +1,74 @@
+name: Deploy to EC2
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew clean build -x test
+
+      - name: Copy jar and Dockerfile to EC2
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: "build/libs/*.jar,Dockerfile"
+          target: "/home/${{ secrets.EC2_USERNAME }}/app"
+
+      - name: Deploy on EC2
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            cd /home/${{ secrets.EC2_USERNAME }}/app
+
+            docker stop hard-click-app || true
+            docker rm hard-click-app || true
+            docker rmi hard-click-app || true
+
+            docker build -t hard-click-app .
+
+            docker run -d \
+              --name hard-click-app \
+              --restart unless-stopped \
+              --network host \
+              -e DB_URL="${{ secrets.DB_URL }}" \
+              -e DB_USERNAME="${{ secrets.DB_USERNAME }}" \
+              -e DB_PASSWORD="${{ secrets.DB_PASSWORD }}" \
+              -e JWT_SECRET="${{ secrets.JWT_SECRET }}" \
+              -e JWT_ACCESS_EXPIRATION=1800000 \
+              -e JWT_REFRESH_EXPIRATION=1209600000 \
+              -e MAIL_USERNAME="${{ secrets.MAIL_USERNAME }}" \
+              -e MAIL_PASSWORD="${{ secrets.MAIL_PASSWORD }}" \
+              -e REDIS_HOST=localhost \
+              -e REDIS_PORT=6379 \
+              -e REDIS_PASSWORD="${{ secrets.REDIS_PASSWORD }}" \
+              -e INFLUX_URL=http://localhost:8086 \
+              -e INFLUX_TOKEN="${{ secrets.INFLUX_TOKEN }}" \
+              -e INFLUX_ORG=hardclick \
+              -e INFLUX_BUCKET=hardclick-metrics \
+              hard-click-app
+
+            echo "=== Deploy complete ==="
+            docker ps | grep hard-click-app

.gitignore

@@ -39,9 +39,15 @@ out/
 ### .yaml ###
 *.yaml
 *.yml
+!application.yaml
 !application-test.yml
 !application-test.yaml
+!docker-compose.yml
 !.coderabbit.yaml
+!.github/**/*.yml
+
+### Secrets ###
+application-secret.yaml
 ### Logs ###
 logs/
 *.log

Dockerfile

@@ -0,0 +1,4 @@
+FROM eclipse-temurin:17-jre-alpine
+WORKDIR /app
+COPY build/libs/*.jar app.jar
+ENTRYPOINT ["java", "-jar", "app.jar"]

build.gradle

@@ -39,6 +39,10 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
     implementation 'org.springframework.boot:spring-boot-starter-mail'
+    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-mysql'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'com.influxdb:influxdb-client-java:7.2.0'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -0,0 +1,36 @@
+services:
+  mysql:
+    image: mysql:8.0
+    container_name: hard-click-mysql
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: Hard-Click
+      MYSQL_USER: Hard-Click
+      MYSQL_PASSWORD: Hard-Click
+      MYSQL_ROOT_PASSWORD: Hard-Click
+    ports:
+      - "3306:3306"
+    volumes:
+      - mysql-data:/var/lib/mysql
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+
+  redis:
+    image: redis:7
+    container_name: hardclick-redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis-data:/data
+
+  influxdb:
+    image: influxdb:2
+    container_name: hardclick-influxdb
+    ports:
+      - "8086:8086"
+    volumes:
+      - influxdb-data:/var/lib/influxdb2
+
+volumes:
+  mysql-data:
+  redis-data:
+  influxdb-data:

src/main/java/com/wanted/backend/domain/learning_activity/application/service/PlayableVideoProgressReader.java

@@ -0,0 +1,40 @@
+package com.wanted.backend.domain.learning_activity.application.service;
+
+import com.wanted.backend.domain.learning_activity.application.port.VideoCatalogPort;
+import com.wanted.backend.domain.learning_activity.domain.model.VideoAccessInfo;
+import com.wanted.backend.domain.learning_activity.domain.model.VideoProgress;
+import com.wanted.backend.domain.learning_activity.domain.repository.VideoProgressRepository;
+import com.wanted.backend.global.exception.BusinessException;
+import com.wanted.backend.global.exception.ErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class PlayableVideoProgressReader {
+
+    private final VideoCatalogPort videoCatalogPort;
+    private final VideoAccessService videoAccessService;
+    private final VideoProgressRepository videoProgressRepository;
+
+    public PlayableVideoProgress get(Long memberId, Long videoId) {
+        VideoAccessInfo accessInfo = videoCatalogPort.findByVideoId(videoId)
+                .orElseThrow(() -> new BusinessException(ErrorCode.VIDEO_NOT_FOUND));
+
+        videoAccessService.validatePlayable(memberId, accessInfo);
+
+        VideoProgress progress = videoProgressRepository
+                .findByMemberIdAndVideoId(memberId, videoId)
+                .orElse(VideoProgress.empty(memberId, accessInfo.courseId(), videoId));
+
+        return new PlayableVideoProgress(accessInfo, progress);
+    }
+
+    public record PlayableVideoProgress(
+            VideoAccessInfo accessInfo,
+            VideoProgress progress
+    ) {
+    }
+}

src/main/java/com/wanted/backend/domain/payment/domain/model/PaymentStatus.java

@@ -5,8 +5,7 @@ public enum PaymentStatus {
     REFUNDED,
     READY,
     FAILED,
-    CANCELED,
-    CANCELLED;
+    CANCELED;
 
     public static PaymentStatus from(String value) {
         return PaymentStatus.valueOf(value);

src/main/java/com/wanted/backend/global/config/InfluxDbConfig.java

@@ -0,0 +1,28 @@
+package com.wanted.backend.global.config;
+
+import com.influxdb.client.InfluxDBClient;
+import com.influxdb.client.InfluxDBClientFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class InfluxDbConfig {
+
+    @Value("${influx.url}")
+    private String url;
+
+    @Value("${influx.token}")
+    private String token;
+
+    @Value("${influx.org}")
+    private String org;
+
+    @Value("${influx.bucket}")
+    private String bucket;
+
+    @Bean
+    public InfluxDBClient influxDBClient() {
+        return InfluxDBClientFactory.create(url, token.toCharArray(), org, bucket);
+    }
+}

src/main/java/com/wanted/backend/global/config/RedisConfig.java

@@ -0,0 +1,38 @@
+package com.wanted.backend.global.config;
+
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.Duration;
+
+@Configuration
+@EnableCaching
+public class RedisConfig {
+
+    @Bean
+    public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofMinutes(10))
+                .serializeKeysWith(
+                        RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+                .serializeValuesWith(
+                        RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()));
+
+        return RedisCacheManager.builder(connectionFactory)
+                .cacheDefaults(config)
+                .build();
+    }
+
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connectionFactory) {
+        return new StringRedisTemplate(connectionFactory);
+    }
+}

src/main/java/com/wanted/backend/global/config/SecurityConfig.java

@@ -8,6 +8,9 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
+import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
+import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -24,6 +27,7 @@
 @Configuration
 @EnableWebSecurity
 @RequiredArgsConstructor
+@EnableMethodSecurity
 public class SecurityConfig {
 
     private final JwtProvider jwtProvider;
@@ -66,7 +70,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 "/v3/api-docs/**"
                         ).permitAll()
                         .requestMatchers(HttpMethod.GET, "/uploads/**").permitAll()
-                        .requestMatchers(HttpMethod.GET, "/api/courses", "/api/courses/*","/api/courses/*/reviews").permitAll()
+                        .requestMatchers(HttpMethod.GET, "/api/courses", "/api/courses/*", "/api/courses/*/reviews").permitAll()
                         .requestMatchers(HttpMethod.POST, "/api/courses").hasRole("INSTRUCTOR")
                         .requestMatchers(HttpMethod.POST, "/api/courses/lessons/*/video").hasRole("INSTRUCTOR")
                         .requestMatchers(HttpMethod.PATCH, "/api/courses/*", "/api/courses/*/status").hasRole("INSTRUCTOR")
@@ -104,4 +108,12 @@ CorsConfigurationSource corsConfigurationSource() {
 
         return source;
     }
+
+    @Bean
+    public RoleHierarchy roleHierarchy() {
+        return RoleHierarchyImpl.fromHierarchy("""
+                ROLE_ADMIN > ROLE_INSTRUCTOR
+                ROLE_INSTRUCTOR > ROLE_STUDENT
+                """);
+    }
 }