Merge branch 'develop' into main

Author: dh2906

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,6 @@
 
 * 
 
-- close #이슈번호
 
 ---
 

.github/SCRIPT/check_flyway_version.py

@@ -0,0 +1,45 @@
+import os
+import subprocess
+
+def get_flyway_files(branch):
+    # 브랜치 체크아웃
+    subprocess.run(['git', 'checkout', branch], check=True)
+    # db 디렉토리에서 파일 목록 가져오기
+    db_path = os.path.join(os.getcwd(), 'src/main/resources/db/migration')
+    files = os.listdir(db_path)
+    # Flyway 파일 추출 및 정렬
+    flyway_files = sorted([f for f in files if f.startswith('V')])
+    return flyway_files
+
+def extract_version_and_name(file_name):
+    version, name = file_name.split('__', 1)
+    return version, name
+
+def main():
+
+    # 현재 브랜치의 Flyway 파일 가져오기
+    current_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip().decode('utf-8')
+    pr_files = get_flyway_files(current_branch)
+
+    # 메인 브랜치의 Flyway 파일 가져오기
+    main_files = get_flyway_files('develop')
+    main_versions = {}
+    for file_name in main_files:
+        version, name = extract_version_and_name(file_name)
+        main_versions[version] = name
+    
+    conflict_versions = []
+    for file_name in pr_files:
+        version, name = file_name.split('__', 1)
+        
+        if version in main_versions and name != main_versions[version]:
+            conflict_versions.append(file_name)
+
+    if conflict_versions:
+        print(f"Error: Version conflict(s) found for versions: {', '.join(conflict_versions)}")
+        exit(1)
+    else:
+        print("No version conflicts found.")
+
+if __name__ == "__main__":
+    main()

.github/workflows/deploy-prod.yml

@@ -93,7 +93,7 @@ jobs:
             docker exec -e MYSQL_PWD="$MYSQL_PASSWORD" "$MYSQL_CONTAINER" \
               mysqldump --no-tablespaces -u"$MYSQL_USERNAME" "$MYSQL_DATABASE" > "$DUMP_FILE"
 
-            find "$BACKUP_DIR" -type f -name '*.sql' -mtime +5 -delete
+            find "$BACKUP_DIR" -type f -name '*.sql' -mtime +30 -delete
 
       - name: Deploy to prod server
         uses: appleboy/ssh-action@v0.1.8

.github/workflows/flyway-version-validator.yml

@@ -0,0 +1,17 @@
+name: Flyway Version Validator
+
+on: [pull_request]
+
+jobs:
+  check-flyway-version:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Fetch all branches
+      run: git fetch --all
+
+    - name: Run Flyway version check
+      run: python .github/SCRIPT/check_flyway_version.py

build.gradle

@@ -64,6 +64,11 @@ dependencies {
     implementation platform('software.amazon.awssdk:bom:2.41.14')
     implementation 'software.amazon.awssdk:s3'
 
+    // 이미지 WEBP 변환
+    implementation 'com.sksamuel.scrimage:scrimage-core:4.3.2'
+    implementation 'com.sksamuel.scrimage:scrimage-webp:4.3.2'
+    implementation 'com.twelvemonkeys.imageio:imageio-jpeg:3.13.1'
+
     // monitoring
     implementation 'io.micrometer:micrometer-registry-prometheus'
 

scripts/code-formatting.sh

@@ -12,9 +12,18 @@ target_java_files=()
 target_mode="staged"
 pre_format_snapshot=""
 
+canonicalize_path() {
+    local input_path="$1"
+    local dir_path
+    local base_name
+
+    dir_path="$(cd "$(dirname "$input_path")" && pwd -P)" || return 1
+    base_name="$(basename "$input_path")"
+    printf '%s/%s\n' "$dir_path" "$base_name"
+}
+
 resolve_target_java_file() {
     local input_file="$1"
-    local candidate_path=""
     local resolved_file=""
     local matched_files=""
     local match_count
@@ -25,11 +34,20 @@ resolve_target_java_file() {
     esac
 
     if [ -f "$input_file" ]; then
-        candidate_path="$input_file"
+        resolved_file="$(canonicalize_path "$input_file")" || {
+            echo "[오류] 파일 경로를 정규화할 수 없습니다: $input_file" >&2
+            return 1
+        }
     elif [ -f "$invocation_dir/$input_file" ]; then
-        candidate_path="$invocation_dir/$input_file"
+        resolved_file="$(canonicalize_path "$invocation_dir/$input_file")" || {
+            echo "[오류] 파일 경로를 정규화할 수 없습니다: $input_file" >&2
+            return 1
+        }
     elif [ -f "$repo_root/$input_file" ]; then
-        candidate_path="$repo_root/$input_file"
+        resolved_file="$(canonicalize_path "$repo_root/$input_file")" || {
+            echo "[오류] 파일 경로를 정규화할 수 없습니다: $input_file" >&2
+            return 1
+        }
     else
         matched_files="$(git ls-files -- "$input_file" "*/$input_file" 2>/dev/null || true)"
         if [ -z "$matched_files" ]; then
@@ -43,11 +61,10 @@ resolve_target_java_file() {
             return 1
         fi
 
-        candidate_path="$repo_root/$matched_files"
-    fi
-
-    if [ -n "$candidate_path" ]; then
-        resolved_file="$(cd "$(dirname "$candidate_path")" && pwd -P)/$(basename "$candidate_path")"
+        resolved_file="$(canonicalize_path "$repo_root/$matched_files")" || {
+            echo "[오류] 파일 경로를 정규화할 수 없습니다: $input_file" >&2
+            return 1
+        }
     fi
 
     case "$resolved_file" in
@@ -448,3 +465,4 @@ else
         echo "[완료] 지정된 Java 파일에 변경할 내용이 없습니다."
     fi
 fi
+