YAPP-Github · leegwichan · Jul 3, 2025 · Jul 3, 2025 · Jul 3, 2025 · Jul 3, 2025
diff --git a/.github/workflows/automatic-erd.yml b/.github/workflows/automatic-erd.yml
@@ -0,0 +1,96 @@
+name: ERD to GitHub Pages
+
+on:
+  pull_request:
+    branches: [ "**" ]
+    paths: [ "**" ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  generate-erd-from-flyway:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_USER: ${{ secrets.TEST_DB_USER }}
+          MYSQL_PASSWORD: ${{ secrets.TEST_DB_PASSWORD }}
+          MYSQL_ROOT_PASSWORD: ${{ secrets.TEST_DB_ROOT_PASSWORD }}
+          MYSQL_DATABASE: testdb
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Download Flyway
+        run: |
+          curl -sSL "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/10.13.0/flyway-commandline-10.13.0-linux-x64.tar.gz" -o flyway.tar.gz
+          tar -xzf flyway.tar.gz
+          echo "$(pwd)/flyway-10.13.0" >> $GITHUB_PATH
+
+      - name: Run Flyway migrations
+        run: |
+          flyway -url="jdbc:mysql://127.0.0.1:3306/testdb?allowPublicKeyRetrieval=true&useSSL=false" -user=${{ secrets.TEST_DB_USER }} -password=${{ secrets.TEST_DB_PASSWORD }} -locations=filesystem:src/main/resources/db/migration migrate
+        shell: bash
+
+      - name: Dump database schema
+        run: |
+          mkdir -p erd
+          mysqldump -h 127.0.0.1 -u ${{ secrets.TEST_DB_USER }} -p${{ secrets.TEST_DB_PASSWORD }} --no-data --skip-comments testdb > erd/schema.sql
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install DBML Tools
+        run: npm install -g @dbml/cli @softwaretechnik/dbml-renderer
+
+      - name: Convert SQL to DBML
+        run: |
+          npx sql2dbml erd/schema.sql --mysql -o erd/schema.dbml
+
+      - name: Render ERD to SVG
+        run: |
+          npx dbml-renderer -i erd/schema.dbml -o erd/erd.svg
+
+      - name: Generate HTML wrapper
+        run: |
+          echo "<html><head><title>ERD Preview</title></head><body><h2>ERD Preview for PR #${{ github.event.pull_request.number }}</h2><img src='erd.svg' style='max-width:100%;'/></body></html>" > erd/index.html
+
+      - name: Deploy ERD to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./erd
+          force_orphan: true
+
+      - name: Comment on PR with ERD Link
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            📌 최신 ERD가 자동 생성되었습니다.
+
+            👉 [ERD 보러가기](https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/)
diff --git a/build.gradle b/build.gradle
@@ -27,8 +27,8 @@ jacoco {
 
 sonarqube {
     properties {
-        property "sonar.projectKey", "baegam_timeeat"
-        property "sonar.organization", "baegam"
+        property "sonar.projectKey", "YAPP-Github_26th-Web-Team-1-BE"
+        property "sonar.organization", "yapp-github"
         property "sonar.host.url", "https://sonarcloud.io"
         property 'sonar.sourceEncoding', 'UTF-8'
         property 'sonar.java.coveragePlugin', 'jacoco'
@@ -56,6 +56,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     // Lombok
     compileOnly 'org.projectlombok:lombok'
@@ -85,6 +86,8 @@ dependencies {
 
     // aws
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-parameter-store:3.2.1'
+    implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.2.1'
+    implementation 'software.amazon.awssdk:s3:2.31.77'
 }
 
 bootJar {
@@ -125,18 +128,18 @@ generateSwaggerUI {
 
 openapi3 {
     servers = [
-                {
-                    url = "https://api-dev.eatda.net"
-                    description = "Develop Server"
-                },
-                {
-                    url = "https://api.eatda.net"
-                    description = "Production Server"
-                },
-                {
-                    url = "http://localhost:8080"
-                    description = "Local Server"
-                }
+            {
+                url = "https://api-dev.eatda.net"
+                description = "Develop Server"
+            },
+            {
+                url = "https://api.eatda.net"
+                description = "Production Server"
+            },
+            {
+                url = "http://localhost:8080"
+                description = "Local Server"
+            }
     ]
     title = "EatDa API"
     description = "EatDa API 명세서"

diff --git a/...main/java/timeeat/TimeEatApplication.java → src/main/java/eatda/EatdaApplication.java b/...main/java/timeeat/TimeEatApplication.java → src/main/java/eatda/EatdaApplication.java
@@ -1,12 +1,12 @@
-package timeeat;
+package eatda;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class TimeEatApplication {
+public class EatdaApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(TimeEatApplication.class, args);
+        SpringApplication.run(EatdaApplication.class, args);
     }
 }
diff --git a/src/main/java/eatda/client/map/KakaoProperties.java b/src/main/java/eatda/client/map/KakaoProperties.java
@@ -0,0 +1,22 @@
+package eatda.client.map;
+
+import lombok.Getter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@ConfigurationProperties(prefix = "kakao")
+public class KakaoProperties {
+
+    private final String apiKey;
+
+    public KakaoProperties(String apiKey) {
+        validateApiKey(apiKey);
+        this.apiKey = apiKey;
+    }
+
+    private void validateApiKey(String apiKey) {
+        if (apiKey == null || apiKey.isBlank()) {
+            throw new IllegalArgumentException("API key must not be null or blank");
+        }
+    }
+}
diff --git a/src/main/java/eatda/client/map/MapClient.java b/src/main/java/eatda/client/map/MapClient.java
@@ -0,0 +1,41 @@
+package eatda.client.map;
+
+import eatda.domain.store.Coordinates;
+import java.util.List;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClient;
+
+@Component
+@EnableConfigurationProperties(KakaoProperties.class)
+public class MapClient {
+
+    private final RestClient restClient;
+    private final KakaoProperties kakaoProperties;
+
+    public MapClient(RestClient.Builder restClient, KakaoProperties properties) {
+        this.restClient = restClient
+                .defaultStatusHandler(HttpStatusCode::is5xxServerError, new MapServerErrorHandler())
+                .build();
+        this.kakaoProperties = properties;
+    }
+
+    public List<StoreSearchResult> searchShops(String query) {
+        return restClient.get()
+                .uri("https://dapi.kakao.com/v2/local/search/keyword.json", builder -> builder
+                        .queryParam("query", query)
+                        .queryParam("category", "FD6")
+                        .queryParam("rect", "%s,%s,%s,%s".formatted(
+                                Coordinates.getMinLongitude(), Coordinates.getMinLatitude(),
+                                Coordinates.getMaxLongitude(), Coordinates.getMaxLatitude()))
+                        .queryParam("page", 1)
+                        .queryParam("size", 15)
+                        .queryParam("sort", "accuracy")
+                        .build())
+                .header("Authorization", "KakaoAK " + kakaoProperties.getApiKey())
+                .retrieve()
+                .body(StoreSearchResults.class)
+                .results();
+    }
+}
diff --git a/src/main/java/eatda/client/map/MapServerErrorHandler.java b/src/main/java/eatda/client/map/MapServerErrorHandler.java
@@ -0,0 +1,16 @@
+package eatda.client.map;
+
+import eatda.exception.BusinessErrorCode;
+import eatda.exception.BusinessException;
+import java.io.IOException;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.RestClient.ResponseSpec.ErrorHandler;
+
+public class MapServerErrorHandler implements ErrorHandler {
+
+    @Override
+    public void handle(HttpRequest request, ClientHttpResponse response) throws IOException {
+        throw new BusinessException(BusinessErrorCode.MAP_SERVER_ERROR);
+    }
+}
diff --git a/src/main/java/eatda/client/map/StoreSearchResult.java b/src/main/java/eatda/client/map/StoreSearchResult.java
@@ -0,0 +1,30 @@
+package eatda.client.map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record StoreSearchResult(
+        @JsonProperty("id") String kakaoId,
+        @JsonProperty("category_group_code") String categoryGroupCode,
+        @JsonProperty("category_name") String categoryName,
+        @JsonProperty("phone") String phoneNumber,
+        @JsonProperty("place_name") String name,
+        @JsonProperty("place_url") String placeUrl,
+        @JsonProperty("address_name") String lotNumberAddress,
+        @JsonProperty("road_address_name") String roadAddress,
+        @JsonProperty("y") double latitude,
+        @JsonProperty("x") double longitude
+) {
+
+    public boolean isFoodStore() {
+        return "FD6".equals(categoryGroupCode);
+    }
+
+    public boolean isInSeoul() {
+        if (lotNumberAddress == null || lotNumberAddress.isBlank()) {
+            return false;
+        }
+        return lotNumberAddress.trim().startsWith("서울");
+    }
+}
diff --git a/src/main/java/eatda/client/map/StoreSearchResults.java b/src/main/java/eatda/client/map/StoreSearchResults.java
@@ -0,0 +1,9 @@
+package eatda.client.map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record StoreSearchResults(@JsonProperty("documents") List<StoreSearchResult> results) {
+}
diff --git a/...ava/timeeat/client/oauth/OauthClient.java → .../java/eatda/client/oauth/OauthClient.java b/...ava/timeeat/client/oauth/OauthClient.java → .../java/eatda/client/oauth/OauthClient.java
@@ -1,5 +1,7 @@
-package timeeat.client.oauth;
+package eatda.client.oauth;
 
+import eatda.exception.BusinessErrorCode;
+import eatda.exception.BusinessException;
 import java.net.URI;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.http.HttpStatusCode;
@@ -9,8 +11,6 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.util.UriComponentsBuilder;
-import timeeat.exception.BusinessErrorCode;
-import timeeat.exception.BusinessException;
 
 @Component
 @EnableConfigurationProperties(OauthProperties.class)

diff --git a/.../client/oauth/OauthMemberInformation.java → .../client/oauth/OauthMemberInformation.java b/.../client/oauth/OauthMemberInformation.java → .../client/oauth/OauthMemberInformation.java
@@ -1,15 +1,15 @@
-package timeeat.client.oauth;
+package eatda.client.oauth;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import timeeat.domain.member.Member;
+import eatda.domain.member.Member;
 
 @JsonDeserialize(using = OauthMemberInformationDeserializer.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record OauthMemberInformation(long socialId, String nickname) {
+public record OauthMemberInformation(long socialId, String email, String nickname) {
 
     public Member toMember() {
-        return new Member(Long.toString(socialId), nickname);
+        return new Member(Long.toString(socialId), email, nickname);
     }
 }
 
diff --git a/...h/OauthMemberInformationDeserializer.java → ...h/OauthMemberInformationDeserializer.java b/...h/OauthMemberInformationDeserializer.java → ...h/OauthMemberInformationDeserializer.java
@@ -1,10 +1,10 @@
-package timeeat.client.oauth;
+package eatda.client.oauth;
 
-import java.io.IOException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
 
 public class OauthMemberInformationDeserializer extends JsonDeserializer<OauthMemberInformation> {
 
@@ -14,11 +14,15 @@ public OauthMemberInformation deserialize(JsonParser jsonParser,
         JsonNode root = jsonParser.getCodec().readTree(jsonParser);
 
         long id = root.path("id").asLong();
+        String email = root
+                .path("kakao_account")
+                .path("email")
+                .asText(null);
         String nickname = root
                 .path("kakao_account")
                 .path("profile")
                 .path("nickname")
                 .asText(null);
-        return new OauthMemberInformation(id, nickname);
+        return new OauthMemberInformation(id, email, nickname);
     }
 }
diff --git a/...timeeat/client/oauth/OauthProperties.java → ...a/eatda/client/oauth/OauthProperties.java b/...timeeat/client/oauth/OauthProperties.java → ...a/eatda/client/oauth/OauthProperties.java
@@ -1,10 +1,10 @@
-package timeeat.client.oauth;
+package eatda.client.oauth;
 
+import eatda.exception.InitializeException;
 import java.net.URI;
 import java.util.List;
 import lombok.Getter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import timeeat.exception.InitializeException;
 
 @Getter
 @ConfigurationProperties(prefix = "oauth")

diff --git a/...client/oauth/OauthServerErrorHandler.java → ...client/oauth/OauthServerErrorHandler.java b/...client/oauth/OauthServerErrorHandler.java → ...client/oauth/OauthServerErrorHandler.java
@@ -1,12 +1,12 @@
-package timeeat.client.oauth;
+package eatda.client.oauth;
 
+import eatda.exception.BusinessErrorCode;
+import eatda.exception.BusinessException;
 import java.io.IOException;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestClient.ResponseSpec.ErrorHandler;
-import timeeat.exception.BusinessErrorCode;
-import timeeat.exception.BusinessException;
 
 @Component
 public class OauthServerErrorHandler implements ErrorHandler {

diff --git a/...java/timeeat/client/oauth/OauthToken.java → ...n/java/eatda/client/oauth/OauthToken.java b/...java/timeeat/client/oauth/OauthToken.java → ...n/java/eatda/client/oauth/OauthToken.java
@@ -1,4 +1,4 @@
-package timeeat.client.oauth;
+package eatda.client.oauth;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;