Return Query Api resources in ApiResult

This commit is contained in:
Rebwon
2021-09-22 10:25:52 +09:00
committed by MaengSol
parent f20b50601b
commit eaa84b2a50
3 changed files with 10 additions and 6 deletions

View File

@@ -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())));
}
}

View File

@@ -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;

View File

@@ -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());
}
}