From 53acd596332c73e3fd341a79ed4cff13b488b2b4 Mon Sep 17 00:00:00 2001 From: juneon Date: Thu, 9 Apr 2026 19:05:37 +0900 Subject: [PATCH 01/10] =?UTF-8?q?chore:=20mannabom-server=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=20=EC=84=B8=ED=8C=85=20=EB=B0=8F=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mannabom-server/.gitattributes | 3 + mannabom-server/.gitignore | 53 ++++ mannabom-server/Dockerfile | 11 + mannabom-server/build.gradle | 80 ++++++ mannabom-server/docker-compose.local.yml | 32 +++ mannabom-server/docker-compose.prod.yml | 33 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 48966 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + mannabom-server/gradlew | 251 +++++++++++++++++ mannabom-server/gradlew.bat | 93 ++++++ mannabom-server/settings.gradle | 1 + .../MannabomServerApplication.java | 13 + .../src/main/resources/application-prod.yml | 140 +++++++++ .../src/main/resources/application.yaml | 157 +++++++++++ .../src/main/resources/data/regions.csv | 245 ++++++++++++++++ .../main/resources/data/regions_original.csv | 251 +++++++++++++++++ .../resources/db/migration/V1__baseline.sql | 266 ++++++++++++++++++ .../db/migration/V2__add_meeting_and_chat.sql | 125 ++++++++ ...and_extra_photo_table_and_rating_table.sql | 77 +++++ .../V4__add_reject_reason_to_like_request.sql | 2 + ...__add_reject_reason_to_message_request.sql | 2 + .../V6__add_source_to_like_request.sql | 9 + .../V7__add_source_to_message_request.sql | 9 + ...le_data_and_add_column_chat_room_table.sql | 44 +++ .../MannabomServerApplicationTests.java | 13 + 25 files changed, 1917 insertions(+) create mode 100644 mannabom-server/.gitattributes create mode 100644 mannabom-server/.gitignore create mode 100644 mannabom-server/Dockerfile create mode 100644 mannabom-server/build.gradle create mode 100644 mannabom-server/docker-compose.local.yml create mode 100644 mannabom-server/docker-compose.prod.yml create mode 100644 mannabom-server/gradle/wrapper/gradle-wrapper.jar create mode 100644 mannabom-server/gradle/wrapper/gradle-wrapper.properties create mode 100755 mannabom-server/gradlew create mode 100644 mannabom-server/gradlew.bat create mode 100644 mannabom-server/settings.gradle create mode 100644 mannabom-server/src/main/java/com/mannabom/mannabom_server/MannabomServerApplication.java create mode 100644 mannabom-server/src/main/resources/application-prod.yml create mode 100644 mannabom-server/src/main/resources/application.yaml create mode 100644 mannabom-server/src/main/resources/data/regions.csv create mode 100644 mannabom-server/src/main/resources/data/regions_original.csv create mode 100644 mannabom-server/src/main/resources/db/migration/V1__baseline.sql create mode 100644 mannabom-server/src/main/resources/db/migration/V2__add_meeting_and_chat.sql create mode 100644 mannabom-server/src/main/resources/db/migration/V3__add_request_table_and_extra_photo_table_and_rating_table.sql create mode 100644 mannabom-server/src/main/resources/db/migration/V4__add_reject_reason_to_like_request.sql create mode 100644 mannabom-server/src/main/resources/db/migration/V5__add_reject_reason_to_message_request.sql create mode 100644 mannabom-server/src/main/resources/db/migration/V6__add_source_to_like_request.sql create mode 100644 mannabom-server/src/main/resources/db/migration/V7__add_source_to_message_request.sql create mode 100644 mannabom-server/src/main/resources/db/migration/V8__migrate_profile_data_and_add_column_chat_room_table.sql create mode 100644 mannabom-server/src/test/java/com/mannabom/mannabom_server/MannabomServerApplicationTests.java diff --git a/mannabom-server/.gitattributes b/mannabom-server/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/mannabom-server/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/mannabom-server/.gitignore b/mannabom-server/.gitignore new file mode 100644 index 0000000..d6bc15c --- /dev/null +++ b/mannabom-server/.gitignore @@ -0,0 +1,53 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +# Logs +*.log + +# Spring local configs / secrets +**/application-local.yml +**/application-local.properties +**/*.secret.* + +mannabom-server/.env* +mannabom-server/src/.env* +.DS_Store + +#firebase 비밀키 +**/src/main/resources/firebase/ +**/src/main/resources/firebase/*.json \ No newline at end of file diff --git a/mannabom-server/Dockerfile b/mannabom-server/Dockerfile new file mode 100644 index 0000000..42bec2c --- /dev/null +++ b/mannabom-server/Dockerfile @@ -0,0 +1,11 @@ +FROM eclipse-temurin:17-jre-alpine + +WORKDIR /app + +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} app.jar + +ENV TZ=Asia/Seoul +RUN apk add --no-cache tzdata + +ENTRYPOINT ["java", "-jar","app.jar"] \ No newline at end of file diff --git a/mannabom-server/build.gradle b/mannabom-server/build.gradle new file mode 100644 index 0000000..65af508 --- /dev/null +++ b/mannabom-server/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.4' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.mannabom' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-websocket' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // JPA/Hibernate + implementation 'org.springframework.boot:spring-boot-starter-security' // Spring Security + implementation 'org.springframework.boot:spring-boot-starter-web' // REST API + implementation 'org.springframework.boot:spring-boot-starter-validation' // 입력값 검증 + implementation 'org.springframework.boot:spring-boot-starter-data-redis' // Redis 연동 + implementation 'org.springframework.boot:spring-boot-starter-webflux' // 카카오 API 호출용 + implementation 'org.springframework.boot:spring-boot-starter-mail' // 이메일 SMTP + + // JWT 토큰 처리 + implementation 'io.jsonwebtoken:jjwt-api:0.12.3' + implementation 'io.jsonwebtoken:jjwt-impl:0.12.6' + implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' + + // 파일 업로드 처리 (로컬 개발용) + implementation 'commons-io:commons-io:2.14.0' + + // 파일 업로드 처리: AWS S3 SDK v2 (AWS S3 배포용) + implementation 'software.amazon.awssdk:s3:2.20.26' + implementation 'software.amazon.awssdk:auth:2.20.26' + implementation 'software.amazon.awssdk:regions:2.20.26' + + // Lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' + + // DB + runtimeOnly 'org.postgresql:postgresql' + + // fcm + implementation 'com.google.firebase:firebase-admin:9.2.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + + // QueryDSL 설정 + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + //매칭 시간 만료를 위한 redisson + implementation 'org.redisson:redisson-spring-boot-starter:3.26.0' + + //db 형상관리 flyway + implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' + + +} + +tasks.named('test') { + useJUnitPlatform() +} + diff --git a/mannabom-server/docker-compose.local.yml b/mannabom-server/docker-compose.local.yml new file mode 100644 index 0000000..5078dcd --- /dev/null +++ b/mannabom-server/docker-compose.local.yml @@ -0,0 +1,32 @@ +# Docker Compose 설정 +version: '3.8' + +services: + # PostgreSQL DB + postgres: + image: postgres:13 + container_name: mannabom-postgres + environment: + POSTGRES_DB: mannabom_db + POSTGRES_USER: postgres # 사용자명 + POSTGRES_PASSWORD: password # 비밀번호 + ports: + - "5432:5432" # 호스트:컨테이너 포트 매핑 + volumes: + - postgres_data:/var/lib/postgresql/data + restart: unless-stopped # 재부팅 시 자동 시작 + + # Redis 캐시/세션 저장소 + redis: + image: redis:6-alpine + container_name: mannabom-redis + ports: + - "6379:6379" # 호스트:컨테이너 포트 매핑 + volumes: + - redis_data:/data + restart: unless-stopped + +# 볼륨 정의 +volumes: + postgres_data: + redis_data: \ No newline at end of file diff --git a/mannabom-server/docker-compose.prod.yml b/mannabom-server/docker-compose.prod.yml new file mode 100644 index 0000000..1466164 --- /dev/null +++ b/mannabom-server/docker-compose.prod.yml @@ -0,0 +1,33 @@ + +services: + mannabom-server: + image: ${ECR_REGISTRY_URI}:${IMAGE_TAG} + container_name: mannabom-server + environment: + - SPRING_PROFILES_ACTIVE=prod + env_file: + - .env + ports: + - 8080:8080 + depends_on: + - redis + networks: + - mannabom-net + volumes: + - /opt/mannabom/firebase:/opt/mannabom/firebase + + redis: + image: redis:alpine + container_name: redis + volumes: + - redis_data:/data + restart: unless-stopped + networks: + - mannabom-net + +networks: + mannabom-net: + driver: bridge + +volumes: + redis_data: {} \ No newline at end of file diff --git a/mannabom-server/gradle/wrapper/gradle-wrapper.jar b/mannabom-server/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d997cfc60f4cff0e7451d19d49a82fa986695d07 GIT binary patch literal 48966 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

`Lem|V$A>eR0uN8Y&sdjtu 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

1bvi{DS7E@q1{$_8->K{_OWv2 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 literal 0 HcmV?d00001 diff --git a/mannabom-server/gradle/wrapper/gradle-wrapper.properties b/mannabom-server/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c61a118 --- /dev/null +++ b/mannabom-server/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/mannabom-server/gradlew b/mannabom-server/gradlew new file mode 100755 index 0000000..b821d99 --- /dev/null +++ b/mannabom-server/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, likeRequest: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks likeRequest a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/mannabom-server/gradlew.bat b/mannabom-server/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/mannabom-server/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/mannabom-server/settings.gradle b/mannabom-server/settings.gradle new file mode 100644 index 0000000..de04807 --- /dev/null +++ b/mannabom-server/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'mannabom-server' diff --git a/mannabom-server/src/main/java/com/mannabom/mannabom_server/MannabomServerApplication.java b/mannabom-server/src/main/java/com/mannabom/mannabom_server/MannabomServerApplication.java new file mode 100644 index 0000000..71f063b --- /dev/null +++ b/mannabom-server/src/main/java/com/mannabom/mannabom_server/MannabomServerApplication.java @@ -0,0 +1,13 @@ +package com.mannabom.mannabom_server; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MannabomServerApplication { + + public static void main(String[] args) { + SpringApplication.run(MannabomServerApplication.class, args); + } + +} diff --git a/mannabom-server/src/main/resources/application-prod.yml b/mannabom-server/src/main/resources/application-prod.yml new file mode 100644 index 0000000..8fefbd2 --- /dev/null +++ b/mannabom-server/src/main/resources/application-prod.yml @@ -0,0 +1,140 @@ +spring: + application: + name: mannabom-server + + # AWS RDS PostgreSQL 설정 + datasource: + url: jdbc:postgresql://${AWS_RDS_ENDPOINT}:${AWS_RDS_PORT:5432}/${AWS_RDS_DATABASE} + username: ${AWS_RDS_USERNAME} + password: ${AWS_RDS_PASSWORD} + driver-class-name: org.postgresql.Driver + + # JPA/Hibernate 설정 + jpa: + hibernate: + ddl-auto: validate # update 사용 (배포용) + default_batch_fetch_size: 100 + show-sql: false # SQL 로그 비활성화 (배포용) + + flyway: + enabled: true + locations: classpath:db/migration + baseline-on-migrate: true + + # EC2 Redis 설정 (우선 AWS 전환X) + data: + redis: + host: ${REDIS_HOST} # EC2 Private IP 또는 localhost (같은 서버인 경우) + port: ${REDIS_PORT:6379} + password: ${REDIS_PASSWORD:} # Redis에 비밀번호 설정한 경우 + + # 파일 업로드 설정 + servlet: + multipart: + max-file-size: 10MB + max-request-size: 30MB + + # 이메일 설정 (우선 AWS 전환X) + mail: + host: smtp.gmail.com + port: 587 + username: ${MAIL_USERNAME} + password: ${MAIL_PASSWORD} + properties: + mail: + smtp: + auth: true + starttls: + enable: true + +# 커스텀 설정 +app: + # JWT 토큰 설정 + jwt: + secret: ${JWT_SECRET} # + access-token-expiration: 86_400_000 # 24시간 (밀리초) + refresh-token-expiration: 604_800_000 # 7일 (밀리초) + + # 카카오 OAuth 설정 (프로덕션) + kakao: + client-id: ${KAKAO_CLIENT_ID} + redirect-uri: ${KAKAO_REDIRECT_URI:https://your-domain.com/api/auth/login/kakao} + development: + skip-age-verification: true # 이거 아직 카카오 디벨로퍼 준비 안되서 + default-birth-year: 2000 + default-gender: "MALE" + + # AWS S3 설정 + aws: + region: ${AWS_REGION:ap-northeast-2} # 서울 리전 + s3: + bucket-name: ${AWS_S3_BUCKET_NAME} + access-key: ${AWS_ACCESS_KEY_ID} + secret-key: ${AWS_SECRET_ACCESS_KEY} + base-url: https://${AWS_S3_BUCKET_NAME}.s3.${AWS_REGION:ap-northeast-2}.amazonaws.com/ + + # 이메일 인증 설정 + email: + dummy-mode: false # 실제 이메일 발송 + +# 로깅 설정 (프로덕션) +logging: + level: + com.mannabom: INFO # 배포용은 INFO 레벨 + org.springframework.security: WARN + org.springframework.web: WARN + file: + name: /var/log/mannabom/app.log # 로그 파일 저장 + +# 서버 설정 +server: + port: ${SERVER_PORT:8080} + +meeting: + cursor: + secret: ${MEETING_SECRET_KEY:local-dev-key-do-not-user-in-prod} + match: + scheduler: + initial-delay: 1800000 + fixed_delay: 1800000 + +#fcm 설정 +fcm: + service-account-path: ${FCM_FILE_PATH:} + project_id: ${FCM_PROJECT_ID:} + url: https://fcm.googleapis.com/v1/projects/${fcm.project_id}/messages:send + google_api: https://www.googleapis.com/auth/cloud-platform + +# 운영 정책 설정 +match: + policy: + cooldown-hours: 72 # 프로필 추천으로 제공된 사용자가 다시 추천으로 뜰 수 있는 최소 시간 + candidate-pool-size: 200 # 추천을 하기 전에 조건에 맞는 사용자 추출(후보군 수) + pick-pool-size: 50 # 이번 추천 리스트로 뽑을 인원수의 상한(최종 인원수) + +ting: + policy: + vip-threshold: 200 # VIP로 분류되는 팅 보유 갯수 기준 + cost: + extra-profile: 5 # 팅을 소모해서 추가적인 프로필 추천을 받을 때 비용(팅 갯수) + extra-profile-bundle5: 20 # 추가 프로필 5개 묶음 비용 + message: 40 # 팅을 소모해서 메시지를 보낼 때 비용(팅 갯수) + like: 20 # 팅을 소모해서 호감 보낼 때 사용(팅 갯수) + view-extra-photo: 5 # 상대 사진 추가로 보기 + view-score: 5 # 상대가 내게 준 점수 조회 비용 + view-liked-me-profile: 5 # 나를 찜한 사람 프로필 보기 (변수 이름을 잘못 지었다 ㅠㅠ 수정 귀찮음,, 헷갈리지 말기) + view-high-score-profile: 5 # 나에게 높은 점수 준 유저 프로필 조회 비용 + +benefit: + policy: + membership: # 맴버쉽 혜택 + monthly-extra-profiles: 35 + monthly-free-messages: 10 + monthly-free-likes: 5 + vip: # VIP 혜택 + daily-extra-profiles: 2 + daily-free-messages: 0 + daily-free-likes: 0 + basic: # 기본 지급 + daily-profile: 10 + daily-love-view: 10 \ No newline at end of file diff --git a/mannabom-server/src/main/resources/application.yaml b/mannabom-server/src/main/resources/application.yaml new file mode 100644 index 0000000..64704f3 --- /dev/null +++ b/mannabom-server/src/main/resources/application.yaml @@ -0,0 +1,157 @@ +spring: + application: + name: mannabom-server + + # PostgreSQL DB 설정 (로컬용) + datasource: + url: jdbc:postgresql://localhost:5432/mannabom_db + username: postgres + password: password + driver-class-name: org.postgresql.Driver + + # JPA/Hibernate 설정 + jpa: + hibernate: + ddl-auto: validate # create(DB테스트용), update(개발용), validate(운영용) + default_batch_fetch_size: 100 + properties: + hibernate.hibernate.use_sql_comments: true + hibernate: + format_sql: true + show-sql: false # SQL 쿼리 로그 출력 (개발용) + + + flyway: + enabled: true + locations: classpath:db/migration + baseline-on-migrate: false + + + + + + # Redis 설정 + data: + redis: + host: localhost + port: 6379 + + # 파일 업로드 설정 + servlet: + multipart: + max-file-size: 10MB + max-request-size: 30MB + + # 이메일 설정 (역시 이후 AWS 전환해야) + mail: + host: smtp.gmail.com + port: 587 + username: ${MAIL_USERNAME:your-email@gmail.com} + password: ${MAIL_PASSWORD:your-app-password} + properties: + mail: + smtp: + auth: true + starttls: + enable: true + +# 커스텀 설정 +app: + aws: + region: ${AWS_REGION} + s3: + bucket-name: ${S3_BUCKET_NAME} + access-key: ${S3_ACCESS_KEY} + secret-key: ${S3_SECRET_KEY} + base-url: ${S3_BASE_URL} + # jwt 토큰 설정 + jwt: + secret: ${JWT_SECRET:mannabom-super-secret-key-for-development-only-change-in-production} # 32자 이상 필수 + access-token-expiration: 86_400_000 # 24시간 (밀리초) + refresh-token-expiration: 604_800_000 # 7일 (밀리초) + + # 카카오 OAuth 설정 + kakao: + client-id: ${KAKAO_CLIENT_ID:your-kakao-client-id} + redirect-uri: http://localhost:8080/api/auth/login/kakao # 임시로 카카오 디벨로퍼에 등록한 URI + # 운영환경에서는 실제 도메인으로 변경 필요 + # redirect-uri: https://company-domain.com/api/auth/login/kakao + + # 사업자 등록 하기 전 임시 개발환경 전용 설정 + development: + skip-age-verification: true # 연령검증 스킵 + default-birth-year: 2000 # 더미 출생년도 (24세) + default-gender: "MALE" # 더미 성별 + + # 파일 저장 설정 (로컬 개발용) + file: + upload-dir: ./uploads/ # 로컬 파일 저장 경로 + base-url: http://localhost:8080/files/ # 파일 접근 URL + # AWS S3 사용 시 설정 변경 필요 + + # 이메일 인증 설정 (로컬 개발용) + email: + dummy-mode: false # false=실제발송, true=콘솔테스트 + +# 로깅 설정 (개발용) +logging: + level: + com.mannabom: DEBUG + org.springframework.security: DEBUG + org.hibernate.SQL: DEBUG + org.hibernate.type.descriptor.sql: TRACE + +# 서버 설정 +server: + port: 8080 + + +# 미팅 리스트 커서 설정 +meeting: + cursor: + secret: ${MEETING_SECRET_KEY:local-dev-key-do-not-user-in-prod} + match: + scheduler: + initial-delay: 1800000 + fixed_delay: 1800000 + +#fcm 설정 +fcm: + service-account-path: ${FCM_FILE_PATH:} + project_id: ${FCM_PROJECT_ID:} + url: https://fcm.googleapis.com/v1/projects/${fcm.project_id}/messages:send + google_api: https://www.googleapis.com/auth/cloud-platform + +# 운영 정책 설정 +match: + policy: + cooldown-hours: 72 # 프로필 추천으로 제공된 사용자가 다시 추천으로 뜰 수 있는 최소 시간 + candidate-pool-size: 200 # 추천을 하기 전에 조건에 맞는 사용자 추출(후보군 수) + pick-pool-size: 50 # 이번 추천 리스트로 뽑을 인원수의 상한(최종 인원수) + +ting: + policy: + vip-threshold: 200 # VIP로 분류되는 팅 보유 갯수 기준 + cost: + extra-profile: 5 # 팅을 소모해서 추가적인 프로필 추천을 받을 때 비용(팅 갯수) + extra-profile-bundle5: 20 # 추가 프로필 5개 묶음 비용 + message: 40 # 팅을 소모해서 메시지를 보낼 때 비용(팅 갯수) + like: 20 # 팅을 소모해서 호감 보낼 때 사용(팅 갯수) + view-extra-photo: 5 # 상대 사진 추가로 보기 + view-score: 5 # 상대가 내게 준 점수 조회 비용 + view-liked-me-profile: 5 # 나를 찜한 사람 프로필 보기 (변수 이름을 잘못 지었다 ㅠㅠ 수정 귀찮음,, 헷갈리지 말기) + view-high-score-profile: 5 # 나에게 높은 점수 준 유저 프로필 조회 비용 + +benefit: + policy: + membership: # 맴버쉽 혜택 + monthly-extra-profiles: 35 + monthly-free-messages: 10 + monthly-free-likes: 5 + vip: # VIP 혜택 + daily-extra-profiles: 2 + daily-free-messages: 0 + daily-free-likes: 0 + basic: # 기본 지급 + daily-profile: 10 + daily-love-view: 10 \ No newline at end of file diff --git a/mannabom-server/src/main/resources/data/regions.csv b/mannabom-server/src/main/resources/data/regions.csv new file mode 100644 index 0000000..bfa6a42 --- /dev/null +++ b/mannabom-server/src/main/resources/data/regions.csv @@ -0,0 +1,245 @@ +sigunguCode,sidoCode,sidoName,sigunguName +11000,11,서울특별시,전체 +11680,11,서울특별시,강남구 +11740,11,서울특별시,강동구 +11305,11,서울특별시,강북구 +11500,11,서울특별시,강서구 +11620,11,서울특별시,관악구 +11215,11,서울특별시,광진구 +11530,11,서울특별시,구로구 +11545,11,서울특별시,금천구 +11350,11,서울특별시,노원구 +11320,11,서울특별시,도봉구 +11230,11,서울특별시,동대문구 +11590,11,서울특별시,동작구 +11440,11,서울특별시,마포구 +11410,11,서울특별시,서대문구 +11650,11,서울특별시,서초구 +11200,11,서울특별시,성동구 +11290,11,서울특별시,성북구 +11710,11,서울특별시,송파구 +11470,11,서울특별시,양천구 +11560,11,서울특별시,영등포구 +11170,11,서울특별시,용산구 +11380,11,서울특별시,은평구 +11110,11,서울특별시,종로구 +11140,11,서울특별시,중구 +11260,11,서울특별시,중랑구 +26000,26,부산광역시,전체 +26440,26,부산광역시,강서구 +26410,26,부산광역시,금정구 +26710,26,부산광역시,기장군 +26290,26,부산광역시,남구 +26170,26,부산광역시,동구 +26260,26,부산광역시,동래구 +26230,26,부산광역시,부산진구 +26320,26,부산광역시,북구 +26530,26,부산광역시,사상구 +26380,26,부산광역시,사하구 +26140,26,부산광역시,서구 +26500,26,부산광역시,수영구 +26470,26,부산광역시,연제구 +26200,26,부산광역시,영도구 +26110,26,부산광역시,중구 +26350,26,부산광역시,해운대구 +27000,27,대구광역시,전체 +27200,27,대구광역시,남구 +27290,27,대구광역시,달서구 +27710,27,대구광역시,달성군 +27140,27,대구광역시,동구 +27230,27,대구광역시,북구 +27170,27,대구광역시,서구 +27260,27,대구광역시,수성구 +27110,27,대구광역시,중구 +28000,28,인천광역시,전체 +28710,28,인천광역시,강화군 +28245,28,인천광역시,계양구 +28200,28,인천광역시,남동구 +28140,28,인천광역시,동구 +28177,28,인천광역시,미추홀구 +28237,28,인천광역시,부평구 +28260,28,인천광역시,서구 +28185,28,인천광역시,연수구 +28720,28,인천광역시,옹진군 +28110,28,인천광역시,중구 +29000,29,광주광역시,전체 +29200,29,광주광역시,광산구 +29155,29,광주광역시,남구 +29110,29,광주광역시,동구 +29170,29,광주광역시,북구 +29140,29,광주광역시,서구 +30000,30,대전광역시,전체 +30230,30,대전광역시,대덕구 +30110,30,대전광역시,동구 +30170,30,대전광역시,서구 +30200,30,대전광역시,유성구 +30140,30,대전광역시,중구 +31000,31,울산광역시,전체 +31140,31,울산광역시,남구 +31170,31,울산광역시,동구 +31200,31,울산광역시,북구 +31710,31,울산광역시,울주군 +31110,31,울산광역시,중구 +36110,36,세종특별자치시,세종특별자치시 +41000,41,경기도,전체 +41820,41,경기도,가평군 +41281,41,경기도,고양시 +41290,41,경기도,과천시 +41210,41,경기도,광명시 +41610,41,경기도,광주시 +41310,41,경기도,구리시 +41410,41,경기도,군포시 +41570,41,경기도,김포시 +41360,41,경기도,남양주시 +41250,41,경기도,동두천시 +41190,41,경기도,부천시 +41135,41,경기도,성남시 +41390,41,경기도,시흥시 +41273,41,경기도,안산시 +41550,41,경기도,안성시 +41173,41,경기도,안양시 +41630,41,경기도,양주시 +41830,41,경기도,양평군 +41670,41,경기도,여주시 +41800,41,경기도,연천군 +41370,41,경기도,오산시 +41463,41,경기도,용인시 +41430,41,경기도,의왕시 +41150,41,경기도,의정부시 +41500,41,경기도,이천시 +41480,41,경기도,파주시 +41220,41,경기도,평택시 +41650,41,경기도,포천시 +41450,41,경기도,하남시 +41590,41,경기도,화성시 +42000,42,강원도,전체 +42150,42,강원도,강릉시 +42820,42,강원도,고성군 +42170,42,강원도,동해시 +42230,42,강원도,삼척시 +42210,42,강원도,속초시 +42800,42,강원도,양구군 +42830,42,강원도,양양군 +42750,42,강원도,영월군 +42130,42,강원도,원주시 +42810,42,강원도,인제군 +42770,42,강원도,정선군 +42780,42,강원도,철원군 +42110,42,강원도,춘천시 +42190,42,강원도,태백시 +42760,42,강원도,평창군 +42720,42,강원도,홍천군 +42790,42,강원도,화천군 +42730,42,강원도,횡성군 +43000,43,충청북도,전체 +43760,43,충청북도,괴산군 +43800,43,충청북도,단양군 +43720,43,충청북도,보은군 +43740,43,충청북도,영동군 +43730,43,충청북도,옥천군 +43770,43,충청북도,음성군 +43150,43,충청북도,제천시 +43745,43,충청북도,증평군 +43750,43,충청북도,진천군 +43111,43,충청북도,청주시 +43130,43,충청북도,충주시 +44000,44,충청남도,전체 +44250,44,충청남도,계룡시 +44150,44,충청남도,공주시 +44710,44,충청남도,금산군 +44230,44,충청남도,논산시 +44270,44,충청남도,당진시 +44180,44,충청남도,보령시 +44760,44,충청남도,부여군 +44210,44,충청남도,서산시 +44770,44,충청남도,서천군 +44200,44,충청남도,아산시 +44810,44,충청남도,예산군 +44131,44,충청남도,천안시 +44790,44,충청남도,청양군 +44825,44,충청남도,태안군 +44800,44,충청남도,홍성군 +45000,45,전라북도,전체 +45790,45,전라북도,고창군 +45130,45,전라북도,군산시 +45210,45,전라북도,김제시 +45190,45,전라북도,남원시 +45730,45,전라북도,무주군 +45800,45,전라북도,부안군 +45770,45,전라북도,순창군 +45710,45,전라북도,완주군 +45140,45,전라북도,익산시 +45750,45,전라북도,임실군 +45740,45,전라북도,장수군 +45113,45,전라북도,전주시 +45180,45,전라북도,정읍시 +45720,45,전라북도,진안군 +46000,46,전라남도,전체 +46810,46,전라남도,강진군 +46770,46,전라남도,고흥군 +46720,46,전라남도,곡성군 +46230,46,전라남도,광양시 +46730,46,전라남도,구례군 +46170,46,전라남도,나주시 +46710,46,전라남도,담양군 +46110,46,전라남도,목포시 +46840,46,전라남도,무안군 +46780,46,전라남도,보성군 +46150,46,전라남도,순천시 +46910,46,전라남도,신안군 +46130,46,전라남도,여수시 +46870,46,전라남도,영광군 +46830,46,전라남도,영암군 +46890,46,전라남도,완도군 +46880,46,전라남도,장성군 +46800,46,전라남도,장흥군 +46900,46,전라남도,진도군 +46860,46,전라남도,함평군 +46820,46,전라남도,해남군 +46790,46,전라남도,화순군 +47000,47,경상북도,전체 +47290,47,경상북도,경산시 +47130,47,경상북도,경주시 +47830,47,경상북도,고령군 +47190,47,경상북도,구미시 +47720,47,경상북도,군위군 +47150,47,경상북도,김천시 +47280,47,경상북도,문경시 +47920,47,경상북도,봉화군 +47250,47,경상북도,상주시 +47840,47,경상북도,성주군 +47170,47,경상북도,안동시 +47770,47,경상북도,영덕군 +47760,47,경상북도,영양군 +47210,47,경상북도,영주시 +47230,47,경상북도,영천시 +47900,47,경상북도,예천군 +47940,47,경상북도,울릉군 +47930,47,경상북도,울진군 +47730,47,경상북도,의성군 +47820,47,경상북도,청도군 +47750,47,경상북도,청송군 +47850,47,경상북도,칠곡군 +47111,47,경상북도,포항시 +48000,48,경상남도,전체 +48310,48,경상남도,거제시 +48880,48,경상남도,거창군 +48820,48,경상남도,고성군 +48250,48,경상남도,김해시 +48840,48,경상남도,남해군 +48270,48,경상남도,밀양시 +48240,48,경상남도,사천시 +48860,48,경상남도,산청군 +48330,48,경상남도,양산시 +48720,48,경상남도,의령군 +48170,48,경상남도,진주시 +48740,48,경상남도,창녕군 +48125,48,경상남도,창원시 +48220,48,경상남도,통영시 +48850,48,경상남도,하동군 +48730,48,경상남도,함안군 +48870,48,경상남도,함양군 +48890,48,경상남도,합천군 +50000,50,제주특별자치도,전체 +50130,50,제주특별자치도,서귀포시 +50110,50,제주특별자치도,제주시 \ No newline at end of file diff --git a/mannabom-server/src/main/resources/data/regions_original.csv b/mannabom-server/src/main/resources/data/regions_original.csv new file mode 100644 index 0000000..348b47c --- /dev/null +++ b/mannabom-server/src/main/resources/data/regions_original.csv @@ -0,0 +1,251 @@ +sigunguCode,sidoCode,sidoName,sigunguName +11680,11,서울특별시,강남구 +11740,11,서울특별시,강동구 +11305,11,서울특별시,강북구 +11500,11,서울특별시,강서구 +11620,11,서울특별시,관악구 +11215,11,서울특별시,광진구 +11530,11,서울특별시,구로구 +11545,11,서울특별시,금천구 +11350,11,서울특별시,노원구 +11320,11,서울특별시,도봉구 +11230,11,서울특별시,동대문구 +11590,11,서울특별시,동작구 +11440,11,서울특별시,마포구 +11410,11,서울특별시,서대문구 +11650,11,서울특별시,서초구 +11200,11,서울특별시,성동구 +11290,11,서울특별시,성북구 +11710,11,서울특별시,송파구 +11470,11,서울특별시,양천구 +11560,11,서울특별시,영등포구 +11170,11,서울특별시,용산구 +11380,11,서울특별시,은평구 +11110,11,서울특별시,종로구 +11140,11,서울특별시,중구 +11260,11,서울특별시,중랑구 +26440,26,부산광역시,강서구 +26410,26,부산광역시,금정구 +26710,26,부산광역시,기장군 +26290,26,부산광역시,남구 +26170,26,부산광역시,동구 +26260,26,부산광역시,동래구 +26230,26,부산광역시,부산진구 +26320,26,부산광역시,북구 +26530,26,부산광역시,사상구 +26380,26,부산광역시,사하구 +26140,26,부산광역시,서구 +26500,26,부산광역시,수영구 +26470,26,부산광역시,연제구 +26200,26,부산광역시,영도구 +26110,26,부산광역시,중구 +26350,26,부산광역시,해운대구 +27200,27,대구광역시,남구 +27290,27,대구광역시,달서구 +27710,27,대구광역시,달성군 +27140,27,대구광역시,동구 +27230,27,대구광역시,북구 +27170,27,대구광역시,서구 +27260,27,대구광역시,수성구 +27110,27,대구광역시,중구 +28710,28,인천광역시,강화군 +28245,28,인천광역시,계양구 +28200,28,인천광역시,남동구 +28140,28,인천광역시,동구 +28177,28,인천광역시,미추홀구 +28237,28,인천광역시,부평구 +28260,28,인천광역시,서구 +28185,28,인천광역시,연수구 +28720,28,인천광역시,옹진군 +28110,28,인천광역시,중구 +29200,29,광주광역시,광산구 +29155,29,광주광역시,남구 +29110,29,광주광역시,동구 +29170,29,광주광역시,북구 +29140,29,광주광역시,서구 +30230,30,대전광역시,대덕구 +30110,30,대전광역시,동구 +30170,30,대전광역시,서구 +30200,30,대전광역시,유성구 +30140,30,대전광역시,중구 +31140,31,울산광역시,남구 +31170,31,울산광역시,동구 +31200,31,울산광역시,북구 +31710,31,울산광역시,울주군 +31110,31,울산광역시,중구 +36110,36,세종특별자치시,세종특별자치시 +41820,41,경기도,가평군 +41281,41,경기도,고양시 덕양구 +41285,41,경기도,고양시 일산동구 +41287,41,경기도,고양시 일산서구 +41290,41,경기도,과천시 +41210,41,경기도,광명시 +41610,41,경기도,광주시 +41310,41,경기도,구리시 +41410,41,경기도,군포시 +41570,41,경기도,김포시 +41360,41,경기도,남양주시 +41250,41,경기도,동두천시 +41190,41,경기도,부천시 +41135,41,경기도,성남시 분당구 +41131,41,경기도,성남시 수정구 +41133,41,경기도,성남시 중원구 +41113,41,경기도,수원시 권선구 +41117,41,경기도,수원시 영통구 +41111,41,경기도,수원시 장안구 +41115,41,경기도,수원시 팔달구 +41390,41,경기도,시흥시 +41273,41,경기도,안산시 단원구 +41271,41,경기도,안산시 상록구 +41550,41,경기도,안성시 +41173,41,경기도,안양시 동안구 +41171,41,경기도,안양시 만안구 +41630,41,경기도,양주시 +41830,41,경기도,양평군 +41670,41,경기도,여주시 +41800,41,경기도,연천군 +41370,41,경기도,오산시 +41463,41,경기도,용인시 기흥구 +41465,41,경기도,용인시 수지구 +41461,41,경기도,용인시 처인구 +41430,41,경기도,의왕시 +41150,41,경기도,의정부시 +41500,41,경기도,이천시 +41480,41,경기도,파주시 +41220,41,경기도,평택시 +41650,41,경기도,포천시 +41450,41,경기도,하남시 +41590,41,경기도,화성시 +42150,42,강원도,강릉시 +42820,42,강원도,고성군 +42170,42,강원도,동해시 +42230,42,강원도,삼척시 +42210,42,강원도,속초시 +42800,42,강원도,양구군 +42830,42,강원도,양양군 +42750,42,강원도,영월군 +42130,42,강원도,원주시 +42810,42,강원도,인제군 +42770,42,강원도,정선군 +42780,42,강원도,철원군 +42110,42,강원도,춘천시 +42190,42,강원도,태백시 +42760,42,강원도,평창군 +42720,42,강원도,홍천군 +42790,42,강원도,화천군 +42730,42,강원도,횡성군 +43760,43,충청북도,괴산군 +43800,43,충청북도,단양군 +43720,43,충청북도,보은군 +43740,43,충청북도,영동군 +43730,43,충청북도,옥천군 +43770,43,충청북도,음성군 +43150,43,충청북도,제천시 +43745,43,충청북도,증평군 +43750,43,충청북도,진천군 +43111,43,충청북도,청주시 상당구 +43112,43,충청북도,청주시 서원구 +43114,43,충청북도,청주시 청원구 +43113,43,충청북도,청주시 흥덕구 +43130,43,충청북도,충주시 +44250,44,충청남도,계룡시 +44150,44,충청남도,공주시 +44710,44,충청남도,금산군 +44230,44,충청남도,논산시 +44270,44,충청남도,당진시 +44180,44,충청남도,보령시 +44760,44,충청남도,부여군 +44210,44,충청남도,서산시 +44770,44,충청남도,서천군 +44200,44,충청남도,아산시 +44810,44,충청남도,예산군 +44131,44,충청남도,천안시 동남구 +44133,44,충청남도,천안시 서북구 +44790,44,충청남도,청양군 +44825,44,충청남도,태안군 +44800,44,충청남도,홍성군 +45790,45,전라북도,고창군 +45130,45,전라북도,군산시 +45210,45,전라북도,김제시 +45190,45,전라북도,남원시 +45730,45,전라북도,무주군 +45800,45,전라북도,부안군 +45770,45,전라북도,순창군 +45710,45,전라북도,완주군 +45140,45,전라북도,익산시 +45750,45,전라북도,임실군 +45740,45,전라북도,장수군 +45113,45,전라북도,전주시 덕진구 +45111,45,전라북도,전주시 완산구 +45180,45,전라북도,정읍시 +45720,45,전라북도,진안군 +46810,46,전라남도,강진군 +46770,46,전라남도,고흥군 +46720,46,전라남도,곡성군 +46230,46,전라남도,광양시 +46730,46,전라남도,구례군 +46170,46,전라남도,나주시 +46710,46,전라남도,담양군 +46110,46,전라남도,목포시 +46840,46,전라남도,무안군 +46780,46,전라남도,보성군 +46150,46,전라남도,순천시 +46910,46,전라남도,신안군 +46130,46,전라남도,여수시 +46870,46,전라남도,영광군 +46830,46,전라남도,영암군 +46890,46,전라남도,완도군 +46880,46,전라남도,장성군 +46800,46,전라남도,장흥군 +46900,46,전라남도,진도군 +46860,46,전라남도,함평군 +46820,46,전라남도,해남군 +46790,46,전라남도,화순군 +47290,47,경상북도,경산시 +47130,47,경상북도,경주시 +47830,47,경상북도,고령군 +47190,47,경상북도,구미시 +47720,47,경상북도,군위군 +47150,47,경상북도,김천시 +47280,47,경상북도,문경시 +47920,47,경상북도,봉화군 +47250,47,경상북도,상주시 +47840,47,경상북도,성주군 +47170,47,경상북도,안동시 +47770,47,경상북도,영덕군 +47760,47,경상북도,영양군 +47210,47,경상북도,영주시 +47230,47,경상북도,영천시 +47900,47,경상북도,예천군 +47940,47,경상북도,울릉군 +47930,47,경상북도,울진군 +47730,47,경상북도,의성군 +47820,47,경상북도,청도군 +47750,47,경상북도,청송군 +47850,47,경상북도,칠곡군 +47111,47,경상북도,포항시 남구 +47113,47,경상북도,포항시 북구 +48310,48,경상남도,거제시 +48880,48,경상남도,거창군 +48820,48,경상남도,고성군 +48250,48,경상남도,김해시 +48840,48,경상남도,남해군 +48270,48,경상남도,밀양시 +48240,48,경상남도,사천시 +48860,48,경상남도,산청군 +48330,48,경상남도,양산시 +48720,48,경상남도,의령군 +48170,48,경상남도,진주시 +48740,48,경상남도,창녕군 +48125,48,경상남도,창원시 마산합포구 +48127,48,경상남도,창원시 마산회원구 +48123,48,경상남도,창원시 성산구 +48121,48,경상남도,창원시 의창구 +48129,48,경상남도,창원시 진해구 +48220,48,경상남도,통영시 +48850,48,경상남도,하동군 +48730,48,경상남도,함안군 +48870,48,경상남도,함양군 +48890,48,경상남도,합천군 +50130,50,제주특별자치도,서귀포시 +50110,50,제주특별자치도,제주시 \ No newline at end of file diff --git a/mannabom-server/src/main/resources/db/migration/V1__baseline.sql b/mannabom-server/src/main/resources/db/migration/V1__baseline.sql new file mode 100644 index 0000000..990052c --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V1__baseline.sql @@ -0,0 +1,266 @@ +-- public.device_token definition + +-- Drop table + +-- DROP TABLE public.device_token; + +CREATE TABLE public.device_token ( + id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + active bool NOT NULL, + last_seen_at timestamptz(6) NULL, + "token" varchar(255) NOT NULL, + user_id int8 NULL, + CONSTRAINT device_token_pkey PRIMARY KEY (id), + CONSTRAINT idx_device_token_token UNIQUE (token) +); +CREATE INDEX idx_device_token_active ON public.device_token USING btree (active); +CREATE INDEX idx_device_token_user ON public.device_token USING btree (user_id); + + +-- public.love_view_recommend_history definition + +-- Drop table + +-- DROP TABLE public.love_view_recommend_history; + +CREATE TABLE public.love_view_recommend_history ( + id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + recommend_type varchar(255) NOT NULL, + recommended_at timestamp(6) NOT NULL, + requester_user_id int8 NOT NULL, + target_user_id int8 NOT NULL, + CONSTRAINT love_view_recommend_history_pkey PRIMARY KEY (id), + CONSTRAINT love_view_recommend_history_recommend_type_check CHECK (((recommend_type)::text = ANY ((ARRAY['FREE'::character varying, 'EXTRA_VIP'::character varying, 'EXTRA_MEMBERSHIP'::character varying, 'EXTRA_TING'::character varying])::text[]))) +); +CREATE INDEX idx_req_target_time ON public.love_view_recommend_history USING btree (requester_user_id, target_user_id, recommended_at); +CREATE INDEX idx_req_time ON public.love_view_recommend_history USING btree (requester_user_id, recommended_at); + + +-- public.policy_config definition + +-- Drop table + +-- DROP TABLE public.policy_config; + +CREATE TABLE public.policy_config ( + id int8 NOT NULL, + benefit_basic_daily_love_view int4 NULL, + benefit_basic_daily_profile int4 NULL, + benefit_membership_cycle_extra_profiles int4 NULL, + benefit_membership_cycle_free_likes int4 NULL, + benefit_membership_cycle_free_messages int4 NULL, + benefit_vip_daily_extra_profiles int4 NULL, + benefit_vip_daily_free_likes int4 NULL, + benefit_vip_daily_free_messages int4 NULL, + match_candidate_pool_size int4 NULL, + match_cooldown_hours int4 NULL, + match_pick_pool_size int4 NULL, + ting_cost_extra_profile int4 NULL, + ting_cost_extra_profile_bundle5 int4 NULL, + ting_cost_like int4 NULL, + ting_cost_message int4 NULL, + ting_cost_view_extra_photo int4 NULL, + ting_cost_view_high_score_profile int4 NULL, + ting_cost_view_liked_me_profile int4 NULL, + ting_cost_view_score int4 NULL, + ting_vip_threshold int4 NULL, + updated_at timestamp(6) NOT NULL, + "version" int8 NULL, + CONSTRAINT policy_config_pkey PRIMARY KEY (id) +); + + +-- public.profile_recommend_history definition + +-- Drop table + +-- DROP TABLE public.profile_recommend_history; + +CREATE TABLE public.profile_recommend_history ( + id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + recommend_type varchar(255) NOT NULL, + recommended_at timestamp(6) NOT NULL, + requester_user_id int8 NOT NULL, + target_user_id int8 NOT NULL, + CONSTRAINT profile_recommend_history_pkey PRIMARY KEY (id), + CONSTRAINT profile_recommend_history_recommend_type_check CHECK (((recommend_type)::text = ANY ((ARRAY['FREE'::character varying, 'EXTRA_VIP'::character varying, 'EXTRA_MEMBERSHIP'::character varying, 'EXTRA_TING'::character varying])::text[]))) +); + + +-- public.questions definition + +-- Drop table + +-- DROP TABLE public.questions; + +CREATE TABLE public.questions ( + question_id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + created_at timestamp(6) NOT NULL, + updated_at timestamp(6) NOT NULL, + question text NOT NULL, + question_type varchar(255) NOT NULL, + CONSTRAINT questions_pkey PRIMARY KEY (question_id), + CONSTRAINT questions_question_type_check CHECK (((question_type)::text = ANY ((ARRAY['REQUIRED_TEXT'::character varying, 'REQUIRED_CHOICE'::character varying, 'OPTIONAL_TEXT'::character varying])::text[]))) +); + + +-- public.ting_wallet definition + +-- Drop table + +-- DROP TABLE public.ting_wallet; + +CREATE TABLE public.ting_wallet ( + user_id int8 NOT NULL, + daily_love_view_granted_date date NULL, + daily_love_view_remaining int4 NOT NULL, + daily_profile_granted_date date NULL, + daily_profile_remaining int4 NOT NULL, + event_ting int4 NOT NULL, + extra_profiles_by_ting_remaining int4 NOT NULL, + m_active_until timestamp(6) NULL, + m_cycle_start_at timestamp(6) NULL, + m_monthly_extra_profiles_remaining int4 NOT NULL, + m_monthly_free_likes_remaining int4 NOT NULL, + m_monthly_extra_messages_remaining int4 NOT NULL, + ting int4 NOT NULL, + "version" int8 NULL, + vip_daily_extra_profiles_remaining int4 NOT NULL, + vip_daily_free_likes_remaining int4 NOT NULL, + vip_daily_free_messages_remaining int4 NOT NULL, + vip_granted_date date NULL, + CONSTRAINT ting_wallet_pkey PRIMARY KEY (user_id) +); + + +-- public.university definition + +-- Drop table + +-- DROP TABLE public.university; + +CREATE TABLE public.university ( + university_id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + created_at timestamp(6) NOT NULL, + updated_at timestamp(6) NOT NULL, + "domain" varchar(255) NOT NULL, + "name" varchar(255) NOT NULL, + CONSTRAINT ukl0v23mm0y4u53a26k7malrfu1 UNIQUE (domain), + CONSTRAINT university_pkey PRIMARY KEY (university_id) +); + + +-- public.users definition + +-- Drop table + +-- DROP TABLE public.users; + +CREATE TABLE public.users ( + user_id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + created_at timestamp(6) NOT NULL, + updated_at timestamp(6) NOT NULL, + is_membership bool NOT NULL, + is_verified bool NOT NULL, + kakao_id varchar(255) NOT NULL, + phone_num varchar(255) NULL, + user_name varchar(255) NULL, + CONSTRAINT ukk4ycaj27putgcujmehwbsrmmc UNIQUE (kakao_id), + CONSTRAINT users_pkey PRIMARY KEY (user_id) +); + + +-- public.profile definition + +-- Drop table + +-- DROP TABLE public.profile; + +CREATE TABLE public.profile ( + profile_id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + created_at timestamp(6) NOT NULL, + updated_at timestamp(6) NOT NULL, + alcohol varchar(255) NULL, + birth_date date NULL, + body_type varchar(255) NULL, + email varchar(255) NULL, + gender varchar(255) NOT NULL, + grade float8 NULL, + height int4 NULL, + mbti varchar(4) NULL, + nick_name varchar(255) NULL, + region_sido varchar(255) NULL, + region_sigungu varchar(255) NULL, + smoking varchar(255) NULL, + university varchar(255) NULL, + user_id int8 NOT NULL, + CONSTRAINT profile_alcohol_check CHECK (((alcohol)::text = ANY ((ARRAY['NON_DRINKER'::character varying, 'OCCASIONAL_DRINKER'::character varying, 'FREQUENT_DRINKER'::character varying])::text[]))), + CONSTRAINT profile_body_type_check CHECK (((body_type)::text = ANY ((ARRAY['SLIM'::character varying, 'AVERAGE'::character varying, 'CHUBBY'::character varying])::text[]))), + CONSTRAINT profile_gender_check CHECK (((gender)::text = ANY ((ARRAY['MALE'::character varying, 'FEMALE'::character varying])::text[]))), + CONSTRAINT profile_pkey PRIMARY KEY (profile_id), + CONSTRAINT profile_smoking_check CHECK (((smoking)::text = ANY ((ARRAY['NON_SMOKER'::character varying, 'VAPE_ONLY'::character varying, 'REGULAR_SMOKER'::character varying])::text[]))), + CONSTRAINT ukc1dkiawnlj6uoe6fnlwd6j83j UNIQUE (user_id), + CONSTRAINT ukcs9f0fwxtv6241hk3b82qyyyh UNIQUE (nick_name), + CONSTRAINT fks14jvsf9tqrcnly0afsv0ngwv FOREIGN KEY (user_id) REFERENCES public.users(user_id) +); + + +-- public.profile_image definition + +-- Drop table + +-- DROP TABLE public.profile_image; + +CREATE TABLE public.profile_image ( + image_id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + created_at timestamp(6) NOT NULL, + updated_at timestamp(6) NOT NULL, + file_name varchar(255) NOT NULL, + image_index int4 NOT NULL, + is_main bool NOT NULL, + original_name varchar(255) NULL, + url varchar(255) NOT NULL, + profile_id int8 NOT NULL, + CONSTRAINT profile_image_pkey PRIMARY KEY (image_id), + CONSTRAINT fk7499uukxrqn9c6ue4g8uox6ao FOREIGN KEY (profile_id) REFERENCES public.profile(profile_id) +); + + +-- public.question_answer definition + +-- Drop table + +-- DROP TABLE public.question_answer; + +CREATE TABLE public.question_answer ( + answer_id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + created_at timestamp(6) NOT NULL, + updated_at timestamp(6) NOT NULL, + answer text NULL, + profile_id int8 NOT NULL, + question_id int8 NOT NULL, + CONSTRAINT question_answer_pkey PRIMARY KEY (answer_id), + CONSTRAINT ukceaeg7ab6u9w7tht8f2lxfvb9 UNIQUE (profile_id, question_id), + CONSTRAINT fk6dicp7lwymw77ry50wa2wrlab FOREIGN KEY (profile_id) REFERENCES public.profile(profile_id), + CONSTRAINT fkpgc6cidvg9xr27j4170epkcaq FOREIGN KEY (question_id) REFERENCES public.questions(question_id) +); + + +-- public.refresh_tokens definition + +-- Drop table + +-- DROP TABLE public.refresh_tokens; + +CREATE TABLE public.refresh_tokens ( + token_id int8 GENERATED BY DEFAULT AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START 1 CACHE 1 NO CYCLE) NOT NULL, + created_at timestamp(6) NOT NULL, + updated_at timestamp(6) NOT NULL, + expires_at timestamp(6) NOT NULL, + refresh_token varchar(512) NOT NULL, + user_id int8 NOT NULL, + CONSTRAINT refresh_tokens_pkey PRIMARY KEY (token_id), + CONSTRAINT uk1yihy5j142kjit22kgccjixro UNIQUE (refresh_token), + CONSTRAINT uk7tdcd6ab5wsgoudnvj7xf1b7l UNIQUE (user_id), + CONSTRAINT fk1lih5y2npsf8u5o3vhdb9y0os FOREIGN KEY (user_id) REFERENCES public.users(user_id) +); \ No newline at end of file diff --git a/mannabom-server/src/main/resources/db/migration/V2__add_meeting_and_chat.sql b/mannabom-server/src/main/resources/db/migration/V2__add_meeting_and_chat.sql new file mode 100644 index 0000000..ad935b7 --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V2__add_meeting_and_chat.sql @@ -0,0 +1,125 @@ +-- V2__add_meeting_and_chat.sql +-- 1. Notification (알림) - 로컬에만 있는 기능 추가 +CREATE TABLE IF NOT EXISTS public.notification ( + id int8 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + created_at timestamptz(6) NOT NULL, + is_read bool NOT NULL, + "type" int2 NULL CHECK (((type >= 0) AND (type <= 5))), + user_id int8 NULL, + "data" text NULL, + message varchar(255) NULL, + title varchar(255) NULL + ); +-- 1. [필수] Meeting 테이블이 참조하는 Regions 테이블 생성 (운영에 없다면 생성) +CREATE TABLE IF NOT EXISTS public.regions ( + sigungu_code varchar(5) NOT NULL, + sido_code varchar(2) NOT NULL, + sido_name varchar(255) NULL, + sigungu_name varchar(255) NULL, + CONSTRAINT regions_pkey PRIMARY KEY (sigungu_code) + ); + +-- 2. Meeting(미팅) 도메인 테이블 생성 +CREATE TABLE public.meeting ( + id int8 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + created_at timestamptz(6) NOT NULL, + updated_at timestamptz(6) NOT NULL, + code varchar(255) NOT NULL, + room_name varchar(255) NULL, + meeting_status int2 NULL, + + -- 인원 및 나이 제한 + max_members int4 NULL, + current_members int4 NULL, + min_age int4 NULL, + max_age int4 NULL, + avg_age float8 NOT NULL, + gender int2 NULL, + + -- 매칭 관련 + occupancy_score int4 NULL, + remaining_reject_count int4 NULL, + matching_start_at timestamptz(6) NULL, + + -- 외래키 컬럼 + created_by int8 NOT NULL, + sigungu_code varchar(5) NULL, + + CONSTRAINT meeting_code_key UNIQUE (code), + CONSTRAINT fk_meeting_creator FOREIGN KEY (created_by) REFERENCES public.users(user_id), + CONSTRAINT fk_meeting_region FOREIGN KEY (sigungu_code) REFERENCES public.regions(sigungu_code) +); + +CREATE TABLE public.meeting_members ( + id int8 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + joined_at timestamptz(6) NOT NULL, + meeting_role int2 NULL, + status int2 NULL, + meeting_id int8 NULL, + user_id int8 NULL, + CONSTRAINT fk_meeting_members_meeting FOREIGN KEY (meeting_id) REFERENCES public.meeting(id), + CONSTRAINT fk_meeting_members_user FOREIGN KEY (user_id) REFERENCES public.users(user_id) +); + +CREATE TABLE public.meeting_matches ( + id int8 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + created_at timestamptz(6) NOT NULL, + decision_dead_line timestamptz(6) NULL, + matching_status int2 NULL, + meeting1decision int2 NULL, + meeting2decision int2 NULL, + meeting1_id int8 NOT NULL, + meeting2_id int8 NOT NULL, + CONSTRAINT fk_match_meeting1 FOREIGN KEY (meeting1_id) REFERENCES public.meeting(id), + CONSTRAINT fk_match_meeting2 FOREIGN KEY (meeting2_id) REFERENCES public.meeting(id) +); + +-- 3. Chat(채팅) 도메인 테이블 생성 +CREATE TABLE public.chat_rooms ( + id int8 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + created_at timestamptz(6) NOT NULL, + updated_at timestamptz(6) NOT NULL, + chat_status int2 NULL CHECK (chat_status >= 0 AND chat_status <= 1), + "type" int2 NULL, + match_id int8 NULL UNIQUE, + meeting_id int8 NULL UNIQUE, + CONSTRAINT fk_chat_match FOREIGN KEY (match_id) REFERENCES public.meeting_matches(id), + CONSTRAINT fk_chat_meeting FOREIGN KEY (meeting_id) REFERENCES public.meeting(id) +); + +CREATE TABLE public.chat_members ( + id int8 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + joined_at timestamptz(6) NULL, + last_read_message_id int4 NULL, + room_id int8 NOT NULL, + user_id int8 NOT NULL, + CONSTRAINT fk_chat_members_room FOREIGN KEY (room_id) REFERENCES public.chat_rooms(id), + CONSTRAINT fk_chat_members_user FOREIGN KEY (user_id) REFERENCES public.users(user_id) +); + +CREATE TABLE public.chat_messages ( + id int8 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + created_at timestamptz(6) NOT NULL, + updated_at timestamptz(6) NOT NULL, + "content" varchar(255) NULL, + "type" int2 NULL, + room_id int8 NULL, + sender_user_id int8 NULL, + CONSTRAINT fk_chat_msg_room FOREIGN KEY (room_id) REFERENCES public.chat_rooms(id), + CONSTRAINT fk_chat_msg_user FOREIGN KEY (sender_user_id) REFERENCES public.users(user_id) +); + +-- 4. Profile 테이블 구조 변경 (로컬 코드와 맞추기 위함) +-- 로컬에서는 university_id, region_id(sigungu_code) FK를 사용하는 것으로 보임 +-- 운영에 있는 기존 데이터(varchar)를 보존하면서 컬럼을 추가함 + +ALTER TABLE public.profile ADD COLUMN IF NOT EXISTS university_id int8; +ALTER TABLE public.profile ADD COLUMN IF NOT EXISTS region_id varchar(5); + +-- FK 연결 (데이터가 NULL이어도 제약조건 생성 가능) +ALTER TABLE public.profile + ADD CONSTRAINT fk_profile_university FOREIGN KEY (university_id) REFERENCES public.university(university_id); + +ALTER TABLE public.profile + ADD CONSTRAINT fk_profile_region FOREIGN KEY (region_id) REFERENCES public.regions(sigungu_code); + diff --git a/mannabom-server/src/main/resources/db/migration/V3__add_request_table_and_extra_photo_table_and_rating_table.sql b/mannabom-server/src/main/resources/db/migration/V3__add_request_table_and_extra_photo_table_and_rating_table.sql new file mode 100644 index 0000000..8656795 --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V3__add_request_table_and_extra_photo_table_and_rating_table.sql @@ -0,0 +1,77 @@ +-- like_request 테이블 생성 +CREATE TABLE like_request ( + id BIGINT GENERATED BY DEFAULT AS IDENTITY, + from_user_id BIGINT NOT NULL, + to_user_id BIGINT NOT NULL, + status VARCHAR(255) NOT NULL, + created_at TIMESTAMP NOT NULL, + responded_at TIMESTAMP, + PRIMARY KEY (id) +); + +-- 유니크 제약조건 추가 (같은 사람에게 중복 요청 방지) +ALTER TABLE like_request + ADD CONSTRAINT uk_like_from_to + UNIQUE (from_user_id, to_user_id); + +-- 인덱스 생성 (조회 성능 최적화) +CREATE INDEX idx_like_to_status ON like_request (to_user_id, status); +CREATE INDEX idx_like_from_status ON like_request (from_user_id, status); + + + +-- message_request 테이블 생성 +CREATE TABLE message_request ( + id BIGINT GENERATED BY DEFAULT AS IDENTITY, + from_user_id BIGINT NOT NULL, + to_user_id BIGINT NOT NULL, + message VARCHAR(200), + status VARCHAR(255) NOT NULL, + created_at TIMESTAMP NOT NULL, + responded_at TIMESTAMP, + PRIMARY KEY (id) +); + +-- 유니크 제약조건 추가 (같은 사람에게 중복 메시지 요청 방지) +ALTER TABLE message_request + ADD CONSTRAINT uk_msg_from_to + UNIQUE (from_user_id, to_user_id); + +-- 인덱스 생성 (조회 성능 최적화) +CREATE INDEX idx_msgreq_to_status ON message_request (to_user_id, status); +CREATE INDEX idx_msgreq_from_status ON message_request (from_user_id, status); + + + +-- profile_extra_photo_unlock 테이블 생성 +CREATE TABLE profile_extra_photo_unlock ( + unlock_id BIGINT GENERATED BY DEFAULT AS IDENTITY, + requester_user_id BIGINT NOT NULL, + target_user_id BIGINT NOT NULL, + photo_id BIGINT NOT NULL, + created_at TIMESTAMP, + updated_at TIMESTAMP, + PRIMARY KEY (unlock_id) +); + +-- 유니크 제약조건 추가 (중복 해제 방지) +ALTER TABLE profile_extra_photo_unlock +ADD CONSTRAINT uk_unlock_requester_target_photo +UNIQUE (requester_user_id, target_user_id, photo_id); + + +-- profile_rating 테이블 생성 +CREATE TABLE profile_rating ( + profile_rating_id BIGINT GENERATED BY DEFAULT AS IDENTITY, + from_user_id BIGINT NOT NULL, + target_user_id BIGINT NOT NULL, + score INTEGER NOT NULL, + created_at TIMESTAMP, + updated_at TIMESTAMP, + PRIMARY KEY (profile_rating_id) +); + +-- 유니크 제약조건 추가 (한 사람이 동일 대상을 중복 평가 불가) +ALTER TABLE profile_rating +ADD CONSTRAINT uk_profile_rating_from_to +UNIQUE (from_user_id, target_user_id); diff --git a/mannabom-server/src/main/resources/db/migration/V4__add_reject_reason_to_like_request.sql b/mannabom-server/src/main/resources/db/migration/V4__add_reject_reason_to_like_request.sql new file mode 100644 index 0000000..cc2c3f7 --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V4__add_reject_reason_to_like_request.sql @@ -0,0 +1,2 @@ +ALTER TABLE like_request +ADD COLUMN IF NOT EXISTS reject_reason VARCHAR(255); diff --git a/mannabom-server/src/main/resources/db/migration/V5__add_reject_reason_to_message_request.sql b/mannabom-server/src/main/resources/db/migration/V5__add_reject_reason_to_message_request.sql new file mode 100644 index 0000000..d00b6e9 --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V5__add_reject_reason_to_message_request.sql @@ -0,0 +1,2 @@ +ALTER TABLE message_request +ADD COLUMN IF NOT EXISTS reject_reason VARCHAR(255); diff --git a/mannabom-server/src/main/resources/db/migration/V6__add_source_to_like_request.sql b/mannabom-server/src/main/resources/db/migration/V6__add_source_to_like_request.sql new file mode 100644 index 0000000..d826ae3 --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V6__add_source_to_like_request.sql @@ -0,0 +1,9 @@ +ALTER TABLE like_request +ADD COLUMN source VARCHAR(30); + +UPDATE like_request +SET source = 'PROFILE_MATCH' +WHERE source IS NULL; + +ALTER TABLE like_request +ALTER COLUMN source SET NOT NULL; \ No newline at end of file diff --git a/mannabom-server/src/main/resources/db/migration/V7__add_source_to_message_request.sql b/mannabom-server/src/main/resources/db/migration/V7__add_source_to_message_request.sql new file mode 100644 index 0000000..17d093e --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V7__add_source_to_message_request.sql @@ -0,0 +1,9 @@ +ALTER TABLE message_request +ADD COLUMN source VARCHAR(30); + +UPDATE message_request +SET source = 'PROFILE_MATCH' +WHERE source IS NULL; + +ALTER TABLE message_request +ALTER COLUMN source SET NOT NULL; \ No newline at end of file diff --git a/mannabom-server/src/main/resources/db/migration/V8__migrate_profile_data_and_add_column_chat_room_table.sql b/mannabom-server/src/main/resources/db/migration/V8__migrate_profile_data_and_add_column_chat_room_table.sql new file mode 100644 index 0000000..5d1f387 --- /dev/null +++ b/mannabom-server/src/main/resources/db/migration/V8__migrate_profile_data_and_add_column_chat_room_table.sql @@ -0,0 +1,44 @@ +-- 1. [데이터 이관] 기존 문자열(university) -> 새로운 ID(university_id) 매핑 +-- 이름이 정확히 일치하는 경우에만 업데이트 +UPDATE public.profile p +SET university_id = u.university_id + FROM public.university u +WHERE p.university = u.name + AND p.university_id IS NULL; -- 이미 값이 있는 건 건드리지 않음 + +-- 2. [데이터 이관] 기존 문자열(region) -> 새로운 ID(region_id) 매핑 +-- 시도/시군구 이름이 모두 일치하는 경우 업데이트 +UPDATE public.profile p +SET region_id = r.sigungu_code + FROM public.regions r +WHERE p.region_sido = r.sido_name + AND p.region_sigungu = r.sigungu_name + AND p.region_id IS NULL; + +-- 3. [컬럼 삭제] 데이터 이관이 끝났으므로 기존 컬럼 삭제 +ALTER TABLE public.profile DROP COLUMN IF EXISTS university; +ALTER TABLE public.profile DROP COLUMN IF EXISTS region_sido; +ALTER TABLE public.profile DROP COLUMN IF EXISTS region_sigungu; + + +-- V5__add_recommend_history_to_chat_rooms.sql + + + +-- 1. 새로운 연관관계 컬럼 추가 +ALTER TABLE public.chat_rooms ADD COLUMN IF NOT EXISTS profile_recommend_history_id int8; +ALTER TABLE public.chat_rooms ADD COLUMN IF NOT EXISTS love_view_recommend_history_id int8; + +-- 2. 1:1 관계를 위한 UNIQUE 제약 조건 추가 +ALTER TABLE public.chat_rooms ADD CONSTRAINT uk_chat_profile_history UNIQUE (profile_recommend_history_id); +ALTER TABLE public.chat_rooms ADD CONSTRAINT uk_chat_loveview_history UNIQUE (love_view_recommend_history_id); + +-- 3. 외래키(FK) 설정 +-- 참조하는 테이블 이름(profile_recommend_history 등)이 실제 생성된 이름과 맞는지 확인하세요! +ALTER TABLE public.chat_rooms + ADD CONSTRAINT fk_chat_profile_history FOREIGN KEY (profile_recommend_history_id) + REFERENCES public.profile_recommend_history(id); + +ALTER TABLE public.chat_rooms + ADD CONSTRAINT fk_chat_loveview_history FOREIGN KEY (love_view_recommend_history_id) + REFERENCES public.love_view_recommend_history(id); \ No newline at end of file diff --git a/mannabom-server/src/test/java/com/mannabom/mannabom_server/MannabomServerApplicationTests.java b/mannabom-server/src/test/java/com/mannabom/mannabom_server/MannabomServerApplicationTests.java new file mode 100644 index 0000000..81dc095 --- /dev/null +++ b/mannabom-server/src/test/java/com/mannabom/mannabom_server/MannabomServerApplicationTests.java @@ -0,0 +1,13 @@ +package com.mannabom.mannabom_server; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MannabomServerApplicationTests { + + @Test + void contextLoads() { + } + +} From 9ed14be127a748f53ff37720f18174d92b4acb8f Mon Sep 17 00:00:00 2001 From: juneon Date: Thu, 9 Apr 2026 19:10:53 +0900 Subject: [PATCH 02/10] =?UTF-8?q?chore:=20PR=20=ED=85=9C=ED=94=8C=EB=A6=BF?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.github/pull_request_template.md | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 mannabom-server/.github/pull_request_template.md diff --git a/mannabom-server/.github/pull_request_template.md b/mannabom-server/.github/pull_request_template.md new file mode 100644 index 0000000..81e7ca4 --- /dev/null +++ b/mannabom-server/.github/pull_request_template.md @@ -0,0 +1,22 @@ +## 작업 내용 +- + +## 변경 이유 +- + +## 주요 변경 사항 +- + +## 테스트 +- [ ] 로컬 실행 확인 +- [ ] API 테스트 확인 +- [ ] DB 마이그레이션 확인 + +## 관련 이슈 +- closes # + +## 리뷰 포인트 +- + +## 참고 사항 +- \ No newline at end of file From 3f480be4cd4732b43bcbfc75cb5211ef265db623 Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 00:21:08 +0900 Subject: [PATCH 03/10] =?UTF-8?q?chore:=20PR=20=ED=85=9C=ED=94=8C=EB=A6=BF?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mannabom-server/.github/{pull_request_template.md => PULL_REQUEST_TEMPLATE/default.md} (100%) diff --git a/mannabom-server/.github/pull_request_template.md b/mannabom-server/.github/PULL_REQUEST_TEMPLATE/default.md similarity index 100% rename from mannabom-server/.github/pull_request_template.md rename to mannabom-server/.github/PULL_REQUEST_TEMPLATE/default.md From d6d043a04714fd205021ac2d01e7a11e2e96e7ac Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 00:21:21 +0900 Subject: [PATCH 04/10] =?UTF-8?q?ci:=20GitHub=20Actions=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mannabom-server/.github/workflows/ci.yml | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 mannabom-server/.github/workflows/ci.yml diff --git a/mannabom-server/.github/workflows/ci.yml b/mannabom-server/.github/workflows/ci.yml new file mode 100644 index 0000000..100d95e --- /dev/null +++ b/mannabom-server/.github/workflows/ci.yml @@ -0,0 +1,38 @@ +name: CI + +on: + pull_request: + branches: [ "main", "dev" ] + push: + branches: [ "main", "dev" ] + +jobs: + test-and-coverage: + name: test-and-coverage + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Grant execute permission + run: chmod +x gradlew + + - name: Run tests and coverage verification + run: ./gradlew clean test jacocoTestReport jacocoTestCoverageVerification + + - name: Upload coverage report artifact + if: always() + uses: actions/upload-artifact@v4 + with: + name: jacoco-report + path: build/reports/jacoco/test/html/ \ No newline at end of file From b540e08c808cfa06690fb72cd5765317ebab79c7 Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 00:21:29 +0900 Subject: [PATCH 05/10] =?UTF-8?q?build:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BB=A4=EB=B2=84=EB=A6=AC=EC=A7=80=20=EA=B2=80=EC=A6=9D=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mannabom-server/build.gradle | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/mannabom-server/build.gradle b/mannabom-server/build.gradle index 65af508..d3ed0bf 100644 --- a/mannabom-server/build.gradle +++ b/mannabom-server/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.5.4' id 'io.spring.dependency-management' version '1.1.7' + id 'jacoco' } group = 'com.mannabom' @@ -78,3 +79,40 @@ tasks.named('test') { useJUnitPlatform() } +test { + useJUnitPlatform() + finalizedBy jacocoTestReport +} + +jacoco { + toolVersion = "0.8.13" +} + +jacocoTestReport { + dependsOn test + + reports { + xml.required = true + csv.required = false + html.required = true + } +} + +jacocoTestCoverageVerification { + dependsOn test + + violationRules { + rule { + enabled = true + element = 'BUNDLE' + + limit { + counter = 'LINE' + value = 'COVEREDRATIO' + minimum = 0.70 + } + } + } +} + +check.dependsOn jacocoTestCoverageVerification \ No newline at end of file From 0d0fff17b0e759851cee87a6ceab49b2066a1c1e Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 00:21:42 +0900 Subject: [PATCH 06/10] =?UTF-8?q?chore:=20gitignore=20=EC=9C=84=EC=B9=98?= =?UTF-8?q?=20=EB=B0=8F=20ignore=20=EA=B7=9C=EC=B9=99=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mannabom-server/.gitignore => .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename mannabom-server/.gitignore => .gitignore (95%) diff --git a/mannabom-server/.gitignore b/.gitignore similarity index 95% rename from mannabom-server/.gitignore rename to .gitignore index d6bc15c..70af5e4 100644 --- a/mannabom-server/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -HELP.md +mannabom-server/HELP.md .gradle build/ !gradle/wrapper/gradle-wrapper.jar @@ -47,6 +47,7 @@ out/ mannabom-server/.env* mannabom-server/src/.env* .DS_Store +.idea/* #firebase 비밀키 **/src/main/resources/firebase/ From 49f6c03a0ee06dac08cdba4777fba475322847fe Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 00:48:27 +0900 Subject: [PATCH 07/10] =?UTF-8?q?refactor:=20=EC=8B=A4=ED=96=89=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EA=B2=BD=EB=A1=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mannabom-server/.github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mannabom-server/.github/workflows/ci.yml b/mannabom-server/.github/workflows/ci.yml index 100d95e..25e45fa 100644 --- a/mannabom-server/.github/workflows/ci.yml +++ b/mannabom-server/.github/workflows/ci.yml @@ -25,9 +25,11 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Grant execute permission + working-directory: mannabom-server run: chmod +x gradlew - name: Run tests and coverage verification + working-directory: mannabom-server run: ./gradlew clean test jacocoTestReport jacocoTestCoverageVerification - name: Upload coverage report artifact @@ -35,4 +37,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: jacoco-report - path: build/reports/jacoco/test/html/ \ No newline at end of file + path: mannabom-server/build/reports/jacoco/test/html/ \ No newline at end of file From 5a75a70621aac65e6b12e45a67c8cdd7a9352f59 Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 00:48:37 +0900 Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +-- mannabom-server/build.gradle | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 70af5e4..f7aa753 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ bin/ !**/src/test/**/bin/ ### IntelliJ IDEA ### -.idea +.idea/ *.iws *.iml *.ipr @@ -47,7 +47,6 @@ out/ mannabom-server/.env* mannabom-server/src/.env* .DS_Store -.idea/* #firebase 비밀키 **/src/main/resources/firebase/ diff --git a/mannabom-server/build.gradle b/mannabom-server/build.gradle index d3ed0bf..2cbc2ae 100644 --- a/mannabom-server/build.gradle +++ b/mannabom-server/build.gradle @@ -75,10 +75,6 @@ dependencies { } -tasks.named('test') { - useJUnitPlatform() -} - test { useJUnitPlatform() finalizedBy jacocoTestReport From 540ee2fa6a9d7cebb4b7d38d6ad1cfa2a3f63ce9 Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 11:51:39 +0900 Subject: [PATCH 09/10] =?UTF-8?q?test:=20CI=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=ED=94=84=EB=A1=9C=ED=95=84=20=EB=B0=8F=20=EC=BB=A4=EB=B2=84?= =?UTF-8?q?=EB=A6=AC=EC=A7=80=20=EA=B2=80=EC=A6=9D=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mannabom-server/.github/workflows/ci.yml | 57 +++++++- .../src/main/resources/application-test.yml | 131 ++++++++++++++++++ 2 files changed, 182 insertions(+), 6 deletions(-) create mode 100644 mannabom-server/src/main/resources/application-test.yml diff --git a/mannabom-server/.github/workflows/ci.yml b/mannabom-server/.github/workflows/ci.yml index 25e45fa..24252a1 100644 --- a/mannabom-server/.github/workflows/ci.yml +++ b/mannabom-server/.github/workflows/ci.yml @@ -11,28 +11,73 @@ jobs: name: test-and-coverage runs-on: ubuntu-latest + services: + postgres: + image: postgres:13 + env: + POSTGRES_DB: mannabom_test + POSTGRES_USER: testuser + POSTGRES_PASSWORD: testpass + ports: + - 5432:5432 + options: >- + --health-cmd="pg_isready -U testuser -d mannabom_test" + --health-interval=10s + --health-timeout=5s + --health-retries=5 + + redis: + image: redis:6-alpine + ports: + - 6379:6379 + options: >- + --health-cmd="redis-cli ping" + --health-interval=10s + --health-timeout=5s + --health-retries=5 + steps: - - name: Checkout + - name: Repository 체크 아웃 uses: actions/checkout@v4 + with: + fetch-depth: 0 - - name: Set up Java + - name: JDK 17 설치 uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 - - name: Set up Gradle + - name: Gradle 세팅 uses: gradle/actions/setup-gradle@v4 - - name: Grant execute permission + - name: 실행 권한 부여 working-directory: mannabom-server run: chmod +x gradlew - - name: Run tests and coverage verification + - name: Gradle 실행 및 테스트 결과 리포트 작성 working-directory: mannabom-server + env: + SPRING_PROFILES_ACTIVE: test run: ./gradlew clean test jacocoTestReport jacocoTestCoverageVerification - - name: Upload coverage report artifact + - name: Python 설치 + uses: actions/setup-python@v5 + with: + python-version: "3.11" + + - name: diff-cover 설치 + run: pip install diff-cover + + - name: PR 변경항목에 대해 테스트 커버리지 충족 여부 확인 + if: github.event_name == 'pull_request' + working-directory: mannabom-server + run: | + diff-cover build/reports/jacoco/test/jacocoTestReport.xml \ + --compare-branch=origin/${{ github.base_ref }} \ + --fail-under=80 + + - name: 테스트 결과 리포트 업로드 if: always() uses: actions/upload-artifact@v4 with: diff --git a/mannabom-server/src/main/resources/application-test.yml b/mannabom-server/src/main/resources/application-test.yml new file mode 100644 index 0000000..beb4e16 --- /dev/null +++ b/mannabom-server/src/main/resources/application-test.yml @@ -0,0 +1,131 @@ +spring: + application: + name: mannabom-server + + datasource: + url: jdbc:postgresql://${TEST_DB_HOST:localhost}:${TEST_DB_PORT:5432}/${TEST_DB_NAME:mannabom_test} + username: ${TEST_DB_USERNAME:testuser} + password: ${TEST_DB_PASSWORD:testpass} + driver-class-name: org.postgresql.Driver + + jpa: + hibernate: + ddl-auto: validate + default_batch_fetch_size: 100 + properties: + hibernate.hibernate.use_sql_comments: true + hibernate: + format_sql: true + show-sql: false + + flyway: + enabled: true + locations: classpath:db/migration + baseline-on-migrate: true + + data: + redis: + host: ${TEST_REDIS_HOST:localhost} + port: ${TEST_REDIS_PORT:6379} + + servlet: + multipart: + max-file-size: 10MB + max-request-size: 30MB + + mail: + host: smtp.gmail.com + port: 587 + username: ${MAIL_USERNAME:test@example.com} + password: ${MAIL_PASSWORD:test-password} + properties: + mail: + smtp: + auth: true + starttls: + enable: true + +app: + aws: + region: ${AWS_REGION:ap-northeast-2} + s3: + bucket-name: ${S3_BUCKET_NAME:test-bucket} + access-key: ${S3_ACCESS_KEY:test-access-key} + secret-key: ${S3_SECRET_KEY:test-secret-key} + base-url: ${S3_BASE_URL:http://localhost/test-bucket} + + jwt: + secret: ${JWT_SECRET:mannabom-test-secret-key-for-ci-at-least-32chars} + access-token-expiration: 86_400_000 + refresh-token-expiration: 604_800_000 + + kakao: + client-id: ${KAKAO_CLIENT_ID:test-kakao-client-id} + redirect-uri: http://localhost:8080/api/auth/login/kakao + development: + skip-age-verification: true + default-birth-year: 2000 + default-gender: "MALE" + + file: + upload-dir: ./uploads-test + base-url: http://localhost:8080/files/ + + email: + dummy-mode: true + +logging: + level: + com.mannabom: INFO + org.springframework.security: WARN + org.hibernate.SQL: WARN + +server: + port: 8080 + +meeting: + cursor: + secret: ${MEETING_SECRET_KEY:test-meeting-secret-key} + match: + scheduler: + initial-delay: 1800000 + fixed_delay: 1800000 + +fcm: + service-account-path: ${FCM_FILE_PATH:} + project_id: ${FCM_PROJECT_ID:test-project} + url: https://fcm.googleapis.com/v1/projects/${fcm.project_id}/messages:send + google_api: https://www.googleapis.com/auth/cloud-platform + +match: + policy: + cooldown-hours: 72 + candidate-pool-size: 200 + pick-pool-size: 50 + +ting: + policy: + vip-threshold: 200 + cost: + extra-profile: 5 + extra-profile-bundle5: 20 + message: 40 + like: 20 + view-extra-photo: 5 + view-score: 5 + view-liked-me-profile: 5 + view-high-score-profile: 5 + +benefit: + policy: + membership: + monthly-extra-profiles: 35 + monthly-free-messages: 10 + monthly-free-likes: 5 + vip: + daily-extra-profiles: 2 + daily-free-messages: 0 + daily-free-likes: 0 + basic: + daily-profile: 10 + daily-love-view: 10 \ No newline at end of file From 23859406f8b39e21db47d3e138af68705ba883b8 Mon Sep 17 00:00:00 2001 From: juneon Date: Fri, 10 Apr 2026 18:36:28 +0900 Subject: [PATCH 10/10] =?UTF-8?q?refactor:=20application-test.yml=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mannabom-server/src/main/resources/application-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mannabom-server/src/main/resources/application-test.yml b/mannabom-server/src/main/resources/application-test.yml index beb4e16..68a949a 100644 --- a/mannabom-server/src/main/resources/application-test.yml +++ b/mannabom-server/src/main/resources/application-test.yml @@ -11,10 +11,10 @@ spring: jpa: hibernate: ddl-auto: validate - default_batch_fetch_size: 100 properties: - hibernate.hibernate.use_sql_comments: true hibernate: + default_batch_fetch_size: 100 + use_sql_comments: true format_sql: true show-sql: false