Merge pull request #155 from TeamLearningFlow/deploy

Deploy

Author: JaehoonJung0430

.github/workflows/main.yml

@@ -24,9 +24,6 @@ jobs:
     # Set up Docker Buildx
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
-      with:
-        install: true
-        driver: docker
 
     # Build and push Docker image
     - name: Build and push

src/main/generated/learningFlow/learningFlow_BE/domain/QEmailVerificationToken.java

@@ -7,6 +7,7 @@
 import com.querydsl.core.types.PathMetadata;
 import javax.annotation.processing.Generated;
 import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
 
 
 /**
@@ -17,6 +18,8 @@ public class QEmailVerificationToken extends EntityPathBase<EmailVerificationTok
 
     private static final long serialVersionUID = -1162432526L;
 
+    private static final PathInits INITS = PathInits.DIRECT2;
+
     public static final QEmailVerificationToken emailVerificationToken = new QEmailVerificationToken("emailVerificationToken");
 
     public final QBaseEntity _super = new QBaseEntity(this);
@@ -35,18 +38,29 @@ public class QEmailVerificationToken extends EntityPathBase<EmailVerificationTok
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
 
+    public final QUser user;
+
     public final BooleanPath verified = createBoolean("verified");
 
     public QEmailVerificationToken(String variable) {
-        super(EmailVerificationToken.class, forVariable(variable));
+        this(EmailVerificationToken.class, forVariable(variable), INITS);
     }
 
     public QEmailVerificationToken(Path<? extends EmailVerificationToken> path) {
-        super(path.getType(), path.getMetadata());
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
     }
 
     public QEmailVerificationToken(PathMetadata metadata) {
-        super(EmailVerificationToken.class, metadata);
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QEmailVerificationToken(PathMetadata metadata, PathInits inits) {
+        this(EmailVerificationToken.class, metadata, inits);
+    }
+
+    public QEmailVerificationToken(Class<? extends EmailVerificationToken> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.user = inits.isInitialized("user") ? new QUser(forProperty("user")) : null;
     }
 
 }

src/main/generated/learningFlow/learningFlow_BE/domain/QUser.java

@@ -22,6 +22,8 @@ public class QUser extends EntityPathBase<User> {
 
     public final QBaseEntity _super = new QBaseEntity(this);
 
+    public final StringPath bannerImgUrl = createString("bannerImgUrl");
+
     public final ListPath<Long, NumberPath<Long>> bookmarkedCollectionIds = this.<Long, NumberPath<Long>>createList("bookmarkedCollectionIds", Long.class, NumberPath.class, PathInits.DIRECT2);
 
     //inherited

src/main/generated/learningFlow/learningFlow_BE/domain/QUserEpisodeProgress.java

@@ -31,6 +31,8 @@ public class QUserEpisodeProgress extends EntityPathBase<UserEpisodeProgress> {
 
     public final NumberPath<Integer> episodeNumber = createNumber("episodeNumber", Integer.class);
 
+    public final BooleanPath isComplete = createBoolean("isComplete");
+
     public final EnumPath<learningFlow.learningFlow_BE.domain.enums.ResourceType> resourceType = createEnum("resourceType", learningFlow.learningFlow_BE.domain.enums.ResourceType.class);
 
     public final NumberPath<Integer> totalProgress = createNumber("totalProgress", Integer.class);

src/main/java/learningFlow/learningFlow_BE/LearningFlowBeApplication.java

@@ -2,7 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 

src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java

@@ -21,9 +21,24 @@ public enum ErrorStatus implements BaseErrorCode {
 
 
     // 멤버 관려 에러
+    EMAIL_ALREADY_EXISTS(HttpStatus.BAD_REQUEST,"EMAIL4001" ,"이미 동일한 이메일로 생성된 계정이 존재합니다."),
+    EMAIL_VERIFICATION_IN_PROGRESS(HttpStatus.BAD_REQUEST, "EMAIL4002", "이미 진행 중인 이메일 인증이 있습니다. 이메일을 확인해주세요."),
+    EMAIL_CHANGE_SAME_AS_CURRENT(HttpStatus.BAD_REQUEST, "EMAIL4004", "기존과 동일한 이메일로는 변경하실 수 없습니다."),
+    GOOGLE_USER_CANNOT_CHANGE_EMAIL(HttpStatus.BAD_REQUEST,"EMAIL4005","구글 로그인 유저는 이메일 변경을 하실 수 없습니다."),
+    EMAIL_CODE_INVALID(HttpStatus.BAD_REQUEST, "EMAIL4006", "유효하지 않은 이메일 인증 코드입니다."),
+    EMAIL_CODE_EXPIRED(HttpStatus.BAD_REQUEST,"EMAIL4007","만료된 이메일 인증 코드입니다. 이메일 인증을 다시 요청해주세요."),
+
     USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "USER4001", "사용자를 찾을 수 없습니다."),
     NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "USER4002", "닉네임은 필수 입니다."),
 
+    // 비밀번호 관련 에러 추가
+    INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "PASSWORD4001", "유효하지 않은 비밀번호입니다."),
+    PASSWORD_CURRENT_MISMATCH(HttpStatus.BAD_REQUEST, "PASSWORD4002", "현재 비밀번호가 일치하지 않습니다."),
+    PASSWORD_SAME_AS_CURRENT(HttpStatus.BAD_REQUEST, "PASSWORD4003", "새 비밀번호는 현재 비밀번호와 달라야 합니다."),
+    PASSWORD_RESET_CODE_INVALID(HttpStatus.BAD_REQUEST, "PASSWORD4004", "유효하지 않은 비밀번호 재설정 코드입니다."),
+    PASSWORD_RESET_CODE_EXPIRED(HttpStatus.BAD_REQUEST, "PASSWORD4005", "만료된 비밀번호 재설정 코드입니다. 비밀번호 재설정을 다시 요청해주세요."),
+
+
     //Resources 관련 에어
     RESOURCES_NOT_FOUND(HttpStatus.NOT_FOUND,"RESOURCE4001","강의 에피소드를 찾을 수 없습니다."),
     QUANTITY_IS_NULL(HttpStatus.BAD_REQUEST, "RESOURCE4002", "분량이 존재하지 않습니다"),
@@ -41,10 +56,6 @@ public enum ErrorStatus implements BaseErrorCode {
     // 예시,,,
     ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."),
 
-
-    EMAIL_ALREADY_EXISTS(HttpStatus.BAD_REQUEST,"EMAIL4001" ,"이미 동일한 이메일로 생성된 계정이 존재합니다."),
-    INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "PASSWORD4001", "유효하지 않은 비밀번호입니다."),
-
     //이미지
     IMAGE_FORMAT_BADREQUEST(HttpStatus.BAD_REQUEST,"COMMON400","이미지 파일만 업로드할 수 있습니다."),
     IMAGE_UPLOAD_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON5001", "이미지 업로드에 실패했습니다. 다시 시도해주세요."),

src/main/java/learningFlow/learningFlow_BE/config/CorsConfig.java

@@ -1,3 +1,4 @@
+/*
 package learningFlow.learningFlow_BE.config;
 
 //Spring Security까지 CORS 적용 목적
@@ -7,6 +8,7 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
+import java.util.Arrays;
 import java.util.List;
 
 @Configuration
@@ -16,12 +18,28 @@ public class CorsConfig {
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
+
+        config.setAllowedOrigins(Arrays.asList(
+                "http://localhost:3000",
+                "http://localhost:8081",
+                "http://onboarding.p-e.kr:8080",
+                "http://54.180.118.227",
+                "https://accounts.google.com"
+        ));
+
+        config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
+        config.setAllowedHeaders(Arrays.asList("*"));
         config.setAllowCredentials(true);
-        config.setAllowedOrigins(List.of("http://localhost:3000", "http://localhost:8081")); // ✅ Swagger 포함
-        config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
-        config.setAllowedHeaders(List.of("*"));
-        config.setMaxAge(3600L);
+        config.setExposedHeaders(Arrays.asList(
+                "Authorization",
+                "Refresh-Token",
+                "Access-Control-Allow-Origin",
+                "Access-Control-Allow-Credentials"
+        ));
+        config.setMaxAge(86400L);
+
         source.registerCorsConfiguration("/**", config);
         return new CorsFilter(source);
     }
 }
+*/

src/main/java/learningFlow/learningFlow_BE/config/WebConfig.java

@@ -1,3 +1,4 @@
+/*
 package learningFlow.learningFlow_BE.config;
 
 import org.springframework.context.annotation.Configuration;
@@ -10,11 +11,19 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost:3000", "http://localhost:8080", "http://onboarding.p-e.kr:8080", "http://54.180.118.227")
-//                .allowedOrigins("http://localhost:3000") // 프론트엔드 주소
+                .allowedOriginPatterns("*")  // 개발 중일 때만 사용
+                // 또는 특정 출처만 허용
+                .allowedOrigins(
+                        "http://localhost:3000",
+                        "http://localhost:8081",
+                        "http://onboarding.p-e.kr:8080",
+                        "http://54.180.118.227",
+                        "https://accounts.google.com"
+                )
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
                 .allowedHeaders("*")
                 .allowCredentials(true)
                 .maxAge(86400L);
     }
 }
+*/

src/main/java/learningFlow/learningFlow_BE/config/security/SecurityConfig.java

@@ -53,10 +53,16 @@ public SecurityFilterChain filterChain(HttpSecurity http, JwtAuthenticationFilte
                                 "/search/**",
                                 "/",
                                 "/collections/{collectionId:[\\d]+}",
-                                 "/image/upload" //이미지 업로드는 허용
+                                "/image/upload", //이미지 업로드는 허용
+                                "/favicon.ico",
+                                "/register",
+                                "/register/complete",
+                                "/login",
+                                "/login/google",
+                                "/oauth2/**",
+                                "/login/oauth2/**",
+                                "/user/change-email"
                         ).permitAll()
-                        .requestMatchers(
-                                "/register", "/register/complete", "/login", "/login/google", "/oauth2/**").permitAll()
                         .requestMatchers("/admin/**").hasRole("ADMIN")
                         .requestMatchers("/user/**", "/resources/**", "/collections/{collectionId:[\\d]+}/likes", "/logout/**").authenticated()
                         .anyRequest().permitAll()
@@ -72,7 +78,6 @@ public SecurityFilterChain filterChain(HttpSecurity http, JwtAuthenticationFilte
                 .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
                 .exceptionHandling(exception ->
                         exception.authenticationEntryPoint(authenticationEntryPoint));
-
         return http.build();
     }
 
@@ -89,10 +94,37 @@ public PasswordEncoder passwordEncoder() {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(List.of("http://localhost:3000")); // 프론트엔드 주소
+
+        configuration.setAllowedOrigins(Arrays.asList(
+                "http://localhost:3000",
+                "http://localhost:8081",
+                "http://onboarding.p-e.kr:8080",
+                "http://54.180.118.227",
+                "https://accounts.google.com"
+        ));
+
         configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
-        configuration.setAllowedHeaders(List.of("*"));
+        configuration.setAllowedHeaders(Arrays.asList(
+                "Authorization",
+                "Refresh-Token",
+                "Access-Control-Allow-Origin",
+                "Access-Control-Allow-Credentials",
+                "Content-Type",
+                "Accept",
+                "Origin",
+                "X-Requested-With"
+        ));
         configuration.setAllowCredentials(true);
+        configuration.setExposedHeaders(Arrays.asList(
+                "Authorization",
+                "Refresh-Token",
+                "Access-Control-Allow-Origin",
+                "Access-Control-Allow-Credentials",
+                "Content-Type",
+                "Accept",
+                "Origin",
+                "X-Requested-With"
+        ));
         configuration.setMaxAge(86400L);
 
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();

src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java

@@ -47,12 +47,12 @@ public static SearchRequestDTO.SearchConditionDTO toSearchConditionDTO(
 
     public static CollectionResponseDTO.SearchResultDTO toSearchResultDTO(
             List<Collection> collections,
-            Long lastId,
             boolean hasNext,
             int totalPages,
             int currentPage,
             User currentUser,
-            Map<Long, CollectionResponseDTO.CollectionLearningInfo> learningInfoMap
+            Map<Long, CollectionResponseDTO.CollectionLearningInfo> learningInfoMap,
+            int totalCount
     ) {
         List<CollectionResponseDTO.CollectionPreviewDTO> list = collections.stream()
                 .map(collection -> toCollectionPreviewDTO(
@@ -63,10 +63,10 @@ public static CollectionResponseDTO.SearchResultDTO toSearchResultDTO(
 
         return CollectionResponseDTO.SearchResultDTO.builder()
                 .searchResults(list)
-                .lastId(lastId)
                 .hasNext(hasNext)
                 .currentPage(currentPage)
                 .totalPages(totalPages)
+                .totalCount(totalCount)
                 .build();
     }
 
@@ -82,6 +82,7 @@ public static CollectionResponseDTO.CollectionPreviewDTO toCollectionPreviewDTO(
 
         return CollectionResponseDTO.CollectionPreviewDTO.builder()
                 .collectionId(collection.getId())
+                .imageUrl(collection.getCollectionImgUrl())
                 .interestField(collection.getInterestField())
                 .title(collection.getTitle())
                 .creator(collection.getCreator())