From b5f39995b26d48d8ad489ebfa36406d7709743a9 Mon Sep 17 00:00:00 2001
From: itsscb <dev@itsscb.de>
Date: Mon, 25 Sep 2023 00:34:54 +0200
Subject: [PATCH] change db.createAccounTx output from CreateAccountTxResult to
 Account (#33)

---
 api/account_test.go          | 21 +++------------------
 db/mock/store.go             |  4 ++--
 db/sqlc/store.go             |  2 +-
 db/sqlc/tx_create_account.go |  4 ++--
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/api/account_test.go b/api/account_test.go
index c3c361c..b697f5d 100644
--- a/api/account_test.go
+++ b/api/account_test.go
@@ -58,29 +58,14 @@ func TestCreateAccountAPI(t *testing.T) {
 					Creator:      account.Creator,
 				}
 
-				exp := db.CreateAccountTxResult{
-					Account: account,
-				}
-
 				store.EXPECT().
 					CreateAccountTx(gomock.Any(), gomock.Eq(arg)).
 					Times(1).
-					Return(exp, nil)
+					Return(account, nil)
 			},
 			checkResponse: func(recorder *httptest.ResponseRecorder) {
 				require.Equal(t, http.StatusOK, recorder.Code)
-				data, err := io.ReadAll(recorder.Body)
-				require.NoError(t, err)
-
-				var getAccount db.CreateAccountTxResult
-				err = json.Unmarshal(data, &getAccount)
-				require.NoError(t, err)
-				require.Equal(t,
-					db.CreateAccountTxResult{
-						Account: account,
-					},
-					getAccount,
-				)
+				requireBodyMatchAccount(t, recorder.Body, account)
 			},
 		},
 		// {
@@ -130,7 +115,7 @@ func TestCreateAccountAPI(t *testing.T) {
 				store.EXPECT().
 					CreateAccountTx(gomock.Any(), gomock.Any()).
 					Times(1).
-					Return(db.CreateAccountTxResult{}, sql.ErrConnDone)
+					Return(db.Account{}, sql.ErrConnDone)
 			},
 			checkResponse: func(recorder *httptest.ResponseRecorder) {
 				require.Equal(t, http.StatusInternalServerError, recorder.Code)
diff --git a/db/mock/store.go b/db/mock/store.go
index 1fcd962..8cca983 100644
--- a/db/mock/store.go
+++ b/db/mock/store.go
@@ -55,10 +55,10 @@ func (mr *MockStoreMockRecorder) CreateAccount(arg0, arg1 any) *gomock.Call {
 }
 
 // CreateAccountTx mocks base method.
-func (m *MockStore) CreateAccountTx(arg0 context.Context, arg1 db.CreateAccountTxParams) (db.CreateAccountTxResult, error) {
+func (m *MockStore) CreateAccountTx(arg0 context.Context, arg1 db.CreateAccountTxParams) (db.Account, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateAccountTx", arg0, arg1)
-	ret0, _ := ret[0].(db.CreateAccountTxResult)
+	ret0, _ := ret[0].(db.Account)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/db/sqlc/store.go b/db/sqlc/store.go
index 6fd8b3e..b4e4eea 100644
--- a/db/sqlc/store.go
+++ b/db/sqlc/store.go
@@ -8,7 +8,7 @@ import (
 
 type Store interface {
 	Querier
-	CreateAccountTx(ctx context.Context, arg CreateAccountTxParams) (CreateAccountTxResult, error)
+	CreateAccountTx(ctx context.Context, arg CreateAccountTxParams) (Account, error)
 	UpdateAccountTx(ctx context.Context, arg UpdateAccountTxParams) (Account, error)
 }
 
diff --git a/db/sqlc/tx_create_account.go b/db/sqlc/tx_create_account.go
index 7a4fefb..34445c0 100644
--- a/db/sqlc/tx_create_account.go
+++ b/db/sqlc/tx_create_account.go
@@ -24,7 +24,7 @@ type CreateAccountTxResult struct {
 	Account Account `json:"account"`
 }
 
-func (store *SQLStore) CreateAccountTx(ctx context.Context, arg CreateAccountTxParams) (CreateAccountTxResult, error) {
+func (store *SQLStore) CreateAccountTx(ctx context.Context, arg CreateAccountTxParams) (Account, error) {
 	var result CreateAccountTxResult
 
 	err := store.execTx(ctx, func(q *Queries) error {
@@ -47,5 +47,5 @@ func (store *SQLStore) CreateAccountTx(ctx context.Context, arg CreateAccountTxP
 		return err
 	})
 
-	return result, err
+	return result.Account, err
 }