Skip to content

Commit 761c667

Browse files
authored
v0.1.4
v0.1.4
2 parents 6dbd048 + 4ac7d80 commit 761c667

File tree

73 files changed

+111
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+111
-79
lines changed

.github/workflows/develop_deploy.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ jobs:
7070
tags: |
7171
type=sha,prefix=
7272
73+
# Generate RestDocs API documentation
74+
- name: Generate RestDocs
75+
run: |
76+
./gradlew restDocsTest openapi3 copyOasSwagger
77+
7378
# Jib을 사용한 Docker 이미지 빌드 및 푸시
7479
- name: Build and Push Docker Image with Jib
7580
env:
@@ -81,14 +86,14 @@ jobs:
8186
-Djib.to.auth.password=${{ secrets.DOCKERHUB_ACCESS_TOKEN }} \
8287
-Djib.container.environment=SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }},SPRING_PROFILES_ACTIVE=dev
8388
84-
# docker-compose.yml 파일을 EC2에 복사
85-
- name: Copy docker-compose.yml to EC2
89+
# docker-compose-dev.yml 파일을 EC2에 복사
90+
- name: Copy docker-compose-dev.yml to EC2
8691
uses: appleboy/scp-action@master
8792
with:
8893
host: ${{ secrets.EC2_HOST }}
8994
username: ec2-user
9095
key: ${{ secrets.EC2_PRIVATE_KEY }}
91-
source: "./docker/docker-compose.yml"
96+
source: "./docker/docker-compose-dev.yml"
9297
target: "/home/ec2-user"
9398
overwrite: true
9499

.github/workflows/production_deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ jobs:
9292
-Djib.container.environment=SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }},SPRING_PROFILES_ACTIVE=prod \
9393
-Djib.from.platforms=linux/arm64
9494
95-
# docker-compose.yml 파일을 EC2에 복사
96-
- name: Copy docker-compose.yml to EC2
95+
# docker-compose-dev.yml 파일을 EC2에 복사
96+
- name: Copy docker-compose-prod.yml to EC2
9797
uses: appleboy/scp-action@master
9898
with:
9999
host: ${{ secrets.EC2_HOST }}

README.md

Lines changed: 3 additions & 1 deletion

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ include(
2323
include(
2424
"sseudam-core:core-api",
2525
"sseudam-core:core-domain",
26+
"sseudam-core:core-contract",
2627
)
2728

2829
include(

sseudam-admin/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies {
88
testImplementation(libs.spring.security.test)
99

1010
implementation(project(":sseudam-core:core-domain"))
11+
implementation(project(":sseudam-core:core-contract"))
1112
implementation(project(":sseudam-storage:db-core"))
1213
implementation(project(":sseudam-storage:redis"))
1314
implementation(project(":sseudam-clients:notification"))

sseudam-admin/src/main/kotlin/com/sseudam/admin/presentation/response/report/SpotReportAdminResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.sseudam.admin.presentation.response.report
22

33
import com.sseudam.common.Address
4+
import com.sseudam.common.GeoJson
45
import com.sseudam.report.ReportStatus
56
import com.sseudam.report.ReportType
67
import com.sseudam.report.SpotReport
7-
import com.sseudam.support.geo.GeoJson
88
import com.sseudam.trashspot.TrashType
99
import io.swagger.v3.oas.annotations.media.Schema
1010
import java.time.LocalDateTime

sseudam-admin/src/main/kotlin/com/sseudam/admin/presentation/response/suggestion/SpotSuggestionAdminResponse.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.sseudam.admin.presentation.response.suggestion
22

33
import com.sseudam.common.Address
4+
import com.sseudam.common.GeoJson
5+
import com.sseudam.common.Region
46
import com.sseudam.suggestion.SpotSuggestion
57
import com.sseudam.suggestion.SuggestionStatus
6-
import com.sseudam.support.geo.GeoJson
7-
import com.sseudam.support.geo.Region
88
import com.sseudam.trashspot.TrashType
99
import io.swagger.v3.oas.annotations.media.Schema
1010
import java.time.LocalDateTime

sseudam-clients/notification/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dependencies {
44
implementation(libs.firebase)
55

66
implementation(project(":sseudam-core:core-domain"))
7+
implementation(project(":sseudam-core:core-contract"))
78

89
testImplementation(project(":sseudam-tests:test-helper"))
910
}

sseudam-clients/oauth-client/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ dependencies {
33
implementation(libs.bundles.openfeign)
44

55
implementation(project(":sseudam-core:core-domain"))
6+
implementation(project(":sseudam-core:core-contract"))
67
}

0 commit comments

Comments
 (0)