feat: rename to UpcomingCharges

Author: turip

openmeter/billing/adapter/gatheringinvoice.go

@@ -40,7 +40,6 @@ func (a *adapter) CreateGatheringInvoice(ctx context.Context, input billing.Crea
 		workflowConfig := mapWorkflowConfigToDB(input.MergedProfile.WorkflowConfig, clonedWorkflowConfig.ID)
 
 		// Force cloning of the workflow
-		// TODO: Is this needed?
 		workflowConfig.ID = ""
 
 		currentSchemaLevel, err := tx.GetInvoiceDefaultSchemaLevel(ctx)
@@ -181,7 +180,7 @@ func (a *adapter) UpdateGatheringInvoice(ctx context.Context, in billing.Gatheri
 		}
 
 		if in.Lines.IsPresent() {
-			err := tx.updateGatheringLines(ctx, in.Lines.OrEmpty())
+			err := tx.updateUpcomingCharges(ctx, in.Lines.OrEmpty())
 			if err != nil {
 				return err
 			}
@@ -372,8 +371,8 @@ func (a *adapter) mapGatheringInvoiceFromDB(ctx context.Context, invoice *db.Bil
 					Namespace: invoice.Namespace,
 				},
 				ManagedModel: models.ManagedModel{
-					CreatedAt: invoice.CreatedAt,
-					UpdatedAt: invoice.UpdatedAt,
+					CreatedAt: invoice.CreatedAt.In(time.UTC),
+					UpdatedAt: invoice.UpdatedAt.In(time.UTC),
 					DeletedAt: convert.TimePtrIn(invoice.DeletedAt, time.UTC),
 				},
 				ID:          invoice.ID,
@@ -403,7 +402,7 @@ func (a *adapter) mapGatheringInvoiceFromDB(ctx context.Context, invoice *db.Bil
 		// 	return billing.StandardInvoice{}, err
 		// }
 
-		res.Lines = billing.NewGatheringInvoiceLines(mappedLines)
+		res.Lines = billing.NewGatheringInvoiceUpcomingCharges(mappedLines)
 	}
 
 	return res, nil

openmeter/billing/adapter/gatheringlines.go

@@ -23,35 +23,35 @@ import (
 )
 
 type gatheringLineDiff struct {
-	Line entitydiff.Diff[*billing.GatheringLine]
+	Line entitydiff.Diff[*billing.UpcomingCharge]
 }
 
-func diffGatheringInvoiceLines(lines billing.GatheringLines) (gatheringLineDiff, error) {
-	dbState := []*billing.GatheringLine{}
+func diffGatheringInvoiceLines(lines billing.UpcomingCharges) (gatheringLineDiff, error) {
+	dbState := []*billing.UpcomingCharge{}
 	for _, line := range lines {
 		if line.DBState != nil {
 			dbState = append(dbState, line.DBState)
 		}
 	}
 
-	linePtrs := lo.Map(lines, func(_ billing.GatheringLine, idx int) *billing.GatheringLine {
+	linePtrs := lo.Map(lines, func(_ billing.UpcomingCharge, idx int) *billing.UpcomingCharge {
 		return &lines[idx]
 	})
 
 	diff := gatheringLineDiff{}
 
-	err := entitydiff.DiffByID(entitydiff.DiffByIDInput[*billing.GatheringLine]{
+	err := entitydiff.DiffByID(entitydiff.DiffByIDInput[*billing.UpcomingCharge]{
 		DBState:       dbState,
 		ExpectedState: linePtrs,
-		HandleDelete: func(item *billing.GatheringLine) error {
+		HandleDelete: func(item *billing.UpcomingCharge) error {
 			diff.Line.NeedsDelete(item)
 			return nil
 		},
-		HandleCreate: func(item *billing.GatheringLine) error {
+		HandleCreate: func(item *billing.UpcomingCharge) error {
 			diff.Line.NeedsCreate(item)
 			return nil
 		},
-		HandleUpdate: func(item entitydiff.DiffUpdate[*billing.GatheringLine]) error {
+		HandleUpdate: func(item entitydiff.DiffUpdate[*billing.UpcomingCharge]) error {
 			diff.Line.NeedsUpdate(item)
 			return nil
 		},
@@ -63,14 +63,14 @@ func diffGatheringInvoiceLines(lines billing.GatheringLines) (gatheringLineDiff,
 	return diff, nil
 }
 
-func (a *adapter) updateGatheringLines(ctx context.Context, lines billing.GatheringLines) error {
+func (a *adapter) updateUpcomingCharges(ctx context.Context, lines billing.UpcomingCharges) error {
 	diff, err := diffGatheringInvoiceLines(lines)
 	if err != nil {
 		return err
 	}
 
-	err = upsertWithOptions(ctx, a.db, diff.Line, upsertInput[*billing.GatheringLine, *db.BillingInvoiceUsageBasedLineConfigCreate]{
-		Create: func(tx *db.Client, line *billing.GatheringLine) (*db.BillingInvoiceUsageBasedLineConfigCreate, error) {
+	err = upsertWithOptions(ctx, a.db, diff.Line, upsertInput[*billing.UpcomingCharge, *db.BillingInvoiceUsageBasedLineConfigCreate]{
+		Create: func(tx *db.Client, line *billing.UpcomingCharge) (*db.BillingInvoiceUsageBasedLineConfigCreate, error) {
 			if line.UBPConfigID == "" {
 				line.UBPConfigID = ulid.Make().String()
 			}
@@ -97,8 +97,8 @@ func (a *adapter) updateGatheringLines(ctx context.Context, lines billing.Gather
 		return fmt.Errorf("creating usage based line configs: %w", err)
 	}
 
-	invoiceLineUpsertConfig := upsertInput[*billing.GatheringLine, *db.BillingInvoiceLineCreate]{
-		Create: func(tx *db.Client, line *billing.GatheringLine) (*db.BillingInvoiceLineCreate, error) {
+	invoiceLineUpsertConfig := upsertInput[*billing.UpcomingCharge, *db.BillingInvoiceLineCreate]{
+		Create: func(tx *db.Client, line *billing.UpcomingCharge) (*db.BillingInvoiceLineCreate, error) {
 			if line.ID == "" {
 				line.ID = ulid.Make().String()
 			}
@@ -162,7 +162,7 @@ func (a *adapter) updateGatheringLines(ctx context.Context, lines billing.Gather
 				UpdateChildUniqueReferenceID().
 				Exec(ctx)
 		},
-		MarkDeleted: func(ctx context.Context, line *billing.GatheringLine) (*billing.GatheringLine, error) {
+		MarkDeleted: func(ctx context.Context, line *billing.UpcomingCharge) (*billing.UpcomingCharge, error) {
 			line.DeletedAt = lo.ToPtr(clock.Now().In(time.UTC))
 			return line, nil
 		},
@@ -175,24 +175,24 @@ func (a *adapter) updateGatheringLines(ctx context.Context, lines billing.Gather
 	return nil
 }
 
-func (a *adapter) mapGatheringInvoiceLinesFromDB(schemaLevel int, dbLines []*db.BillingInvoiceLine) ([]billing.GatheringLine, error) {
-	return slicesx.MapWithErr(dbLines, func(dbLine *db.BillingInvoiceLine) (billing.GatheringLine, error) {
+func (a *adapter) mapGatheringInvoiceLinesFromDB(schemaLevel int, dbLines []*db.BillingInvoiceLine) ([]billing.UpcomingCharge, error) {
+	return slicesx.MapWithErr(dbLines, func(dbLine *db.BillingInvoiceLine) (billing.UpcomingCharge, error) {
 		return a.mapGatheringInvoiceLineFromDB(schemaLevel, dbLine)
 	})
 }
 
-func (a *adapter) mapGatheringInvoiceLineFromDB(schemaLevel int, dbLine *db.BillingInvoiceLine) (billing.GatheringLine, error) {
+func (a *adapter) mapGatheringInvoiceLineFromDB(schemaLevel int, dbLine *db.BillingInvoiceLine) (billing.UpcomingCharge, error) {
 	if dbLine.Type != billing.InvoiceLineTypeUsageBased {
-		return billing.GatheringLine{}, fmt.Errorf("only usage based lines can be gathering invoice lines [line_id=%s]", dbLine.ID)
+		return billing.UpcomingCharge{}, fmt.Errorf("only usage based lines can be gathering invoice lines [line_id=%s]", dbLine.ID)
 	}
 
 	ubpLine := dbLine.Edges.UsageBasedLine
 	if ubpLine == nil {
-		return billing.GatheringLine{}, fmt.Errorf("usage based line data is missing [line_id=%s]", dbLine.ID)
+		return billing.UpcomingCharge{}, fmt.Errorf("usage based line data is missing [line_id=%s]", dbLine.ID)
 	}
 
-	line := billing.GatheringLine{
-		GatheringLineBase: billing.GatheringLineBase{
+	line := billing.UpcomingCharge{
+		UpcomingChargeBase: billing.UpcomingChargeBase{
 			ManagedResource: models.NewManagedResource(models.ManagedResourceInput{
 				Namespace:   dbLine.Namespace,
 				ID:          dbLine.ID,
@@ -243,7 +243,7 @@ func (a *adapter) mapGatheringInvoiceLineFromDB(schemaLevel int, dbLine *db.Bill
 
 	cloned, err := line.WithoutDBState()
 	if err != nil {
-		return billing.GatheringLine{}, fmt.Errorf("cloning line: %w", err)
+		return billing.UpcomingCharge{}, fmt.Errorf("cloning line: %w", err)
 	}
 
 	line.DBState = lo.ToPtr(cloned)