Merge pull request #15 from Ring-Us/develop

fix: github actions main-cd 수정

Author: wodydl0

.github/workflows/main-cd.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - main  # main 브랜치에 푸시될 때 실행
+  pull_request:
+    branches:
+      - main
 
 jobs:
   deploy:

build.gradle

@@ -39,6 +39,13 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+    //aws
+    implementation platform('software.amazon.awssdk:bom:2.20.0') // AWS SDK 버전 관리
+    implementation 'software.amazon.awssdk:s3'
+    implementation 'software.amazon.awssdk:sts'
+    implementation 'software.amazon.awssdk:core:2.30.20'
+    implementation 'software.amazon.awssdk:ec2'
 }
 
 tasks.named('test') {

dev.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ENV_FILE=".env"
+ENV_FILE=".env.dev"
 
 echo "[dev.sh] environment variable file: $ENV_FILE"
 
@@ -25,7 +25,7 @@ fi
 
 echo "[dev.sh] environment variable load complete"
 
-./gradlew clean build
+./gradlew build -x test
 
 if [ $? -eq 0 ]; then
     echo "[dev.sh] build complete"
@@ -34,6 +34,6 @@ else
     exit 1
 fi
 
-sudo docker compose --env-file .env up -d --build
+sudo docker compose --env-file .env.dev up -d --build
 
-echo "[dev.sh] deploy complete"
+echo "[dev.sh] deploy complete"

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     restart: always
 
   database:
-    image: mysql:9.0.0
+    image: mysql:8.4.4
     container_name: ring-us-database
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
@@ -34,16 +34,14 @@ services:
   redis:
     image: redis:7.0
     container_name: ring-us-redis
-    environment:
-      REDIS_PASSWORD : ${REDIS_PASSWORD}
-    command: redis-server --requirepass ${REDIS_PASSWORD}
+    command: --port ${REDIS_PORT} --requirepass ${REDIS_PASSWORD}
     expose:
       - ${REDIS_PORT}
     ports:
       - ${REDIS_PORT}:${REDIS_PORT}
     restart: always
     volumes:
-      - ring-us-redis:/var/lib/redis
+      - ring-us-redis:/data
 volumes:
   ring-us-database:
-  ring-us-redis:
+  ring-us-redis:

src/main/java/es/princip/ringus/domain/mentee/Mentee.java

@@ -1,6 +1,8 @@
 package es.princip.ringus.domain.mentee;
 
 import es.princip.ringus.domain.common.Education;
+import es.princip.ringus.infra.storage.domain.Certificate;
+import es.princip.ringus.infra.storage.domain.ProfileImage;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -30,6 +32,9 @@ public class Mentee {
     @Column(name = "introduction", length = 500)
     private String introduction;
 
+    @Embedded
+    private ProfileImage profileImage;
+
     @Column(name = "member_id")
     private Long memberId;
 
@@ -45,4 +50,11 @@ public Mentee(
         this.introduction = introduction;
         this.memberId = memberId;
     }
+
+    /**
+     * 프로필 이미지 업데이트
+     */
+    public void updateProfileImage(ProfileImage profileImage) {
+        this.profileImage = profileImage;
+    }
 }

src/main/java/es/princip/ringus/domain/mentor/Mentor.java

@@ -6,6 +6,8 @@
 import es.princip.ringus.domain.mentor.vo.Organization;
 import es.princip.ringus.domain.mentor.vo.Portfolio;
 import es.princip.ringus.domain.mentor.vo.Timezone;
+import es.princip.ringus.infra.storage.domain.Certificate;
+import es.princip.ringus.infra.storage.domain.ProfileImage;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -66,6 +68,9 @@ public class Mentor {
     @Embedded
     private Portfolio portfolio;
 
+    @Embedded
+    private ProfileImage profileImage;
+
     @Column(name = "member_id")
     private Long memberId;
 
@@ -93,4 +98,11 @@ public Mentor(
         this.portfolio = portfolio;
         this.memberId = memberId;
     }
+
+    /**
+     * 프로필 이미지 업데이트
+     */
+    public void updateProfileImage(ProfileImage profileImage) {
+        this.profileImage = profileImage;
+    }
 }

src/main/java/es/princip/ringus/global/exception/CustomRuntimeException.java

@@ -1,9 +1,11 @@
 package es.princip.ringus.global.exception;
 
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 
 @Getter
+@Slf4j
 public class CustomRuntimeException extends RuntimeException{
 
     private HttpStatus status;
@@ -15,6 +17,8 @@ public CustomRuntimeException(ErrorCode errorCode){
         this.status = errorCode.status();
         this.message = errorCode.message();
         this.code = errorCode.code();
+
+        log.error("CustomRuntimeException 발생: status={}, code={}, message={}", status, code, message, this);
     }
 
 }

src/main/java/es/princip/ringus/global/util/UniversityDomainUtil.java

@@ -1,59 +1,27 @@
 package es.princip.ringus.global.util;
 
-import jakarta.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
+import lombok.Getter;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
+@Getter
+public enum UniversityDomainUtil {
+    KNU("knu.ac.kr");
 
-@Component
-public class UniversityDomainUtil {
+    private final String domain;
 
-    private static String filePath;
-    private static final Set<String> universityDomains = new HashSet<>();
-
-    public UniversityDomainUtil(@Value("${university.file.path}") String filePath) {
-        UniversityDomainUtil.filePath = filePath;
-    }
-
-    @PostConstruct
-    private void init() {
-        loadUniversityDomains();
+    UniversityDomainUtil(String domain) {
+        this.domain = domain;
     }
 
     /**
-     * 대학 도메인 목록을 파일에서 로드하여 universityDomains에 저장
-     */
-    private static void loadUniversityDomains() {
-        try (BufferedReader br = new BufferedReader(new FileReader(filePath))) {
-            StringBuilder content = new StringBuilder();
-            String line;
-
-            while ((line = br.readLine()) != null) {
-                content.append(line).append(" ");
-            }
-
-            String[] parts = content.toString().trim().split(" ");
-            for (int i = 1; i < parts.length; i += 2) {
-                universityDomains.add(parts[i]);
-            }
-
-        } catch (IOException e) {
-            throw new RuntimeException("대학 도메인을 읽어오는데 실패함", e);
-        }
-    }
-
-    /**
-     * 이메일이 대학 도메인인지 확인
-     * @param email 검사할 이메일 주소
-     * @return 대학 도메인에 해당하면 true, 아니면 false
+     * 주어진 이메일이 대학 도메인에 속하는지 확인
      */
     public static boolean isUniversityVerified(String email) {
         String domain = email.substring(email.indexOf("@") + 1);
-        return universityDomains.contains(domain);
+        for (UniversityDomainUtil university : values()) {
+            if (university.getDomain().equals(domain)) {
+                return true;
+            }
+        }
+        return false;
     }
 }

src/main/java/es/princip/ringus/infra/config/S3Config.java

@@ -0,0 +1,40 @@
+package es.princip.ringus.infra.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+@Component
+public class S3Config {
+    @Value("${aws.s3.region}")
+    private String region;
+
+    @Value("${aws.s3.access-key:}")
+    private String accessKey; // 액세스 키 (없으면 빈 값)
+
+    @Value("${aws.s3.secret-key:}")
+    private String secretKey; // 시크릿 키 (없으면 빈 값)
+
+    @Bean
+    public S3Client s3Client() {
+        // 로컬 환경에서 액세스 키와 시크릿 키가 설정되어 있으면 StaticCredentialsProvider 사용
+        if (!accessKey.isEmpty() && !secretKey.isEmpty()) {
+            AwsBasicCredentials awsCredentials = AwsBasicCredentials.create(accessKey, secretKey);
+            return S3Client.builder()
+                    .region(Region.of(region))
+                    .credentialsProvider(StaticCredentialsProvider.create(awsCredentials))
+                    .build();
+        }
+
+        // EC2 환경에서는 DefaultCredentialsProvider 사용 (IAM 역할)
+        return S3Client.builder()
+                .region(Region.of(region))
+                .credentialsProvider(DefaultCredentialsProvider.create())
+                .build();
+    }
+}

src/main/java/es/princip/ringus/infra/config/WebConfig.java

@@ -19,7 +19,12 @@ public WebConfig(SessionInterceptor sessionInterceptor) {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(sessionInterceptor)
-                .addPathPatterns("/**")
-                .excludePathPatterns("/auth/**");
+                .excludePathPatterns("/**")
+                .excludePathPatterns("/auth/**")
+                .excludePathPatterns("/service-terms")
+                .excludePathPatterns("/swagger-ui/**")
+                .excludePathPatterns("/v3/api-docs/**")
+                .excludePathPatterns("/swagger-resources/**")
+                .excludePathPatterns("/webjars/**");
     }
 }