feat: accounts (#2)

* feat: change version

* fix: name

* feat: accounts

* fix: migration

Author: skynet2

.github/workflows/general.yaml

@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - master
-      - initial
 
 env:
   version: 0.0.0.${{github.run_number}}
@@ -13,7 +12,7 @@ jobs:
       versionOut: ${{ steps.generateVersion.outputs.version }}
     steps:
       - id: generateVersion
-        run: echo "version=$(date '+%Y.%m.%d.%H%M%S').${{ github.run_number }}" >> "$GITHUB_OUTPUT"
+        run: echo "version=0.0.${{ github.run_number }}" >> "$GITHUB_OUTPUT"
   image:
     runs-on: ubuntu-latest
     needs:

.gitignore

@@ -25,3 +25,7 @@ go.work.sum
 .env
 
 .idea/
+**/*_mocks_test.go
+**/*_mock_test.go
+**/*_mock.go
+**/*_mocks.go

cmd/server/accounts.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"connectrpc.com/connect"
+	"context"
+	accountsv1 "github.com/ft-t/go-money-pb/gen/gomoneypb/accounts/v1"
+	"github.com/ft-t/go-money-pb/gen/gomoneypb/accounts/v1/accountsv1connect"
+	"github.com/ft-t/go-money/pkg/boilerplate"
+)
+
+type AccountsApi struct {
+	accSvc AccountSvc
+}
+
+func (a *AccountsApi) CreateAccount(
+	ctx context.Context,
+	c *connect.Request[accountsv1.CreateAccountRequest],
+) (*connect.Response[accountsv1.CreateAccountResponse], error) {
+	// todo auth
+
+	resp, err := a.accSvc.Create(ctx, c.Msg)
+	if err != nil {
+		return nil, err
+	}
+
+	return connect.NewResponse(resp), nil
+}
+
+func (a *AccountsApi) UpdateAccount(
+	ctx context.Context,
+	c *connect.Request[accountsv1.UpdateAccountRequest],
+) (*connect.Response[accountsv1.UpdateAccountResponse], error) {
+	// todo auth
+
+	resp, err := a.accSvc.Update(ctx, c.Msg)
+	if err != nil {
+		return nil, err
+	}
+
+	return connect.NewResponse(resp), nil
+}
+
+func (a *AccountsApi) ListAccounts(
+	ctx context.Context,
+	c *connect.Request[accountsv1.ListAccountsRequest],
+) (*connect.Response[accountsv1.ListAccountsResponse], error) {
+	// todo auth
+	resp, err := a.accSvc.List(ctx, c.Msg)
+	if err != nil {
+		return nil, err
+	}
+
+	return connect.NewResponse(resp), nil
+}
+
+func NewAccountsApi(
+	mux *boilerplate.DefaultGrpcServer,
+	accSvc AccountSvc,
+) (*AccountsApi, error) {
+	res := &AccountsApi{
+		accSvc: accSvc,
+	}
+
+	mux.GetMux().Handle(
+		accountsv1connect.NewAccountsServiceHandler(res, mux.GetDefaultHandlerOptions()...),
+	)
+
+	return res, nil
+}

cmd/server/interfaces.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	accountsv1 "github.com/ft-t/go-money-pb/gen/gomoneypb/accounts/v1"
 	configurationv1 "github.com/ft-t/go-money-pb/gen/gomoneypb/configuration/v1"
 	usersv1 "github.com/ft-t/go-money-pb/gen/gomoneypb/users/v1"
 )
@@ -18,6 +19,23 @@ type UserSvc interface {
 	) (*usersv1.CreateResponse, error)
 }
 
+type AccountSvc interface {
+	Create(
+		ctx context.Context,
+		req *accountsv1.CreateAccountRequest,
+	) (*accountsv1.CreateAccountResponse, error)
+
+	Update(
+		ctx context.Context,
+		req *accountsv1.UpdateAccountRequest,
+	) (*accountsv1.UpdateAccountResponse, error)
+
+	List(
+		ctx context.Context,
+		req *accountsv1.ListAccountsRequest,
+	) (*accountsv1.ListAccountsResponse, error)
+}
+
 type ConfigSvc interface {
 	GetConfiguration(
 		ctx context.Context,

cmd/server/main.go

@@ -2,10 +2,13 @@ package main
 
 import (
 	"context"
+	"github.com/ft-t/go-money/pkg/accounts"
 	"github.com/ft-t/go-money/pkg/appcfg"
 	"github.com/ft-t/go-money/pkg/boilerplate"
 	"github.com/ft-t/go-money/pkg/configuration"
+	"github.com/ft-t/go-money/pkg/currency"
 	"github.com/ft-t/go-money/pkg/jwt"
+	"github.com/ft-t/go-money/pkg/mappers"
 	"github.com/ft-t/go-money/pkg/users"
 	"github.com/rs/zerolog/log"
 	"os"
@@ -54,6 +57,19 @@ func main() {
 		log.Logger.Fatal().Err(err).Msg("failed to create config handler")
 	}
 
+	decimalSvc := currency.NewDecimalService()
+
+	mapper := mappers.NewMapper(&mappers.MapperConfig{
+		DecimalSvc: decimalSvc,
+	})
+
+	_, err = NewAccountsApi(grpcServer, accounts.NewService(&accounts.ServiceConfig{
+		MapperSvc: mapper,
+	}))
+	if err != nil {
+		log.Logger.Fatal().Err(err).Msg("failed to create accounts handler")
+	}
+
 	go func() {
 		grpcServer.ServeAsync(config.GrpcPort)
 

cmd/server/user.go renamed to cmd/server/users.go

@@ -6,6 +6,8 @@ import (
 	"github.com/ft-t/go-money/pkg/database"
 )
 
+//go:generate mockgen -destination interfaces_mocks_test.go -package accounts_test -source=interfaces.go
+
 type MapperSvc interface {
 	MapAccount(ctx context.Context, acc *database.Account) *v1.Account
 }

pkg/accounts/interfaces.go

@@ -14,6 +14,11 @@ type Service struct {
 	cfg *ServiceConfig
 }
 
+func (s *Service) List(ctx context.Context, req *accountsv1.ListAccountsRequest) (*accountsv1.ListAccountsResponse, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
 type ServiceConfig struct {
 	MapperSvc MapperSvc
 }
@@ -40,6 +45,16 @@ func (s *Service) Create(
 		CreatedAt:      time.Now().UTC(),
 		DeletedAt:      gorm.DeletedAt{},
 		Type:           req.Account.Type,
+		Note:           req.Account.Note,
+	}
+
+	if req.Account.CurrencyBalance != "" {
+		cb, err := decimal.NewFromString(req.Account.CurrencyBalance)
+		if err != nil {
+			return nil, err
+		}
+
+		account.CurrentBalance = cb
 	}
 
 	if err := database.GetDbWithContext(ctx, database.DbTypeMaster).Create(account).Error; err != nil {
@@ -70,6 +85,11 @@ func (s *Service) Update(
 	account.Type = req.Type
 	account.Extra = req.Extra
 	account.LastUpdatedAt = time.Now().UTC()
+	account.Note = req.Note
+
+	if account.Extra == nil {
+		account.Extra = map[string]string{}
+	}
 
 	if err := tx.Save(&account).Error; err != nil {
 		return nil, err