personal-finance/datastore
2
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Releases Wiki Activity

ongoing

Browse Source
This commit is contained in:
Luís Murta 2025-04-07 08:34:54 +01:00
parent 5552b0622a
commit 965c7ab240
6 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/impl.go
View File

@ -59,7 +59,7 @@ func (server *ServerImpl) GetTransactions(ctx echo.Context, params GetTransactio
offset = int(*params.Offset)
}
transactions, err := server.Dal.Transactions(limit, offset)
transactions, err := server.Dal.Transactions(limit, offset, params.Category)
if err != nil {
return err
}

18
internal/api/impl_test.go
View File

@ -146,6 +146,17 @@ func TestServerImpl_GetTransactions(t *testing.T) {
false,
entity.Transactions{{Id: 1, Date: time.Now(), Description: "desc#1", Value: decimal.New(0, 0)}},
},
{
"200+category",
fields{mock_dal},
args{GetTransactionsParams{
Limit: golang.Ptr[int32](100),
Offset: golang.Ptr[int32](0),
Category: golang.Ptr("cat"),
}},
false,
entity.Transactions{{Id: 1, Date: time.Now(), Description: "desc#1", Value: decimal.New(0, 0), Category: golang.Ptr("cat")}},
},
{
"204",
fields{mock_dal},
@ -164,13 +175,16 @@ func TestServerImpl_GetTransactions(t *testing.T) {
rec := httptest.NewRecorder()
ctx := echo.New().NewContext(req, rec)
mock_dal.EXPECT().Transactions(int(*tt.args.params.Limit), int(*tt.args.params.Offset)).Return(tt.mocks, nil).Times(1)
mock_dal.EXPECT().
Transactions(int(*tt.args.params.Limit), int(*tt.args.params.Offset), tt.args.params.Category).
Return(tt.mocks, nil).
Times(1)
if err := pf.GetTransactions(ctx, tt.args.params); (err != nil) != tt.wantErr {
t.Errorf("ServerImpl.GetTransactions() error = %v,", err)
}
code, _ := strconv.Atoi(tt.name)
code, _ := strconv.Atoi(strings.Split(tt.name, "+")[0])
assert.Equal(t, code, rec.Code)
})
}

2
internal/dal/dal.go
View File

@ -4,7 +4,7 @@ import "git.rosemyrtle.work/personal-finance/server/internal/entity"
type DAL interface {
Transaction(transactionId int64) (*entity.Transaction, error)
Transactions(limit, offset int) (entity.Transactions, error)
Transactions(limit, offset int, category *string) (entity.Transactions, error)
InsertTransaction(entity.Transaction) (entity.Transaction, error)
UpdateTransaction(entity.TransactionId, *entity.CategoryName) (bool, error)
TransactionExists(uint64) (bool, error)

14
internal/dal/impl.go
View File

@ -41,8 +41,8 @@ func (dal *DalImpl) Transaction(transactionId int64) (*entity.Transaction, error
return &transactions[0], nil
}
func (dal *DalImpl) Transactions(limit, offset int) (entity.Transactions, error) {
log.Print("DAL::Transactions", "limit", limit, "offset", offset)
func (dal *DalImpl) Transactions(limit, offset int, category *string) (entity.Transactions, error) {
log.Print("DAL::Transactions", "limit", limit, "offset", offset, "category", category)
if dal.Db == nil {
log.Panic("database not available")
@ -57,8 +57,16 @@ func (dal *DalImpl) Transactions(limit, offset int) (entity.Transactions, error)
LIMIT $1
OFFSET $2
`
args := []any{limit, offset}
rows, err := dal.Db.Query(stmt, limit, offset)
if category != nil {
stmt += `
WHERE tc.name = $3
`
args = append(args, *category)
}
rows, err := dal.Db.Query(stmt, args...)
if err != nil {
return entity.Transactions{}, err
}

2
internal/dal/impl_test.go
View File

@ -158,7 +158,7 @@ func TestDalImpl_Transactions(t *testing.T) {
mock.NewRows([]string{"id", "date", "description", "amount", "category"}).AddRows(tt.mocks...),
)
got, err := dal.Transactions(limit, offset)
got, err := dal.Transactions(limit, offset, nil)
if (err != nil) != tt.wantErr {
t.Errorf("DalImpl.Transactions() error = %v, wantErr %v", err, tt.wantErr)
return

8
internal/mock/mock_dal.gen.go
View File

@ -131,18 +131,18 @@ func (mr *MockDALMockRecorder) TransactionExists(arg0 any) *gomock.Call {
}
// Transactions mocks base method.
func (m *MockDAL) Transactions(limit, offset int) ([]entity.Transaction, error) {
func (m *MockDAL) Transactions(limit, offset int, category *string) ([]entity.Transaction, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Transactions", limit, offset)
ret := m.ctrl.Call(m, "Transactions", limit, offset, category)
ret0, _ := ret[0].([]entity.Transaction)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Transactions indicates an expected call of Transactions.
func (mr *MockDALMockRecorder) Transactions(limit, offset any) *gomock.Call {
func (mr *MockDALMockRecorder) Transactions(limit, offset, category any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transactions", reflect.TypeOf((*MockDAL)(nil).Transactions), limit, offset)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transactions", reflect.TypeOf((*MockDAL)(nil).Transactions), limit, offset, category)
}
// UpdateTransaction mocks base method.