From 825f7dc2f01267bea4bfce25603d2a71a0ccb189 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 05:00:41 +0000 Subject: [PATCH 01/14] =?UTF-8?q?MapSee-BE=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20:=20docs=20:=20v0.1.2=20README=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=A0=95=EB=B3=B4=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3636520..125483a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ -## 최신 버전 : v0.1.1 (2026-01-18) +## 최신 버전 : v0.1.2 (2026-01-18) [전체 버전 기록 보기](CHANGELOG.md) From acda6f66154ea16ceea0a64eb71a339df7346331 Mon Sep 17 00:00:00 2001 From: SUH SAECHAN <83532821+Cassiiopeia@users.noreply.github.com> Date: Sun, 18 Jan 2026 21:04:06 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20Spring=20init=20=EB=B0=8F=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20workflow=20=EA=B5=AC=ED=98=84=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=20:=20feat=20:=20TEST=20cicd=20=EB=A1=9C=EC=A7=81=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20https://github.com/MapSee-Lab/MapSee-BE/issues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml | 80 +++++++------------ 1 file changed, 28 insertions(+), 52 deletions(-) diff --git a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml index 37562ba..f708bd7 100644 --- a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml +++ b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml @@ -23,22 +23,19 @@ name: PROJECT-SPRING-SYNOLOGY-CICD # │ SERVER_PASSWORD │ 서버 SSH 접속 비밀번호 │ # └─────────────────────────────┴────────────────────────────────────┘ # -# 🧪 선택적 Secrets (포트 커스터마이징시): -# ┌─────────────────────────────┬────────────────────────────────────┐ -# │ PROJECT_DEPLOY_PORT │ deploy 브랜치 배포 포트 (기본: 8080) │ -# │ PROJECT_TEST_PORT │ test 브랜치 배포 포트 (기본: 8081) │ -# └─────────────────────────────┴────────────────────────────────────┘ -# -# 📦 볼륨 마운트 설정 (워크플로우 env 섹션에서 설정): +# 🌐 포트 및 볼륨 설정 (워크플로우 env 섹션에서 설정): # ┌─────────────────────────────┬────────────────────────────────────┐ +# │ DEPLOY_PORT │ deploy/main 브랜치 배포 포트 │ +# │ TEST_PORT │ test 브랜치 배포 포트 │ +# ├─────────────────────────────┼────────────────────────────────────┤ # │ ENABLE_VOLUME_MOUNT │ 볼륨 마운트 활성화 (true/false) │ # │ VOLUME_HOST_PATH │ 호스트 볼륨 경로 │ # │ VOLUME_CONTAINER_PATH │ 컨테이너 내부 마운트 경로 │ # └─────────────────────────────┴────────────────────────────────────┘ # -# 💡 포트 설정 예시: -# - PROJECT_DEPLOY_PORT: 8080 (배포 서비스 포트) -# - PROJECT_TEST_PORT: 8081 (테스트 서비스 포트) +# 💡 포트 설정 예시 (env 섹션에서 변경): +# DEPLOY_PORT: "8092" # 배포 서비스 포트 +# TEST_PORT: "8093" # 테스트 서비스 포트 # # ⚠️ 주의사항: # 1. 포트는 서버에서 사용하지 않는 포트를 선택하세요 @@ -65,15 +62,14 @@ name: PROJECT-SPRING-SYNOLOGY-CICD # - 포트 충돌 방지를 위한 환경변수 기반 포트 설정 # # 🌿 브랜치별 배포 전략: -# - deploy 브랜치: 배포 환경 (PROJECT_DEPLOY_PORT 사용, 기본: 8080) -# - main 브랜치: 배포 환경 (수동 실행시, PROJECT_DEPLOY_PORT 사용, 기본: 8080) -# - test 브랜치: 테스트 환경 (PROJECT_TEST_PORT 사용, 기본: 8081) +# - deploy 브랜치: 배포 환경 (DEPLOY_PORT 사용) +# - main 브랜치: 배포 환경 (수동 실행시, DEPLOY_PORT 사용) +# - test 브랜치: 테스트 환경 (TEST_PORT 사용) # # 📝 사용 방법: # 1. 위의 GitHub Secrets 설정 -# 2. 아래 PROJECT_NAME을 실제 프로젝트명으로 변경 +# 2. 아래 env 섹션에서 PROJECT_NAME, DEPLOY_PORT, TEST_PORT 등 설정 # 3. deploy와 test 브랜치에 push하면 자동으로 CI/CD 실행 (main 브랜치는 수동 실행만 가능) -# 4. GitHub Secrets에서 포트 설정 (기본값: deploy=8080, test=8081) # # =================================================================== @@ -85,8 +81,7 @@ name: PROJECT-SPRING-SYNOLOGY-CICD on: push: branches: - - deploy # 배포 환경 (8080 포트) - - test # 테스트 환경 (8081 포트) + - deploy # 배포 환경 (DEPLOY_PORT 사용) workflow_dispatch: # 수동 실행 허용 # =================================================================== @@ -107,6 +102,9 @@ env: # 📁 경로 설정 APPLICATION_YML_DIR: "MS-Web/src/main/resources" + # 🌐 포트 설정 + DEPLOY_PORT: "8092" # deploy/main 브랜치 배포 포트 + # 📦 볼륨 마운트 설정 # true: 볼륨 마운트 활성화 (디렉토리 없으면 자동 생성) # false: 볼륨 마운트 비활성화 (기본값) @@ -232,36 +230,11 @@ jobs: PROJECT_NAME="${{ env.PROJECT_NAME }}" # ============================================================ - # 브랜치별 포트 및 컨테이너명 설정 + # 포트 및 컨테이너명 설정 # ============================================================ - # 기본값 설정 - PORT=8080 - CONTAINER_NAME="${PROJECT_NAME}-back" - - # 브랜치에 따른 환경별 설정 - if [ "$BRANCH" == "deploy" ] || [ "$BRANCH" == "main" ]; then - # 🚀 배포 환경 (deploy 브랜치 또는 main 브랜치) - # GitHub Secrets의 PROJECT_DEPLOY_PORT 환경변수 사용 - # 설정되어 있지 않으면 기본값 8080 사용 - PORT=${{ secrets.PROJECT_DEPLOY_PORT || '8080' }} - CONTAINER_NAME="${PROJECT_NAME}-back-deploy" - echo "🚀 배포 환경으로 배포합니다 (브랜치: $BRANCH)" - - elif [ "$BRANCH" == "test" ]; then - # 🧪 테스트 환경 (test 브랜치) - # GitHub Secrets의 PROJECT_TEST_PORT 환경변수 사용 - # 설정되어 있지 않으면 기본값 8081 사용 - PORT=${{ secrets.PROJECT_TEST_PORT || '8081' }} - CONTAINER_NAME="${PROJECT_NAME}-back-test" - echo "🧪 테스트 환경으로 배포합니다" - - else - # ⚠️ 기타 브랜치 (예상치 못한 브랜치) - echo "⚠️ 지원하지 않는 브랜치입니다: $BRANCH" - echo "이 워크플로우는 deploy 브랜치와 test 브랜치만 지원합니다." - echo "on.push.branches에서 지원할 브랜치를 설정하세요." - exit 1 - fi + PORT=${{ env.DEPLOY_PORT }} + CONTAINER_NAME="${PROJECT_NAME}-back-deploy" + echo "🚀 배포 환경으로 배포합니다 (브랜치: $BRANCH)" # 설정 정보 출력 echo "📋 배포 설정 정보:" @@ -345,14 +318,17 @@ jobs: # 현재 설정: deploy와 test 브랜치에 push할 때 자동 배포 # main 브랜치는 수동 실행(workflow_dispatch)만 가능 # -# 브랜치별 포트: -# - deploy: 8080 (PROJECT_DEPLOY_PORT secret으로 변경 가능) -# - main: 8080 (수동 실행시, PROJECT_DEPLOY_PORT secret으로 변경 가능) -# - test: 8081 (PROJECT_TEST_PORT secret으로 변경 가능) +# 브랜치별 포트 (env 섹션에서 설정): +# - deploy/main: DEPLOY_PORT (기본: 8092) +# - test: TEST_PORT (기본: 8093) # # 필요한 Secrets: # - APPLICATION_PROD_YML, DOCKERHUB_*, SERVER_* (필수) -# - PROJECT_DEPLOY_PORT (선택, 기본값: 8080) -# - PROJECT_TEST_PORT (선택, 기본값: 8081) +# +# env 섹션에서 설정하는 값들: +# - PROJECT_NAME: 프로젝트명 +# - DEPLOY_PORT: 배포 포트 +# - TEST_PORT: 테스트 포트 +# - ENABLE_VOLUME_MOUNT: 볼륨 마운트 활성화 여부 # # =================================================================== \ No newline at end of file From c8b6ac54e527ad520244998bbac0f3d5467b36a5 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 12:04:19 +0000 Subject: [PATCH 03/14] =?UTF-8?q?MapSee-BE=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EA=B4=80=EB=A6=AC:=20chore:=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=200.1.3=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- version.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index e6ac514..5ff2899 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ bootJar { allprojects { group = 'kr.suhsaechan.mapsee' - version = '0.1.2' + version = '0.1.3' repositories { mavenCentral() diff --git a/version.yml b/version.yml index e7c1455..1e9aa26 100644 --- a/version.yml +++ b/version.yml @@ -34,11 +34,11 @@ # - 버전은 항상 높은 버전으로 자동 동기화됩니다 # =================================================================== -version: "0.1.2" -version_code: 6 # app build number +version: "0.1.3" +version_code: 7 # app build number project_type: "spring" # spring, flutter, next, react, react-native, react-native-expo, node, python, basic metadata: - last_updated: "2026-01-18 04:58:58" + last_updated: "2026-01-18 12:04:19" last_updated_by: "Cassiiopeia" default_branch: "main" integrated_from: "SUH-DEVOPS-TEMPLATE" From 28c0cc36380169fbe1782604780c7bdcd6fcb669 Mon Sep 17 00:00:00 2001 From: SUH SAECHAN <83532821+Cassiiopeia@users.noreply.github.com> Date: Sun, 18 Jan 2026 21:10:04 +0900 Subject: [PATCH 04/14] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20Spring=20init=20=EB=B0=8F=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20workflow=20=EA=B5=AC=ED=98=84=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=20:=20feat=20:=20TEST=20cicd=20=EB=A1=9C=EC=A7=81=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20https://github.com/MapSee-Lab/MapSee-BE/issues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml index f708bd7..e55dcab 100644 --- a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml +++ b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml @@ -26,7 +26,6 @@ name: PROJECT-SPRING-SYNOLOGY-CICD # 🌐 포트 및 볼륨 설정 (워크플로우 env 섹션에서 설정): # ┌─────────────────────────────┬────────────────────────────────────┐ # │ DEPLOY_PORT │ deploy/main 브랜치 배포 포트 │ -# │ TEST_PORT │ test 브랜치 배포 포트 │ # ├─────────────────────────────┼────────────────────────────────────┤ # │ ENABLE_VOLUME_MOUNT │ 볼륨 마운트 활성화 (true/false) │ # │ VOLUME_HOST_PATH │ 호스트 볼륨 경로 │ @@ -35,7 +34,6 @@ name: PROJECT-SPRING-SYNOLOGY-CICD # # 💡 포트 설정 예시 (env 섹션에서 변경): # DEPLOY_PORT: "8092" # 배포 서비스 포트 -# TEST_PORT: "8093" # 테스트 서비스 포트 # # ⚠️ 주의사항: # 1. 포트는 서버에서 사용하지 않는 포트를 선택하세요 @@ -64,19 +62,18 @@ name: PROJECT-SPRING-SYNOLOGY-CICD # 🌿 브랜치별 배포 전략: # - deploy 브랜치: 배포 환경 (DEPLOY_PORT 사용) # - main 브랜치: 배포 환경 (수동 실행시, DEPLOY_PORT 사용) -# - test 브랜치: 테스트 환경 (TEST_PORT 사용) # # 📝 사용 방법: # 1. 위의 GitHub Secrets 설정 -# 2. 아래 env 섹션에서 PROJECT_NAME, DEPLOY_PORT, TEST_PORT 등 설정 -# 3. deploy와 test 브랜치에 push하면 자동으로 CI/CD 실행 (main 브랜치는 수동 실행만 가능) +# 2. 아래 env 섹션에서 PROJECT_NAME, DEPLOY_PORT 등 설정 +# 3. deploy 브랜치에 push하면 자동으로 CI/CD 실행 (main 브랜치는 수동 실행만 가능) # # =================================================================== # =================================================================== # 트리거 설정 # =================================================================== -# deploy와 test 브랜치에 push할 때 자동으로 CI/CD가 실행됩니다. +# deploy 브랜치에 push할 때 자동으로 CI/CD가 실행됩니다. # main 브랜치는 workflow_dispatch로 수동 실행만 가능합니다. on: push: @@ -312,15 +309,14 @@ jobs: echo "🔗 접속 URL: http://${{ secrets.SERVER_HOST }}:${PORT}" # =================================================================== -# 사용 예시 - deploy와 test 브랜치 사용 +# 사용 예시 # =================================================================== # -# 현재 설정: deploy와 test 브랜치에 push할 때 자동 배포 +# 현재 설정: deploy 브랜치에 push할 때 자동 배포 # main 브랜치는 수동 실행(workflow_dispatch)만 가능 # -# 브랜치별 포트 (env 섹션에서 설정): +# 포트 설정 (env 섹션에서 설정): # - deploy/main: DEPLOY_PORT (기본: 8092) -# - test: TEST_PORT (기본: 8093) # # 필요한 Secrets: # - APPLICATION_PROD_YML, DOCKERHUB_*, SERVER_* (필수) @@ -328,7 +324,6 @@ jobs: # env 섹션에서 설정하는 값들: # - PROJECT_NAME: 프로젝트명 # - DEPLOY_PORT: 배포 포트 -# - TEST_PORT: 테스트 포트 # - ENABLE_VOLUME_MOUNT: 볼륨 마운트 활성화 여부 # # =================================================================== \ No newline at end of file From 63ad97cb5e106eb090a542abfbfcbf29512d6d50 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 12:10:26 +0000 Subject: [PATCH 05/14] =?UTF-8?q?MapSee-BE=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EA=B4=80=EB=A6=AC:=20chore:=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=200.1.4=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- version.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5ff2899..a5a759b 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ bootJar { allprojects { group = 'kr.suhsaechan.mapsee' - version = '0.1.3' + version = '0.1.4' repositories { mavenCentral() diff --git a/version.yml b/version.yml index 1e9aa26..a9362c4 100644 --- a/version.yml +++ b/version.yml @@ -34,11 +34,11 @@ # - 버전은 항상 높은 버전으로 자동 동기화됩니다 # =================================================================== -version: "0.1.3" -version_code: 7 # app build number +version: "0.1.4" +version_code: 8 # app build number project_type: "spring" # spring, flutter, next, react, react-native, react-native-expo, node, python, basic metadata: - last_updated: "2026-01-18 12:04:19" + last_updated: "2026-01-18 12:10:26" last_updated_by: "Cassiiopeia" default_branch: "main" integrated_from: "SUH-DEVOPS-TEMPLATE" From 54c6551d8f1f1a70e6cc4d675981eaa4d9984f1e Mon Sep 17 00:00:00 2001 From: SUH SAECHAN <83532821+Cassiiopeia@users.noreply.github.com> Date: Sun, 18 Jan 2026 21:46:11 +0900 Subject: [PATCH 06/14] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20Spring=20init=20=EB=B0=8F=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20workflow=20=EA=B5=AC=ED=98=84=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=20:=20feat=20:=20=EB=B0=B0=ED=8F=AC=20=ED=8F=AC=ED=8A=B8=20809?= =?UTF-8?q?2=20>=208093=20https://github.com/MapSee-Lab/MapSee-BE/issues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml index e55dcab..3e1a614 100644 --- a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml +++ b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml @@ -100,7 +100,7 @@ env: APPLICATION_YML_DIR: "MS-Web/src/main/resources" # 🌐 포트 설정 - DEPLOY_PORT: "8092" # deploy/main 브랜치 배포 포트 + DEPLOY_PORT: "8093" # deploy/main 브랜치 배포 포트 # 📦 볼륨 마운트 설정 # true: 볼륨 마운트 활성화 (디렉토리 없으면 자동 생성) From 0a2708a452fc12f4d91e1b556250ef72a5433ae4 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 12:46:26 +0000 Subject: [PATCH 07/14] =?UTF-8?q?MapSee-BE=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EA=B4=80=EB=A6=AC:=20chore:=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=200.1.5=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- version.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a5a759b..980b63c 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ bootJar { allprojects { group = 'kr.suhsaechan.mapsee' - version = '0.1.4' + version = '0.1.5' repositories { mavenCentral() diff --git a/version.yml b/version.yml index a9362c4..d129904 100644 --- a/version.yml +++ b/version.yml @@ -34,11 +34,11 @@ # - 버전은 항상 높은 버전으로 자동 동기화됩니다 # =================================================================== -version: "0.1.4" -version_code: 8 # app build number +version: "0.1.5" +version_code: 9 # app build number project_type: "spring" # spring, flutter, next, react, react-native, react-native-expo, node, python, basic metadata: - last_updated: "2026-01-18 12:10:26" + last_updated: "2026-01-18 12:46:26" last_updated_by: "Cassiiopeia" default_branch: "main" integrated_from: "SUH-DEVOPS-TEMPLATE" From 42b69eec7d665d9f3aa6eb3c5d3b5252d2e0c51a Mon Sep 17 00:00:00 2001 From: SUH SAECHAN <83532821+Cassiiopeia@users.noreply.github.com> Date: Sun, 18 Jan 2026 21:53:00 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20Spring=20init=20=EB=B0=8F=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20workflow=20=EA=B5=AC=ED=98=84=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=20:=20feat=20:=20=EB=B0=B0=ED=8F=AC=20=ED=8F=AC=ED=8A=B8=20809?= =?UTF-8?q?3=20>=208096=20https://github.com/MapSee-Lab/MapSee-BE/issues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml index 3e1a614..120ac6b 100644 --- a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml +++ b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml @@ -100,7 +100,7 @@ env: APPLICATION_YML_DIR: "MS-Web/src/main/resources" # 🌐 포트 설정 - DEPLOY_PORT: "8093" # deploy/main 브랜치 배포 포트 + DEPLOY_PORT: "8096" # deploy/main 브랜치 배포 포트 # 📦 볼륨 마운트 설정 # true: 볼륨 마운트 활성화 (디렉토리 없으면 자동 생성) From df1b02737577bea2ca8e3b9b1a7357ba1bd54e6f Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 12:53:14 +0000 Subject: [PATCH 09/14] =?UTF-8?q?MapSee-BE=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EA=B4=80=EB=A6=AC:=20chore:=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=200.1.6=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- version.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 980b63c..262a113 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ bootJar { allprojects { group = 'kr.suhsaechan.mapsee' - version = '0.1.5' + version = '0.1.6' repositories { mavenCentral() diff --git a/version.yml b/version.yml index d129904..8a51d84 100644 --- a/version.yml +++ b/version.yml @@ -34,11 +34,11 @@ # - 버전은 항상 높은 버전으로 자동 동기화됩니다 # =================================================================== -version: "0.1.5" -version_code: 9 # app build number +version: "0.1.6" +version_code: 10 # app build number project_type: "spring" # spring, flutter, next, react, react-native, react-native-expo, node, python, basic metadata: - last_updated: "2026-01-18 12:46:26" + last_updated: "2026-01-18 12:53:14" last_updated_by: "Cassiiopeia" default_branch: "main" integrated_from: "SUH-DEVOPS-TEMPLATE" From 00eb4776c3d3c129e8a6da4e571ee569e6c80bcd Mon Sep 17 00:00:00 2001 From: SUH SAECHAN <83532821+Cassiiopeia@users.noreply.github.com> Date: Sun, 18 Jan 2026 22:54:30 +0900 Subject: [PATCH 10/14] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20Spring=20init=20=EB=B0=8F=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20workflow=20=EA=B5=AC=ED=98=84=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=20:=20refactor=20:=20=EC=BB=A8=ED=85=8C=EC=9D=B4=EB=84=88=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20https://github.com/MapSee-Lab/MapSee-BE/is?= =?UTF-8?q?sues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml | 21 +++++++++++++++++-- MS-Web/src/main/resources/application.yml | 20 ++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml index 120ac6b..e1b236e 100644 --- a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml +++ b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml @@ -23,9 +23,11 @@ name: PROJECT-SPRING-SYNOLOGY-CICD # │ SERVER_PASSWORD │ 서버 SSH 접속 비밀번호 │ # └─────────────────────────────┴────────────────────────────────────┘ # -# 🌐 포트 및 볼륨 설정 (워크플로우 env 섹션에서 설정): +# 🌐 포트 및 컨테이너 설정 (워크플로우 env 섹션에서 설정): # ┌─────────────────────────────┬────────────────────────────────────┐ # │ DEPLOY_PORT │ deploy/main 브랜치 배포 포트 │ +# │ CONTAINER_NAME │ Docker 컨테이너 이름 │ +# │ │ (기본값: PROJECT_NAME) │ # ├─────────────────────────────┼────────────────────────────────────┤ # │ ENABLE_VOLUME_MOUNT │ 볼륨 마운트 활성화 (true/false) │ # │ VOLUME_HOST_PATH │ 호스트 볼륨 경로 │ @@ -102,6 +104,11 @@ env: # 🌐 포트 설정 DEPLOY_PORT: "8096" # deploy/main 브랜치 배포 포트 + # 🐳 컨테이너 이름 설정 + # 비워두면 PROJECT_NAME을 기본값으로 사용 (예: mapsee-back) + # 커스텀 이름을 원하면 직접 입력 (예: "my-custom-container") + CONTAINER_NAME: "" + # 📦 볼륨 마운트 설정 # true: 볼륨 마운트 활성화 (디렉토리 없으면 자동 생성) # false: 볼륨 마운트 비활성화 (기본값) @@ -230,7 +237,16 @@ jobs: # 포트 및 컨테이너명 설정 # ============================================================ PORT=${{ env.DEPLOY_PORT }} - CONTAINER_NAME="${PROJECT_NAME}-back-deploy" + + # 컨테이너 이름 설정 (환경변수가 비어있으면 PROJECT_NAME을 기본값으로 사용) + if [ -z "${{ env.CONTAINER_NAME }}" ]; then + CONTAINER_NAME="${PROJECT_NAME}" + echo "ℹ️ CONTAINER_NAME이 설정되지 않아 PROJECT_NAME을 사용합니다: $CONTAINER_NAME" + else + CONTAINER_NAME="${{ env.CONTAINER_NAME }}" + echo "ℹ️ 사용자 지정 CONTAINER_NAME 사용: $CONTAINER_NAME" + fi + echo "🚀 배포 환경으로 배포합니다 (브랜치: $BRANCH)" # 설정 정보 출력 @@ -324,6 +340,7 @@ jobs: # env 섹션에서 설정하는 값들: # - PROJECT_NAME: 프로젝트명 # - DEPLOY_PORT: 배포 포트 +# - CONTAINER_NAME: 컨테이너 이름 (기본값: PROJECT_NAME) # - ENABLE_VOLUME_MOUNT: 볼륨 마운트 활성화 여부 # # =================================================================== \ No newline at end of file diff --git a/MS-Web/src/main/resources/application.yml b/MS-Web/src/main/resources/application.yml index d07d4e4..a020b39 100644 --- a/MS-Web/src/main/resources/application.yml +++ b/MS-Web/src/main/resources/application.yml @@ -57,3 +57,23 @@ suhapilog: firebase: credentials: path: mapsee-fcm.json + +suh-logger: + # 전체 로깅 활성화 여부 + enabled: true # true(기본값), false + pretty-print-json: true # false(기본값), true + max-response-body-size: 9000 # 양의 정수 (기본값: 4096) + exclude-patterns: # 문자열 배열 (기본값: 빈 배열) + # - /actuator # Spring Boot Actuator 제외 + # - /health # Health Check 제외 + # - /login # 로그인 엔드포인트 제외 (예시) + # - /logout # 로그아웃 엔드포인트 제외 (예시) + # - /auth # 인증 관련 엔드포인트 제외 (예시) + excluded-classes: # 문자열 배열 (기본값: 빈 배열) + # - org.springframework.web.multipart.MultipartFile + # - java.util.Vector + # - java.io.File + masking: + header: true # true(기본값), false - 민감한 헤더 마스킹 여부 + header: + enabled: false \ No newline at end of file From d3107e7329a2564320285f120a0cfba1e88d4427 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 13:54:51 +0000 Subject: [PATCH 11/14] =?UTF-8?q?MapSee-BE=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EA=B4=80=EB=A6=AC:=20chore:=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=200.1.7=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- version.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 262a113..12f8c8c 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ bootJar { allprojects { group = 'kr.suhsaechan.mapsee' - version = '0.1.6' + version = '0.1.7' repositories { mavenCentral() diff --git a/version.yml b/version.yml index 8a51d84..2b45b5f 100644 --- a/version.yml +++ b/version.yml @@ -34,11 +34,11 @@ # - 버전은 항상 높은 버전으로 자동 동기화됩니다 # =================================================================== -version: "0.1.6" -version_code: 10 # app build number +version: "0.1.7" +version_code: 11 # app build number project_type: "spring" # spring, flutter, next, react, react-native, react-native-expo, node, python, basic metadata: - last_updated: "2026-01-18 12:53:14" + last_updated: "2026-01-18 13:54:50" last_updated_by: "Cassiiopeia" default_branch: "main" integrated_from: "SUH-DEVOPS-TEMPLATE" From 8970e517b6fcf6d3e36dfd03aaa9f32f3024261b Mon Sep 17 00:00:00 2001 From: SUH SAECHAN <83532821+Cassiiopeia@users.noreply.github.com> Date: Mon, 19 Jan 2026 00:22:00 +0900 Subject: [PATCH 12/14] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20Spring=20init=20=EB=B0=8F=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20workflow=20=EA=B5=AC=ED=98=84=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=20:=20fix=20:=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=AA=85?= =?UTF-8?q?=20mapsee=20>=20mapsy=20=EB=A1=9C=20=EC=88=98=EC=A0=95=20https:?= =?UTF-8?q?//github.com/MapSee-Lab/MapSee-BE/issues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml | 6 +- .../PROJECT-SPRING-SYNOLOGY-PR-PREVIEW.yaml | 2 +- .gitignore | 2 +- Dockerfile | 6 +- .../ai/dto/AiCallbackRequest.java | 2 +- .../ai/dto/AiCallbackResponse.java | 2 +- .../ai/dto/PlaceExtractionRequest.java | 2 +- .../ai/dto/PlaceExtractionResponse.java | 2 +- .../ai/service/AiServerService.java | 12 +- .../auth/constant/SecurityUrl.java | 2 +- .../auth/dto/AuthRequest.java | 8 +- .../auth/dto/AuthResponse.java | 2 +- .../auth/dto/CustomUserDetails.java | 6 +- .../auth/dto/ReissueRequest.java | 2 +- .../auth/dto/ReissueResponse.java | 2 +- .../auth/dto/SignInRequest.java | 6 +- .../auth/dto/SignInResponse.java | 2 +- .../filter/TokenAuthenticationFilter.java | 18 +- .../{mapsee => mapsy}/auth/jwt/JwtUtil.java | 10 +- .../auth/service/AuthService.java | 42 +-- .../service/CustomUserDetailsService.java | 12 +- MS-Common/build.gradle | 4 +- .../common/constant/Author.java | 2 +- .../common/constant/ContentStatus.java | 2 +- .../common/constant/DeviceType.java | 2 +- .../common/constant/MemberRole.java | 2 +- .../common/constant/SocialPlatform.java | 2 +- .../common/entity/BaseEntity.java | 2 +- .../entity/SoftDeletableBaseEntity.java | 2 +- .../common/exception/CustomException.java | 4 +- .../common/exception/ErrorCodeBuilder.java | 6 +- .../common/exception/ErrorResponse.java | 4 +- .../exception/GlobalExceptionHandler.java | 4 +- .../common/exception/constant/ErrorCode.java | 2 +- .../constant/ErrorMessageTemplate.java | 2 +- .../common/logging/LogExecutionTime.java | 2 +- .../common/logging/MethodLoggingAspect.java | 4 +- .../common/properties/AiServerProperties.java | 2 +- .../common/properties/PlaceProperties.java | 2 +- .../properties/SpringDocProperties.java | 2 +- .../common/util/CommonUtil.java | 6 +- .../common/util/CustomP6SpyFormatter.java | 2 +- .../common/util/NetworkUtil.java | 9 +- .../common/util/ScrapFlyUtil.java | 2 +- .../common/util/TimeUtil.java | 2 +- .../member/constant/InterestCategory.java | 2 +- .../member/constant/MemberGender.java | 2 +- .../constant/MemberOnboardingStatus.java | 2 +- .../member/constant/MemberRole.java | 2 +- .../member/constant/OnboardingStep.java | 2 +- .../member/constant/TargetType.java | 2 +- .../member/dto/CheckNameResponse.java | 2 +- .../member/dto/FcmNotificationRequest.java | 2 +- .../member/dto/InterestDto.java | 2 +- .../member/dto/MemberDto.java | 6 +- .../member/dto/ProfileUpdateRequest.java | 4 +- .../UpdateServiceAgreementTermsRequest.java | 2 +- .../UpdateServiceAgreementTermsResponse.java | 4 +- .../response/GetAllInterestsResponse.java | 6 +- .../response/GetInterestByIdResponse.java | 4 +- .../GetInterestsByCategoryResponse.java | 4 +- .../request/UpdateBirthDateRequest.java | 2 +- .../request/UpdateGenderRequest.java | 4 +- .../request/UpdateInterestsRequest.java | 2 +- .../onboarding/request/UpdateNameRequest.java | 2 +- .../response/OnboardingResponse.java | 6 +- .../member/entity/AuthCredential.java | 4 +- .../member/entity/FcmToken.java | 6 +- .../member/entity/Interest.java | 6 +- .../member/entity/Member.java | 12 +- .../member/entity/MemberInterest.java | 4 +- .../member/entity/Notification.java | 6 +- .../member/repository/FcmTokenRepository.java | 6 +- .../member/repository/InterestRepository.java | 6 +- .../repository/MemberInterestRepository.java | 4 +- .../member/repository/MemberRepository.java | 4 +- .../member/service/FcmService.java | 14 +- .../member/service/InterestService.java | 22 +- .../member/service/MemberService.java | 54 +-- .../place/constant/FolderVisibility.java | 2 +- .../place/constant/PlacePlatform.java | 2 +- .../place/constant/PlaceSavedStatus.java | 2 +- .../place/constant/PlaceWeekday.java | 2 +- .../place/dto/GetSavedPlacesResponse.java | 2 +- .../place/dto/GetTemporaryPlacesResponse.java | 2 +- .../place/dto/GooglePlaceSearchDto.java | 2 +- .../place/dto/PlaceBusinessHourDto.java | 6 +- .../place/dto/PlaceDetailDto.java | 10 +- .../{mapsee => mapsy}/place/dto/PlaceDto.java | 4 +- .../place/dto/PlaceMediaDto.java | 4 +- .../place/dto/PlacePlatformReferenceDto.java | 6 +- .../place/dto/SavePlaceResponse.java | 2 +- .../place/entity/Folder.java | 8 +- .../place/entity/FolderPlace.java | 4 +- .../place/entity/MemberPlace.java | 12 +- .../{mapsee => mapsy}/place/entity/Place.java | 4 +- .../place/entity/PlaceBusinessHour.java | 6 +- .../place/entity/PlaceMedia.java | 4 +- .../place/entity/PlacePlatformReference.java | 6 +- .../repository/MemberPlaceRepository.java | 10 +- .../PlaceBusinessHourRepository.java | 4 +- .../repository/PlaceMediaRepository.java | 4 +- .../PlacePlatformReferenceRepository.java | 8 +- .../place/repository/PlaceRepository.java | 4 +- .../place/service/GooglePlaceSearcher.java | 20 +- .../place/service/MemberPlaceService.java | 30 +- .../place/service/PlacePlatformSearcher.java | 4 +- .../place/service/PlaceSearchService.java | 4 +- .../place/service/PlaceService.java | 24 +- .../sns/constant/ContentPlatform.java | 2 +- .../sns/dto/AiContentRequest.java | 2 +- .../{mapsee => mapsy}/sns/dto/ContentDto.java | 8 +- .../sns/dto/GetContentInfoRequest.java | 2 +- .../sns/dto/GetContentInfoResponse.java | 6 +- .../sns/dto/GetMemberContentPageResponse.java | 2 +- .../sns/dto/GetRecentContentResponse.java | 2 +- .../{mapsee => mapsy}/sns/dto/PlaceDto.java | 4 +- .../dto/RequestPlaceExtractionRequest.java | 2 +- .../dto/RequestPlaceExtractionResponse.java | 4 +- .../{mapsee => mapsy}/sns/entity/Content.java | 8 +- .../sns/entity/ContentMedia.java | 4 +- .../sns/entity/ContentMember.java | 6 +- .../sns/entity/ContentPlace.java | 6 +- .../repository/ContentMemberRepository.java | 8 +- .../repository/ContentPlaceRepository.java | 4 +- .../sns/repository/ContentRepository.java | 4 +- .../sns/service/AiCallbackService.java | 50 +-- .../sns/service/ContentService.java | 40 +- .../web/MapsyApplication.java} | 6 +- .../web/config/ComponentScanConfig.java | 4 +- .../web/config/FirebaseConfig.java | 2 +- .../web/config/FlywayConfig.java | 2 +- .../web/config/JpaConfig.java | 6 +- .../web/config/OkHttpConfig.java | 2 +- .../web/config/P6SpyConfig.java | 4 +- .../web/config/RedisConfig.java | 2 +- .../web/config/SecurityConfig.java | 10 +- .../web/config/SwaggerConfig.java | 4 +- .../web/config/WebClientConfig.java | 2 +- .../web/controller/AiController.java | 16 +- .../web/controller/AiControllerDocs.java | 23 +- .../web/controller/AuthController.java | 8 +- .../web/controller/AuthControllerDocs.java | 29 +- .../web/controller/ContentController.java | 22 +- .../web/controller/ContentControllerDocs.java | 47 +-- .../web/controller/InterestController.java | 12 +- .../controller/InterestControllerDocs.java | 27 +- .../web/controller/MemberController.java | 30 +- .../web/controller/MemberControllerDocs.java | 71 ++-- .../web/controller/PlaceController.java | 18 +- .../web/controller/PlaceControllerDocs.java | 41 +- MS-Web/src/main/resources/application.yml | 10 +- .../web/MapsyApplicationTests.java} | 4 +- README.md | 2 +- build.gradle | 2 +- ...Logger-SpringBoot4-Compatibility-Report.md | 355 ++++++++++++++++++ settings.gradle | 2 +- 157 files changed, 929 insertions(+), 633 deletions(-) rename MS-AI/src/main/java/kr/suhsaechan/{mapsee => mapsy}/ai/dto/AiCallbackRequest.java (98%) rename MS-AI/src/main/java/kr/suhsaechan/{mapsee => mapsy}/ai/dto/AiCallbackResponse.java (93%) rename MS-AI/src/main/java/kr/suhsaechan/{mapsee => mapsy}/ai/dto/PlaceExtractionRequest.java (95%) rename MS-AI/src/main/java/kr/suhsaechan/{mapsee => mapsy}/ai/dto/PlaceExtractionResponse.java (95%) rename MS-AI/src/main/java/kr/suhsaechan/{mapsee => mapsy}/ai/service/AiServerService.java (90%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/constant/SecurityUrl.java (95%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/dto/AuthRequest.java (86%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/dto/AuthResponse.java (93%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/dto/CustomUserDetails.java (91%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/dto/ReissueRequest.java (91%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/dto/ReissueResponse.java (91%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/dto/SignInRequest.java (89%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/dto/SignInResponse.java (94%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/filter/TokenAuthenticationFilter.java (90%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/jwt/JwtUtil.java (97%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/service/AuthService.java (91%) rename MS-Auth/src/main/java/kr/suhsaechan/{mapsee => mapsy}/auth/service/CustomUserDetailsService.java (68%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/constant/Author.java (90%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/constant/ContentStatus.java (85%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/constant/DeviceType.java (70%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/constant/MemberRole.java (65%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/constant/SocialPlatform.java (72%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/entity/BaseEntity.java (92%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/entity/SoftDeletableBaseEntity.java (94%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/exception/CustomException.java (92%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/exception/ErrorCodeBuilder.java (92%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/exception/ErrorResponse.java (93%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/exception/GlobalExceptionHandler.java (98%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/exception/constant/ErrorCode.java (98%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/exception/constant/ErrorMessageTemplate.java (95%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/logging/LogExecutionTime.java (93%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/logging/MethodLoggingAspect.java (98%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/properties/AiServerProperties.java (94%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/properties/PlaceProperties.java (94%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/properties/SpringDocProperties.java (89%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/util/CommonUtil.java (88%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/util/CustomP6SpyFormatter.java (98%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/util/NetworkUtil.java (95%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/util/ScrapFlyUtil.java (68%) rename MS-Common/src/main/java/kr/suhsaechan/{mapsee => mapsy}/common/util/TimeUtil.java (94%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/constant/InterestCategory.java (96%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/constant/MemberGender.java (76%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/constant/MemberOnboardingStatus.java (80%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/constant/MemberRole.java (75%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/constant/OnboardingStep.java (89%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/constant/TargetType.java (75%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/CheckNameResponse.java (93%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/FcmNotificationRequest.java (96%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/InterestDto.java (83%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/MemberDto.java (94%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/ProfileUpdateRequest.java (81%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/UpdateServiceAgreementTermsRequest.java (95%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/UpdateServiceAgreementTermsResponse.java (82%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/interest/response/GetAllInterestsResponse.java (92%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/interest/response/GetInterestByIdResponse.java (91%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/interest/response/GetInterestsByCategoryResponse.java (93%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/onboarding/request/UpdateBirthDateRequest.java (91%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/onboarding/request/UpdateGenderRequest.java (84%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/onboarding/request/UpdateInterestsRequest.java (93%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/onboarding/request/UpdateNameRequest.java (91%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/dto/onboarding/response/OnboardingResponse.java (77%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/entity/AuthCredential.java (86%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/entity/FcmToken.java (87%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/entity/Interest.java (76%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/entity/Member.java (88%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/entity/MemberInterest.java (86%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/entity/Notification.java (88%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/repository/FcmTokenRepository.java (82%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/repository/InterestRepository.java (83%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/repository/MemberInterestRepository.java (73%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/repository/MemberRepository.java (78%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/service/FcmService.java (95%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/service/InterestService.java (76%) rename MS-Member/src/main/java/kr/suhsaechan/{mapsee => mapsy}/member/service/MemberService.java (92%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/constant/FolderVisibility.java (75%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/constant/PlacePlatform.java (76%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/constant/PlaceSavedStatus.java (92%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/constant/PlaceWeekday.java (78%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/GetSavedPlacesResponse.java (91%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/GetTemporaryPlacesResponse.java (91%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/GooglePlaceSearchDto.java (98%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/PlaceBusinessHourDto.java (85%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/PlaceDetailDto.java (93%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/PlaceDto.java (94%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/PlaceMediaDto.java (91%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/PlacePlatformReferenceDto.java (84%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/dto/SavePlaceResponse.java (95%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/entity/Folder.java (87%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/entity/FolderPlace.java (89%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/entity/MemberPlace.java (88%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/entity/Place.java (95%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/entity/PlaceBusinessHour.java (90%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/entity/PlaceMedia.java (91%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/entity/PlacePlatformReference.java (87%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/repository/MemberPlaceRepository.java (88%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/repository/PlaceBusinessHourRepository.java (88%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/repository/PlaceMediaRepository.java (88%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/repository/PlacePlatformReferenceRepository.java (80%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/repository/PlaceRepository.java (93%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/service/GooglePlaceSearcher.java (95%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/service/MemberPlaceService.java (89%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/service/PlacePlatformSearcher.java (84%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/service/PlaceSearchService.java (88%) rename MS-Place/src/main/java/kr/suhsaechan/{mapsee => mapsy}/place/service/PlaceService.java (73%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/constant/ContentPlatform.java (88%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/AiContentRequest.java (90%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/ContentDto.java (90%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/GetContentInfoRequest.java (92%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/GetContentInfoResponse.java (86%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/GetMemberContentPageResponse.java (92%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/GetRecentContentResponse.java (91%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/PlaceDto.java (96%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/RequestPlaceExtractionRequest.java (92%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/dto/RequestPlaceExtractionResponse.java (77%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/entity/Content.java (86%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/entity/ContentMedia.java (91%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/entity/ContentMember.java (91%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/entity/ContentPlace.java (91%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/repository/ContentMemberRepository.java (88%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/repository/ContentPlaceRepository.java (91%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/repository/ContentRepository.java (78%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/service/AiCallbackService.java (92%) rename MS-SNS/src/main/java/kr/suhsaechan/{mapsee => mapsy}/sns/service/ContentService.java (91%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee/web/MapseeApplication.java => mapsy/web/MapsyApplication.java} (60%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/ComponentScanConfig.java (74%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/FirebaseConfig.java (97%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/FlywayConfig.java (97%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/JpaConfig.java (69%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/OkHttpConfig.java (97%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/P6SpyConfig.java (81%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/RedisConfig.java (97%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/SecurityConfig.java (92%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/SwaggerConfig.java (95%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/config/WebClientConfig.java (97%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/AiController.java (74%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/AiControllerDocs.java (67%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/AuthController.java (92%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/AuthControllerDocs.java (83%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/ContentController.java (85%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/ContentControllerDocs.java (80%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/InterestController.java (77%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/InterestControllerDocs.java (58%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/MemberController.java (83%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/MemberControllerDocs.java (82%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/PlaceController.java (88%) rename MS-Web/src/main/java/kr/suhsaechan/{mapsee => mapsy}/web/controller/PlaceControllerDocs.java (79%) rename MS-Web/src/test/java/kr/suhsaechan/{mapsee/web/MapseeApplicationTests.java => mapsy/web/MapsyApplicationTests.java} (70%) create mode 100644 docs/SuhLogger-SpringBoot4-Compatibility-Report.md diff --git a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml index e1b236e..3d4d57c 100644 --- a/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml +++ b/.github/workflows/PROJECT-SPRING-SYNOLOGY-MAPSEE-CICD.yaml @@ -88,7 +88,7 @@ on: # =================================================================== env: # 🔧 프로젝트 설정 - 실제 프로젝트명으로 변경하세요 - PROJECT_NAME: "mapsee-back" # 기본값: project (프로젝트명에 맞게 수정 필요) + PROJECT_NAME: "mapsy-back" # 기본값: project (프로젝트명에 맞게 수정 필요) # 🐳 Docker 설정 DOCKER_IMAGE_PREFIX: "back-container" @@ -105,7 +105,7 @@ env: DEPLOY_PORT: "8096" # deploy/main 브랜치 배포 포트 # 🐳 컨테이너 이름 설정 - # 비워두면 PROJECT_NAME을 기본값으로 사용 (예: mapsee-back) + # 비워두면 PROJECT_NAME을 기본값으로 사용 (예: mapsy-back) # 커스텀 이름을 원하면 직접 입력 (예: "my-custom-container") CONTAINER_NAME: "" @@ -113,7 +113,7 @@ env: # true: 볼륨 마운트 활성화 (디렉토리 없으면 자동 생성) # false: 볼륨 마운트 비활성화 (기본값) ENABLE_VOLUME_MOUNT: "false" - VOLUME_HOST_PATH: "/volume1/projects/mapsee" # 호스트 경로 + VOLUME_HOST_PATH: "/volume1/projects/mapsy" # 호스트 경로 VOLUME_CONTAINER_PATH: "/mnt" # 컨테이너 내부 경로 jobs: diff --git a/.github/workflows/PROJECT-SPRING-SYNOLOGY-PR-PREVIEW.yaml b/.github/workflows/PROJECT-SPRING-SYNOLOGY-PR-PREVIEW.yaml index 378ed4c..872f2c3 100644 --- a/.github/workflows/PROJECT-SPRING-SYNOLOGY-PR-PREVIEW.yaml +++ b/.github/workflows/PROJECT-SPRING-SYNOLOGY-PR-PREVIEW.yaml @@ -70,7 +70,7 @@ name: PROJECT-SPRING-SYNOLOGY-PR-PREVIEW # =================================================================== env: # 프로젝트 고유 식별자 (컨테이너명, 이미지명, 도메인에 사용) (프로젝트별 수정 필요) - PROJECT_NAME: mapsee-be + PROJECT_NAME: mapsy-be # Spring Boot 빌드 설정 (프로젝트별 수정 필요) JAVA_VERSION: '21' diff --git a/.gitignore b/.gitignore index c995702..8f06ba4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ build/ # Firebase *-fcm.json -mapsee-fcm.json +mapsy-fcm.json # Environment & Secrets application-prod.yml diff --git a/Dockerfile b/Dockerfile index 3077356..20b21b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ # =================================================================== -# MapSee-BE Spring Boot Dockerfile +# MapSy-BE Spring Boot Dockerfile # =================================================================== FROM eclipse-temurin:21-jre-alpine -LABEL maintainer="MapSee Team" -LABEL description="MapSee Backend API Server" +LABEL maintainer="MapSy Team" +LABEL description="MapSy Backend API Server" WORKDIR /app diff --git a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/AiCallbackRequest.java b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/AiCallbackRequest.java similarity index 98% rename from MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/AiCallbackRequest.java rename to MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/AiCallbackRequest.java index 8ecb96b..b091350 100644 --- a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/AiCallbackRequest.java +++ b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/AiCallbackRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.ai.dto; +package kr.suhsaechan.mapsy.ai.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; diff --git a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/AiCallbackResponse.java b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/AiCallbackResponse.java similarity index 93% rename from MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/AiCallbackResponse.java rename to MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/AiCallbackResponse.java index eff284b..320aec3 100644 --- a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/AiCallbackResponse.java +++ b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/AiCallbackResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.ai.dto; +package kr.suhsaechan.mapsy.ai.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/PlaceExtractionRequest.java b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/PlaceExtractionRequest.java similarity index 95% rename from MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/PlaceExtractionRequest.java rename to MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/PlaceExtractionRequest.java index 8be0fc1..b03836a 100644 --- a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/PlaceExtractionRequest.java +++ b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/PlaceExtractionRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.ai.dto; +package kr.suhsaechan.mapsy.ai.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/PlaceExtractionResponse.java b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/PlaceExtractionResponse.java similarity index 95% rename from MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/PlaceExtractionResponse.java rename to MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/PlaceExtractionResponse.java index 213af27..f4a33ea 100644 --- a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/dto/PlaceExtractionResponse.java +++ b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/dto/PlaceExtractionResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.ai.dto; +package kr.suhsaechan.mapsy.ai.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/service/AiServerService.java b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/service/AiServerService.java similarity index 90% rename from MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/service/AiServerService.java rename to MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/service/AiServerService.java index 8489f55..093f0f8 100644 --- a/MS-AI/src/main/java/kr/suhsaechan/mapsee/ai/service/AiServerService.java +++ b/MS-AI/src/main/java/kr/suhsaechan/mapsy/ai/service/AiServerService.java @@ -1,11 +1,11 @@ -package kr.suhsaechan.mapsee.ai.service; +package kr.suhsaechan.mapsy.ai.service; import com.fasterxml.jackson.databind.ObjectMapper; -import kr.suhsaechan.mapsee.ai.dto.PlaceExtractionRequest; -import kr.suhsaechan.mapsee.ai.dto.PlaceExtractionResponse; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.common.properties.AiServerProperties; +import kr.suhsaechan.mapsy.ai.dto.PlaceExtractionRequest; +import kr.suhsaechan.mapsy.ai.dto.PlaceExtractionResponse; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.properties.AiServerProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.MediaType; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/constant/SecurityUrl.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/constant/SecurityUrl.java similarity index 95% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/constant/SecurityUrl.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/constant/SecurityUrl.java index e72c80e..a48d270 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/constant/SecurityUrl.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/constant/SecurityUrl.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.auth.constant; +package kr.suhsaechan.mapsy.auth.constant; import java.util.List; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/AuthRequest.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/AuthRequest.java similarity index 86% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/AuthRequest.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/AuthRequest.java index fa35a57..8c4696f 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/AuthRequest.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/AuthRequest.java @@ -1,9 +1,9 @@ -package kr.suhsaechan.mapsee.auth.dto; +package kr.suhsaechan.mapsy.auth.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import kr.suhsaechan.mapsee.common.constant.DeviceType; -import kr.suhsaechan.mapsee.common.constant.SocialPlatform; -import kr.suhsaechan.mapsee.member.entity.Member; +import kr.suhsaechan.mapsy.common.constant.DeviceType; +import kr.suhsaechan.mapsy.common.constant.SocialPlatform; +import kr.suhsaechan.mapsy.member.entity.Member; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/AuthResponse.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/AuthResponse.java similarity index 93% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/AuthResponse.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/AuthResponse.java index 36fa4e9..42bf4f9 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/AuthResponse.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/AuthResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.auth.dto; +package kr.suhsaechan.mapsy.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/CustomUserDetails.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/CustomUserDetails.java similarity index 91% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/CustomUserDetails.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/CustomUserDetails.java index 81abf70..d334b42 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/CustomUserDetails.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/CustomUserDetails.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.auth.dto; +package kr.suhsaechan.mapsy.auth.dto; -import kr.suhsaechan.mapsee.member.constant.MemberRole; -import kr.suhsaechan.mapsee.member.entity.Member; +import kr.suhsaechan.mapsy.member.constant.MemberRole; +import kr.suhsaechan.mapsy.member.entity.Member; import lombok.Getter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/ReissueRequest.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/ReissueRequest.java similarity index 91% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/ReissueRequest.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/ReissueRequest.java index a5dfb02..c9dd873 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/ReissueRequest.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/ReissueRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.auth.dto; +package kr.suhsaechan.mapsy.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/ReissueResponse.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/ReissueResponse.java similarity index 91% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/ReissueResponse.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/ReissueResponse.java index 8be62bf..c6c8c03 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/ReissueResponse.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/ReissueResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.auth.dto; +package kr.suhsaechan.mapsy.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/SignInRequest.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/SignInRequest.java similarity index 89% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/SignInRequest.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/SignInRequest.java index 50678d6..1129f5a 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/SignInRequest.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/SignInRequest.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.auth.dto; +package kr.suhsaechan.mapsy.auth.dto; -import kr.suhsaechan.mapsee.common.constant.DeviceType; -import kr.suhsaechan.mapsee.common.constant.SocialPlatform; +import kr.suhsaechan.mapsy.common.constant.DeviceType; +import kr.suhsaechan.mapsy.common.constant.SocialPlatform; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/SignInResponse.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/SignInResponse.java similarity index 94% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/SignInResponse.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/SignInResponse.java index ef9818a..09accbf 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/dto/SignInResponse.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/dto/SignInResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.auth.dto; +package kr.suhsaechan.mapsy.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/filter/TokenAuthenticationFilter.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/filter/TokenAuthenticationFilter.java similarity index 90% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/filter/TokenAuthenticationFilter.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/filter/TokenAuthenticationFilter.java index 4d010e9..71de588 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/filter/TokenAuthenticationFilter.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/filter/TokenAuthenticationFilter.java @@ -1,14 +1,14 @@ -package kr.suhsaechan.mapsee.auth.filter; +package kr.suhsaechan.mapsy.auth.filter; import com.fasterxml.jackson.databind.ObjectMapper; -import kr.suhsaechan.mapsee.auth.constant.SecurityUrl; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.auth.jwt.JwtUtil; -import kr.suhsaechan.mapsee.auth.service.CustomUserDetailsService; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.ErrorResponse; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.member.entity.Member; +import kr.suhsaechan.mapsy.auth.constant.SecurityUrl; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.auth.jwt.JwtUtil; +import kr.suhsaechan.mapsy.auth.service.CustomUserDetailsService; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.ErrorResponse; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.member.entity.Member; import io.jsonwebtoken.ExpiredJwtException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/jwt/JwtUtil.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/jwt/JwtUtil.java similarity index 97% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/jwt/JwtUtil.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/jwt/JwtUtil.java index 58c7c63..0048493 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/jwt/JwtUtil.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/jwt/JwtUtil.java @@ -1,9 +1,9 @@ -package kr.suhsaechan.mapsee.auth.jwt; +package kr.suhsaechan.mapsy.auth.jwt; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.auth.service.CustomUserDetailsService; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.auth.service.CustomUserDetailsService; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/service/AuthService.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/service/AuthService.java similarity index 91% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/service/AuthService.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/service/AuthService.java index c94daef..6cd551d 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/service/AuthService.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/service/AuthService.java @@ -1,24 +1,24 @@ -package kr.suhsaechan.mapsee.auth.service; - -import kr.suhsaechan.mapsee.auth.dto.AuthRequest; -import kr.suhsaechan.mapsee.auth.dto.AuthResponse; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.auth.dto.ReissueRequest; -import kr.suhsaechan.mapsee.auth.dto.ReissueResponse; -import kr.suhsaechan.mapsee.auth.dto.SignInRequest; -import kr.suhsaechan.mapsee.auth.dto.SignInResponse; -import kr.suhsaechan.mapsee.auth.jwt.JwtUtil; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.member.constant.MemberOnboardingStatus; -import kr.suhsaechan.mapsee.member.constant.OnboardingStep; -import kr.suhsaechan.mapsee.member.entity.FcmToken; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.member.entity.MemberInterest; -import kr.suhsaechan.mapsee.member.repository.FcmTokenRepository; -import kr.suhsaechan.mapsee.member.repository.MemberInterestRepository; -import kr.suhsaechan.mapsee.member.repository.MemberRepository; -import kr.suhsaechan.mapsee.member.service.MemberService; +package kr.suhsaechan.mapsy.auth.service; + +import kr.suhsaechan.mapsy.auth.dto.AuthRequest; +import kr.suhsaechan.mapsy.auth.dto.AuthResponse; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.auth.dto.ReissueRequest; +import kr.suhsaechan.mapsy.auth.dto.ReissueResponse; +import kr.suhsaechan.mapsy.auth.dto.SignInRequest; +import kr.suhsaechan.mapsy.auth.dto.SignInResponse; +import kr.suhsaechan.mapsy.auth.jwt.JwtUtil; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.member.constant.MemberOnboardingStatus; +import kr.suhsaechan.mapsy.member.constant.OnboardingStep; +import kr.suhsaechan.mapsy.member.entity.FcmToken; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.member.entity.MemberInterest; +import kr.suhsaechan.mapsy.member.repository.FcmTokenRepository; +import kr.suhsaechan.mapsy.member.repository.MemberInterestRepository; +import kr.suhsaechan.mapsy.member.repository.MemberRepository; +import kr.suhsaechan.mapsy.member.service.MemberService; import io.jsonwebtoken.ExpiredJwtException; import java.time.LocalDateTime; import java.util.List; diff --git a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/service/CustomUserDetailsService.java b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/service/CustomUserDetailsService.java similarity index 68% rename from MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/service/CustomUserDetailsService.java rename to MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/service/CustomUserDetailsService.java index 4f93d34..de6ed01 100644 --- a/MS-Auth/src/main/java/kr/suhsaechan/mapsee/auth/service/CustomUserDetailsService.java +++ b/MS-Auth/src/main/java/kr/suhsaechan/mapsy/auth/service/CustomUserDetailsService.java @@ -1,10 +1,10 @@ -package kr.suhsaechan.mapsee.auth.service; +package kr.suhsaechan.mapsy.auth.service; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.member.repository.MemberRepository; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.member.repository.MemberRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/MS-Common/build.gradle b/MS-Common/build.gradle index d08c196..a8e7013 100644 --- a/MS-Common/build.gradle +++ b/MS-Common/build.gradle @@ -52,8 +52,8 @@ dependencies { api 'org.flywaydb:flyway-database-postgresql' // Suh Libraries - api "me.suhsaechan:suh-logger:1.3.11" - api "me.suhsaechan:suh-api-log:1.1.5" + api "kr.suhsaechan:suh-logger:2.0.1" + api "kr.suhsaechan:suh-api-log:2.0.1" // Java Faker (for test data generation) api('com.github.javafaker:javafaker:1.0.2') { diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/Author.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/Author.java similarity index 90% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/Author.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/Author.java index 592577a..f5c8b7b 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/Author.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/Author.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.constant; +package kr.suhsaechan.mapsy.common.constant; // Swagger DOCS에서 @ApiChangeLog 어노테이션에 사용 public final class Author { diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/ContentStatus.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/ContentStatus.java similarity index 85% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/ContentStatus.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/ContentStatus.java index 5e08bb3..cb7054d 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/ContentStatus.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/ContentStatus.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.constant; +package kr.suhsaechan.mapsy.common.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/DeviceType.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/DeviceType.java similarity index 70% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/DeviceType.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/DeviceType.java index eb436e5..21ccfa7 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/DeviceType.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/DeviceType.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.constant; +package kr.suhsaechan.mapsy.common.constant; public enum DeviceType { IOS, // iOS 디바이스 (iPhone, iPad) diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/MemberRole.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/MemberRole.java similarity index 65% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/MemberRole.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/MemberRole.java index bb2984e..86c6d6e 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/MemberRole.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/MemberRole.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.constant; +package kr.suhsaechan.mapsy.common.constant; public enum MemberRole { ROLE_USER, // 일반 사용자 diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/SocialPlatform.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/SocialPlatform.java similarity index 72% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/SocialPlatform.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/SocialPlatform.java index 7c427e1..0b3dc43 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/constant/SocialPlatform.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/constant/SocialPlatform.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.constant; +package kr.suhsaechan.mapsy.common.constant; public enum SocialPlatform { NORMAL, // 기본 로그인 diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/entity/BaseEntity.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/entity/BaseEntity.java similarity index 92% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/entity/BaseEntity.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/entity/BaseEntity.java index 1bff115..5bd0ddb 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/entity/BaseEntity.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.entity; +package kr.suhsaechan.mapsy.common.entity; import jakarta.persistence.*; import lombok.Getter; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/entity/SoftDeletableBaseEntity.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/entity/SoftDeletableBaseEntity.java similarity index 94% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/entity/SoftDeletableBaseEntity.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/entity/SoftDeletableBaseEntity.java index 7890006..be9b324 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/entity/SoftDeletableBaseEntity.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/entity/SoftDeletableBaseEntity.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.entity; +package kr.suhsaechan.mapsy.common.entity; import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/CustomException.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/CustomException.java similarity index 92% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/CustomException.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/CustomException.java index 7284113..7bf6e91 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/CustomException.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/CustomException.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.common.exception; +package kr.suhsaechan.mapsy.common.exception; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/ErrorCodeBuilder.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/ErrorCodeBuilder.java similarity index 92% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/ErrorCodeBuilder.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/ErrorCodeBuilder.java index 0385eb0..1ac8cf4 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/ErrorCodeBuilder.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/ErrorCodeBuilder.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.common.exception; +package kr.suhsaechan.mapsy.common.exception; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorMessageTemplate.BusinessStatus; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorMessageTemplate.Subject; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorMessageTemplate.BusinessStatus; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorMessageTemplate.Subject; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/ErrorResponse.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/ErrorResponse.java similarity index 93% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/ErrorResponse.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/ErrorResponse.java index 7032b55..d7fffb0 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/ErrorResponse.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/ErrorResponse.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.common.exception; +package kr.suhsaechan.mapsy.common.exception; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/GlobalExceptionHandler.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/GlobalExceptionHandler.java similarity index 98% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/GlobalExceptionHandler.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/GlobalExceptionHandler.java index e9ee9e6..f61c399 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/GlobalExceptionHandler.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.exception; +package kr.suhsaechan.mapsy.common.exception; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.HttpStatus; @@ -22,7 +22,7 @@ */ @Slf4j @Hidden -@RestControllerAdvice(basePackages = "kr.suhsaechan.mapsee") +@RestControllerAdvice(basePackages = "kr.suhsaechan.mapsy") public class GlobalExceptionHandler { /** diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/constant/ErrorCode.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/constant/ErrorCode.java similarity index 98% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/constant/ErrorCode.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/constant/ErrorCode.java index 3494ef1..915609b 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/constant/ErrorCode.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/constant/ErrorCode.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.exception.constant; +package kr.suhsaechan.mapsy.common.exception.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/constant/ErrorMessageTemplate.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/constant/ErrorMessageTemplate.java similarity index 95% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/constant/ErrorMessageTemplate.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/constant/ErrorMessageTemplate.java index 6088da4..2842d7a 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/exception/constant/ErrorMessageTemplate.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/exception/constant/ErrorMessageTemplate.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.exception.constant; +package kr.suhsaechan.mapsy.common.exception.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/logging/LogExecutionTime.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/logging/LogExecutionTime.java similarity index 93% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/logging/LogExecutionTime.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/logging/LogExecutionTime.java index 019ada3..fbc407a 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/logging/LogExecutionTime.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/logging/LogExecutionTime.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.logging; +package kr.suhsaechan.mapsy.common.logging; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/logging/MethodLoggingAspect.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/logging/MethodLoggingAspect.java similarity index 98% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/logging/MethodLoggingAspect.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/logging/MethodLoggingAspect.java index c1387e8..006a369 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/logging/MethodLoggingAspect.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/logging/MethodLoggingAspect.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.logging; +package kr.suhsaechan.mapsy.common.logging; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -18,7 +18,7 @@ public class MethodLoggingAspect { /** * Controller, Service, Repository 메소드 통합 로깅 와일드카드 패턴으로 모든 모듈 자동 적용 */ - @Around("within(kr.suhsaechan.mapsee..*) && " + @Around("within(kr.suhsaechan.mapsy..*) && " + "(execution(* *Controller.*(..)) || " + " execution(* *Service.*(..)) || " + " execution(* *Repository.*(..)))") diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/AiServerProperties.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/AiServerProperties.java similarity index 94% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/AiServerProperties.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/AiServerProperties.java index 1f1e9b8..1112f17 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/AiServerProperties.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/AiServerProperties.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.properties; +package kr.suhsaechan.mapsy.common.properties; import lombok.Getter; import lombok.Setter; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/PlaceProperties.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/PlaceProperties.java similarity index 94% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/PlaceProperties.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/PlaceProperties.java index 578810b..b88bd59 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/PlaceProperties.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/PlaceProperties.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.properties; +package kr.suhsaechan.mapsy.common.properties; import lombok.Getter; import lombok.Setter; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/SpringDocProperties.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/SpringDocProperties.java similarity index 89% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/SpringDocProperties.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/SpringDocProperties.java index 5a59908..3d39c78 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/properties/SpringDocProperties.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/properties/SpringDocProperties.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.properties; +package kr.suhsaechan.mapsy.common.properties; import java.util.List; import lombok.AllArgsConstructor; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/CommonUtil.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/CommonUtil.java similarity index 88% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/CommonUtil.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/CommonUtil.java index fc826a6..7e903b9 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/CommonUtil.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/CommonUtil.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.common.util; +package kr.suhsaechan.mapsy.common.util; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/CustomP6SpyFormatter.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/CustomP6SpyFormatter.java similarity index 98% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/CustomP6SpyFormatter.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/CustomP6SpyFormatter.java index 389d640..6044174 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/CustomP6SpyFormatter.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/CustomP6SpyFormatter.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.util; +package kr.suhsaechan.mapsy.common.util; import com.p6spy.engine.spy.appender.MessageFormattingStrategy; import org.hibernate.engine.jdbc.internal.FormatStyle; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/NetworkUtil.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/NetworkUtil.java similarity index 95% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/NetworkUtil.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/NetworkUtil.java index b9add85..01bd599 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/NetworkUtil.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/NetworkUtil.java @@ -1,13 +1,12 @@ -package kr.suhsaechan.mapsee.common.util; +package kr.suhsaechan.mapsy.common.util; -import static me.suhsaechan.suhlogger.util.SuhLogger.*; +import static kr.suhsaechan.suhlogger.util.SuhLogger.*; import com.fasterxml.jackson.databind.ObjectMapper; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.suhsaechan.suhlogger.util.SuhLogger; import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/ScrapFlyUtil.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/ScrapFlyUtil.java similarity index 68% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/ScrapFlyUtil.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/ScrapFlyUtil.java index 63b1735..39558dd 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/ScrapFlyUtil.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/ScrapFlyUtil.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.util; +package kr.suhsaechan.mapsy.common.util; import org.springframework.stereotype.Component; diff --git a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/TimeUtil.java b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/TimeUtil.java similarity index 94% rename from MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/TimeUtil.java rename to MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/TimeUtil.java index 9b09b9b..16a5282 100644 --- a/MS-Common/src/main/java/kr/suhsaechan/mapsee/common/util/TimeUtil.java +++ b/MS-Common/src/main/java/kr/suhsaechan/mapsy/common/util/TimeUtil.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.common.util; +package kr.suhsaechan.mapsy.common.util; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/InterestCategory.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/InterestCategory.java similarity index 96% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/InterestCategory.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/InterestCategory.java index 4e5c6de..3566107 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/InterestCategory.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/InterestCategory.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.constant; +package kr.suhsaechan.mapsy.member.constant; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberGender.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberGender.java similarity index 76% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberGender.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberGender.java index 1e79913..854e4f2 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberGender.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberGender.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.constant; +package kr.suhsaechan.mapsy.member.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberOnboardingStatus.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberOnboardingStatus.java similarity index 80% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberOnboardingStatus.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberOnboardingStatus.java index 5f8be3e..31ccd66 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberOnboardingStatus.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberOnboardingStatus.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.constant; +package kr.suhsaechan.mapsy.member.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberRole.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberRole.java similarity index 75% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberRole.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberRole.java index 0db45ca..fb81c20 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/MemberRole.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/MemberRole.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.constant; +package kr.suhsaechan.mapsy.member.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/OnboardingStep.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/OnboardingStep.java similarity index 89% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/OnboardingStep.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/OnboardingStep.java index e5e046d..7227e32 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/OnboardingStep.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/OnboardingStep.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.constant; +package kr.suhsaechan.mapsy.member.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/TargetType.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/TargetType.java similarity index 75% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/TargetType.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/TargetType.java index 10651bc..fd7d352 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/constant/TargetType.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/constant/TargetType.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.constant; +package kr.suhsaechan.mapsy.member.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/CheckNameResponse.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/CheckNameResponse.java similarity index 93% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/CheckNameResponse.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/CheckNameResponse.java index 54a4681..74466a7 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/CheckNameResponse.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/CheckNameResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.dto; +package kr.suhsaechan.mapsy.member.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/FcmNotificationRequest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/FcmNotificationRequest.java similarity index 96% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/FcmNotificationRequest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/FcmNotificationRequest.java index 9d0a1c5..23b2ea8 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/FcmNotificationRequest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/FcmNotificationRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.dto; +package kr.suhsaechan.mapsy.member.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/InterestDto.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/InterestDto.java similarity index 83% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/InterestDto.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/InterestDto.java index 0e71d0a..9bc48cc 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/InterestDto.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/InterestDto.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.dto; +package kr.suhsaechan.mapsy.member.dto; import java.util.UUID; import lombok.AllArgsConstructor; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/MemberDto.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/MemberDto.java similarity index 94% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/MemberDto.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/MemberDto.java index 8d38816..0d09ebe 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/MemberDto.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/MemberDto.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.dto; +package kr.suhsaechan.mapsy.member.dto; -import kr.suhsaechan.mapsee.member.constant.MemberGender; -import kr.suhsaechan.mapsee.member.entity.Member; +import kr.suhsaechan.mapsy.member.constant.MemberGender; +import kr.suhsaechan.mapsy.member.entity.Member; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import java.time.LocalDate; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/ProfileUpdateRequest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/ProfileUpdateRequest.java similarity index 81% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/ProfileUpdateRequest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/ProfileUpdateRequest.java index 2bbf031..250d060 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/ProfileUpdateRequest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/ProfileUpdateRequest.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.dto; +package kr.suhsaechan.mapsy.member.dto; -import kr.suhsaechan.mapsee.member.constant.MemberGender; +import kr.suhsaechan.mapsy.member.constant.MemberGender; import java.time.LocalDate; import java.util.List; import java.util.UUID; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/UpdateServiceAgreementTermsRequest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/UpdateServiceAgreementTermsRequest.java similarity index 95% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/UpdateServiceAgreementTermsRequest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/UpdateServiceAgreementTermsRequest.java index 3f3af80..a8bdb32 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/UpdateServiceAgreementTermsRequest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/UpdateServiceAgreementTermsRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.dto; +package kr.suhsaechan.mapsy.member.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/UpdateServiceAgreementTermsResponse.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/UpdateServiceAgreementTermsResponse.java similarity index 82% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/UpdateServiceAgreementTermsResponse.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/UpdateServiceAgreementTermsResponse.java index 24ed9c9..50cd45b 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/UpdateServiceAgreementTermsResponse.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/UpdateServiceAgreementTermsResponse.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.dto; +package kr.suhsaechan.mapsy.member.dto; -import kr.suhsaechan.mapsee.member.constant.OnboardingStep; +import kr.suhsaechan.mapsy.member.constant.OnboardingStep; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetAllInterestsResponse.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetAllInterestsResponse.java similarity index 92% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetAllInterestsResponse.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetAllInterestsResponse.java index ee18f68..1d58511 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetAllInterestsResponse.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetAllInterestsResponse.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.dto.interest.response; +package kr.suhsaechan.mapsy.member.dto.interest.response; -import kr.suhsaechan.mapsee.member.constant.InterestCategory; -import kr.suhsaechan.mapsee.member.entity.Interest; +import kr.suhsaechan.mapsy.member.constant.InterestCategory; +import kr.suhsaechan.mapsy.member.entity.Interest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetInterestByIdResponse.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetInterestByIdResponse.java similarity index 91% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetInterestByIdResponse.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetInterestByIdResponse.java index 09c8c8d..4400ced 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetInterestByIdResponse.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetInterestByIdResponse.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.dto.interest.response; +package kr.suhsaechan.mapsy.member.dto.interest.response; -import kr.suhsaechan.mapsee.member.entity.Interest; +import kr.suhsaechan.mapsy.member.entity.Interest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetInterestsByCategoryResponse.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetInterestsByCategoryResponse.java similarity index 93% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetInterestsByCategoryResponse.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetInterestsByCategoryResponse.java index 51bbb9e..cf2a948 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/interest/response/GetInterestsByCategoryResponse.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/interest/response/GetInterestsByCategoryResponse.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.dto.interest.response; +package kr.suhsaechan.mapsy.member.dto.interest.response; -import kr.suhsaechan.mapsee.member.entity.Interest; +import kr.suhsaechan.mapsy.member.entity.Interest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateBirthDateRequest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateBirthDateRequest.java similarity index 91% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateBirthDateRequest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateBirthDateRequest.java index 524d0a9..a77a610 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateBirthDateRequest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateBirthDateRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.dto.onboarding.request; +package kr.suhsaechan.mapsy.member.dto.onboarding.request; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateGenderRequest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateGenderRequest.java similarity index 84% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateGenderRequest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateGenderRequest.java index 9b9c4f9..57f69a5 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateGenderRequest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateGenderRequest.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.dto.onboarding.request; +package kr.suhsaechan.mapsy.member.dto.onboarding.request; import com.fasterxml.jackson.annotation.JsonIgnore; -import kr.suhsaechan.mapsee.member.constant.MemberGender; +import kr.suhsaechan.mapsy.member.constant.MemberGender; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateInterestsRequest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateInterestsRequest.java similarity index 93% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateInterestsRequest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateInterestsRequest.java index 4d097fb..4ff051d 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateInterestsRequest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateInterestsRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.dto.onboarding.request; +package kr.suhsaechan.mapsy.member.dto.onboarding.request; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateNameRequest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateNameRequest.java similarity index 91% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateNameRequest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateNameRequest.java index cd1ceaa..5837b8e 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/request/UpdateNameRequest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/request/UpdateNameRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.member.dto.onboarding.request; +package kr.suhsaechan.mapsy.member.dto.onboarding.request; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/response/OnboardingResponse.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/response/OnboardingResponse.java similarity index 77% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/response/OnboardingResponse.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/response/OnboardingResponse.java index 764d12d..4b1ca0f 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/dto/onboarding/response/OnboardingResponse.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/dto/onboarding/response/OnboardingResponse.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.dto.onboarding.response; +package kr.suhsaechan.mapsy.member.dto.onboarding.response; -import kr.suhsaechan.mapsee.member.constant.OnboardingStep; -import kr.suhsaechan.mapsee.member.dto.MemberDto; +import kr.suhsaechan.mapsy.member.constant.OnboardingStep; +import kr.suhsaechan.mapsy.member.dto.MemberDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/AuthCredential.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/AuthCredential.java similarity index 86% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/AuthCredential.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/AuthCredential.java index c3cbb2c..28e1123 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/AuthCredential.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/AuthCredential.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.entity; +package kr.suhsaechan.mapsy.member.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/FcmToken.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/FcmToken.java similarity index 87% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/FcmToken.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/FcmToken.java index 21e164e..d7c4c8d 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/FcmToken.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/FcmToken.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.entity; +package kr.suhsaechan.mapsy.member.entity; -import kr.suhsaechan.mapsee.common.constant.DeviceType; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.common.constant.DeviceType; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Interest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Interest.java similarity index 76% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Interest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Interest.java index 0e3a8d2..5d4972b 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Interest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Interest.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.entity; +package kr.suhsaechan.mapsy.member.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; -import kr.suhsaechan.mapsee.member.constant.InterestCategory; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.member.constant.InterestCategory; import jakarta.persistence.*; import lombok.*; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Member.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Member.java similarity index 88% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Member.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Member.java index 073e95c..be38fa7 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Member.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Member.java @@ -1,10 +1,10 @@ -package kr.suhsaechan.mapsee.member.entity; +package kr.suhsaechan.mapsy.member.entity; -import kr.suhsaechan.mapsee.common.entity.SoftDeletableBaseEntity; -import kr.suhsaechan.mapsee.member.constant.MemberRole; -import kr.suhsaechan.mapsee.member.constant.MemberOnboardingStatus; -import kr.suhsaechan.mapsee.member.constant.MemberGender; -import kr.suhsaechan.mapsee.member.constant.OnboardingStep; +import kr.suhsaechan.mapsy.common.entity.SoftDeletableBaseEntity; +import kr.suhsaechan.mapsy.member.constant.MemberRole; +import kr.suhsaechan.mapsy.member.constant.MemberOnboardingStatus; +import kr.suhsaechan.mapsy.member.constant.MemberGender; +import kr.suhsaechan.mapsy.member.constant.OnboardingStep; import jakarta.persistence.*; import lombok.*; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/MemberInterest.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/MemberInterest.java similarity index 86% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/MemberInterest.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/MemberInterest.java index 96b0a66..1109c89 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/MemberInterest.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/MemberInterest.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.entity; +package kr.suhsaechan.mapsy.member.entity; -import kr.suhsaechan.mapsee.common.entity.SoftDeletableBaseEntity; +import kr.suhsaechan.mapsy.common.entity.SoftDeletableBaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Notification.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Notification.java similarity index 88% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Notification.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Notification.java index 56c7e27..2a5465e 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/entity/Notification.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/entity/Notification.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.entity; +package kr.suhsaechan.mapsy.member.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; -import kr.suhsaechan.mapsee.member.constant.TargetType; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.member.constant.TargetType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/FcmTokenRepository.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/FcmTokenRepository.java similarity index 82% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/FcmTokenRepository.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/FcmTokenRepository.java index ea5094d..887c624 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/FcmTokenRepository.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/FcmTokenRepository.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.repository; +package kr.suhsaechan.mapsy.member.repository; -import kr.suhsaechan.mapsee.member.entity.FcmToken; -import kr.suhsaechan.mapsee.member.entity.Member; +import kr.suhsaechan.mapsy.member.entity.FcmToken; +import kr.suhsaechan.mapsy.member.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; import java.time.LocalDateTime; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/InterestRepository.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/InterestRepository.java similarity index 83% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/InterestRepository.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/InterestRepository.java index 17e1bd9..e2484f0 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/InterestRepository.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/InterestRepository.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.member.repository; +package kr.suhsaechan.mapsy.member.repository; -import kr.suhsaechan.mapsee.member.constant.InterestCategory; -import kr.suhsaechan.mapsee.member.entity.Interest; +import kr.suhsaechan.mapsy.member.constant.InterestCategory; +import kr.suhsaechan.mapsy.member.entity.Interest; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/MemberInterestRepository.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/MemberInterestRepository.java similarity index 73% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/MemberInterestRepository.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/MemberInterestRepository.java index 4ddcbd2..8c4447d 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/MemberInterestRepository.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/MemberInterestRepository.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.repository; +package kr.suhsaechan.mapsy.member.repository; -import kr.suhsaechan.mapsee.member.entity.MemberInterest; +import kr.suhsaechan.mapsy.member.entity.MemberInterest; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/MemberRepository.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/MemberRepository.java similarity index 78% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/MemberRepository.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/MemberRepository.java index 247f5d3..2a0e5cc 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/repository/MemberRepository.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/repository/MemberRepository.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.member.repository; +package kr.suhsaechan.mapsy.member.repository; -import kr.suhsaechan.mapsee.member.entity.Member; +import kr.suhsaechan.mapsy.member.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/FcmService.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/FcmService.java similarity index 95% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/FcmService.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/FcmService.java index fd199f1..04f0750 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/FcmService.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/FcmService.java @@ -1,13 +1,13 @@ -package kr.suhsaechan.mapsee.member.service; +package kr.suhsaechan.mapsy.member.service; import com.google.firebase.FirebaseApp; import com.google.firebase.messaging.*; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.member.dto.FcmNotificationRequest; -import kr.suhsaechan.mapsee.member.entity.FcmToken; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.member.repository.FcmTokenRepository; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.member.dto.FcmNotificationRequest; +import kr.suhsaechan.mapsy.member.entity.FcmToken; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.member.repository.FcmTokenRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/InterestService.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/InterestService.java similarity index 76% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/InterestService.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/InterestService.java index b197d2d..e729de7 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/InterestService.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/InterestService.java @@ -1,15 +1,15 @@ -package kr.suhsaechan.mapsee.member.service; +package kr.suhsaechan.mapsy.member.service; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.ErrorCodeBuilder; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorMessageTemplate.BusinessStatus; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorMessageTemplate.Subject; -import kr.suhsaechan.mapsee.member.constant.InterestCategory; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetAllInterestsResponse; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetInterestByIdResponse; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetInterestsByCategoryResponse; -import kr.suhsaechan.mapsee.member.entity.Interest; -import kr.suhsaechan.mapsee.member.repository.InterestRepository; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.ErrorCodeBuilder; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorMessageTemplate.BusinessStatus; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorMessageTemplate.Subject; +import kr.suhsaechan.mapsy.member.constant.InterestCategory; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetAllInterestsResponse; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetInterestByIdResponse; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetInterestsByCategoryResponse; +import kr.suhsaechan.mapsy.member.entity.Interest; +import kr.suhsaechan.mapsy.member.repository.InterestRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.Cacheable; diff --git a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/MemberService.java b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/MemberService.java similarity index 92% rename from MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/MemberService.java rename to MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/MemberService.java index eeca761..4a587e6 100644 --- a/MS-Member/src/main/java/kr/suhsaechan/mapsee/member/service/MemberService.java +++ b/MS-Member/src/main/java/kr/suhsaechan/mapsy/member/service/MemberService.java @@ -1,30 +1,30 @@ -package kr.suhsaechan.mapsee.member.service; - -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.ErrorCodeBuilder; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorMessageTemplate.Subject; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorMessageTemplate.BusinessStatus; -import kr.suhsaechan.mapsee.member.constant.MemberGender; -import kr.suhsaechan.mapsee.member.constant.MemberOnboardingStatus; -import kr.suhsaechan.mapsee.member.constant.OnboardingStep; -import kr.suhsaechan.mapsee.member.dto.CheckNameResponse; -import kr.suhsaechan.mapsee.member.dto.InterestDto; -import kr.suhsaechan.mapsee.member.dto.MemberDto; -import kr.suhsaechan.mapsee.member.dto.ProfileUpdateRequest; -import kr.suhsaechan.mapsee.member.dto.UpdateServiceAgreementTermsRequest; -import kr.suhsaechan.mapsee.member.dto.UpdateServiceAgreementTermsResponse; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateBirthDateRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateGenderRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateInterestsRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateNameRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.response.OnboardingResponse; -import kr.suhsaechan.mapsee.member.entity.Interest; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.member.entity.MemberInterest; -import kr.suhsaechan.mapsee.member.repository.InterestRepository; -import kr.suhsaechan.mapsee.member.repository.MemberInterestRepository; -import kr.suhsaechan.mapsee.member.repository.MemberRepository; +package kr.suhsaechan.mapsy.member.service; + +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.ErrorCodeBuilder; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorMessageTemplate.Subject; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorMessageTemplate.BusinessStatus; +import kr.suhsaechan.mapsy.member.constant.MemberGender; +import kr.suhsaechan.mapsy.member.constant.MemberOnboardingStatus; +import kr.suhsaechan.mapsy.member.constant.OnboardingStep; +import kr.suhsaechan.mapsy.member.dto.CheckNameResponse; +import kr.suhsaechan.mapsy.member.dto.InterestDto; +import kr.suhsaechan.mapsy.member.dto.MemberDto; +import kr.suhsaechan.mapsy.member.dto.ProfileUpdateRequest; +import kr.suhsaechan.mapsy.member.dto.UpdateServiceAgreementTermsRequest; +import kr.suhsaechan.mapsy.member.dto.UpdateServiceAgreementTermsResponse; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateBirthDateRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateGenderRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateInterestsRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateNameRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.response.OnboardingResponse; +import kr.suhsaechan.mapsy.member.entity.Interest; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.member.entity.MemberInterest; +import kr.suhsaechan.mapsy.member.repository.InterestRepository; +import kr.suhsaechan.mapsy.member.repository.MemberInterestRepository; +import kr.suhsaechan.mapsy.member.repository.MemberRepository; import java.time.LocalDate; import java.util.HashSet; import java.util.Set; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/FolderVisibility.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/FolderVisibility.java similarity index 75% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/FolderVisibility.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/FolderVisibility.java index e1c55c6..8483be0 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/FolderVisibility.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/FolderVisibility.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.constant; +package kr.suhsaechan.mapsy.place.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlacePlatform.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlacePlatform.java similarity index 76% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlacePlatform.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlacePlatform.java index 030e085..6bc8255 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlacePlatform.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlacePlatform.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.constant; +package kr.suhsaechan.mapsy.place.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlaceSavedStatus.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlaceSavedStatus.java similarity index 92% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlaceSavedStatus.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlaceSavedStatus.java index c3443dd..846e2ec 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlaceSavedStatus.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlaceSavedStatus.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.constant; +package kr.suhsaechan.mapsy.place.constant; /** * 장소 저장 상태 diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlaceWeekday.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlaceWeekday.java similarity index 78% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlaceWeekday.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlaceWeekday.java index a275dd0..fce3f1c 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/constant/PlaceWeekday.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/constant/PlaceWeekday.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.constant; +package kr.suhsaechan.mapsy.place.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GetSavedPlacesResponse.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GetSavedPlacesResponse.java similarity index 91% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GetSavedPlacesResponse.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GetSavedPlacesResponse.java index 453a61f..10bf39e 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GetSavedPlacesResponse.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GetSavedPlacesResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GetTemporaryPlacesResponse.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GetTemporaryPlacesResponse.java similarity index 91% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GetTemporaryPlacesResponse.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GetTemporaryPlacesResponse.java index b5be072..70a2e37 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GetTemporaryPlacesResponse.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GetTemporaryPlacesResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GooglePlaceSearchDto.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GooglePlaceSearchDto.java similarity index 98% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GooglePlaceSearchDto.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GooglePlaceSearchDto.java index 3e05cab..9ccb76e 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/GooglePlaceSearchDto.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/GooglePlaceSearchDto.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceBusinessHourDto.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceBusinessHourDto.java similarity index 85% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceBusinessHourDto.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceBusinessHourDto.java index 08877a1..43fe64c 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceBusinessHourDto.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceBusinessHourDto.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; -import kr.suhsaechan.mapsee.place.constant.PlaceWeekday; -import kr.suhsaechan.mapsee.place.entity.PlaceBusinessHour; +import kr.suhsaechan.mapsy.place.constant.PlaceWeekday; +import kr.suhsaechan.mapsy.place.entity.PlaceBusinessHour; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalTime; import lombok.AllArgsConstructor; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceDetailDto.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceDetailDto.java similarity index 93% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceDetailDto.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceDetailDto.java index f341025..3e1668a 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceDetailDto.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceDetailDto.java @@ -1,9 +1,9 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.place.entity.PlaceBusinessHour; -import kr.suhsaechan.mapsee.place.entity.PlaceMedia; -import kr.suhsaechan.mapsee.place.entity.PlacePlatformReference; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.PlaceBusinessHour; +import kr.suhsaechan.mapsy.place.entity.PlaceMedia; +import kr.suhsaechan.mapsy.place.entity.PlacePlatformReference; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; import java.util.List; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceDto.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceDto.java similarity index 94% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceDto.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceDto.java index 4ec4859..67a493d 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceDto.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceDto.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; -import kr.suhsaechan.mapsee.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.Place; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; import java.util.List; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceMediaDto.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceMediaDto.java similarity index 91% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceMediaDto.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceMediaDto.java index 697fc74..0948615 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlaceMediaDto.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlaceMediaDto.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; -import kr.suhsaechan.mapsee.place.entity.PlaceMedia; +import kr.suhsaechan.mapsy.place.entity.PlaceMedia; import io.swagger.v3.oas.annotations.media.Schema; import java.util.UUID; import lombok.AllArgsConstructor; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlacePlatformReferenceDto.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlacePlatformReferenceDto.java similarity index 84% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlacePlatformReferenceDto.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlacePlatformReferenceDto.java index d856858..08ac418 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/PlacePlatformReferenceDto.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/PlacePlatformReferenceDto.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; -import kr.suhsaechan.mapsee.place.constant.PlacePlatform; -import kr.suhsaechan.mapsee.place.entity.PlacePlatformReference; +import kr.suhsaechan.mapsy.place.constant.PlacePlatform; +import kr.suhsaechan.mapsy.place.entity.PlacePlatformReference; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/SavePlaceResponse.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/SavePlaceResponse.java similarity index 95% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/SavePlaceResponse.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/SavePlaceResponse.java index cfef72d..d4713e0 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/dto/SavePlaceResponse.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/dto/SavePlaceResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.place.dto; +package kr.suhsaechan.mapsy.place.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/Folder.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/Folder.java similarity index 87% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/Folder.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/Folder.java index 14dfa30..7a72382 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/Folder.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/Folder.java @@ -1,8 +1,8 @@ -package kr.suhsaechan.mapsee.place.entity; +package kr.suhsaechan.mapsy.place.entity; -import kr.suhsaechan.mapsee.common.entity.SoftDeletableBaseEntity; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.place.constant.FolderVisibility; +import kr.suhsaechan.mapsy.common.entity.SoftDeletableBaseEntity; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.place.constant.FolderVisibility; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/FolderPlace.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/FolderPlace.java similarity index 89% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/FolderPlace.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/FolderPlace.java index e9f1634..f882ead 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/FolderPlace.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/FolderPlace.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.entity; +package kr.suhsaechan.mapsy.place.entity; -import kr.suhsaechan.mapsee.common.entity.SoftDeletableBaseEntity; +import kr.suhsaechan.mapsy.common.entity.SoftDeletableBaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/MemberPlace.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/MemberPlace.java similarity index 88% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/MemberPlace.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/MemberPlace.java index c17de56..9d561b9 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/MemberPlace.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/MemberPlace.java @@ -1,10 +1,10 @@ -package kr.suhsaechan.mapsee.place.entity; +package kr.suhsaechan.mapsy.place.entity; -import kr.suhsaechan.mapsee.common.entity.SoftDeletableBaseEntity; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.place.constant.PlaceSavedStatus; +import kr.suhsaechan.mapsy.common.entity.SoftDeletableBaseEntity; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.place.constant.PlaceSavedStatus; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/Place.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/Place.java similarity index 95% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/Place.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/Place.java index bfaff57..a87ed74 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/Place.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/Place.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.entity; +package kr.suhsaechan.mapsy.place.entity; -import kr.suhsaechan.mapsee.common.entity.SoftDeletableBaseEntity; +import kr.suhsaechan.mapsy.common.entity.SoftDeletableBaseEntity; import jakarta.persistence.*; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlaceBusinessHour.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlaceBusinessHour.java similarity index 90% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlaceBusinessHour.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlaceBusinessHour.java index fdc7edf..b4b36e3 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlaceBusinessHour.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlaceBusinessHour.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.place.entity; +package kr.suhsaechan.mapsy.place.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; -import kr.suhsaechan.mapsee.place.constant.PlaceWeekday; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.place.constant.PlaceWeekday; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlaceMedia.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlaceMedia.java similarity index 91% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlaceMedia.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlaceMedia.java index 9d9679e..c13bc67 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlaceMedia.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlaceMedia.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.entity; +package kr.suhsaechan.mapsy.place.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlacePlatformReference.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlacePlatformReference.java similarity index 87% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlacePlatformReference.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlacePlatformReference.java index ef07ff0..aab49dc 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/entity/PlacePlatformReference.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/entity/PlacePlatformReference.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.place.entity; +package kr.suhsaechan.mapsy.place.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; -import kr.suhsaechan.mapsee.place.constant.PlacePlatform; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.place.constant.PlacePlatform; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/MemberPlaceRepository.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/MemberPlaceRepository.java similarity index 88% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/MemberPlaceRepository.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/MemberPlaceRepository.java index b035402..04bb124 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/MemberPlaceRepository.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/MemberPlaceRepository.java @@ -1,9 +1,9 @@ -package kr.suhsaechan.mapsee.place.repository; +package kr.suhsaechan.mapsy.place.repository; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.place.constant.PlaceSavedStatus; -import kr.suhsaechan.mapsee.place.entity.MemberPlace; -import kr.suhsaechan.mapsee.place.entity.Place; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.place.constant.PlaceSavedStatus; +import kr.suhsaechan.mapsy.place.entity.MemberPlace; +import kr.suhsaechan.mapsy.place.entity.Place; import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceBusinessHourRepository.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceBusinessHourRepository.java similarity index 88% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceBusinessHourRepository.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceBusinessHourRepository.java index 93020a3..0a8c47b 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceBusinessHourRepository.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceBusinessHourRepository.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.repository; +package kr.suhsaechan.mapsy.place.repository; -import kr.suhsaechan.mapsee.place.entity.PlaceBusinessHour; +import kr.suhsaechan.mapsy.place.entity.PlaceBusinessHour; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceMediaRepository.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceMediaRepository.java similarity index 88% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceMediaRepository.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceMediaRepository.java index 6f00653..ae4ffe8 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceMediaRepository.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceMediaRepository.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.repository; +package kr.suhsaechan.mapsy.place.repository; -import kr.suhsaechan.mapsee.place.entity.PlaceMedia; +import kr.suhsaechan.mapsy.place.entity.PlaceMedia; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlacePlatformReferenceRepository.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlacePlatformReferenceRepository.java similarity index 80% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlacePlatformReferenceRepository.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlacePlatformReferenceRepository.java index 1bd6af2..f42e0f8 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlacePlatformReferenceRepository.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlacePlatformReferenceRepository.java @@ -1,8 +1,8 @@ -package kr.suhsaechan.mapsee.place.repository; +package kr.suhsaechan.mapsy.place.repository; -import kr.suhsaechan.mapsee.place.constant.PlacePlatform; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.place.entity.PlacePlatformReference; +import kr.suhsaechan.mapsy.place.constant.PlacePlatform; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.PlacePlatformReference; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceRepository.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceRepository.java similarity index 93% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceRepository.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceRepository.java index b7efa8e..f87e136 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/repository/PlaceRepository.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/repository/PlaceRepository.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.repository; +package kr.suhsaechan.mapsy.place.repository; -import kr.suhsaechan.mapsee.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.Place; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/GooglePlaceSearcher.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/GooglePlaceSearcher.java similarity index 95% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/GooglePlaceSearcher.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/GooglePlaceSearcher.java index 198f436..5109d7f 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/GooglePlaceSearcher.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/GooglePlaceSearcher.java @@ -1,15 +1,15 @@ -package kr.suhsaechan.mapsee.place.service; +package kr.suhsaechan.mapsy.place.service; import com.fasterxml.jackson.databind.ObjectMapper; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.common.properties.PlaceProperties; -import kr.suhsaechan.mapsee.place.constant.PlacePlatform; -import kr.suhsaechan.mapsee.place.dto.GooglePlaceSearchDto; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.place.entity.PlacePlatformReference; -import kr.suhsaechan.mapsee.place.repository.PlacePlatformReferenceRepository; -import kr.suhsaechan.mapsee.place.repository.PlaceRepository; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.properties.PlaceProperties; +import kr.suhsaechan.mapsy.place.constant.PlacePlatform; +import kr.suhsaechan.mapsy.place.dto.GooglePlaceSearchDto; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.PlacePlatformReference; +import kr.suhsaechan.mapsy.place.repository.PlacePlatformReferenceRepository; +import kr.suhsaechan.mapsy.place.repository.PlaceRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/MemberPlaceService.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/MemberPlaceService.java similarity index 89% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/MemberPlaceService.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/MemberPlaceService.java index d5a69e9..b14c818 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/MemberPlaceService.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/MemberPlaceService.java @@ -1,18 +1,18 @@ -package kr.suhsaechan.mapsee.place.service; - -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.member.repository.MemberRepository; -import kr.suhsaechan.mapsee.place.constant.PlaceSavedStatus; -import kr.suhsaechan.mapsee.place.dto.GetSavedPlacesResponse; -import kr.suhsaechan.mapsee.place.dto.GetTemporaryPlacesResponse; -import kr.suhsaechan.mapsee.place.dto.PlaceDto; -import kr.suhsaechan.mapsee.place.dto.SavePlaceResponse; -import kr.suhsaechan.mapsee.place.entity.MemberPlace; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.place.repository.MemberPlaceRepository; -import kr.suhsaechan.mapsee.place.repository.PlaceRepository; +package kr.suhsaechan.mapsy.place.service; + +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.member.repository.MemberRepository; +import kr.suhsaechan.mapsy.place.constant.PlaceSavedStatus; +import kr.suhsaechan.mapsy.place.dto.GetSavedPlacesResponse; +import kr.suhsaechan.mapsy.place.dto.GetTemporaryPlacesResponse; +import kr.suhsaechan.mapsy.place.dto.PlaceDto; +import kr.suhsaechan.mapsy.place.dto.SavePlaceResponse; +import kr.suhsaechan.mapsy.place.entity.MemberPlace; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.place.repository.MemberPlaceRepository; +import kr.suhsaechan.mapsy.place.repository.PlaceRepository; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlacePlatformSearcher.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlacePlatformSearcher.java similarity index 84% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlacePlatformSearcher.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlacePlatformSearcher.java index ad2cc86..e0122b0 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlacePlatformSearcher.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlacePlatformSearcher.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.service; +package kr.suhsaechan.mapsy.place.service; -import kr.suhsaechan.mapsee.place.dto.GooglePlaceSearchDto; +import kr.suhsaechan.mapsy.place.dto.GooglePlaceSearchDto; /** * 플랫폼별 장소 검색 인터페이스 diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlaceSearchService.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlaceSearchService.java similarity index 88% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlaceSearchService.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlaceSearchService.java index 887b57f..a1f8841 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlaceSearchService.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlaceSearchService.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.place.service; +package kr.suhsaechan.mapsy.place.service; -import kr.suhsaechan.mapsee.place.dto.GooglePlaceSearchDto; +import kr.suhsaechan.mapsy.place.dto.GooglePlaceSearchDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlaceService.java b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlaceService.java similarity index 73% rename from MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlaceService.java rename to MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlaceService.java index e9ec8c6..4ef4812 100644 --- a/MS-Place/src/main/java/kr/suhsaechan/mapsee/place/service/PlaceService.java +++ b/MS-Place/src/main/java/kr/suhsaechan/mapsy/place/service/PlaceService.java @@ -1,16 +1,16 @@ -package kr.suhsaechan.mapsee.place.service; +package kr.suhsaechan.mapsy.place.service; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.place.dto.PlaceDetailDto; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.place.entity.PlaceBusinessHour; -import kr.suhsaechan.mapsee.place.entity.PlaceMedia; -import kr.suhsaechan.mapsee.place.entity.PlacePlatformReference; -import kr.suhsaechan.mapsee.place.repository.PlaceBusinessHourRepository; -import kr.suhsaechan.mapsee.place.repository.PlaceMediaRepository; -import kr.suhsaechan.mapsee.place.repository.PlacePlatformReferenceRepository; -import kr.suhsaechan.mapsee.place.repository.PlaceRepository; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.place.dto.PlaceDetailDto; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.PlaceBusinessHour; +import kr.suhsaechan.mapsy.place.entity.PlaceMedia; +import kr.suhsaechan.mapsy.place.entity.PlacePlatformReference; +import kr.suhsaechan.mapsy.place.repository.PlaceBusinessHourRepository; +import kr.suhsaechan.mapsy.place.repository.PlaceMediaRepository; +import kr.suhsaechan.mapsy.place.repository.PlacePlatformReferenceRepository; +import kr.suhsaechan.mapsy.place.repository.PlaceRepository; import java.util.List; import java.util.UUID; import lombok.RequiredArgsConstructor; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/constant/ContentPlatform.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/constant/ContentPlatform.java similarity index 88% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/constant/ContentPlatform.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/constant/ContentPlatform.java index f5c60e0..a5c1e05 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/constant/ContentPlatform.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/constant/ContentPlatform.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.sns.constant; +package kr.suhsaechan.mapsy.sns.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/AiContentRequest.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/AiContentRequest.java similarity index 90% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/AiContentRequest.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/AiContentRequest.java index 3e84948..8c063de 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/AiContentRequest.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/AiContentRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; import java.util.UUID; import lombok.AllArgsConstructor; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/ContentDto.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/ContentDto.java similarity index 90% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/ContentDto.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/ContentDto.java index 6e39782..da536b9 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/ContentDto.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/ContentDto.java @@ -1,8 +1,8 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; -import kr.suhsaechan.mapsee.sns.constant.ContentPlatform; -import kr.suhsaechan.mapsee.common.constant.ContentStatus; -import kr.suhsaechan.mapsee.sns.entity.Content; +import kr.suhsaechan.mapsy.sns.constant.ContentPlatform; +import kr.suhsaechan.mapsy.common.constant.ContentStatus; +import kr.suhsaechan.mapsy.sns.entity.Content; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; import java.util.UUID; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetContentInfoRequest.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetContentInfoRequest.java similarity index 92% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetContentInfoRequest.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetContentInfoRequest.java index f110ec4..6ba4ec9 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetContentInfoRequest.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetContentInfoRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetContentInfoResponse.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetContentInfoResponse.java similarity index 86% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetContentInfoResponse.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetContentInfoResponse.java index 818728f..566c496 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetContentInfoResponse.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetContentInfoResponse.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.sns.entity.Content; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.sns.entity.Content; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import java.util.stream.Collectors; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetMemberContentPageResponse.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetMemberContentPageResponse.java similarity index 92% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetMemberContentPageResponse.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetMemberContentPageResponse.java index 6fb76c7..522f329 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetMemberContentPageResponse.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetMemberContentPageResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetRecentContentResponse.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetRecentContentResponse.java similarity index 91% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetRecentContentResponse.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetRecentContentResponse.java index 0f0772c..028120c 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/GetRecentContentResponse.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/GetRecentContentResponse.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/PlaceDto.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/PlaceDto.java similarity index 96% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/PlaceDto.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/PlaceDto.java index 2f61a28..8d1c041 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/PlaceDto.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/PlaceDto.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; -import kr.suhsaechan.mapsee.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.Place; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; import java.util.List; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/RequestPlaceExtractionRequest.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/RequestPlaceExtractionRequest.java similarity index 92% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/RequestPlaceExtractionRequest.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/RequestPlaceExtractionRequest.java index c553e72..3dfeb10 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/RequestPlaceExtractionRequest.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/RequestPlaceExtractionRequest.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/RequestPlaceExtractionResponse.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/RequestPlaceExtractionResponse.java similarity index 77% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/RequestPlaceExtractionResponse.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/RequestPlaceExtractionResponse.java index 195e06d..ae31a2e 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/dto/RequestPlaceExtractionResponse.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/dto/RequestPlaceExtractionResponse.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.sns.dto; +package kr.suhsaechan.mapsy.sns.dto; -import kr.suhsaechan.mapsee.common.constant.ContentStatus; +import kr.suhsaechan.mapsy.common.constant.ContentStatus; import java.util.UUID; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/Content.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/Content.java similarity index 86% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/Content.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/Content.java index 4eef660..2e18e52 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/Content.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/Content.java @@ -1,8 +1,8 @@ -package kr.suhsaechan.mapsee.sns.entity; +package kr.suhsaechan.mapsy.sns.entity; -import kr.suhsaechan.mapsee.common.entity.SoftDeletableBaseEntity; -import kr.suhsaechan.mapsee.sns.constant.ContentPlatform; -import kr.suhsaechan.mapsee.common.constant.ContentStatus; +import kr.suhsaechan.mapsy.common.entity.SoftDeletableBaseEntity; +import kr.suhsaechan.mapsy.sns.constant.ContentPlatform; +import kr.suhsaechan.mapsy.common.constant.ContentStatus; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentMedia.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentMedia.java similarity index 91% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentMedia.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentMedia.java index e8e8673..2c76967 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentMedia.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentMedia.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.sns.entity; +package kr.suhsaechan.mapsy.sns.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentMember.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentMember.java similarity index 91% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentMember.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentMember.java index 6cf68bd..7ad5547 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentMember.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentMember.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.sns.entity; +package kr.suhsaechan.mapsy.sns.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; -import kr.suhsaechan.mapsee.member.entity.Member; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.member.entity.Member; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentPlace.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentPlace.java similarity index 91% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentPlace.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentPlace.java index 7a3de6e..b44ce4c 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/entity/ContentPlace.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/entity/ContentPlace.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.sns.entity; +package kr.suhsaechan.mapsy.sns.entity; -import kr.suhsaechan.mapsee.common.entity.BaseEntity; +import kr.suhsaechan.mapsy.common.entity.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -15,7 +15,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import kr.suhsaechan.mapsee.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.Place; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; import jakarta.persistence.Index; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentMemberRepository.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentMemberRepository.java similarity index 88% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentMemberRepository.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentMemberRepository.java index a426608..11c28bb 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentMemberRepository.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentMemberRepository.java @@ -1,8 +1,8 @@ -package kr.suhsaechan.mapsee.sns.repository; +package kr.suhsaechan.mapsy.sns.repository; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.sns.entity.Content; -import kr.suhsaechan.mapsee.sns.entity.ContentMember; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.sns.entity.Content; +import kr.suhsaechan.mapsy.sns.entity.ContentMember; import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentPlaceRepository.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentPlaceRepository.java similarity index 91% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentPlaceRepository.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentPlaceRepository.java index 1355006..399bf43 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentPlaceRepository.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentPlaceRepository.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.sns.repository; +package kr.suhsaechan.mapsy.sns.repository; -import kr.suhsaechan.mapsee.sns.entity.ContentPlace; +import kr.suhsaechan.mapsy.sns.entity.ContentPlace; import java.util.List; import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentRepository.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentRepository.java similarity index 78% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentRepository.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentRepository.java index 7397807..a3298e5 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/repository/ContentRepository.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/repository/ContentRepository.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.sns.repository; +package kr.suhsaechan.mapsy.sns.repository; -import kr.suhsaechan.mapsee.sns.entity.Content; +import kr.suhsaechan.mapsy.sns.entity.Content; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/service/AiCallbackService.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/service/AiCallbackService.java similarity index 92% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/service/AiCallbackService.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/service/AiCallbackService.java index 0b54204..42db62d 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/service/AiCallbackService.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/service/AiCallbackService.java @@ -1,26 +1,26 @@ -package kr.suhsaechan.mapsee.sns.service; - -import kr.suhsaechan.mapsee.ai.dto.AiCallbackRequest; -import kr.suhsaechan.mapsee.ai.dto.AiCallbackResponse; -import kr.suhsaechan.mapsee.common.constant.ContentStatus; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.place.constant.PlacePlatform; -import kr.suhsaechan.mapsee.place.constant.PlaceSavedStatus; -import kr.suhsaechan.mapsee.place.dto.GooglePlaceSearchDto; -import kr.suhsaechan.mapsee.place.entity.MemberPlace; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.place.entity.PlacePlatformReference; -import kr.suhsaechan.mapsee.place.repository.MemberPlaceRepository; -import kr.suhsaechan.mapsee.place.repository.PlacePlatformReferenceRepository; -import kr.suhsaechan.mapsee.place.repository.PlaceRepository; -import kr.suhsaechan.mapsee.place.service.PlaceSearchService; -import kr.suhsaechan.mapsee.sns.entity.Content; -import kr.suhsaechan.mapsee.sns.entity.ContentMember; -import kr.suhsaechan.mapsee.sns.entity.ContentPlace; -import kr.suhsaechan.mapsee.sns.repository.ContentMemberRepository; -import kr.suhsaechan.mapsee.sns.repository.ContentPlaceRepository; -import kr.suhsaechan.mapsee.sns.repository.ContentRepository; +package kr.suhsaechan.mapsy.sns.service; + +import kr.suhsaechan.mapsy.ai.dto.AiCallbackRequest; +import kr.suhsaechan.mapsy.ai.dto.AiCallbackResponse; +import kr.suhsaechan.mapsy.common.constant.ContentStatus; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.place.constant.PlacePlatform; +import kr.suhsaechan.mapsy.place.constant.PlaceSavedStatus; +import kr.suhsaechan.mapsy.place.dto.GooglePlaceSearchDto; +import kr.suhsaechan.mapsy.place.entity.MemberPlace; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.place.entity.PlacePlatformReference; +import kr.suhsaechan.mapsy.place.repository.MemberPlaceRepository; +import kr.suhsaechan.mapsy.place.repository.PlacePlatformReferenceRepository; +import kr.suhsaechan.mapsy.place.repository.PlaceRepository; +import kr.suhsaechan.mapsy.place.service.PlaceSearchService; +import kr.suhsaechan.mapsy.sns.entity.Content; +import kr.suhsaechan.mapsy.sns.entity.ContentMember; +import kr.suhsaechan.mapsy.sns.entity.ContentPlace; +import kr.suhsaechan.mapsy.sns.repository.ContentMemberRepository; +import kr.suhsaechan.mapsy.sns.repository.ContentPlaceRepository; +import kr.suhsaechan.mapsy.sns.repository.ContentRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; -import kr.suhsaechan.mapsee.member.service.FcmService; +import kr.suhsaechan.mapsy.member.service.FcmService; // AI 서버 Webhook Callback 처리 @Service @@ -247,7 +247,7 @@ private void updateContentWithContentInfo(Content content, AiCallbackRequest req // platform 업데이트 (null이 아닐 때만) if (contentInfo.getPlatform() != null) { try { - content.setPlatform(kr.suhsaechan.mapsee.sns.constant.ContentPlatform.valueOf(contentInfo.getPlatform())); + content.setPlatform(kr.suhsaechan.mapsy.sns.constant.ContentPlatform.valueOf(contentInfo.getPlatform())); } catch (IllegalArgumentException e) { log.error("Invalid platform value: {}. Keeping existing platform for contentId={}", contentInfo.getPlatform(), content.getId()); diff --git a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/service/ContentService.java b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/service/ContentService.java similarity index 91% rename from MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/service/ContentService.java rename to MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/service/ContentService.java index 9880e7c..b5b47a9 100644 --- a/MS-SNS/src/main/java/kr/suhsaechan/mapsee/sns/service/ContentService.java +++ b/MS-SNS/src/main/java/kr/suhsaechan/mapsy/sns/service/ContentService.java @@ -1,23 +1,23 @@ -package kr.suhsaechan.mapsee.sns.service; - -import kr.suhsaechan.mapsee.ai.dto.PlaceExtractionResponse; -import kr.suhsaechan.mapsee.place.entity.Place; -import kr.suhsaechan.mapsee.sns.dto.*; -import kr.suhsaechan.mapsee.ai.service.AiServerService; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.common.constant.ContentStatus; -import kr.suhsaechan.mapsee.common.util.CommonUtil; -import kr.suhsaechan.mapsee.member.entity.Member; -import kr.suhsaechan.mapsee.member.repository.MemberRepository; -import kr.suhsaechan.mapsee.place.dto.PlaceDto; -import kr.suhsaechan.mapsee.sns.dto.ContentDto; -import kr.suhsaechan.mapsee.sns.entity.Content; -import kr.suhsaechan.mapsee.sns.entity.ContentMember; -import kr.suhsaechan.mapsee.sns.entity.ContentPlace; -import kr.suhsaechan.mapsee.sns.repository.ContentMemberRepository; -import kr.suhsaechan.mapsee.sns.repository.ContentPlaceRepository; -import kr.suhsaechan.mapsee.sns.repository.ContentRepository; +package kr.suhsaechan.mapsy.sns.service; + +import kr.suhsaechan.mapsy.ai.dto.PlaceExtractionResponse; +import kr.suhsaechan.mapsy.place.entity.Place; +import kr.suhsaechan.mapsy.sns.dto.*; +import kr.suhsaechan.mapsy.ai.service.AiServerService; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.constant.ContentStatus; +import kr.suhsaechan.mapsy.common.util.CommonUtil; +import kr.suhsaechan.mapsy.member.entity.Member; +import kr.suhsaechan.mapsy.member.repository.MemberRepository; +import kr.suhsaechan.mapsy.place.dto.PlaceDto; +import kr.suhsaechan.mapsy.sns.dto.ContentDto; +import kr.suhsaechan.mapsy.sns.entity.Content; +import kr.suhsaechan.mapsy.sns.entity.ContentMember; +import kr.suhsaechan.mapsy.sns.entity.ContentPlace; +import kr.suhsaechan.mapsy.sns.repository.ContentMemberRepository; +import kr.suhsaechan.mapsy.sns.repository.ContentPlaceRepository; +import kr.suhsaechan.mapsy.sns.repository.ContentRepository; import java.util.Collections; import java.util.List; import java.util.Optional; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/MapseeApplication.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/MapsyApplication.java similarity index 60% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/MapseeApplication.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/MapsyApplication.java index b024e8d..2222c22 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/MapseeApplication.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/MapsyApplication.java @@ -1,12 +1,12 @@ -package kr.suhsaechan.mapsee.web; +package kr.suhsaechan.mapsy.web; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class MapseeApplication { +public class MapsyApplication { public static void main(String[] args) { - SpringApplication.run(MapseeApplication.class, args); + SpringApplication.run(MapsyApplication.class, args); } } diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/ComponentScanConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/ComponentScanConfig.java similarity index 74% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/ComponentScanConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/ComponentScanConfig.java index 46b41c9..bf5a3a3 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/ComponentScanConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/ComponentScanConfig.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ * 컴포넌트 스캔 설정 모든 모듈의 패키지를 스캔하여 Bean으로 등록 */ @Configuration -@ComponentScan(basePackages = "kr.suhsaechan.mapsee") +@ComponentScan(basePackages = "kr.suhsaechan.mapsy") public class ComponentScanConfig { } diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/FirebaseConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/FirebaseConfig.java similarity index 97% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/FirebaseConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/FirebaseConfig.java index 16173af..452e8c6 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/FirebaseConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/FirebaseConfig.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import com.google.auth.oauth2.GoogleCredentials; import com.google.firebase.FirebaseApp; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/FlywayConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/FlywayConfig.java similarity index 97% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/FlywayConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/FlywayConfig.java index 3839a0f..df71195 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/FlywayConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/FlywayConfig.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import org.flywaydb.core.api.callback.Callback; import org.flywaydb.core.api.callback.Context; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/JpaConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/JpaConfig.java similarity index 69% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/JpaConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/JpaConfig.java index 8551218..3753c1e 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/JpaConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/JpaConfig.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.context.annotation.Configuration; @@ -7,8 +7,8 @@ @Configuration @EnableJpaAuditing -@EnableJpaRepositories(basePackages = "kr.suhsaechan.mapsee") -@EntityScan(basePackages = "kr.suhsaechan.mapsee") +@EnableJpaRepositories(basePackages = "kr.suhsaechan.mapsy") +@EntityScan(basePackages = "kr.suhsaechan.mapsy") public class JpaConfig { } diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/OkHttpConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/OkHttpConfig.java similarity index 97% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/OkHttpConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/OkHttpConfig.java index f4a05ef..d360b3a 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/OkHttpConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/OkHttpConfig.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import okhttp3.Cookie; import okhttp3.CookieJar; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/P6SpyConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/P6SpyConfig.java similarity index 81% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/P6SpyConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/P6SpyConfig.java index 1ce7723..f88196f 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/P6SpyConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/P6SpyConfig.java @@ -1,7 +1,7 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import com.p6spy.engine.spy.P6SpyOptions; -import kr.suhsaechan.mapsee.common.util.CustomP6SpyFormatter; +import kr.suhsaechan.mapsy.common.util.CustomP6SpyFormatter; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/RedisConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/RedisConfig.java similarity index 97% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/RedisConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/RedisConfig.java index 5a3a3f1..c8b91b8 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/RedisConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/RedisConfig.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/SecurityConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/SecurityConfig.java similarity index 92% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/SecurityConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/SecurityConfig.java index a0bec9a..6b81219 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/SecurityConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/SecurityConfig.java @@ -1,9 +1,9 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; -import kr.suhsaechan.mapsee.auth.constant.SecurityUrl; -import kr.suhsaechan.mapsee.auth.filter.TokenAuthenticationFilter; -import kr.suhsaechan.mapsee.auth.jwt.JwtUtil; -import kr.suhsaechan.mapsee.auth.service.CustomUserDetailsService; +import kr.suhsaechan.mapsy.auth.constant.SecurityUrl; +import kr.suhsaechan.mapsy.auth.filter.TokenAuthenticationFilter; +import kr.suhsaechan.mapsy.auth.jwt.JwtUtil; +import kr.suhsaechan.mapsy.auth.service.CustomUserDetailsService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/SwaggerConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/SwaggerConfig.java similarity index 95% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/SwaggerConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/SwaggerConfig.java index a2c8352..296fcdd 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/SwaggerConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/SwaggerConfig.java @@ -1,6 +1,6 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; -import kr.suhsaechan.mapsee.common.properties.SpringDocProperties; +import kr.suhsaechan.mapsy.common.properties.SpringDocProperties; import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/WebClientConfig.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/WebClientConfig.java similarity index 97% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/WebClientConfig.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/WebClientConfig.java index 325cbbf..f5e9fe3 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/config/WebClientConfig.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/config/WebClientConfig.java @@ -1,4 +1,4 @@ -package kr.suhsaechan.mapsee.web.config; +package kr.suhsaechan.mapsy.web.config; import io.netty.channel.ChannelOption; import io.netty.handler.timeout.ReadTimeoutHandler; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AiController.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AiController.java similarity index 74% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AiController.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AiController.java index 7625cbb..ea72ec6 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AiController.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AiController.java @@ -1,12 +1,12 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.ai.dto.AiCallbackRequest; -import kr.suhsaechan.mapsee.ai.dto.AiCallbackResponse; -import kr.suhsaechan.mapsee.common.exception.CustomException; -import kr.suhsaechan.mapsee.common.exception.constant.ErrorCode; -import kr.suhsaechan.mapsee.common.properties.AiServerProperties; -import kr.suhsaechan.mapsee.common.util.CommonUtil; -import kr.suhsaechan.mapsee.sns.service.AiCallbackService; +import kr.suhsaechan.mapsy.ai.dto.AiCallbackRequest; +import kr.suhsaechan.mapsy.ai.dto.AiCallbackResponse; +import kr.suhsaechan.mapsy.common.exception.CustomException; +import kr.suhsaechan.mapsy.common.exception.constant.ErrorCode; +import kr.suhsaechan.mapsy.common.properties.AiServerProperties; +import kr.suhsaechan.mapsy.common.util.CommonUtil; +import kr.suhsaechan.mapsy.sns.service.AiCallbackService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AiControllerDocs.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AiControllerDocs.java similarity index 67% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AiControllerDocs.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AiControllerDocs.java index 73123c5..bca4b27 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AiControllerDocs.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AiControllerDocs.java @@ -1,22 +1,19 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.ai.dto.AiCallbackRequest; -import kr.suhsaechan.mapsee.ai.dto.AiCallbackResponse; -import kr.suhsaechan.mapsee.common.constant.Author; +import kr.suhsaechan.mapsy.ai.dto.AiCallbackRequest; +import kr.suhsaechan.mapsy.ai.dto.AiCallbackResponse; +import kr.suhsaechan.mapsy.common.constant.Author; import io.swagger.v3.oas.annotations.Operation; -import me.suhsaechan.suhapilog.annotation.ApiChangeLog; -import me.suhsaechan.suhapilog.annotation.ApiChangeLogs; +import kr.suhsaechan.suhapilog.annotation.ApiLog; import org.springframework.http.ResponseEntity; public interface AiControllerDocs { - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 129, description = "AI 서버 Callback API ContentInfo 파라미터 추가 (contentUrl, platformUploader 필드)"), - @ApiChangeLog(date = "2025.11.18", author = Author.SUHSAECHAN, issueNumber = 83, description = "AI 서버 Callback API ContentInfo 파라미터 추가 (summary 필드)"), - @ApiChangeLog(date = "2025.11.12", author = Author.SUHSAECHAN, issueNumber = 70, description = "명세 변경, 기존 전체정보 > 상호명으로만 받음"), - @ApiChangeLog(date = "2025.11.02", author = Author.KANGJIYUN, issueNumber = 48, description = "AI 서버 Webhook Callback 리팩터링"), - @ApiChangeLog(date = "2025.10.31", author = Author.SUHSAECHAN, issueNumber = 48, description = "AI 서버 Webhook Callback 처리 API 구현"), - }) + @ApiLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 129, description = "AI 서버 Callback API ContentInfo 파라미터 추가 (contentUrl, platformUploader 필드)") + @ApiLog(date = "2025.11.18", author = Author.SUHSAECHAN, issueNumber = 83, description = "AI 서버 Callback API ContentInfo 파라미터 추가 (summary 필드)") + @ApiLog(date = "2025.11.12", author = Author.SUHSAECHAN, issueNumber = 70, description = "명세 변경, 기존 전체정보 > 상호명으로만 받음") + @ApiLog(date = "2025.11.02", author = Author.KANGJIYUN, issueNumber = 48, description = "AI 서버 Webhook Callback 리팩터링") + @ApiLog(date = "2025.10.31", author = Author.SUHSAECHAN, issueNumber = 48, description = "AI 서버 Webhook Callback 처리 API 구현") @Operation(summary = "AI 서버 Webhook Callback", description = """ ## 인증(API Key): **필요** (Header: X-API-Key) diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AuthController.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AuthController.java similarity index 92% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AuthController.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AuthController.java index fdf4e7f..96e0e4d 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AuthController.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AuthController.java @@ -1,8 +1,8 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.auth.dto.*; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.auth.service.AuthService; +import kr.suhsaechan.mapsy.auth.dto.*; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.auth.service.AuthService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AuthControllerDocs.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AuthControllerDocs.java similarity index 83% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AuthControllerDocs.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AuthControllerDocs.java index e9d3588..3fc5386 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/AuthControllerDocs.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/AuthControllerDocs.java @@ -1,19 +1,16 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.auth.dto.*; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.common.constant.Author; +import kr.suhsaechan.mapsy.auth.dto.*; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.common.constant.Author; import io.swagger.v3.oas.annotations.Operation; -import me.suhsaechan.suhapilog.annotation.ApiChangeLog; -import me.suhsaechan.suhapilog.annotation.ApiChangeLogs; +import kr.suhsaechan.suhapilog.annotation.ApiLog; import org.springframework.http.ResponseEntity; public interface AuthControllerDocs { - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 0, description = "FCM 토큰 멀티 디바이스 지원 추가"), - @ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "인증 모듈 추가 및 기본 OAuth 로그인 구현"), - }) + @ApiLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 0, description = "FCM 토큰 멀티 디바이스 지원 추가") + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "인증 모듈 추가 및 기본 OAuth 로그인 구현") @Operation(summary = "소셜 로그인", description = """ ## 인증(JWT): **불필요** @@ -48,9 +45,7 @@ public interface AuthControllerDocs { """) ResponseEntity signIn(SignInRequest request); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "토큰 재발급 기능 구현"), - }) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "토큰 재발급 기능 구현") @Operation(summary = "토큰 재발급", description = """ ## 인증(JWT): **불필요** @@ -74,9 +69,7 @@ public interface AuthControllerDocs { """) ResponseEntity reissue(ReissueRequest request); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "로그아웃 기능 구현"), - }) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "로그아웃 기능 구현") @Operation(summary = "로그아웃", description = """ ## 인증(JWT): **필요** @@ -97,9 +90,7 @@ public interface AuthControllerDocs { """) ResponseEntity logout(CustomUserDetails customUserDetails, String authorization, AuthRequest request); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.19", author = Author.SUHSAECHAN, issueNumber = 91, description = "회원 탈퇴 API 추가") - }) + @ApiLog(date = "2025.11.19", author = Author.SUHSAECHAN, issueNumber = 91, description = "회원 탈퇴 API 추가") @Operation( summary = "회원 탈퇴", description = diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/ContentController.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/ContentController.java similarity index 85% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/ContentController.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/ContentController.java index a44bf75..bf1efa2 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/ContentController.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/ContentController.java @@ -1,15 +1,15 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.place.dto.GetSavedPlacesResponse; -import kr.suhsaechan.mapsee.place.dto.PlaceDto; -import kr.suhsaechan.mapsee.sns.dto.ContentDto; -import kr.suhsaechan.mapsee.sns.dto.GetRecentContentResponse; -import kr.suhsaechan.mapsee.sns.dto.GetContentInfoResponse; -import kr.suhsaechan.mapsee.sns.dto.GetMemberContentPageResponse; -import kr.suhsaechan.mapsee.sns.dto.RequestPlaceExtractionRequest; -import kr.suhsaechan.mapsee.sns.dto.RequestPlaceExtractionResponse; -import kr.suhsaechan.mapsee.sns.service.ContentService; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.place.dto.GetSavedPlacesResponse; +import kr.suhsaechan.mapsy.place.dto.PlaceDto; +import kr.suhsaechan.mapsy.sns.dto.ContentDto; +import kr.suhsaechan.mapsy.sns.dto.GetRecentContentResponse; +import kr.suhsaechan.mapsy.sns.dto.GetContentInfoResponse; +import kr.suhsaechan.mapsy.sns.dto.GetMemberContentPageResponse; +import kr.suhsaechan.mapsy.sns.dto.RequestPlaceExtractionRequest; +import kr.suhsaechan.mapsy.sns.dto.RequestPlaceExtractionResponse; +import kr.suhsaechan.mapsy.sns.service.ContentService; import jakarta.validation.Valid; import java.util.UUID; import java.util.List; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/ContentControllerDocs.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/ContentControllerDocs.java similarity index 80% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/ContentControllerDocs.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/ContentControllerDocs.java index 74201bd..294eccc 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/ContentControllerDocs.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/ContentControllerDocs.java @@ -1,18 +1,17 @@ -package kr.suhsaechan.mapsee.web.controller; - -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.sns.dto.GetContentInfoResponse; -import kr.suhsaechan.mapsee.sns.dto.GetMemberContentPageResponse; -import kr.suhsaechan.mapsee.sns.dto.RequestPlaceExtractionRequest; -import kr.suhsaechan.mapsee.common.constant.Author; -import kr.suhsaechan.mapsee.place.dto.GetSavedPlacesResponse; -import kr.suhsaechan.mapsee.sns.dto.GetRecentContentResponse; -import kr.suhsaechan.mapsee.sns.dto.RequestPlaceExtractionResponse; +package kr.suhsaechan.mapsy.web.controller; + +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.sns.dto.GetContentInfoResponse; +import kr.suhsaechan.mapsy.sns.dto.GetMemberContentPageResponse; +import kr.suhsaechan.mapsy.sns.dto.RequestPlaceExtractionRequest; +import kr.suhsaechan.mapsy.common.constant.Author; +import kr.suhsaechan.mapsy.place.dto.GetSavedPlacesResponse; +import kr.suhsaechan.mapsy.sns.dto.GetRecentContentResponse; +import kr.suhsaechan.mapsy.sns.dto.RequestPlaceExtractionResponse; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; import java.util.UUID; -import me.suhsaechan.suhapilog.annotation.ApiChangeLog; -import me.suhsaechan.suhapilog.annotation.ApiChangeLogs; +import kr.suhsaechan.suhapilog.annotation.ApiLog; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.PathVariable; @@ -21,11 +20,9 @@ public interface ContentControllerDocs { - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.21", author = Author.SUHSAECHAN, issueNumber = 88, description = "ContentController 리팩토링에 따른 DOCS 간소화"), - @ApiChangeLog(date = "2025.11.02", author = Author.KANGJIYUN, issueNumber = 54, description = "콘텐츠 Docs 추가 및 리팩토링"), - @ApiChangeLog(date = "2025.10.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 성별 설정 API 추가") - }) + @ApiLog(date = "2025.11.21", author = Author.SUHSAECHAN, issueNumber = 88, description = "ContentController 리팩토링에 따른 DOCS 간소화") + @ApiLog(date = "2025.11.02", author = Author.KANGJIYUN, issueNumber = 54, description = "콘텐츠 Docs 추가 및 리팩토링") + @ApiLog(date = "2025.10.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 성별 설정 API 추가") @Operation(summary = "SNS URL로 콘텐츠 생성 및 장소 추출 요청", description = """ ## 인증(JWT): **필요** @@ -44,9 +41,7 @@ ResponseEntity requestPlaceExtraction( @AuthenticationPrincipal CustomUserDetails userDetails, @Valid @RequestBody RequestPlaceExtractionRequest request); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 111, description = "단일 SNS 컨텐츠 조회 API 추가") - }) + @ApiLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 111, description = "단일 SNS 컨텐츠 조회 API 추가") @Operation(summary = "단일 SNS 컨텐츠 정보 조회", description = """ ## 인증(JWT): **필요** @@ -78,9 +73,7 @@ ResponseEntity getContentInfo( @AuthenticationPrincipal CustomUserDetails userDetails, @PathVariable UUID contentId); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 112, description = "Member가 소유한 Content 목록 조회 API 추가") - }) + @ApiLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 112, description = "Member가 소유한 Content 목록 조회 API 추가") @Operation(summary = "회원 콘텐츠 목록 조회", description = """ ## 인증(JWT): **필요** @@ -118,9 +111,7 @@ ResponseEntity getMemberContentPage( @RequestParam(required = false, defaultValue = "10") Integer pageSize); - @ApiChangeLogs( - @ApiChangeLog(date = "2025.11.16", author = Author.KANGJIYUN, issueNumber = 78, description = "최근 콘텐츠 조회 Docs 추가 및 리팩토링") - ) + @ApiLog(date = "2025.11.16", author = Author.KANGJIYUN, issueNumber = 78, description = "최근 콘텐츠 조회 Docs 추가 및 리팩토링") @Operation( summary = "최근 SNS 콘텐츠 목록 조회", description = @@ -147,9 +138,7 @@ ResponseEntity getMemberContentPage( """) ResponseEntity getRecentContents(CustomUserDetails userDetails); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.20", author = Author.KANGJIYUN, issueNumber = 80, description = "최신순으로 장소 조회") - }) + @ApiLog(date = "2025.11.20", author = Author.KANGJIYUN, issueNumber = 80, description = "최신순으로 장소 조회") @Operation( summary = "최근 장소 목록 조회", description = diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/InterestController.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/InterestController.java similarity index 77% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/InterestController.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/InterestController.java index 77dccc7..c8223ad 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/InterestController.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/InterestController.java @@ -1,10 +1,10 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.member.constant.InterestCategory; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetAllInterestsResponse; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetInterestByIdResponse; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetInterestsByCategoryResponse; -import kr.suhsaechan.mapsee.member.service.InterestService; +import kr.suhsaechan.mapsy.member.constant.InterestCategory; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetAllInterestsResponse; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetInterestByIdResponse; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetInterestsByCategoryResponse; +import kr.suhsaechan.mapsy.member.service.InterestService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/InterestControllerDocs.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/InterestControllerDocs.java similarity index 58% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/InterestControllerDocs.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/InterestControllerDocs.java index 253f4a6..b29758e 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/InterestControllerDocs.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/InterestControllerDocs.java @@ -1,18 +1,17 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.common.constant.Author; -import kr.suhsaechan.mapsee.member.constant.InterestCategory; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetAllInterestsResponse; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetInterestByIdResponse; -import kr.suhsaechan.mapsee.member.dto.interest.response.GetInterestsByCategoryResponse; +import kr.suhsaechan.mapsy.common.constant.Author; +import kr.suhsaechan.mapsy.member.constant.InterestCategory; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetAllInterestsResponse; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetInterestByIdResponse; +import kr.suhsaechan.mapsy.member.dto.interest.response.GetInterestsByCategoryResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import me.suhsaechan.suhapilog.annotation.ApiChangeLog; -import me.suhsaechan.suhapilog.annotation.ApiChangeLogs; +import kr.suhsaechan.suhapilog.annotation.ApiLog; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -21,24 +20,18 @@ public interface InterestControllerDocs { - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.04", author = Author.SUHSAECHAN, issueNumber = 61, description = "전체 관심사 목록 조회 init"), - }) + @ApiLog(date = "2025.11.04", author = Author.SUHSAECHAN, issueNumber = 61, description = "전체 관심사 목록 조회 init") @Operation(summary = "전체 관심사 목록 조회", description = "13개 대분류 카테고리별로 그룹핑된 전체 관심사 목록을 조회합니다. (Redis 캐싱 적용)") ResponseEntity getAllInterests(); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.04", author = Author.SUHSAECHAN, issueNumber = 61, description = "특정 카테고리 관심사 조회 init"), - }) + @ApiLog(date = "2025.11.04", author = Author.SUHSAECHAN, issueNumber = 61, description = "특정 카테고리 관심사 조회 init") @Operation(summary = "특정 카테고리 관심사 조회", description = "특정 대분류 카테고리의 관심사 목록을 조회합니다.") ResponseEntity getInterestsByCategory( @Parameter(description = "관심사 카테고리 (FOOD, CAFE_DESSERT 등)", required = true) @PathVariable InterestCategory category ); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.04", author = Author.SUHSAECHAN, issueNumber = 61, description = "관심사 상세 조회 init"), - }) + @ApiLog(date = "2025.11.04", author = Author.SUHSAECHAN, issueNumber = 61, description = "관심사 상세 조회 init") @Operation(summary = "관심사 상세 조회", description = "관심사 ID로 특정 관심사의 상세 정보를 조회합니다.") ResponseEntity getInterestById( @Parameter(description = "관심사 ID", required = true) diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/MemberController.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/MemberController.java similarity index 83% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/MemberController.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/MemberController.java index 85b2a0c..0c747fd 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/MemberController.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/MemberController.java @@ -1,18 +1,18 @@ -package kr.suhsaechan.mapsee.web.controller; - -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.member.dto.CheckNameResponse; -import kr.suhsaechan.mapsee.member.dto.InterestDto; -import kr.suhsaechan.mapsee.member.dto.MemberDto; -import kr.suhsaechan.mapsee.member.dto.ProfileUpdateRequest; -import kr.suhsaechan.mapsee.member.dto.UpdateServiceAgreementTermsRequest; -import kr.suhsaechan.mapsee.member.dto.UpdateServiceAgreementTermsResponse; -import kr.suhsaechan.mapsee.member.dto.onboarding.response.OnboardingResponse; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateBirthDateRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateGenderRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateInterestsRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateNameRequest; -import kr.suhsaechan.mapsee.member.service.MemberService; +package kr.suhsaechan.mapsy.web.controller; + +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.member.dto.CheckNameResponse; +import kr.suhsaechan.mapsy.member.dto.InterestDto; +import kr.suhsaechan.mapsy.member.dto.MemberDto; +import kr.suhsaechan.mapsy.member.dto.ProfileUpdateRequest; +import kr.suhsaechan.mapsy.member.dto.UpdateServiceAgreementTermsRequest; +import kr.suhsaechan.mapsy.member.dto.UpdateServiceAgreementTermsResponse; +import kr.suhsaechan.mapsy.member.dto.onboarding.response.OnboardingResponse; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateBirthDateRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateGenderRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateInterestsRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateNameRequest; +import kr.suhsaechan.mapsy.member.service.MemberService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import java.util.UUID; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/MemberControllerDocs.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/MemberControllerDocs.java similarity index 82% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/MemberControllerDocs.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/MemberControllerDocs.java index db806be..d664284 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/MemberControllerDocs.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/MemberControllerDocs.java @@ -1,22 +1,21 @@ -package kr.suhsaechan.mapsee.web.controller; +package kr.suhsaechan.mapsy.web.controller; -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.common.constant.Author; -import kr.suhsaechan.mapsee.member.dto.CheckNameResponse; -import kr.suhsaechan.mapsee.member.dto.InterestDto; -import kr.suhsaechan.mapsee.member.dto.MemberDto; -import kr.suhsaechan.mapsee.member.dto.ProfileUpdateRequest; -import kr.suhsaechan.mapsee.member.dto.UpdateServiceAgreementTermsRequest; -import kr.suhsaechan.mapsee.member.dto.UpdateServiceAgreementTermsResponse; -import kr.suhsaechan.mapsee.member.dto.onboarding.response.OnboardingResponse; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateBirthDateRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateGenderRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateInterestsRequest; -import kr.suhsaechan.mapsee.member.dto.onboarding.request.UpdateNameRequest; +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.common.constant.Author; +import kr.suhsaechan.mapsy.member.dto.CheckNameResponse; +import kr.suhsaechan.mapsy.member.dto.InterestDto; +import kr.suhsaechan.mapsy.member.dto.MemberDto; +import kr.suhsaechan.mapsy.member.dto.ProfileUpdateRequest; +import kr.suhsaechan.mapsy.member.dto.UpdateServiceAgreementTermsRequest; +import kr.suhsaechan.mapsy.member.dto.UpdateServiceAgreementTermsResponse; +import kr.suhsaechan.mapsy.member.dto.onboarding.response.OnboardingResponse; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateBirthDateRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateGenderRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateInterestsRequest; +import kr.suhsaechan.mapsy.member.dto.onboarding.request.UpdateNameRequest; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; -import me.suhsaechan.suhapilog.annotation.ApiChangeLog; -import me.suhsaechan.suhapilog.annotation.ApiChangeLogs; +import kr.suhsaechan.suhapilog.annotation.ApiLog; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.RequestParam; @@ -26,9 +25,7 @@ public interface MemberControllerDocs { - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화"), - }) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화") @Operation(summary = "회원 생성", description = """ ## 인증(JWT): **불필요** @@ -61,9 +58,7 @@ public interface MemberControllerDocs { """) ResponseEntity createMember(MemberDto memberDto); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 약관 동의 API 추가"), - }) + @ApiLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 약관 동의 API 추가") @Operation(summary = "약관 동의", description = """ ## 인증(JWT): **필요** @@ -89,9 +84,7 @@ ResponseEntity agreeMemberTerms( @AuthenticationPrincipal CustomUserDetails userDetails, @Valid UpdateServiceAgreementTermsRequest request); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 이름 설정 API 추가"), - }) + @ApiLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 이름 설정 API 추가") @Operation(summary = "이름 설정", description = """ ## 인증(JWT): **필요** @@ -114,7 +107,7 @@ ResponseEntity updateName( @AuthenticationPrincipal CustomUserDetails userDetails, @Valid UpdateNameRequest request); - @ApiChangeLogs({@ApiChangeLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 생년월일 설정 API 추가")}) + @ApiLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 생년월일 설정 API 추가") @Operation(summary = "생년월일 설정", description = """ ## 인증(JWT): **필요** @@ -137,9 +130,7 @@ ResponseEntity updateBirthDate( @AuthenticationPrincipal CustomUserDetails userDetails, @Valid UpdateBirthDateRequest request); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 성별 설정 API 추가"), - }) + @ApiLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 성별 설정 API 추가") @Operation(summary = "성별 설정", description = """ ## 인증(JWT): **필요** @@ -162,9 +153,7 @@ ResponseEntity updateGender( @AuthenticationPrincipal CustomUserDetails userDetails, @Valid UpdateGenderRequest request); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 관심사 설정 API 추가"), - }) + @ApiLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 22, description = "온보딩 관심사 설정 API 추가") @Operation(summary = "관심사 설정", description = """ ## 인증(JWT): **필요** @@ -189,7 +178,7 @@ ResponseEntity updateInterests( @AuthenticationPrincipal CustomUserDetails userDetails, @Valid UpdateInterestsRequest request); - @ApiChangeLogs({@ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화")}) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화") @Operation(summary = "전체 회원 목록 조회", description = """ ## 인증(JWT): **불필요** @@ -209,9 +198,7 @@ ResponseEntity updateInterests( """) ResponseEntity> getAllMembers(); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화"), - }) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화") @Operation(summary = "회원 단건 조회 (ID)", description = """ ## 인증(JWT): **불필요** @@ -239,7 +226,7 @@ ResponseEntity updateInterests( """) ResponseEntity getMemberById(UUID memberId); - @ApiChangeLogs({@ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화")}) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화") @Operation(summary = "회원 단건 조회 (Email)", description = """ ## 인증(JWT): **불필요** @@ -267,9 +254,7 @@ ResponseEntity updateInterests( """) ResponseEntity getMemberByEmail(String email); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화"), - }) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화") @Operation(summary = "회원 프로필 설정(수정)", description = """ ## 인증(JWT): **필요** @@ -301,7 +286,7 @@ ResponseEntity updateProfile( @AuthenticationPrincipal CustomUserDetails userDetails, @Valid ProfileUpdateRequest request); - @ApiChangeLogs({@ApiChangeLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화")}) + @ApiLog(date = "2025.10.16", author = Author.SUHSAECHAN, issueNumber = 22, description = "회원 관리 API 문서화") @Operation(summary = "회원 관심사 조회 (ID)", description = """ ## 인증(JWT): **불필요** @@ -321,9 +306,7 @@ ResponseEntity updateProfile( """) ResponseEntity> getInterestsByMemberId(UUID memberId); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 106, description = "닉네임 중복 확인 API 추가"), - }) + @ApiLog(date = "2025.11.23", author = Author.SUHSAECHAN, issueNumber = 106, description = "닉네임 중복 확인 API 추가") @Operation(summary = "닉네임 중복 확인", description = """ ## 인증(JWT): **불필요** diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/PlaceController.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/PlaceController.java similarity index 88% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/PlaceController.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/PlaceController.java index e7ed889..596250a 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/PlaceController.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/PlaceController.java @@ -1,12 +1,12 @@ -package kr.suhsaechan.mapsee.web.controller; - -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.place.dto.GetSavedPlacesResponse; -import kr.suhsaechan.mapsee.place.dto.GetTemporaryPlacesResponse; -import kr.suhsaechan.mapsee.place.dto.PlaceDetailDto; -import kr.suhsaechan.mapsee.place.dto.SavePlaceResponse; -import kr.suhsaechan.mapsee.place.service.MemberPlaceService; -import kr.suhsaechan.mapsee.place.service.PlaceService; +package kr.suhsaechan.mapsy.web.controller; + +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.place.dto.GetSavedPlacesResponse; +import kr.suhsaechan.mapsy.place.dto.GetTemporaryPlacesResponse; +import kr.suhsaechan.mapsy.place.dto.PlaceDetailDto; +import kr.suhsaechan.mapsy.place.dto.SavePlaceResponse; +import kr.suhsaechan.mapsy.place.service.MemberPlaceService; +import kr.suhsaechan.mapsy.place.service.PlaceService; import java.util.UUID; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/PlaceControllerDocs.java b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/PlaceControllerDocs.java similarity index 79% rename from MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/PlaceControllerDocs.java rename to MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/PlaceControllerDocs.java index 085b7f9..52bd75b 100644 --- a/MS-Web/src/main/java/kr/suhsaechan/mapsee/web/controller/PlaceControllerDocs.java +++ b/MS-Web/src/main/java/kr/suhsaechan/mapsy/web/controller/PlaceControllerDocs.java @@ -1,22 +1,19 @@ -package kr.suhsaechan.mapsee.web.controller; - -import kr.suhsaechan.mapsee.auth.dto.CustomUserDetails; -import kr.suhsaechan.mapsee.common.constant.Author; -import kr.suhsaechan.mapsee.place.dto.GetSavedPlacesResponse; -import kr.suhsaechan.mapsee.place.dto.GetTemporaryPlacesResponse; -import kr.suhsaechan.mapsee.place.dto.PlaceDetailDto; -import kr.suhsaechan.mapsee.place.dto.SavePlaceResponse; +package kr.suhsaechan.mapsy.web.controller; + +import kr.suhsaechan.mapsy.auth.dto.CustomUserDetails; +import kr.suhsaechan.mapsy.common.constant.Author; +import kr.suhsaechan.mapsy.place.dto.GetSavedPlacesResponse; +import kr.suhsaechan.mapsy.place.dto.GetTemporaryPlacesResponse; +import kr.suhsaechan.mapsy.place.dto.PlaceDetailDto; +import kr.suhsaechan.mapsy.place.dto.SavePlaceResponse; import io.swagger.v3.oas.annotations.Operation; import java.util.UUID; -import me.suhsaechan.suhapilog.annotation.ApiChangeLog; -import me.suhsaechan.suhapilog.annotation.ApiChangeLogs; +import kr.suhsaechan.suhapilog.annotation.ApiLog; import org.springframework.http.ResponseEntity; public interface PlaceControllerDocs { - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.10.25", author = Author.SUHSAECHAN, issueNumber = 36, description = "장소 상세 정보 조회 API 추가"), - }) + @ApiLog(date = "2025.10.25", author = Author.SUHSAECHAN, issueNumber = 36, description = "장소 상세 정보 조회 API 추가") @Operation(summary = "장소 세부정보 조회", description = """ ## 인증(JWT): **필요** @@ -55,9 +52,7 @@ ResponseEntity getPlaceDetail( UUID placeId ); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "임시 저장 장소 목록 조회 API 추가"), - }) + @ApiLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "임시 저장 장소 목록 조회 API 추가") @Operation(summary = "임시 저장 장소 목록 조회", description = """ ## 인증(JWT): **필요** @@ -82,10 +77,8 @@ ResponseEntity getTemporaryPlaces( CustomUserDetails userDetails ); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 129, description = "저장한 장소 목록 조회 API 응답에 userRatingsTotal 필드 추가"), - @ApiChangeLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "저장한 장소 목록 조회 API 추가"), - }) + @ApiLog(date = "2025.01.15", author = Author.SUHSAECHAN, issueNumber = 129, description = "저장한 장소 목록 조회 API 응답에 userRatingsTotal 필드 추가") + @ApiLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "저장한 장소 목록 조회 API 추가") @Operation(summary = "저장한 장소 목록 조회", description = """ ## 인증(JWT): **필요** @@ -111,9 +104,7 @@ ResponseEntity getSavedPlaces( CustomUserDetails userDetails ); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "장소 저장 API 추가"), - }) + @ApiLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "장소 저장 API 추가") @Operation(summary = "장소 저장", description = """ ## 인증(JWT): **필요** @@ -140,9 +131,7 @@ ResponseEntity savePlace( UUID placeId ); - @ApiChangeLogs({ - @ApiChangeLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "임시 저장 장소 삭제 API 추가"), - }) + @ApiLog(date = "2025.11.24", author = Author.SUHSAECHAN, issueNumber = 103, description = "임시 저장 장소 삭제 API 추가") @Operation(summary = "임시 저장 장소 삭제", description = """ ## 인증(JWT): **필요** diff --git a/MS-Web/src/main/resources/application.yml b/MS-Web/src/main/resources/application.yml index a020b39..8546909 100644 --- a/MS-Web/src/main/resources/application.yml +++ b/MS-Web/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: application: - name: mapsee + name: mapsy profiles: active: prod flyway: @@ -30,7 +30,7 @@ decorator: # Swagger/OpenAPI 설정 springdoc: servers: - - url: https://api.mapsee.suhsaechan.kr + - url: https://api.mapsy.suhsaechan.kr description: main-server - url: http://localhost:8080 description: local-server @@ -44,7 +44,7 @@ springdoc: operations-sorter: alpha try-it-out-enabled: true filter: true - packages-to-scan: kr.suhsaechan.mapsee + packages-to-scan: kr.suhsaechan.mapsy paths-to-match: /api/** default-consumes-media-type: application/json;charset=UTF-8 default-produces-media-type: application/json;charset=UTF-8 @@ -52,11 +52,11 @@ springdoc: # GitHub Issue 연동 suhapilog: github: - base-url: https://github.com/suhsaechan/MapSee-BE/issues/ + base-url: https://github.com/MapSee-Lab/MapSy-BE/issues/ firebase: credentials: - path: mapsee-fcm.json + path: mapsy-fcm.json suh-logger: # 전체 로깅 활성화 여부 diff --git a/MS-Web/src/test/java/kr/suhsaechan/mapsee/web/MapseeApplicationTests.java b/MS-Web/src/test/java/kr/suhsaechan/mapsy/web/MapsyApplicationTests.java similarity index 70% rename from MS-Web/src/test/java/kr/suhsaechan/mapsee/web/MapseeApplicationTests.java rename to MS-Web/src/test/java/kr/suhsaechan/mapsy/web/MapsyApplicationTests.java index a662adf..a1e5636 100644 --- a/MS-Web/src/test/java/kr/suhsaechan/mapsee/web/MapseeApplicationTests.java +++ b/MS-Web/src/test/java/kr/suhsaechan/mapsy/web/MapsyApplicationTests.java @@ -1,10 +1,10 @@ -package kr.suhsaechan.mapsee.web; +package kr.suhsaechan.mapsy.web; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class MapseeApplicationTests { +class MapsyApplicationTests { @Test void contextLoads() { diff --git a/README.md b/README.md index 125483a..f721e24 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MapSee-BE +# MapSy-BE diff --git a/build.gradle b/build.gradle index 262a113..ec18ab9 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ bootJar { } allprojects { - group = 'kr.suhsaechan.mapsee' + group = 'kr.suhsaechan.mapsy' version = '0.1.6' repositories { diff --git a/docs/SuhLogger-SpringBoot4-Compatibility-Report.md b/docs/SuhLogger-SpringBoot4-Compatibility-Report.md new file mode 100644 index 0000000..5047e51 --- /dev/null +++ b/docs/SuhLogger-SpringBoot4-Compatibility-Report.md @@ -0,0 +1,355 @@ +# SuhLogger 라이브러리 Spring Boot 3.x/4.x 호환성 문제 보고서 + +## 1. 문제 요약 + +### 발생 오류 +``` +org.springframework.beans.factory.BeanDefinitionStoreException: +Failed to process import candidates for configuration class +[me.suhsaechan.suhlogger.config.SuhLoggerAutoConfiguration] + +Caused by: java.lang.ClassNotFoundException: +org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration +``` + +### 영향 범위 +- **라이브러리**: `me.suhsaechan:suh-logger:1.3.11` +- **영향받는 환경**: Spring Boot 4.0.1 + Spring Framework 7.0.2 +- **정상 동작 환경**: Spring Boot 3.x + +--- + +## 2. 근본 원인 분석 + +### Spring Boot 4.x의 모듈화 (Modularization) + +Spring Boot 4.0은 `spring-boot-autoconfigure` JAR을 작은 모듈로 분할하는 **획기적인 구조 변경**을 도입했습니다. + +#### 변경 전 (Spring Boot 3.x) +``` +spring-boot-autoconfigure (단일 JAR, ~2MB) +└── org.springframework.boot.autoconfigure.security.servlet + └── SecurityAutoConfiguration.class ✅ 존재 +``` + +#### 변경 후 (Spring Boot 4.x) +``` +spring-boot-autoconfigure (기본 JAR) +├── org.springframework.boot.autoconfigure (코어만 포함) + +spring-boot-security (별도 모듈) +└── org.springframework.boot.security + └── autoconfigure + └── SecurityAutoConfiguration.class ✅ 여기로 이동 +``` + +### 패키지 경로 변경 + +| 버전 | SecurityAutoConfiguration 패키지 경로 | +|------|----------------------------------------| +| Spring Boot 3.x | `org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration` | +| Spring Boot 4.x | `org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration` | + +--- + +## 3. SuhLogger 라이브러리 수정 필요 사항 + +### 3.1 현재 문제가 되는 코드 (추정) + +SuhLogger의 `SuhLoggerAutoConfiguration` 클래스에서 다음과 같은 코드가 있을 것으로 추정: + +```java +// ❌ Spring Boot 3.x 전용 - 4.x에서 ClassNotFoundException 발생 +@AutoConfiguration(before = SecurityAutoConfiguration.class) +// 또는 +@ConditionalOnClass(name = "org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration") +``` + +### 3.2 수정 방안 + +#### 방안 A: 조건부 클래스 로딩 (권장) + +```java +@AutoConfiguration +@ConditionalOnClass(name = { + "org.springframework.security.core.Authentication" // 공통 클래스 사용 +}) +public class SuhLoggerAutoConfiguration { + // ... +} +``` + +#### 방안 B: 버전별 분기 처리 + +```java +@AutoConfiguration +public class SuhLoggerAutoConfiguration { + + // Spring Boot 버전 감지 + private static final boolean IS_SPRING_BOOT_4 = isSpringBoot4OrLater(); + + private static boolean isSpringBoot4OrLater() { + try { + // Spring Boot 4.x 모듈화된 클래스 확인 + Class.forName("org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } +} +``` + +#### 방안 C: 멀티 모듈 빌드 (가장 깔끔) + +``` +suh-logger/ +├── suh-logger-core/ # 핵심 로직 (Spring 버전 무관) +├── suh-logger-spring-boot-3/ # Spring Boot 3.x 자동 설정 +└── suh-logger-spring-boot-4/ # Spring Boot 4.x 자동 설정 +``` + +### 3.3 META-INF 설정 파일 수정 + +#### Spring Boot 3.x (spring.factories) +```properties +# META-INF/spring.factories +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +me.suhsaechan.suhlogger.config.SuhLoggerAutoConfiguration +``` + +#### Spring Boot 4.x (AutoConfiguration.imports) +``` +# META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +me.suhsaechan.suhlogger.config.SuhLoggerAutoConfiguration +``` + +**호환성 유지**: 두 파일 모두 유지하면 Spring Boot 3.x와 4.x 모두 지원 가능 + +--- + +## 4. 상세 수정 가이드 + +### 4.1 build.gradle 수정 + +```gradle +plugins { + id 'java-library' + id 'maven-publish' +} + +// Spring Boot 3.x와 4.x 모두 지원하기 위한 의존성 설정 +dependencies { + // 공통 Spring 의존성 (컴파일 전용) + compileOnly 'org.springframework.boot:spring-boot-autoconfigure' + compileOnly 'org.springframework.security:spring-security-core' + + // Spring Boot 버전에 따라 선택적으로 로드됨 + compileOnly 'org.springframework.boot:spring-boot-security' // 4.x용 + + // 테스트 + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +// 버전 범위 지정 +ext { + springBootVersionRange = '[3.0.0, 5.0.0)' // 3.x ~ 4.x 지원 +} +``` + +### 4.2 AutoConfiguration 클래스 수정 + +```java +package me.suhsaechan.suhlogger.config; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; + +/** + * SuhLogger 자동 설정 + * Spring Boot 3.x 및 4.x 모두 지원 + */ +@AutoConfiguration +@ConditionalOnClass(name = "org.springframework.security.core.Authentication") +public class SuhLoggerAutoConfiguration { + + @Bean + @ConditionalOnMissingBean + public SuhLoggerConfigurer suhLoggerConfigurer() { + return new SuhLoggerConfigurer(); + } + + // SecurityAutoConfiguration 직접 참조 제거 + // 대신 Spring Security 공통 클래스 사용 +} +``` + +### 4.3 조건부 Security 설정 (필요시) + +```java +package me.suhsaechan.suhlogger.config; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.context.annotation.Configuration; + +/** + * Security 관련 로깅 설정 + * Spring Security가 있을 때만 활성화 + */ +@Configuration +@ConditionalOnClass(name = "org.springframework.security.core.context.SecurityContextHolder") +public class SuhLoggerSecurityConfig { + + // Spring Boot 버전과 무관하게 동작하는 Security 로깅 설정 + // SecurityAutoConfiguration을 직접 참조하지 않음 +} +``` + +--- + +## 5. Spring Boot 3.x vs 4.x 주요 API 변경 요약 + +### 5.1 Security 관련 변경 + +| 항목 | Spring Boot 3.x | Spring Boot 4.x | +|------|-----------------|-----------------| +| SecurityAutoConfiguration 패키지 | `o.s.b.autoconfigure.security.servlet` | `o.s.b.security.autoconfigure` | +| WebSecurityConfigurerAdapter | Deprecated | **제거됨** | +| authorizeRequests() | Deprecated | **제거됨** | +| authorizeHttpRequests() | 권장 | 필수 | +| and() 메서드 | 사용 가능 | **제거됨** (Lambda DSL 필수) | + +### 5.2 모듈 의존성 변경 + +```gradle +// Spring Boot 3.x +implementation 'org.springframework.boot:spring-boot-starter-security' + +// Spring Boot 4.x (추가 필요시) +implementation 'org.springframework.boot:spring-boot-starter-security' +implementation 'org.springframework.boot:spring-boot-security' // 자동 설정 모듈 +``` + +--- + +## 6. 테스트 전략 + +### 6.1 멀티 버전 테스트 설정 + +```gradle +// build.gradle +test { + useJUnitPlatform() +} + +// Spring Boot 3.x 테스트 +task testSpringBoot3(type: Test) { + systemProperty 'spring.boot.version', '3.4.0' +} + +// Spring Boot 4.x 테스트 +task testSpringBoot4(type: Test) { + systemProperty 'spring.boot.version', '4.0.1' +} +``` + +### 6.2 호환성 테스트 코드 + +```java +@SpringBootTest +class SuhLoggerCompatibilityTest { + + @Test + void contextLoads() { + // Spring Boot 버전에 관계없이 컨텍스트 로드 성공 확인 + } + + @Test + void suhLoggerAutoConfigurationLoaded() { + // SuhLoggerAutoConfiguration 빈 존재 확인 + } +} +``` + +--- + +## 7. 마이그레이션 체크리스트 + +### SuhLogger 라이브러리 개발자용 + +- [ ] `SecurityAutoConfiguration` 직접 import 제거 +- [ ] 공통 Spring Security 클래스 사용으로 변경 (`Authentication`, `SecurityContextHolder` 등) +- [ ] `META-INF/spring.factories` 유지 (Spring Boot 3.x 호환) +- [ ] `META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports` 추가 (Spring Boot 4.x) +- [ ] 멀티 버전 테스트 추가 +- [ ] 버전 번호 업데이트 (예: 1.3.11 → 1.4.0 또는 2.0.0) +- [ ] CHANGELOG 업데이트 +- [ ] Nexus 저장소에 새 버전 배포 + +### SuhLogger 사용자용 (MapSy-BE) + +- [ ] SuhLogger 버전 업데이트 (호환 버전 배포 후) +- [ ] 또는 임시로 SuhLogger 의존성 제거 +- [ ] Spring Boot 4.x 마이그레이션 가이드 확인 +- [ ] `spring-boot-starter-security-test` 의존성 추가 (테스트용) + +--- + +## 8. 임시 해결 방안 (MapSy-BE) + +SuhLogger 라이브러리 업데이트 전까지 사용할 수 있는 임시 방안: + +### 방안 1: SuhLogger 제외 + +```gradle +// MS-Common/build.gradle +// 임시로 주석 처리 +// api "me.suhsaechan:suh-logger:1.3.11" +// api "me.suhsaechan:suh-api-log:1.1.5" +``` + +### 방안 2: Spring Boot 다운그레이드 + +```gradle +// 루트 build.gradle +plugins { + id 'org.springframework.boot' version '3.4.0' // 4.0.1 → 3.4.0 +} +``` + +### 방안 3: classic autoconfigure 모듈 추가 (실험적) + +```gradle +// Spring Boot 4.x에서 레거시 호환성 모듈 추가 +implementation 'org.springframework.boot:spring-boot-autoconfigure-classic' +``` + +--- + +## 9. 참고 자료 + +- [Spring Boot 4.0 Migration Guide](https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.0-Migration-Guide) +- [Modularizing Spring Boot (공식 블로그)](https://spring.io/blog/2025/10/28/modularizing-spring-boot/) +- [Spring Boot 4 Modularization Fix](https://www.danvega.dev/blog/2025/12/12/spring-boot-4-modularization) +- [Spring Security Migration to 7.0](https://docs.spring.io/spring-security/reference/migration/index.html) +- [Spring Boot Security Auto-Configuration | Baeldung](https://www.baeldung.com/spring-boot-security-autoconfiguration) + +--- + +## 10. 결론 + +**핵심 문제**: SuhLogger 1.3.11이 Spring Boot 3.x 전용 패키지 경로(`org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration`)를 하드코딩하고 있음 + +**해결책**: SuhLogger 라이브러리에서 `SecurityAutoConfiguration` 직접 참조를 제거하고, 버전 무관한 공통 Spring Security 클래스 사용으로 변경 + +**권장 버전 정책**: +- SuhLogger 1.x: Spring Boot 3.x 전용 +- SuhLogger 2.x: Spring Boot 3.x + 4.x 모두 지원 + +--- + +*작성일: 2026-01-18* +*대상 프로젝트: MapSy-BE* +*관련 라이브러리: me.suhsaechan:suh-logger:1.3.11* diff --git a/settings.gradle b/settings.gradle index 8d01661..f460c22 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } -rootProject.name = 'mapsee' +rootProject.name = 'mapsy' include 'MS-Common' include 'MS-Auth' From d6d03d7be0d133bd74565851b11b341c579171b5 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 15:22:43 +0000 Subject: [PATCH 13/14] =?UTF-8?q?MapSy-BE=20=EB=B2=84=EC=A0=84=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EA=B4=80=EB=A6=AC:=20chore:=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=200.1.8=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- version.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index f05d692..4dbd3c6 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ bootJar { allprojects { group = 'kr.suhsaechan.mapsy' - version = '0.1.7' + version = '0.1.8' repositories { mavenCentral() diff --git a/version.yml b/version.yml index 2b45b5f..bce5a1f 100644 --- a/version.yml +++ b/version.yml @@ -34,11 +34,11 @@ # - 버전은 항상 높은 버전으로 자동 동기화됩니다 # =================================================================== -version: "0.1.7" -version_code: 11 # app build number +version: "0.1.8" +version_code: 12 # app build number project_type: "spring" # spring, flutter, next, react, react-native, react-native-expo, node, python, basic metadata: - last_updated: "2026-01-18 13:54:50" + last_updated: "2026-01-18 15:22:42" last_updated_by: "Cassiiopeia" default_branch: "main" integrated_from: "SUH-DEVOPS-TEMPLATE" From 024bd91a1e56622ce3554b49201c8479b228bd81 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 18 Jan 2026 15:29:36 +0000 Subject: [PATCH 14/14] =?UTF-8?q?MapSy-BE=20=EB=B2=84=EC=A0=84=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20:=20docs=20:=20v0.1.8=20=EB=A6=B4=EB=A6=AC=EC=A6=88?= =?UTF-8?q?=20=EB=AC=B8=EC=84=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?(PR=20#5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.json | 24 +++++++++++++++++++++--- CHANGELOG.md | 15 +++++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.json b/CHANGELOG.json index beabf12..fefad9a 100644 --- a/CHANGELOG.json +++ b/CHANGELOG.json @@ -1,11 +1,29 @@ { "metadata": { - "lastUpdated": "2026-01-18T05:00:21Z", - "currentVersion": "0.1.2", + "lastUpdated": "2026-01-18T15:29:36Z", + "currentVersion": "0.1.8", "projectType": "spring", - "totalReleases": 2 + "totalReleases": 3 }, "releases": [ + { + "version": "0.1.8", + "project_type": "spring", + "date": "2026-01-18", + "pr_number": 5, + "raw_summary": "## Summary by CodeRabbit\n\n## 릴리즈 노트\n\n* **Chores**\n * 프로젝트명을 \"MapSee-AI\"에서 \"MapSy\"로 업데이트했습니다.\n * 빌드 및 배포 설정을 새 프로젝트명에 맞게 조정했습니다.\n * API 애플리케이션 메타데이터 및 사용자 식별 정보를 업데이트했습니다.", + "parsed_changes": { + "chores": { + "title": "Chores", + "items": [ + "프로젝트명을 \"MapSee-AI\"에서 \"MapSy\"로 업데이트했습니다.", + "빌드 및 배포 설정을 새 프로젝트명에 맞게 조정했습니다.", + "API 애플리케이션 메타데이터 및 사용자 식별 정보를 업데이트했습니다." + ] + } + }, + "parse_method": "markdown" + }, { "version": "0.1.2", "project_type": "spring", diff --git a/CHANGELOG.md b/CHANGELOG.md index ae7c152..c2edf32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,18 @@ # Changelog -**현재 버전:** 0.1.2 -**마지막 업데이트:** 2026-01-18T05:00:21Z +**현재 버전:** 0.1.8 +**마지막 업데이트:** 2026-01-18T15:29:36Z + +--- + +## [0.1.8] - 2026-01-18 + +**PR:** #5 + +**Chores** +- 프로젝트명을 "MapSee-AI"에서 "MapSy"로 업데이트했습니다. +- 빌드 및 배포 설정을 새 프로젝트명에 맞게 조정했습니다. +- API 애플리케이션 메타데이터 및 사용자 식별 정보를 업데이트했습니다. ---