Merge branch 'test'

InsuranceSystem · Dec 8, 2023 · 4c7d013 · 4c7d013
2 parents 1db515c + f2bc2c4
commit 4c7d013
Show file tree

Hide file tree

Showing 174 changed files with 2,703 additions and 1,592 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+files/
 
 ### STS ###
 .apt_generated

diff --git a/ddl.sql b/ddl.sql
diff --git a/...esystem2/InsuranceSystem2Application.java → ...ncesystem/InsuranceSystemApplication.java b/...esystem2/InsuranceSystem2Application.java → ...ncesystem/InsuranceSystemApplication.java
@@ -1,13 +1,13 @@
-package aplus.insurancesystem2;
+package aplus.insurancesystem;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class InsuranceSystem2Application {
+public class InsuranceSystemApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(InsuranceSystem2Application.class, args);
+        SpringApplication.run(InsuranceSystemApplication.class, args);
     }
 
 }
diff --git a/...config/AplusAuthenticationEntryPoint.java → ...config/AplusAuthenticationEntryPoint.java b/...config/AplusAuthenticationEntryPoint.java → ...config/AplusAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package aplus.insurancesystem2.common.config;
+package aplus.insurancesystem.common.config;
 
 import java.io.IOException;
 

diff --git a/...esystem2/common/config/P6SpyFomatter.java → ...cesystem/common/config/P6SpyFomatter.java b/...esystem2/common/config/P6SpyFomatter.java → ...cesystem/common/config/P6SpyFomatter.java
@@ -1,4 +1,4 @@
-package aplus.insurancesystem2.common.config;
+package aplus.insurancesystem.common.config;
 
 import java.util.Locale;
 

diff --git a/...system2/common/config/SecurityConfig.java → ...esystem/common/config/SecurityConfig.java b/...system2/common/config/SecurityConfig.java → ...esystem/common/config/SecurityConfig.java
@@ -1,4 +1,6 @@
-package aplus.insurancesystem2.common.config;
+package aplus.insurancesystem.common.config;
+
+import java.util.List;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,10 +12,15 @@
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-import aplus.insurancesystem2.common.security.AplusAccessDeniedHandler;
-import aplus.insurancesystem2.common.security.AplusAuthenticationSuccessHandler;
+import aplus.insurancesystem.common.security.AplusAccessDeniedHandler;
+import aplus.insurancesystem.common.security.AplusAuthenticationFailureHandler;
+import aplus.insurancesystem.common.security.AplusAuthenticationSuccessHandler;
 
 @Configuration
 @EnableWebSecurity
@@ -29,6 +36,11 @@ public SimpleUrlAuthenticationSuccessHandler loginSuccessHandler() {
         return new AplusAuthenticationSuccessHandler();
     }
 
+    @Bean
+    public AuthenticationFailureHandler loginFailureHandler() {
+        return new AplusAuthenticationFailureHandler();
+    }
+
     @Bean
     public AccessDeniedHandler accessDeniedHandler() {
         return new AplusAccessDeniedHandler();
@@ -49,12 +61,15 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .anyRequest().authenticated()
                 )
                 .csrf(AbstractHttpConfigurer::disable)
+                .cors((cors) -> cors
+                        .configurationSource(apiConfigurationSource()))
                 .formLogin((login) -> login
                         .loginPage("/loginpage")
                         .loginProcessingUrl("/login")
                         .usernameParameter("loginId")
                         .passwordParameter("password")
                         .successHandler(loginSuccessHandler())
+                        .failureHandler(loginFailureHandler())
                 )
                 .exceptionHandling((exception) -> exception
                         .accessDeniedHandler(accessDeniedHandler())
@@ -68,4 +83,15 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 );
         return http.build();
     }
+
+    private CorsConfigurationSource apiConfigurationSource() {
+        CorsConfiguration configuration = new CorsConfiguration();
+        configuration.setAllowCredentials(true);
+        configuration.setAllowedOrigins(List.of("http://localhost:3000"));
+        configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
+        configuration.setAllowedHeaders(List.of("*"));
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", configuration);
+        return source;
+    }
 }
diff --git a/...esystem2/common/config/SwaggerConfig.java → ...cesystem/common/config/SwaggerConfig.java b/...esystem2/common/config/SwaggerConfig.java → ...cesystem/common/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package aplus.insurancesystem2.common.config;
+package aplus.insurancesystem.common.config;
 
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
@@ -19,6 +19,17 @@
 @Configuration
 public class SwaggerConfig {
 
+    @Bean
+    public GroupedOpenApi allOpenApi() {
+        String[] paths = {"/**"};
+
+        return GroupedOpenApi
+                .builder()
+                .group("전체 API")
+                .pathsToMatch(paths)
+                .build();
+    }
+
     @Bean
     public GroupedOpenApi customerOpenApi() {
         String[] paths = {"/customers/**"};
@@ -64,12 +75,45 @@ public GroupedOpenApi insuranceApplicationOpenApi() {
     }
 
     @Bean
-    public GroupedOpenApi loginOpenApi() {
-        String[] paths = {"/**"};
+    public GroupedOpenApi contractOpenApi() {
+        String[] paths = {"/contracts/**"};
+
+        return GroupedOpenApi
+                .builder()
+                .group("계약 API")
+                .pathsToMatch(paths)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi paymentOpenApi() {
+        String[] paths = {"/payments/**"};
+
+        return GroupedOpenApi
+                .builder()
+                .group("납입 API")
+                .pathsToMatch(paths)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi compensationClaimOpenApi() {
+        String[] paths = {"/compensation-claim/**"};
+
+        return GroupedOpenApi
+                .builder()
+                .group("보상금 청구 API")
+                .pathsToMatch(paths)
+                .build();
+    }
+
+    @Bean
+    public GroupedOpenApi surveyOpenApi() {
+        String[] paths = {"/survey/**"};
 
         return GroupedOpenApi
                 .builder()
-                .group("로그인 API")
+                .group("손해사정 API")
                 .pathsToMatch(paths)
                 .build();
     }

diff --git a/...rancesystem2/common/config/WebConfig.java → ...urancesystem/common/config/WebConfig.java b/...rancesystem2/common/config/WebConfig.java → ...urancesystem/common/config/WebConfig.java
@@ -1,14 +1,16 @@
-package aplus.insurancesystem2.common.config;
+package aplus.insurancesystem.common.config;
 
 import java.util.List;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import aplus.insurancesystem2.common.converter.UserInfoArgumentResolver;
+import aplus.insurancesystem.common.converter.EInsuranceTypeConverter;
+import aplus.insurancesystem.common.converter.EPaymentCycleConverter;
+import aplus.insurancesystem.common.converter.UserInfoArgumentResolver;
 import lombok.RequiredArgsConstructor;
 
 @Configuration
@@ -17,18 +19,15 @@
 public class WebConfig implements WebMvcConfigurer {
 
     private final UserInfoArgumentResolver userInfoArgumentResolver;
+    private final EPaymentCycleConverter ePaymentCycleConverter;
 
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
         resolvers.add(userInfoArgumentResolver);
     }
 
     @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowedMethods("*")
-                .allowedHeaders("*")
-                .allowCredentials(true).maxAge(3600);
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(ePaymentCycleConverter);
     }
 }
diff --git a/...m2/common/converter/EGenderConverter.java → ...em/common/converter/EGenderConverter.java b/...m2/common/converter/EGenderConverter.java → ...em/common/converter/EGenderConverter.java
@@ -1,9 +1,9 @@
-package aplus.insurancesystem2.common.converter;
+package aplus.insurancesystem.common.converter;
 
 import java.util.EnumSet;
 
 
-import aplus.insurancesystem2.domain.customer.entity.customer.EGender;
+import aplus.insurancesystem.domain.customer.entity.customer.EGender;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 

diff --git a/src/main/java/aplus/insurancesystem/common/converter/EInsuranceTypeConverter.java b/src/main/java/aplus/insurancesystem/common/converter/EInsuranceTypeConverter.java
@@ -0,0 +1,24 @@
+package aplus.insurancesystem.common.converter;
+
+import java.util.EnumSet;
+
+import aplus.insurancesystem.domain.Insurance.entity.insurance.InsuranceType;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class EInsuranceTypeConverter implements AttributeConverter<InsuranceType, String> {
+
+    @Override
+    public String convertToDatabaseColumn(InsuranceType insuranceType) {
+        return insuranceType.getName();
+    }
+
+    @Override
+    public InsuranceType convertToEntityAttribute(String dbData) {
+        return EnumSet.allOf(InsuranceType.class).stream()
+                      .filter(e -> e.getName().equals(dbData))
+                      .findAny()
+                      .orElseThrow(IllegalArgumentException::new);
+    }
+}
diff --git a/src/main/java/aplus/insurancesystem/common/converter/EJobConverter.java b/src/main/java/aplus/insurancesystem/common/converter/EJobConverter.java
@@ -0,0 +1,24 @@
+package aplus.insurancesystem.common.converter;
+
+import java.util.EnumSet;
+
+import aplus.insurancesystem.domain.customer.entity.customer.Job;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class EJobConverter implements AttributeConverter<Job, String>  {
+
+    @Override
+    public String convertToDatabaseColumn(Job job) {
+        return job.getName();
+    }
+
+    @Override
+    public Job convertToEntityAttribute(String dbData) {
+        return EnumSet.allOf(Job.class).stream()
+                      .filter(e -> e.getName().equals(dbData))
+                      .findAny()
+                      .orElseThrow(IllegalArgumentException::new);
+    }
+}
diff --git a/src/main/java/aplus/insurancesystem/common/converter/EPaymentCycleConverter.java b/src/main/java/aplus/insurancesystem/common/converter/EPaymentCycleConverter.java
@@ -0,0 +1,20 @@
+package aplus.insurancesystem.common.converter;
+
+import java.util.Arrays;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import aplus.insurancesystem.domain.Insurance.entity.insurauceApplication.PaymentCycle;
+
+@Component
+public class EPaymentCycleConverter implements Converter<String, PaymentCycle> {
+
+    @Override
+    public PaymentCycle convert(String source) {
+        return Arrays.stream(PaymentCycle.values())
+                .filter(e -> e.getName().equals(source))
+                .findAny()
+                .orElseThrow(IllegalArgumentException::new);
+    }
+}
diff --git a/...system2/common/converter/GetCustomer.java → ...esystem/common/converter/GetCustomer.java b/...system2/common/converter/GetCustomer.java → ...esystem/common/converter/GetCustomer.java
@@ -1,4 +1,4 @@
-package aplus.insurancesystem2.common.converter;
+package aplus.insurancesystem.common.converter;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...stem2/common/converter/RoleConverter.java → ...ystem/common/converter/RoleConverter.java b/...stem2/common/converter/RoleConverter.java → ...ystem/common/converter/RoleConverter.java
@@ -1,6 +1,6 @@
-package aplus.insurancesystem2.common.converter;
+package aplus.insurancesystem.common.converter;
 
-import aplus.insurancesystem2.domain.customer.entity.customer.Role;
+import aplus.insurancesystem.domain.customer.entity.customer.Role;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 import java.util.EnumSet;

diff --git a/...n/converter/UserInfoArgumentResolver.java → ...n/converter/UserInfoArgumentResolver.java b/...n/converter/UserInfoArgumentResolver.java → ...n/converter/UserInfoArgumentResolver.java
@@ -1,4 +1,4 @@
-package aplus.insurancesystem2.common.converter;
+package aplus.insurancesystem.common.converter;
 
 import java.util.Objects;
 
@@ -10,11 +10,11 @@
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import aplus.insurancesystem2.common.exception.BusinessException;
-import aplus.insurancesystem2.common.exception.ErrorCode;
-import aplus.insurancesystem2.common.security.CustomUserDetails;
-import aplus.insurancesystem2.common.security.CustomerInfo;
-import aplus.insurancesystem2.domain.customer.entity.customer.Customer;
+import aplus.insurancesystem.common.exception.BusinessException;
+import aplus.insurancesystem.common.exception.ErrorCode;
+import aplus.insurancesystem.common.security.CustomUserDetails;
+import aplus.insurancesystem.common.security.CustomerInfo;
+import aplus.insurancesystem.domain.customer.entity.customer.Customer;
 
 @Component
 public class UserInfoArgumentResolver implements HandlerMethodArgumentResolver {

diff --git a/...ancesystem2/common/dto/ErrorResponse.java → ...rancesystem/common/dto/ErrorResponse.java b/...ancesystem2/common/dto/ErrorResponse.java → ...rancesystem/common/dto/ErrorResponse.java
@@ -1,6 +1,6 @@
-package aplus.insurancesystem2.common.dto;
+package aplus.insurancesystem.common.dto;
 
-import aplus.insurancesystem2.common.exception.ErrorCode;
+import aplus.insurancesystem.common.exception.ErrorCode;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/...cesystem2/common/dto/SuccessResponse.java → ...ncesystem/common/dto/SuccessResponse.java b/...cesystem2/common/dto/SuccessResponse.java → ...ncesystem/common/dto/SuccessResponse.java
@@ -1,5 +1,6 @@
-package aplus.insurancesystem2.common.dto;
+package aplus.insurancesystem.common.dto;
 
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 

diff --git a/...2/common/exception/BusinessException.java → ...m/common/exception/BusinessException.java b/...2/common/exception/BusinessException.java → ...m/common/exception/BusinessException.java
@@ -1,7 +1,6 @@
-package aplus.insurancesystem2.common.exception;
+package aplus.insurancesystem.common.exception;
 
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 @Getter
 public class BusinessException extends RuntimeException {

diff --git a/...cesystem2/common/exception/ErrorCode.java → ...ncesystem/common/exception/ErrorCode.java b/...cesystem2/common/exception/ErrorCode.java → ...ncesystem/common/exception/ErrorCode.java
@@ -1,4 +1,4 @@
-package aplus.insurancesystem2.common.exception;
+package aplus.insurancesystem.common.exception;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -10,6 +10,8 @@ public enum ErrorCode {
     // Common
     INTERNAL_SERVER_ERROR(500, "C001", "서버에 오류가 발생하였습니다."),
     NOT_LOGIN(401, "C002", "로그인이 필요합니다."),
+    UPLOAD_FILE_ERROR(500, "C003", "파일 업로드에 실패하였습니다."),
+    DOWNLOAD_FILE_ERROR(500, "C004", "파일 다운로드에 실패하였습니다."),
 
     // Customer
     CUSTOMER_NOT_FOUND(404, "U001", "고객을 찾을 수 없습니다."),
@@ -26,7 +28,10 @@ public enum ErrorCode {
     // Contract
     CONTRACT_NOT_FOUND(404, "C001", "계약을 찾을 수 없습니다."),
 
-    COMPENSATION_CLIAM_NOT_FOUND(404, "CC001" , "청구 내역을 찾을 수 없습니다."),
+    // Payment
+    PAYMENT_NOT_FOUND(404, "P001", "납입을 찾을 수 없습니다."),
+
+    COMPENSATION_CLAIM_NOT_FOUND(404, "CC001" , "청구 내역을 찾을 수 없습니다."),
     CAR_ACCIDENT_NOT_FOUND(404, "CA001" ,"사고 접수 내역을 찾을 수 없습니다." ),
     SURVEY_NOT_FOUND(404, "SV001", "손해사정 내역을 찾을 수 없습니다.");