Merge pull request #51 from nootey/development

nootey · web-flow · commit 66c7baa89f50 · 2026-01-22T15:58:30.000+01:00
Minor adjustments
diff --git a/.github/workflows/test-server.yaml b/.github/workflows/test-server.yaml
@@ -28,21 +28,6 @@ jobs:
     name: Run tests
     runs-on: ubuntu-latest
 
-    services:
-      postgres:
-        image: postgres:15
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -63,6 +48,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
+      - name: Start test services
+        run: docker compose -f deployments/docker/docker-compose.test.yaml up -d
+
+      - name: Wait for PostgreSQL
+        run: |
+          timeout 30 bash -c 'until docker compose -f deployments/docker/docker-compose.test.yaml exec -T postgres-test pg_isready; do sleep 1; done'
+
       - name: Install dependencies
         run: go mod download
 
diff --git a/cmd/http_server.go b/cmd/http_server.go
@@ -18,7 +18,7 @@ var httpServerCmd = &cobra.Command{
 			zap.Bool("release", cfg.Release),
 		)
 
-		app := runtime.NewServerRuntime(cfg, logger)
+		app := runtime.NewHttpServerRuntime(cfg, logger)
 		return app.Run(cmd.Context())
 	},
 }
diff --git a/deployments/docker/docker-compose.test.yaml b/deployments/docker/docker-compose.test.yaml
@@ -0,0 +1,14 @@
+services:
+  postgres-test:
+    image: postgres:18
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
diff --git a/internal/bootstrap/service_container.go b/internal/bootstrap/service_container.go
@@ -14,7 +14,7 @@ import (
 	"gorm.io/gorm"
 )
 
-type Container struct {
+type ServiceContainer struct {
 	Config             *config.Config
 	DB                 *gorm.DB
 	AuthzService       *authz.Service
@@ -33,7 +33,7 @@ type Container struct {
 	NotesService       *services.NotesService
 }
 
-func NewContainer(cfg *config.Config, db *gorm.DB, logger *zap.Logger) (*Container, error) {
+func NewServiceContainer(cfg *config.Config, db *gorm.DB, logger *zap.Logger) (*ServiceContainer, error) {
 
 	// Initialize mailer
 	mail := mailer.NewMailer(cfg, &mailer.MailConfig{From: cfg.Mailer.Username, FromName: "Wealth Warden Support"})
@@ -82,7 +82,7 @@ func NewContainer(cfg *config.Config, db *gorm.DB, logger *zap.Logger) (*Contain
 	investmentService := services.NewInvestmentService(investmentRepo, accountRepo, settingsRepo, loggingRepo, jobDispatcher, priceFetchClient, currencyConverter)
 	notesService := services.NewNotesService(notesRepo, loggingRepo, jobDispatcher)
 
-	return &Container{
+	return &ServiceContainer{
 		Config:             cfg,
 		DB:                 db,
 		AuthzService:       authzSvc,
diff --git a/internal/http/routes.go b/internal/http/routes.go
@@ -13,10 +13,10 @@ import (
 
 type RouteInitializerHTTP struct {
 	Router    *gin.Engine
-	Container *bootstrap.Container
+	Container *bootstrap.ServiceContainer
 }
 
-func NewRouteInitializerHTTP(r *gin.Engine, container *bootstrap.Container) *RouteInitializerHTTP {
+func NewRouteInitializerHTTP(r *gin.Engine, container *bootstrap.ServiceContainer) *RouteInitializerHTTP {
 
 	return &RouteInitializerHTTP{
 		Router:    r,
diff --git a/internal/http/server.go b/internal/http/server.go
@@ -29,7 +29,7 @@ type Server struct {
 	logger *zap.Logger
 }
 
-func NewServer(container *bootstrap.Container, logger *zap.Logger) *Server {
+func NewServer(container *bootstrap.ServiceContainer, logger *zap.Logger) *Server {
 
 	router := NewRouter(container, logger)
 
@@ -72,7 +72,7 @@ func (s *Server) Shutdown() error {
 	return nil
 }
 
-func NewRouter(container *bootstrap.Container, logger *zap.Logger) *gin.Engine {
+func NewRouter(container *bootstrap.ServiceContainer, logger *zap.Logger) *gin.Engine {
 
 	var r *gin.Engine
 	if container.Config.Release {
diff --git a/internal/jobscheduler/automate_templates_job.go b/internal/jobscheduler/automate_templates_job.go
@@ -10,10 +10,10 @@ import (
 
 type AutomateTemplateJob struct {
 	logger    *zap.Logger
-	container *bootstrap.Container
+	container *bootstrap.ServiceContainer
 }
 
-func NewAutomateTemplateJob(logger *zap.Logger, container *bootstrap.Container) *AutomateTemplateJob {
+func NewAutomateTemplateJob(logger *zap.Logger, container *bootstrap.ServiceContainer) *AutomateTemplateJob {
 	return &AutomateTemplateJob{
 		logger:    logger,
 		container: container,
diff --git a/internal/jobscheduler/backfill_job.go b/internal/jobscheduler/backfill_job.go
@@ -11,10 +11,10 @@ import (
 
 type BackfillJob struct {
 	logger    *zap.Logger
-	container *bootstrap.Container
+	container *bootstrap.ServiceContainer
 }
 
-func NewBackfillJob(logger *zap.Logger, container *bootstrap.Container) *BackfillJob {
+func NewBackfillJob(logger *zap.Logger, container *bootstrap.ServiceContainer) *BackfillJob {
 	return &BackfillJob{
 		logger:    logger,
 		container: container,
diff --git a/internal/jobscheduler/investment_price_sync.go b/internal/jobscheduler/investment_price_sync.go
@@ -15,11 +15,11 @@ import (
 
 type InvestmentPriceSyncJob struct {
 	logger           *zap.Logger
-	container        *bootstrap.Container
+	container        *bootstrap.ServiceContainer
 	priceFetchClient finance.PriceFetcher
 }
 
-func NewInvestmentPriceSyncJob(logger *zap.Logger, container *bootstrap.Container, priceFetchClient finance.PriceFetcher) *InvestmentPriceSyncJob {
+func NewInvestmentPriceSyncJob(logger *zap.Logger, container *bootstrap.ServiceContainer, priceFetchClient finance.PriceFetcher) *InvestmentPriceSyncJob {
 	return &InvestmentPriceSyncJob{
 		logger:           logger,
 		container:        container,
diff --git a/internal/runtime/http_server.go b/internal/runtime/http_server.go
@@ -13,19 +13,19 @@ import (
 	"go.uber.org/zap"
 )
 
-type ServerRuntime struct {
+type HttpServerRuntime struct {
 	Logger *zap.Logger
 	Config *config.Config
 }
 
-func NewServerRuntime(cfg *config.Config, logger *zap.Logger) *ServerRuntime {
-	return &ServerRuntime{
+func NewHttpServerRuntime(cfg *config.Config, logger *zap.Logger) *HttpServerRuntime {
+	return &HttpServerRuntime{
 		Config: cfg,
 		Logger: logger,
 	}
 }
 
-func (rt *ServerRuntime) Run(context context.Context) error {
+func (rt *HttpServerRuntime) Run(context context.Context) error {
 	ctx, stop := signal.NotifyContext(context, syscall.SIGTERM, syscall.SIGINT)
 	defer stop()
 
@@ -47,7 +47,7 @@ func (rt *ServerRuntime) Run(context context.Context) error {
 	// Initialize container
 	containerLogger := rt.Logger.Named("container")
 	httpLogger := rt.Logger.Named("http")
-	container, err := bootstrap.NewContainer(rt.Config, dbClient, containerLogger)
+	container, err := bootstrap.NewServiceContainer(rt.Config, dbClient, containerLogger)
 	if err != nil {
 		containerLogger.Error("Container initialization failed", zap.Error(err))
 		return fmt.Errorf("cntainer initialization failed: %w", err)
diff --git a/internal/runtime/scheduler.go b/internal/runtime/scheduler.go
@@ -14,7 +14,7 @@ import (
 
 type Scheduler struct {
 	logger    *zap.Logger
-	container *bootstrap.Container
+	container *bootstrap.ServiceContainer
 	scheduler gocron.Scheduler
 	config    SchedulerConfig
 }
@@ -25,7 +25,7 @@ type SchedulerConfig struct {
 	StartPriceSyncImmediately bool
 }
 
-func NewScheduler(logger *zap.Logger, container *bootstrap.Container, config SchedulerConfig) (*Scheduler, error) {
+func NewScheduler(logger *zap.Logger, container *bootstrap.ServiceContainer, config SchedulerConfig) (*Scheduler, error) {
 
 	if logger == nil {
 		return nil, fmt.Errorf("logger cannot be nil")
diff --git a/internal/runtime/scheduler_test.go b/internal/runtime/scheduler_test.go
@@ -14,13 +14,13 @@ import (
 type SchedulerTestSuite struct {
 	suite.Suite
 	logger    *zap.Logger
-	container *bootstrap.Container
+	container *bootstrap.ServiceContainer
 	scheduler *runtime.Scheduler
 }
 
 func (suite *SchedulerTestSuite) SetupTest() {
 	suite.logger = zaptest.NewLogger(suite.T())
-	suite.container = &bootstrap.Container{
+	suite.container = &bootstrap.ServiceContainer{
 		Config: &config.Config{
 			FinanceAPIBaseURL: "https://query1.finance.yahoo.com",
 		},
diff --git a/internal/services/charting_service.go b/internal/services/charting_service.go
@@ -339,7 +339,7 @@ func (s *ChartingService) GetYearlyCashFlowBreakdown(ctx context.Context, userID
 			}
 		}
 
-		netMonth := inflow.Add(outflow)
+		net := inflow.Add(outflow)
 
 		// Get transfers and calculate categories
 		if shouldSubtractTransfers {
@@ -356,16 +356,17 @@ func (s *ChartingService) GetYearlyCashFlowBreakdown(ctx context.Context, userID
 					debtRepayments = debtRepayments.Add(tr.Amount)
 				}
 
-				netMonth = netMonth.Sub(tr.Amount)
 			}
 		}
 
-		takeHome := decimal.Zero
-		overflow := decimal.Zero
-		if netMonth.GreaterThan(decimal.Zero) {
-			takeHome = netMonth
-		} else if netMonth.LessThan(decimal.Zero) {
-			overflow = netMonth
+		categorizedTransfersTotal := savings.Add(investments).Add(debtRepayments)
+		takeHomeCalc := net.Sub(categorizedTransfersTotal)
+
+		var takeHome, overflow decimal.Decimal
+		if takeHomeCalc.LessThan(decimal.Zero) {
+			overflow = takeHomeCalc
+		} else {
+			takeHome = takeHomeCalc
 		}
 
 		months = append(months, models.MonthBreakdown{
diff --git a/internal/services/transaction_service.go b/internal/services/transaction_service.go
@@ -1843,7 +1843,6 @@ func (s *TransactionService) ToggleTransactionTemplateActiveState(ctx context.Co
 	if !changes.IsEmpty() {
 		err = s.jobDispatcher.Dispatch(&jobqueue.ActivityLogJob{
 			LoggingRepo: s.loggingRepo,
-
 			Event:       "update",
 			Category:    "txn_template",
 			Description: nil,
diff --git a/internal/tests/container_setup.go b/internal/tests/container_setup.go
@@ -22,7 +22,7 @@ import (
 type TestContainer struct {
 	container *postgres.PostgresContainer
 	DB        *gorm.DB
-	App       *bootstrap.Container
+	App       *bootstrap.ServiceContainer
 }
 
 type ServiceIntegrationSuite struct {
@@ -85,7 +85,7 @@ func (s *ServiceIntegrationSuite) SetupSuite() {
 	s.Require().NoError(err, "seeding failed")
 
 	// Build application container
-	appContainer, err := bootstrap.NewContainer(cfg, db, l)
+	appContainer, err := bootstrap.NewServiceContainer(cfg, db, l)
 	s.Require().NoError(err, "failed to bootstrap app container")
 
 	s.TC = &TestContainer{

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ var httpServerCmd = &cobra.Command{`
`18`	`18`	`zap.Bool("release", cfg.Release),`
`19`	`19`	`)`
`20`	`20`
`21`		`- app := runtime.NewServerRuntime(cfg, logger)`
	`21`	`+ app := runtime.NewHttpServerRuntime(cfg, logger)`
`22`	`22`	`return app.Run(cmd.Context())`
`23`	`23`	`},`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type Server struct {`
`29`	`29`	`logger *zap.Logger`
`30`	`30`	`}`
`31`	`31`
`32`		`-func NewServer(container bootstrap.Container, logger zap.Logger) *Server {`
	`32`	`+func NewServer(container bootstrap.ServiceContainer, logger zap.Logger) *Server {`
`33`	`33`
`34`	`34`	`router := NewRouter(container, logger)`
`35`	`35`
`@@ -72,7 +72,7 @@ func (s *Server) Shutdown() error {`
`72`	`72`	`return nil`
`73`	`73`	`}`
`74`	`74`
`75`		`-func NewRouter(container bootstrap.Container, logger zap.Logger) *gin.Engine {`
	`75`	`+func NewRouter(container bootstrap.ServiceContainer, logger zap.Logger) *gin.Engine {`
`76`	`76`
`77`	`77`	`var r *gin.Engine`
`78`	`78`	`if container.Config.Release {`