dev -> main

.github/workflows/ci-cd.yml

@@ -28,23 +28,49 @@ jobs:
       - name: make application.yml
         if: contains(github.ref, 'main') || contains(github.ref, 'dev')
         run: |
-          cd ./src/main/resources 
+          cd ./Clubber-External/src/main/resources 
           touch ./application.yml 
           echo "${{ secrets.YML }}" > ./application.yml
         shell: bash
 
+      - name: make application.yml (Internal)
+        if: contains(github.ref, 'main') || contains(github.ref, 'dev')
+        run: |
+          cd ./Clubber-Internal/src/main/resources 
+          touch ./application.yml 
+          echo "${{ secrets.INTERNAL_YML }}" > ./application.yml
+        shell: bash
+
       - name: make application-dev.yml
         if: contains(github.ref, 'dev')
         run: |
-          cd ./src/main/resources
+          cd ./Clubber-External/src/main/resources
           touch ./application-dev.yml
           echo "${{ secrets.YML_DEV }}" > ./application-dev.yml
         shell: bash
 
+      # [Internal] application-dev.yml
+      - name: make application-dev.yml (Internal)
+        if: contains(github.ref, 'dev')
+        run: |
+          cd ./Clubber-Internal/src/main/resources
+          touch ./application-dev.yml
+          echo "${{ secrets.INTERNAL_YML_DEV }}" > ./application-dev.yml
+        shell: bash
+
       - name: make application-prod.yml
         if: contains(github.ref, 'main')
         run: |
-          cd ./src/main/resources
+          cd ./Clubber-External/src/main/resources
+          touch ./application-prod.yml
+          echo "${{ secrets.YML_PROD }}" > ./application-prod.yml
+        shell: bash
+
+      # [Internal] application-prod.yml
+      - name: make application-prod.yml (Internal)
+        if: contains(github.ref, 'main')
+        run: |
+          cd ./Clubber-Internal/src/main/resources
           touch ./application-prod.yml
           echo "${{ secrets.YML_PROD }}" > ./application-prod.yml
         shell: bash
@@ -53,23 +79,37 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-        run: ./gradlew clean build -x test
+        run: ./gradlew :Clubber-External:clean build -x test
 
+      # [Internal] Build
+      - name: Build with Gradle (Internal)
+        run: ./gradlew :Clubber-Internal:clean build -x test
 
       - name: docker build and push to dev
         if: contains(github.ref, 'dev')
         run: |
+          cd Clubber-External
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
           docker build -f Dockerfile.dev -t ${{ secrets.DOCKER_REPO }}/clubber-backend-dev .
           docker push ${{ secrets.DOCKER_REPO }}/clubber-backend-dev
 
       - name: docker build and push to dev nginx
         if: contains(github.ref, 'dev')
         run: |
+          cd Clubber-External
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
           docker build -f Dockerfile.nginx.dev -t ${{ secrets.DOCKER_REPO }}/clubber-nginx-dev .
           docker push ${{ secrets.DOCKER_REPO }}/clubber-nginx-dev
 
+      # [Internal] Docker Build & Push (Dev)
+      - name: docker build and push to dev (Internal)
+        if: contains(github.ref, 'dev')
+        run: |
+          cd Clubber-Internal
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile.dev -t ${{ secrets.DOCKER_REPO }}/clubber-internal-dev .
+          docker push ${{ secrets.DOCKER_REPO }}/clubber-internal-dev
+
       - name: docker build and push to prod
         if: contains(github.ref, 'main')
         run: |
@@ -84,6 +124,15 @@ jobs:
           docker build -f Dockerfile.nginx.prod -t ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod .
           docker push ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod
 
+      # [Internal] Docker Build & Push (Prod)
+      - name: docker build and push to prod (Internal)
+        if: contains(github.ref, 'main')
+        run: |
+          cd Clubber-Internal
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile.prod -t ${{ secrets.DOCKER_REPO }}/clubber-internal-prod .
+          docker push ${{ secrets.DOCKER_REPO }}/clubber-internal-prod
+
       - name: Copy docker-compose.yml to EC2 DEV
         if: contains(github.ref, 'dev')
         uses: appleboy/scp-action@master
@@ -115,6 +164,7 @@ jobs:
             cd /home/ubuntu
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-backend-dev
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-internal-dev
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front-dev
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-nginx-dev
             sudo docker-compose -f docker-compose-dev.yml up -d
@@ -131,6 +181,7 @@ jobs:
             cd /home/ubuntu
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-backend-prod
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-internal-prod  # [Internal]
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front-prod
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod
             sudo docker-compose -f docker-compose-prod.yml up -d

.gitignore

@@ -6,7 +6,7 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 #YML filese
-src/main/resources/*.yml
+application*.yml
 src/main/resources/data.sql
 
 # User-specific stuff
@@ -180,4 +180,7 @@ gradle-app.setting
 
 *.idea
 
-# End of https://www.toptal.com/developers/gitignore/api/intellij,gradle,java
+**/build/generated/sources/querydsl/ss
+
+# End of https://www.toptal.com/developers/gitignore/api/intellij,gradle,java
+Clubber-Domain/Clubber-Domain.iml

Clubber-Common/Clubber-Common.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

Clubber-Common/build.gradle

@@ -0,0 +1,7 @@
+jar {
+    enabled = true
+}
+
+bootJar {
+    enabled = false
+}

src/main/java/com/clubber/ClubberServer/global/common/consts/ClubberStatic.java → Clubber-Common/src/main/java/com/clubber/common/consts/ClubberStatic.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.global.common.consts;
+package com.clubber.common.consts;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

src/main/java/com/clubber/ClubberServer/global/dto/ErrorResponse.java → Clubber-Common/src/main/java/com/clubber/common/dto/ErrorResponse.java

@@ -1,7 +1,7 @@
-package com.clubber.ClubberServer.global.dto;
+package com.clubber.common.dto;
 
 
-import com.clubber.ClubberServer.global.exception.ErrorReason;
+import com.clubber.common.exception.ErrorReason;
 import java.time.LocalDateTime;
 import lombok.Getter;
 

src/main/java/com/clubber/ClubberServer/global/dto/SuccessResponse.java → Clubber-Common/src/main/java/com/clubber/common/dto/SuccessResponse.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.global.dto;
+package com.clubber.common.dto;
 
 import java.time.LocalDateTime;
 import lombok.Getter;

src/main/java/com/clubber/ClubberServer/global/exception/BaseErrorCode.java → Clubber-Common/src/main/java/com/clubber/common/exception/BaseErrorCode.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.global.exception;
+package com.clubber.common.exception;
 
 public interface BaseErrorCode {
 

src/main/java/com/clubber/ClubberServer/global/exception/BaseException.java → Clubber-Common/src/main/java/com/clubber/common/exception/BaseException.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.global.exception;
+package com.clubber.common.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/clubber/ClubberServer/global/exception/EnumTypeNotValidException.java → Clubber-Common/src/main/java/com/clubber/common/exception/EnumTypeNotValidException.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.global.exception;
+package com.clubber.common.exception;
 
 public class EnumTypeNotValidException extends BaseException {
 

src/main/java/com/clubber/ClubberServer/global/exception/ErrorReason.java → Clubber-Common/src/main/java/com/clubber/common/exception/ErrorReason.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.global.exception;
+package com.clubber.common.exception;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/clubber/ClubberServer/global/exception/GlobalErrorCode.java → Clubber-Common/src/main/java/com/clubber/common/exception/GlobalErrorCode.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.global.exception;
+package com.clubber.common.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/clubber/ClubberServer/global/mapper/enums/EnumDefaultMapperType.java → Clubber-Common/src/main/java/com/clubber/common/mapper/enums/EnumDefaultMapperType.java

@@ -1,6 +1,6 @@
-package com.clubber.ClubberServer.global.mapper.enums;
+package com.clubber.common.mapper.enums;
 
-import com.clubber.ClubberServer.global.vo.enums.EnumMapperVO;
+import com.clubber.common.vo.enums.EnumMapperVO;
 
 public interface EnumDefaultMapperType extends EnumMapperType {
 

Clubber-Common/src/main/java/com/clubber/common/mapper/enums/EnumFaqMapperType.java

@@ -0,0 +1,14 @@
+package com.clubber.common.mapper.enums;
+
+import com.clubber.common.vo.enums.EnumFaQMapperVO;
+import com.clubber.common.vo.enums.EnumMapperVO;
+
+public interface EnumFaqMapperType extends EnumMapperType {
+
+	String getAnswer();
+
+	@Override
+	default EnumMapperVO createVO() {
+		return new EnumFaQMapperVO(this);
+	}
+}

Clubber-Common/src/main/java/com/clubber/common/mapper/enums/EnumImageMapperType.java

@@ -0,0 +1,15 @@
+package com.clubber.common.mapper.enums;
+
+import com.clubber.common.vo.enums.EnumImageMapperVO;
+import com.clubber.common.vo.enums.EnumMapperVO;
+
+public interface EnumImageMapperType extends EnumMapperType {
+
+	String getImageUrl();
+
+	@Override
+	default EnumMapperVO createVO() {
+		return new EnumImageMapperVO(this);
+	}
+}
+

src/main/java/com/clubber/ClubberServer/global/mapper/enums/EnumMapper.java → Clubber-Common/src/main/java/com/clubber/common/mapper/enums/EnumMapper.java

@@ -1,6 +1,6 @@
-package com.clubber.ClubberServer.global.mapper.enums;
+package com.clubber.common.mapper.enums;
 
-import com.clubber.ClubberServer.global.vo.enums.EnumMapperVO;
+import com.clubber.common.vo.enums.EnumMapperVO;
 import lombok.NoArgsConstructor;
 
 import java.util.*;

Clubber-Common/src/main/java/com/clubber/common/mapper/enums/EnumMapperType.java

@@ -0,0 +1,13 @@
+package com.clubber.common.mapper.enums;
+
+import com.clubber.common.vo.enums.EnumMapperVO;
+
+public interface EnumMapperType {
+
+	String getCode();
+
+	String getTitle();
+
+	EnumMapperVO createVO();
+}
+

src/main/java/com/clubber/ClubberServer/global/vo/enums/EnumFaQMapperVO.java → Clubber-Common/src/main/java/com/clubber/common/vo/enums/EnumFaQMapperVO.java

@@ -1,6 +1,6 @@
-package com.clubber.ClubberServer.global.vo.enums;
+package com.clubber.common.vo.enums;
 
-import com.clubber.ClubberServer.global.mapper.enums.EnumFaqMapperType;
+import com.clubber.common.mapper.enums.EnumFaqMapperType;
 import lombok.Getter;
 
 @Getter

src/main/java/com/clubber/ClubberServer/global/vo/enums/EnumImageMapperVO.java → Clubber-Common/src/main/java/com/clubber/common/vo/enums/EnumImageMapperVO.java

@@ -1,6 +1,6 @@
-package com.clubber.ClubberServer.global.vo.enums;
+package com.clubber.common.vo.enums;
 
-import com.clubber.ClubberServer.global.mapper.enums.EnumImageMapperType;
+import com.clubber.common.mapper.enums.EnumImageMapperType;
 import lombok.Getter;
 
 @Getter

src/main/java/com/clubber/ClubberServer/global/vo/enums/EnumMapperVO.java → Clubber-Common/src/main/java/com/clubber/common/vo/enums/EnumMapperVO.java

@@ -1,6 +1,6 @@
-package com.clubber.ClubberServer.global.vo.enums;
+package com.clubber.common.vo.enums;
 
-import com.clubber.ClubberServer.global.mapper.enums.EnumMapperType;
+import com.clubber.common.mapper.enums.EnumMapperType;
 import lombok.Getter;
 
 @Getter

Clubber-Domain/build.gradle

@@ -0,0 +1,17 @@
+dependencies{
+    implementation project(":Clubber-Common")
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations'
+
+    //TODO QueryDSL Projections & 외부 DTO 의존성 제거
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
+}
+
+jar {
+    enabled = true
+}
+
+bootJar {
+    enabled = false
+}

src/main/java/com/clubber/ClubberServer/domain/common/BaseEntity.java → Clubber-Domain/src/main/java/com/clubber/domain/common/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.domain.common;
+package com.clubber.domain.common;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.EntityListeners;

src/main/java/com/clubber/ClubberServer/global/vo/image/ImageVO.java → Clubber-Domain/src/main/java/com/clubber/domain/common/vo/ImageVO.java

@@ -1,6 +1,6 @@
-package com.clubber.ClubberServer.global.vo.image;
+package com.clubber.domain.common.vo;
 
-import static com.clubber.ClubberServer.global.common.consts.ClubberStatic.IMAGE_SERVER;
+import static com.clubber.common.consts.ClubberStatic.IMAGE_SERVER;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import jakarta.persistence.Embeddable;

src/main/java/com/clubber/ClubberServer/domain/admin/domain/Admin.java → Clubber-Domain/src/main/java/com/clubber/domain/domains/admin/domain/Admin.java

@@ -1,10 +1,10 @@
-package com.clubber.ClubberServer.domain.admin.domain;
+package com.clubber.domain.domains.admin.domain;
 
-import com.clubber.ClubberServer.domain.admin.exception.AdminAlreadyDeletedException;
-import com.clubber.ClubberServer.domain.club.domain.Club;
-import com.clubber.ClubberServer.domain.common.BaseEntity;
-import com.clubber.ClubberServer.domain.user.domain.AccountRole;
-import com.clubber.ClubberServer.domain.user.domain.AccountState;
+import com.clubber.domain.domains.admin.exception.AdminAlreadyDeletedException;
+import com.clubber.domain.domains.club.domain.Club;
+import com.clubber.domain.common.BaseEntity;
+import com.clubber.domain.domains.user.domain.AccountRole;
+import com.clubber.domain.domains.user.domain.AccountState;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;

src/main/java/com/clubber/ClubberServer/domain/admin/domain/AdminPasswordFindAuth.java → Clubber-Domain/src/main/java/com/clubber/domain/domains/admin/domain/AdminPasswordFindAuth.java

@@ -1,7 +1,7 @@
-package com.clubber.ClubberServer.domain.admin.domain;
+package com.clubber.domain.domains.admin.domain;
 
-import com.clubber.ClubberServer.domain.admin.exception.AdminAlreadyEmailVerifiedException;
-import com.clubber.ClubberServer.domain.admin.exception.AdminInvalidAuthCodeException;
+import com.clubber.domain.domains.admin.exception.AdminAlreadyEmailVerifiedException;
+import com.clubber.domain.domains.admin.exception.AdminInvalidAuthCodeException;
 import lombok.Builder;
 import lombok.Getter;
 import org.springframework.data.annotation.Id;

src/main/java/com/clubber/ClubberServer/domain/admin/domain/AdminRefreshToken.java → Clubber-Domain/src/main/java/com/clubber/domain/domains/admin/domain/AdminRefreshToken.java

@@ -1,4 +1,4 @@
-package com.clubber.ClubberServer.domain.admin.domain;
+package com.clubber.domain.domains.admin.domain;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/clubber/ClubberServer/domain/admin/domain/AdminSignupAuth.java → Clubber-Domain/src/main/java/com/clubber/domain/domains/admin/domain/AdminSignupAuth.java

@@ -1,7 +1,7 @@
-package com.clubber.ClubberServer.domain.admin.domain;
+package com.clubber.domain.domains.admin.domain;
 
-import com.clubber.ClubberServer.domain.admin.exception.AdminAlreadyEmailVerifiedException;
-import com.clubber.ClubberServer.domain.admin.exception.AdminInvalidAuthCodeException;
+import com.clubber.domain.domains.admin.exception.AdminAlreadyEmailVerifiedException;
+import com.clubber.domain.domains.admin.exception.AdminInvalidAuthCodeException;
 import lombok.Builder;
 import lombok.Getter;
 import org.springframework.data.annotation.Id;

src/main/java/com/clubber/ClubberServer/domain/admin/domain/AdminUpdateEmailAuth.java → Clubber-Domain/src/main/java/com/clubber/domain/domains/admin/domain/AdminUpdateEmailAuth.java

@@ -1,7 +1,7 @@
-package com.clubber.ClubberServer.domain.admin.domain;
+package com.clubber.domain.domains.admin.domain;
 
-import com.clubber.ClubberServer.domain.admin.exception.AdminAlreadyEmailVerifiedException;
-import com.clubber.ClubberServer.domain.admin.exception.AdminInvalidAuthCodeException;
+import com.clubber.domain.domains.admin.exception.AdminAlreadyEmailVerifiedException;
+import com.clubber.domain.domains.admin.exception.AdminInvalidAuthCodeException;
 import lombok.Builder;
 import lombok.Getter;
 import org.springframework.data.annotation.Id;