From eaa84b2a506891b62fe2ece8a1d163dbc67fbb94 Mon Sep 17 00:00:00 2001
From: Rebwon <msolo021015@naver.com>
Date: Wed, 22 Sep 2021 10:25:52 +0900
Subject: [PATCH] Return Query Api resources in ApiResult

---
 .../com/yam/app/account/presentation/AccountQueryApi.java | 6 ++++--
 .../{ => common}/configuration/DatabaseConfiguration.java | 2 +-
 .../app/account/integration/AccountIntegrationTests.java  | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename src/main/java/com/yam/app/{ => common}/configuration/DatabaseConfiguration.java (96%)

diff --git a/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java b/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java
index fd6ed88..58df4e9 100644
--- a/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java
+++ b/src/main/java/com/yam/app/account/presentation/AccountQueryApi.java
@@ -3,6 +3,7 @@ package com.yam.app.account.presentation;
 import com.yam.app.account.application.AccountFacade;
 import com.yam.app.account.infrastructure.AccountPrincipal;
 import com.yam.app.account.infrastructure.LoginAccount;
+import com.yam.app.common.ApiResult;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,9 +24,10 @@ public final class AccountQueryApi {
     }
 
     @GetMapping("/api/accounts/me")
-    public ResponseEntity<AccountResponse> findInfo(
+    public ResponseEntity<ApiResult<?>> findInfo(
         @LoginAccount AccountPrincipal accountPrincipal) {
-        return ResponseEntity.ok(accountFacade.findInfo(accountPrincipal.getEmail()));
+        return ResponseEntity
+            .ok(ApiResult.success(accountFacade.findInfo(accountPrincipal.getEmail())));
     }
 
 }
diff --git a/src/main/java/com/yam/app/configuration/DatabaseConfiguration.java b/src/main/java/com/yam/app/common/configuration/DatabaseConfiguration.java
similarity index 96%
rename from src/main/java/com/yam/app/configuration/DatabaseConfiguration.java
rename to src/main/java/com/yam/app/common/configuration/DatabaseConfiguration.java
index 3a6937a..9b3fb47 100644
--- a/src/main/java/com/yam/app/configuration/DatabaseConfiguration.java
+++ b/src/main/java/com/yam/app/common/configuration/DatabaseConfiguration.java
@@ -1,4 +1,4 @@
-package com.yam.app.configuration;
+package com.yam.app.common.configuration;
 
 import javax.sql.DataSource;
 import org.apache.ibatis.session.SqlSessionFactory;
diff --git a/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java b/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java
index b360130..93908b7 100644
--- a/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java
+++ b/src/test/java/com/yam/app/account/integration/AccountIntegrationTests.java
@@ -119,9 +119,11 @@ final class AccountIntegrationTests {
         actions
             .andDo(print())
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$.id").isNumber())
-            .andExpect(jsonPath("$.email").isString())
-            .andExpect(jsonPath("$.nickname").isString());
+            .andExpect(jsonPath("$.success").value(true))
+            .andExpect(jsonPath("$.message").doesNotExist())
+            .andExpect(jsonPath("$.data.id").isNumber())
+            .andExpect(jsonPath("$.data.email").isString())
+            .andExpect(jsonPath("$.data.nickname").isString());
     }
 
 }