better end points and better tests

2026-03-21 15:47:40 +01:00
parent 3f203178b2
commit 3490dd13d4
10 changed files with 482 additions and 34 deletions
--- a/internal/database/actual-repo.go
+++ b/internal/database/actual-repo.go
@@ -38,20 +38,28 @@ func (r *ActualsRepo) Ingest(ctx context.Context, req model.IngestActualsRequest
 	}

 	a := &model.Actual{}
+	var ingestedAt string
+
 	err = r.db.QueryRowContext(ctx, `
-		SELECT id, fiscal_year, fiscal_period, department_id, gl_account_id,
-		       amount, currency, source, ingested_at
-		FROM actuals
-		WHERE fiscal_year=? AND fiscal_period=? AND department_id=? AND gl_account_id=?`,
+    SELECT id, fiscal_year, fiscal_period, department_id, gl_account_id,
+           amount, currency, source, ingested_at
+    FROM actuals
+    WHERE fiscal_year=? AND fiscal_period=? AND department_id=? AND gl_account_id=?`,
 		req.FiscalYear, req.FiscalPeriod, deptID, glID,
 	).Scan(
 		&a.ID, &a.FiscalYear, &a.FiscalPeriod,
 		&a.DepartmentID, &a.GLAccountID,
-		&a.Amount, &a.Currency, &a.Source, &a.IngestedAt,
+		&a.Amount, &a.Currency, &a.Source, &ingestedAt,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("fetch ingested actual: %w", err)
 	}
+
+	a.IngestedAt, err = parseTime(ingestedAt)
+	if err != nil {
+		return nil, fmt.Errorf("parse ingested_at %q: %w", ingestedAt, err)
+	}
+
 	return a, nil
 }

@@ -82,3 +90,15 @@ func (r *ActualsRepo) ListByPeriod(ctx context.Context, fiscalYear, fiscalPeriod
 	}
 	return result, rows.Err()
 }
+
+func (r *ActualsRepo) IngestBatch(ctx context.Context, reqs []model.IngestActualsRequest) ([]*model.Actual, error) {
+	out := make([]*model.Actual, 0, len(reqs))
+	for _, req := range reqs {
+		a, err := r.Ingest(ctx, req)
+		if err != nil {
+			return nil, fmt.Errorf("IngestBatch: record (dept=%s gl=%s): %w", req.DeptCode, req.GLCode, err)
+		}
+		out = append(out, a)
+	}
+	return out, nil
+}
--- a/internal/database/report.go
+++ b/internal/database/report.go
@@ -0,0 +1,144 @@
+package database
+
+import (
+	"Engine/internal/model"
+	"context"
+	"database/sql"
+	"fmt"
+)
+
+type ReportRepo struct {
+	db *sql.DB
+}
+
+func NewReportRepo(db *sql.DB) *ReportRepo {
+	return &ReportRepo{db: db}
+}
+
+// getAmountsByGLType is the shared query for both actuals and budget tables,
+// filtered to a single GL account type, period, and department.
+func (rr *ReportRepo) getActualAmountsByGLType(
+	ctx context.Context,
+	accountType model.GLAccountType,
+	fiscalYear, fiscalPeriod int,
+	deptCode string,
+) ([]model.GLAmountRow, error) {
+	const q = `
+        SELECT  g.code,
+                g.description,
+                SUM(a.amount),
+                a.currency
+        FROM    actuals a
+        JOIN    gl_accounts  g ON g.id = a.gl_account_id
+        JOIN    departments  d ON d.id = a.department_id
+        WHERE   g.type          = ?
+        AND     g.active        = 1
+        AND     a.fiscal_year   = ?
+        AND     a.fiscal_period = ?
+        AND     d.code          = ?
+        GROUP BY g.id, a.currency
+        ORDER BY g.code`
+
+	rows, err := rr.db.QueryContext(ctx, q,
+		string(accountType), fiscalYear, fiscalPeriod, deptCode)
+	if err != nil {
+		return nil, fmt.Errorf("getActualAmountsByGLType(%s): %w", accountType, err)
+	}
+	defer rows.Close()
+
+	var out []model.GLAmountRow
+	for rows.Next() {
+		var r model.GLAmountRow
+		if err := rows.Scan(&r.GLCode, &r.Description, &r.Amount, &r.Currency); err != nil {
+			return nil, fmt.Errorf("getActualAmountsByGLType(%s): scan: %w", accountType, err)
+		}
+		out = append(out, r)
+	}
+	return out, rows.Err()
+}
+
+func (rr *ReportRepo) getBudgetAmountsByGLType(
+	ctx context.Context,
+	accountType model.GLAccountType,
+	fiscalYear, fiscalPeriod int,
+	deptCode string,
+	version model.BudgetVersion,
+) ([]model.RevenueAmounts, error) {
+	const q = `
+        SELECT  g.code,
+                g.description,
+                SUM(b.amount),
+                b.currency
+        FROM    budgets b
+        JOIN    gl_accounts  g ON g.id = b.gl_account_id
+        JOIN    departments  d ON d.id = b.department_id
+        WHERE   g.type          = ?
+        AND     g.active        = 1
+        AND     b.fiscal_year   = ?
+        AND     b.fiscal_period = ?
+        AND     d.code          = ?
+        AND     b.version       = ?
+        GROUP BY g.id, b.currency
+        ORDER BY g.code`
+
+	rows, err := rr.db.QueryContext(ctx, q,
+		string(accountType), fiscalYear, fiscalPeriod, deptCode, string(version))
+	if err != nil {
+		return nil, fmt.Errorf("getBudgetAmountsByGLType(%s): %w", accountType, err)
+	}
+	defer rows.Close()
+
+	var out []model.RevenueAmounts
+	for rows.Next() {
+		var r model.RevenueAmounts
+		if err := rows.Scan(&r.GLCode, &r.Description, &r.Amount, &r.Currency); err != nil {
+			return nil, fmt.Errorf("getBudgetAmountsByGLType(%s): scan: %w", accountType, err)
+		}
+		out = append(out, r)
+	}
+	return out, rows.Err()
+}
+
+// ── Public surface ────────────────────────────────────────────────────────────
+
+func (rr *ReportRepo) GetGLRevenueActuals(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string) ([]model.GLAmountRow, error) {
+	return rr.getActualAmountsByGLType(ctx, model.GLRevenue, fiscalYear, fiscalPeriod, deptCode)
+}
+
+func (rr *ReportRepo) GetGLRevenueBudget(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string, version model.BudgetVersion) ([]model.RevenueAmounts, error) {
+	return rr.getBudgetAmountsByGLType(ctx, model.GLRevenue, fiscalYear, fiscalPeriod, deptCode, version)
+}
+
+// Same pair for the other types — all delegate to the shared private methods.
+
+func (rr *ReportRepo) GetGLCOGSActuals(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string) ([]model.GLAmountRow, error) {
+	return rr.getActualAmountsByGLType(ctx, model.GLCOGS, fiscalYear, fiscalPeriod, deptCode)
+}
+
+func (rr *ReportRepo) GetGLCOGSBudget(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string, version model.BudgetVersion) ([]model.RevenueAmounts, error) {
+	return rr.getBudgetAmountsByGLType(ctx, model.GLCOGS, fiscalYear, fiscalPeriod, deptCode, version)
+}
+
+func (rr *ReportRepo) GetGLOpexActuals(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string) ([]model.GLAmountRow, error) {
+	return rr.getActualAmountsByGLType(ctx, model.GLOpex, fiscalYear, fiscalPeriod, deptCode)
+}
+
+func (rr *ReportRepo) GetGLOpexBudget(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string, version model.BudgetVersion) ([]model.RevenueAmounts, error) {
+	return rr.getBudgetAmountsByGLType(ctx, model.GLOpex, fiscalYear, fiscalPeriod, deptCode, version)
+}
+
+func (rr *ReportRepo) GetGLCapexActuals(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string) ([]model.GLAmountRow, error) {
+	return rr.getActualAmountsByGLType(ctx, model.GLCapex, fiscalYear, fiscalPeriod, deptCode)
+}
+
+func (rr *ReportRepo) GetGLCapexBudget(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string, version model.BudgetVersion) ([]model.RevenueAmounts, error) {
+	return rr.getBudgetAmountsByGLType(ctx, model.GLCapex, fiscalYear, fiscalPeriod, deptCode, version)
+}
+
+func (rr *ReportRepo) GetGLHeadcountActuals(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string) ([]model.GLAmountRow, error) {
+	return rr.getActualAmountsByGLType(ctx, model.GLHeadcount, fiscalYear, fiscalPeriod, deptCode)
+}
+
+func (rr *ReportRepo) GetGLHeadcountBudget(ctx context.Context, fiscalYear, fiscalPeriod int, deptCode string, version model.BudgetVersion) ([]model.RevenueAmounts, error) {
+	return rr.getBudgetAmountsByGLType(ctx, model.GLHeadcount, fiscalYear, fiscalPeriod, deptCode, version)
+}