Merge pull request #68 from cloudcomputinginha/dev

CHORE: Release v1.6

Author: zjhj0814

build.gradle

@@ -4,6 +4,10 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.7'
 }
 
+ext {
+    set('springCloudVersion', "2024.0.1")
+}
+
 group = 'cloudcomputinginha'
 version = '0.0.1-SNAPSHOT'
 
@@ -26,19 +30,18 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    //implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
     implementation 'software.amazon.awssdk:s3:2.21.5'
 
-    //implementation 'org.springframework.boot:spring-boot-starter-actuator'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+    //querydsl
     implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
     annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
@@ -74,6 +77,8 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
+    // OpenFeign AI 서버와 통신을 위한 의존성
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.2.1'
 }
 
 tasks.named('test') {

src/main/java/cloudcomputinginha/demo/DemoApplication.java

@@ -2,6 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -10,6 +11,7 @@
 @EnableJpaAuditing
 @EnableAsync
 @EnableScheduling
+@EnableFeignClients
 public class DemoApplication {
 
     public static void main(String[] args) {

src/main/java/cloudcomputinginha/demo/apiPayload/code/handler/AiHandler.java

@@ -0,0 +1,10 @@
+package cloudcomputinginha.demo.apiPayload.code.handler;
+
+import cloudcomputinginha.demo.apiPayload.code.BaseErrorCode;
+import cloudcomputinginha.demo.apiPayload.exception.GeneralException;
+
+public class AiHandler extends GeneralException {
+    public AiHandler(BaseErrorCode errorCode) {
+        super(errorCode);
+    }
+}

src/main/java/cloudcomputinginha/demo/apiPayload/code/status/ErrorStatus.java

@@ -36,7 +36,7 @@ public enum ErrorStatus implements BaseErrorCode {
     INTERVIEW_NOT_ACCEPTING_MEMBERS(HttpStatus.BAD_REQUEST, "INTERVIEW4002", "현재 인터뷰는 참여자를 받지 않습니다."),
     INTERVIEW_END_TIME_INVALID(HttpStatus.CONFLICT, "INTERVIEW4003", "인터뷰의 종료 시간이 시작 시간보다 빠릅니다."),
     INTERVIEW_ALREADY_TERMINATED(HttpStatus.CONFLICT, "INTERVIEW4004", "해당하는 인터뷰는 이미 종료되었습니다."),
-    INTERVIEW_NO_PERMISSION(HttpStatus.FORBIDDEN, "INTERVIEW4005", "해당 인터뷰 수정 권한이 없습니다."),
+    INTERVIEW_NO_PERMISSION(HttpStatus.FORBIDDEN, "INTERVIEW4005", "해당 인터뷰에 대한 권한이 없습니다."),
     INTERVIEW_DOCUMENTS_NOT_FOUND(HttpStatus.BAD_REQUEST, "INTERVIEW4006", "이력서와 자기소개서는 필수입니다."),
 
     // 멤버 인터뷰 관련 에러,
@@ -61,7 +61,13 @@ public enum ErrorStatus implements BaseErrorCode {
     INTERVIEW_SCHEDULE_CHECK_FAIL(HttpStatus.INTERNAL_SERVER_ERROR, "SCHEDULER5004", "Job 존재 여부 확인에 실패했습니다."),
     INTERVIEW_SCHEDULE_ALREADY_EXISTS(HttpStatus.CONFLICT, "SCHEDULER4001", "해당 면접 스케줄은 이미 존재합니다."),
     INTERVIEW_REMINDER_TIME_INVALID(HttpStatus.BAD_REQUEST, "SCHEDULER4002", "면접 리마인더 시간이 유효하지 않습니다."),
-    INTERVIEW_SCHEDULE_INVALID_ARGUMENT(HttpStatus.BAD_REQUEST, "SCHEDULER4003", "면접 ID 또는 시간이 유효하지 않습니다.");
+    INTERVIEW_SCHEDULE_INVALID_ARGUMENT(HttpStatus.BAD_REQUEST, "SCHEDULER4003", "면접 ID 또는 시간이 유효하지 않습니다."),
+
+    // AI 관련 에러
+    AI_RESOURCE_NOT_FOUND(HttpStatus.NOT_FOUND, "AI4001", "AI 서비스에서 리소스를 찾을 수 없습니다."),
+    AI_BAD_REQUEST(HttpStatus.BAD_REQUEST, "AI4002", "AI 서비스에 잘못된 요청을 보냈습니다."),
+    AI_INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "AI5001", "AI 서비스에서 내부 서버 에러가 발생했습니다."),
+    ;
 
     private final HttpStatus httpStatus;
     private final String code;

src/main/java/cloudcomputinginha/demo/config/AiFeignConfig.java

@@ -0,0 +1,38 @@
+package cloudcomputinginha.demo.config;
+
+import cloudcomputinginha.demo.infra.ai.AiServiceErrorDecoder;
+import feign.Request;
+import feign.Retryer;
+import feign.codec.ErrorDecoder;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Feign 클라이언트 설정
+ * - 타임아웃 설정
+ * - 에러 디코더 설정
+ * - 재시도 설정
+ */
+@Configuration
+@RequiredArgsConstructor
+public class AiFeignConfig {
+
+    private final AiServiceErrorDecoder customErrorDecoder;
+
+    @Bean
+    public Request.Options feignRequestOptions() {
+        return new Request.Options(5000, 15000);
+        // 5s 연결 타임아웃, 15s 읽기(응답대기) 타임아웃
+    }
+
+    @Bean
+    public ErrorDecoder errorDecoder() {
+        return customErrorDecoder;
+    }
+
+    @Bean
+    public Retryer retryer() {
+        return new Retryer.Default(100, 1000, 3);
+    }
+}

src/main/java/cloudcomputinginha/demo/config/DomainInfo.java

@@ -1,6 +1,7 @@
 package cloudcomputinginha.demo.config;
 
-import org.springframework.beans.factory.annotation.Value;
+import cloudcomputinginha.demo.config.properties.CloudProperties;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;
@@ -11,26 +12,22 @@
 // EC2의 Instance Metadata Service (IMDS)에서 IAM Role의 자격 증명을 가져옴.
 // => EC2 인스턴스의 IAM Role을 사용하여 자동 인증
 @Configuration
+@RequiredArgsConstructor
 public class S3Config {
-
-    @Value("${cloud.aws.s3.region}")
-    private String region;
-
-    @Value("${cloud.aws.auth}")
-    private String authType;
+    private final CloudProperties cloudProperties;
 
     @Bean
     public S3Client s3Client() {
         return S3Client.builder()
-                .region(Region.of(region))
+                .region(Region.of(cloudProperties.getS3().getRegion())) // 변경된 부분
                 .credentialsProvider(InstanceProfileCredentialsProvider.create())
                 .build();
     }
 
     @Bean
     public S3Presigner s3Presigner() {
         return S3Presigner.builder()
-                .region(Region.of(region))
+                .region(Region.of(cloudProperties.getS3().getRegion())) // 변경된 부분
                 .credentialsProvider(InstanceProfileCredentialsProvider.create())
                 .build();
     }

src/main/java/cloudcomputinginha/demo/config/S3Config.java

@@ -1,8 +1,8 @@
 package cloudcomputinginha.demo.config.auth;
 
+import cloudcomputinginha.demo.config.properties.DomainProperties;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -20,12 +20,8 @@
 @EnableWebSecurity
 @RequiredArgsConstructor
 public class SecurityConfig {
-
+    private final DomainProperties domainProperties;
     private final JwtProvider jwtProvider;
-    @Value("${notification.domain.interview}")
-    private String interviewDomain;
-    @Value("${notification.domain.interview-ai}")
-    private String interviewAiDomain;
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
@@ -40,8 +36,8 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
                                         "http://localhost:3000",
                                         "https://cloud-computing-fe-two.vercel.app",
                                         "http://127.0.0.1:5500",
-                                        interviewDomain,
-                                        interviewAiDomain
+                                        domainProperties.getAi(),
+                                        domainProperties.getBackend()
                                 ));
 
                                 configuration.setAllowedMethods(

src/main/java/cloudcomputinginha/demo/config/auth/SecurityConfig.java

@@ -0,0 +1,31 @@
+package cloudcomputinginha.demo.config.properties;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "cloud.aws")
+public class CloudProperties {
+
+    @NotBlank(message = "AWS 인증 방식은 필수입니다.")
+    private String auth;
+
+    @Valid
+    private S3 s3 = new S3();
+
+    @Getter
+    @Setter
+    public static class S3 {
+        @NotBlank(message = "S3 버킷 이름은 필수입니다.")
+        private String bucket;
+
+        @NotBlank(message = "AWS 리전은 필수입니다.")
+        private String region;
+    }
+}

src/main/java/cloudcomputinginha/demo/config/properties/CloudProperties.java

@@ -0,0 +1,19 @@
+package cloudcomputinginha.demo.config.properties;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "domain")
+public class DomainProperties {
+    @NotBlank(message = "백엔드 도메인은 필수입니다.")
+    private String backend;
+
+    @NotBlank(message = "AI 도메인은 필수입니다.")
+    private String ai;
+}