Merge pull request #315 from Team-Smeme/add/#data-for-withdraw

[REFACTOR] 스밈 성형

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Create application-secret.yml
         run: |
           pwd
-          cd ./smeem-api/src/main/resources
+          cd ./smeem-bootstrap/src/main/resources
           touch ./application-secret.yml
           echo "${{ secrets.APPLICATION_SECRET_YML }}" >> ./application-secret.yml
           cat ./application-secret.yml
@@ -36,12 +36,12 @@ jobs:
 
       - name: Create FireBase JSON file From AWS
         run: |
-          aws s3 cp --region ap-northeast-2 s3://${{ secrets.AWS_BUCKET_NAME }}/json/smeem_fcm.json smeem-external/src/main/resources/firebase/smeem_fcm.json
+          aws s3 cp --region ap-northeast-2 s3://${{ secrets.AWS_BUCKET_NAME }}/json/smeem_fcm.json smeem-notification/firebase/src/main/resources/firebase-config/smeem_fcm.json
 
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
         shell: bash
 
       - name: Build with Gradle
         run: ./gradlew build
-        shell: bash
+        shell: bash

.gitignore

@@ -36,11 +36,9 @@ out/
 ### VS Code ###
 .vscode/
 
-application.properties
 application-oauth2.yml
-*.properties
-.env
 smeem_fcm.json
 .DS_Store
 
-application-secret.yml
+application-secret.yml
+docker/postgresql

build.gradle

@@ -1,37 +1,31 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-}
-
 plugins {
     id 'java'
     id 'org.springframework.boot' version '3.2.1'
     id 'io.spring.dependency-management' version '1.1.4'
+    id 'application'
 }
 
 allprojects {
-    apply plugin: 'java'
-    apply plugin: 'org.springframework.boot'
-    apply plugin: 'io.spring.dependency-management'
-
-    group = 'com.smeme'
+    group = 'com.smeem'
     version = '0.0.1-SNAPSHOT'
     sourceCompatibility = '17'
 
     repositories {
         mavenCentral()
     }
+}
 
-    configurations {
-        compileOnly {
-            extendsFrom annotationProcessor
-        }
+subprojects {
+    apply {
+        plugin 'java'
+        plugin 'org.springframework.boot'
+        plugin 'io.spring.dependency-management'
+        plugin 'application'
     }
 
     dependencies {
-
-        // test
+        implementation 'org.springframework.boot:spring-boot-autoconfigure'
+        implementation 'org.springframework.boot:spring-boot-starter-logging'
         testImplementation 'org.springframework.boot:spring-boot-starter-test'
         testImplementation 'org.springframework.security:spring-security-test'
 
@@ -40,13 +34,30 @@ allprojects {
         annotationProcessor 'org.projectlombok:lombok'
         testAnnotationProcessor 'org.projectlombok:lombok'
         testCompileOnly 'org.projectlombok:lombok'
+
+        // validation
+        implementation 'org.springframework.boot:spring-boot-starter-validation'
+    }
+
+    tasks.named('bootJar') {
+        mainClass.set("com.smeem.bootstrap.SmeemBootstrapApplication")
     }
 
     tasks.named('test') {
         useJUnitPlatform()
     }
 }
 
-jar { enabled = true }
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+}
+
+tasks.bootJar {
+    enabled = false
+}
 
-bootJar { enabled = false }
+tasks.jar {
+    enabled = true
+}

docker/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.8"
+services:
+  postgresql:
+    image: postgres:16.3
+    restart: always
+    container_name: smeem
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    volumes:
+      - ./postgresql/data:/var/lib/postgresql/data

settings.gradle

@@ -1,7 +1,16 @@
-rootProject.name = 'server'
-include 'smeem-api'
-include 'smeem-domain'
-include 'smeem-batch'
-include 'smeem-external'
-include 'smeem-common'
+rootProject.name = 'smeem'
 
+include 'smeem-bootstrap'
+include 'smeem-common'
+include 'smeem-batch'
+include 'smeem-input-http'
+include 'smeem-application'
+include 'smeem-output-persistence'
+include 'smeem-output-persistence:postgresql'
+include 'smeem-output-notice'
+include 'smeem-output-notice:discord'
+include 'smeem-output-notification'
+include 'smeem-output-notification:firebase'
+include 'smeem-output-oauth'
+include 'smeem-output-oauth:apple'
+include 'smeem-output-oauth:kakao'