v1.1.0

.github/workflows/dev-CD.yml

@@ -0,0 +1,76 @@
+name: DEV CD
+
+on:
+  push:
+    branches: [ "develop" ]
+
+jobs:
+  deploy-ci:
+    runs-on: ubuntu-22.04
+    env:
+      working-directory-spring: main
+      working-directory-nestjs: server
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install dependencies (npm 의존성 설치)
+        run: npm install
+        working-directory: ${{ env.working-directory-nestjs }}
+
+      - name: resources 폴더 내 application-secret.properties 파일 생성
+        run: |
+          mkdir -p src/main/resources
+          echo "${{ secrets.APPLICATION_SECRET }}" > src/main/resources/application-secret.properties
+        working-directory: ${{ env.working-directory-spring }}
+
+      - name: nestjs 폴더 내 .dev.env 파일 생성
+        run: |
+          echo "${{ secrets.APPLICATION_SECRET }}" > .dev.env
+        working-directory: ${{ env.working-directory-nestjs }}
+
+      - name: Build (Spring)
+        run: |
+          chmod +x gradlew
+          ./gradlew clean build
+        working-directory: ${{ env.working-directory-spring }}
+        shell: bash
+
+      - name: Build (nestjs)
+        run: npm run build
+        working-directory: ${{ env.working-directory-nestjs }}
+
+      ### 여기까지 CI와 거의 동일
+
+      - name: docker build 가능하도록 환경 설정
+        uses: docker/setup-buildx-action@v2
+
+      - name: docker hub에 로그인
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_LOGIN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_LOGIN_ACCESSTOKEN }}
+
+      - name: docker image 빌드 및 푸시 (Spring)
+        run: |
+          docker build --platform linux/amd64 -t makerscrew/main .
+          docker push makerscrew/main
+        working-directory: ${{ env.working-directory-spring }}
+
+      - name: docker image 빌드 및 푸시 (nestjs)
+        run: |
+          docker build --platform linux/amd64 -t makerscrew/server .
+          docker push makerscrew/server
+        working-directory: ${{ env.working-directory-nestjs }}

docker-compose.dev.yml

@@ -3,16 +3,16 @@ version: "3.7"
 services:
   swagger:
     labels:
-      caddy: localhost crew.api.dev.sopt.org www.crew.api.dev.sopt.org
+      caddy: localhost crew.api.dev.sopt.org
 
   spring:
     environment:
       - SPRING_PROFILES_ACTIVE=dev
     labels:
-      caddy: localhost crew.api.dev.sopt.org www.crew.api.dev.sopt.org
+      caddy: localhost crew.api.dev.sopt.org
 
   nestjs:
     environment:
       - NODE_ENV=dev
     labels:
-      caddy: localhost crew.api.dev.sopt.org www.crew.api.dev.sopt.org
+      caddy: localhost crew.api.dev.sopt.org

docker-compose.prod.yml

@@ -3,16 +3,16 @@ version: "3.7"
 services:
   swagger:
     labels:
-      caddy: localhost crew.api.prod.sopt.org www.crew.api.prod.sopt.org
+      caddy: localhost crew.api.prod.sopt.org
 
   spring:
     environment:
       - SPRING_PROFILES_ACTIVE=prod
     labels:
-      caddy: localhost crew.api.prod.sopt.org www.crew.api.prod.sopt.org
+      caddy: localhost crew.api.prod.sopt.org
 
   nestjs:
     environment:
       - NODE_ENV=prod
     labels:
-      caddy: localhost crew.api.prod.sopt.org www.crew.api.prod.sopt.org
+      caddy: localhost crew.api.prod.sopt.org

docker-compose.yml

@@ -70,6 +70,8 @@ services:
       caddy.route_2.reverse_proxy: "{{ upstreams 4000 }}"
       caddy.route_3: /user/v2/*
       caddy.route_3.reverse_proxy: "{{ upstreams 4000 }}"
+      caddy.route_4: /meeting/v2/*
+      caddy.route_4.reverse_proxy: "{{ upstreams 4000 }}"
 
   nestjs:
     build:
@@ -97,22 +99,26 @@ services:
       caddy.route_3.reverse_proxy: "{{ upstreams 3000 }}"
       caddy.route_4: /comment/v1/*
       caddy.route_4.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_5: /meeting
+      caddy.route_5: /meeting/apply
       caddy.route_5.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_6: /meeting/*
+      caddy.route_6: /meeting
       caddy.route_6.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_7: /notice/v1
+      caddy.route_7: /meeting/v1/*
       caddy.route_7.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_8: /notice/v1/*
+      caddy.route_8: /meeting/*
       caddy.route_8.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_9: /post/v1
+      caddy.route_9: /notice/v1
       caddy.route_9.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_10: /post/v1/*
+      caddy.route_10: /notice/v1/*
       caddy.route_10.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_11: /users
+      caddy.route_11: /post/v1
       caddy.route_11.reverse_proxy: "{{ upstreams 3000 }}"
-      caddy.route_12: /users/*
+      caddy.route_12: /post/v1/*
       caddy.route_12.reverse_proxy: "{{ upstreams 3000 }}"
+      caddy.route_13: /users
+      caddy.route_13.reverse_proxy: "{{ upstreams 3000 }}"
+      caddy.route_14: /users/*
+      caddy.route_14.reverse_proxy: "{{ upstreams 3000 }}"
 
 networks:
   caddy:

main/build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'org.sopt.makers.crew'
-version = '1.0.0'
+version = '1.1.0'
 
 java {
     sourceCompatibility = '17'
@@ -24,7 +24,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     // https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-ui
-    implementation 'io.hypersistence:hypersistence-utils-hibernate-60:3.5.2'
+    implementation 'io.hypersistence:hypersistence-utils-hibernate-62:3.6.0'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'org.springframework.boot:spring-boot-starter-webflux:3.1.5'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
@@ -40,8 +40,22 @@ dependencies {
     implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
     implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
     implementation 'com.auth0:java-jwt:4.4.0'
+
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.0.3'
 }
 
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+ext {
+    set('springCloudVersion', "2022.0.3")
+}
+
+dependencyManagement {
+
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
+
+}

main/src/main/java/org/sopt/makers/crew/main/common/config/FeignClientConfig.java

@@ -0,0 +1,10 @@
+package org.sopt.makers.crew.main.common.config;
+
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Configuration;
+
+@EnableFeignClients(basePackages = "org.sopt.makers.crew.main.internal.notification")
+@Configuration
+public class FeignClientConfig {
+
+}

main/src/main/java/org/sopt/makers/crew/main/common/config/SecurityConfig.java

@@ -38,30 +38,47 @@ public class SecurityConfig {
   };
 
   private static final String[] AUTH_WHITELIST = {
-      "/health"
+      "/health",
+      "meeting/v2/org-user/**"
   };
 
   @Bean
   @Profile("dev")
   SecurityFilterChain devSecurityFilterChain(HttpSecurity http) throws Exception {
-    http.csrf((csrfConfig) ->
-            csrfConfig.disable()
-        )
+    http.csrf((csrfConfig) -> csrfConfig.disable())
         .cors(Customizer.withDefaults())
-        .sessionManagement((sessionManagement) ->
-            sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-        )
+        .sessionManagement(
+            (sessionManagement) -> sessionManagement.sessionCreationPolicy(
+                SessionCreationPolicy.STATELESS))
         .authorizeHttpRequests(
             authorize -> authorize.requestMatchers(AUTH_WHITELIST).permitAll()
                 .requestMatchers(SWAGGER_URL).permitAll()
-                .anyRequest().authenticated()
-        )
+                .anyRequest().authenticated())
         .addFilterBefore(
-            new JwtAuthenticationFilter(jwtTokenProvider, jwtAuthenticationEntryPoint),
+            new JwtAuthenticationFilter(this.jwtTokenProvider, this.jwtAuthenticationEntryPoint),
             UsernamePasswordAuthenticationFilter.class)
-        .exceptionHandling(exceptionHandling ->
-            exceptionHandling.authenticationEntryPoint(jwtAuthenticationEntryPoint)
-        );
+        .exceptionHandling(exceptionHandling -> exceptionHandling
+            .authenticationEntryPoint(this.jwtAuthenticationEntryPoint));
+    return http.build();
+  }
+
+  @Bean
+  @Profile("prod")
+  SecurityFilterChain prodSecurityFilterChain(HttpSecurity http) throws Exception {
+    http.csrf((csrfConfig) -> csrfConfig.disable())
+        .cors(Customizer.withDefaults())
+        .sessionManagement(
+            (sessionManagement) -> sessionManagement.sessionCreationPolicy(
+                SessionCreationPolicy.STATELESS))
+        .authorizeHttpRequests(
+            authorize -> authorize.requestMatchers(AUTH_WHITELIST).permitAll()
+                .requestMatchers(SWAGGER_URL).permitAll()
+                .anyRequest().authenticated())
+        .addFilterBefore(
+            new JwtAuthenticationFilter(this.jwtTokenProvider, this.jwtAuthenticationEntryPoint),
+            UsernamePasswordAuthenticationFilter.class)
+        .exceptionHandling(exceptionHandling -> exceptionHandling
+            .authenticationEntryPoint(this.jwtAuthenticationEntryPoint));
     return http.build();
   }
 
@@ -80,4 +97,4 @@ CorsConfigurationSource corsConfigurationSource() {
     return source;
   }
 
-}
+}

main/src/main/java/org/sopt/makers/crew/main/common/config/SwaggerConfig.java

@@ -21,7 +21,7 @@ public OpenAPI openAPI() {
 
                 Info info = new Info()
                                 .title("Crew API 문서")
-                                .version("1.0.0")
+                                .version("1.1.0")
                                 .description("Crew API 문서");
 
                 String jwtSchemeName = "JWT Authorization";
@@ -39,4 +39,4 @@ public OpenAPI openAPI() {
                                 .addSecurityItem(securityRequirement)
                                 .components(components);
         }
-}
+}

main/src/main/java/org/sopt/makers/crew/main/common/exception/ForbiddenException.java

@@ -0,0 +1,15 @@
+package org.sopt.makers.crew.main.common.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class ForbiddenException extends BaseException {
+
+  public ForbiddenException() {
+    super(HttpStatus.FORBIDDEN);
+  }
+
+  public ForbiddenException(String message) {
+    super(HttpStatus.FORBIDDEN, message);
+  }
+
+}

main/src/main/java/org/sopt/makers/crew/main/common/exception/NoContentException.java

@@ -0,0 +1,14 @@
+package org.sopt.makers.crew.main.common.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class NoContentException extends BaseException {
+
+  public NoContentException() {
+    super(HttpStatus.NO_CONTENT);
+  }
+
+  public NoContentException(String message) {
+    super(HttpStatus.NO_CONTENT, message);
+  }
+}

main/src/main/java/org/sopt/makers/crew/main/common/pagination/dto/PageMetaDto.java

@@ -0,0 +1,35 @@
+package org.sopt.makers.crew.main.common.pagination.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+
+@Getter
+public class PageMetaDto {
+
+  @Schema(description = "페이지 위치")
+  private int page;
+
+  @Schema(description = "가져올 데이터 개수")
+  private int take;
+
+  @Schema(description = "응답 데이터 개수")
+  private int itemCount;
+
+  @Schema(description = "총 페이지 수")
+  private int pageCount;
+
+  @Schema(description = "이전 페이지가 있는지 유무")
+  private boolean hasPreviousPage;
+
+  @Schema(description = "다음 페이지가 있는지 유무")
+  private boolean hasNextPage;
+
+  public PageMetaDto(PageOptionsDto pageOptionsDto, int itemCount) {
+    this.page = pageOptionsDto.getPage();
+    this.take = pageOptionsDto.getTake();
+    this.itemCount = itemCount;
+    this.pageCount = (int) Math.ceil((double) this.itemCount / this.take);
+    this.hasPreviousPage = this.page > 1;
+    this.hasNextPage = this.page < this.pageCount;
+  }
+}

main/src/main/java/org/sopt/makers/crew/main/common/pagination/dto/PageOptionsDto.java

@@ -0,0 +1,24 @@
+package org.sopt.makers.crew.main.common.pagination.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import lombok.Getter;
+
+@Getter
+public class PageOptionsDto {
+
+  @Schema(description = "각 페이지", defaultValue = "1", example = "1")
+  @Min(1)
+  private Integer page;
+
+  @Schema(description = "가져올 데이터 개수", defaultValue = "12", example = "12")
+  @Min(1)
+  @Max(50)
+  private Integer take;
+
+  public PageOptionsDto(Integer page, Integer take) {
+    this.page = page == null ? 1 : page;
+    this.take = take == null ? 12 : take;
+  }
+}