draft: feat: Pricing Implementation, Editable Slots in Status Page by admin, dynamic pricing

admin/billing.go

@@ -201,16 +201,18 @@ func (s *Service) RepairOrganizationBilling(ctx context.Context, org *database.O
 			return nil, nil, fmt.Errorf("failed to start trial: %w", err)
 		}
 
-		// send trial started email
-		err = s.Email.SendTrialStarted(&email.TrialStarted{
-			ToEmail:      org.BillingEmail,
-			ToName:       org.Name,
-			OrgName:      org.Name,
-			FrontendURL:  s.URLs.Frontend(),
-			TrialEndDate: sub.TrialEndDate,
-		})
-		if err != nil {
-			s.Logger.Named("billing").Error("failed to send trial started email", zap.String("org_name", org.Name), zap.String("org_id", org.ID), zap.String("billing_email", org.BillingEmail), zap.Error(err))
+		// Only send the trial-started email for trial-based plans; free plan has no trial period
+		if sub.Plan == nil || sub.Plan.PlanType != billing.FreePlanType {
+			err = s.Email.SendTrialStarted(&email.TrialStarted{
+				ToEmail:      org.BillingEmail,
+				ToName:       org.Name,
+				OrgName:      org.Name,
+				FrontendURL:  s.URLs.Frontend(),
+				TrialEndDate: sub.TrialEndDate,
+			})
+			if err != nil {
+				s.Logger.Named("billing").Error("failed to send trial started email", zap.String("org_name", org.Name), zap.String("org_id", org.ID), zap.String("billing_email", org.BillingEmail), zap.Error(err))
+			}
 		}
 	} else {
 		s.Logger.Named("billing").Warn("subscription already exists for org", zap.String("org_id", org.ID), zap.String("org_name", org.Name))
@@ -273,7 +275,8 @@ func (s *Service) StartTrial(ctx context.Context, org *database.Organization) (*
 			return nil, nil, fmt.Errorf("failed to create subscription: %w", err)
 		}
 
-		if org.CreatedByUserID != nil {
+		// Only count trial orgs for trial-based plans (not Free)
+		if plan.PlanType != billing.FreePlanType && org.CreatedByUserID != nil {
 			err = s.DB.IncrementCurrentTrialOrgCount(ctx, *org.CreatedByUserID)
 			if err != nil {
 				return nil, nil, fmt.Errorf("failed to increment current trial org count: %w", err)
@@ -286,22 +289,6 @@ func (s *Service) StartTrial(ctx context.Context, org *database.Organization) (*
 		return org, sub, nil
 	}
 
-	var userEmail string
-	if org.CreatedByUserID != nil {
-		user, err := s.DB.FindUser(ctx, *org.CreatedByUserID)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to get user info: %w", err)
-		}
-		userEmail = user.Email
-	}
-
-	s.Logger.Named("billing").Info("started trial for organization",
-		zap.String("org_name", org.Name),
-		zap.String("org_id", org.ID),
-		zap.String("trial_end_date", sub.TrialEndDate.String()),
-		zap.String("user_email", userEmail),
-	)
-
 	org, err = s.DB.UpdateOrganization(ctx, org.ID, &database.UpdateOrganizationOptions{
 		Name:                                org.Name,
 		DisplayName:                         org.DisplayName,
@@ -339,6 +326,28 @@ func (s *Service) StartTrial(ctx context.Context, org *database.Organization) (*
 		return nil, nil, err
 	}
 
+	// Free plan: grant initial credits in DB; no trial issue, billing tracked via credit worker
+	if plan.PlanType == billing.FreePlanType {
+		creditAmount := 250.0
+		creditExpiry := time.Now().AddDate(1, 0, 0) // 1 year from now
+		err := s.DB.SetOrganizationCredits(ctx, org.ID, creditAmount, creditExpiry)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to grant free plan credits: %w", err)
+		}
+		s.Logger.Named("billing").Info("started free plan for organization",
+			zap.String("org_name", org.Name),
+			zap.String("org_id", org.ID),
+			zap.Float64("credits_granted", creditAmount),
+		)
+		return org, sub, nil
+	}
+
+	s.Logger.Named("billing").Info("started trial for organization",
+		zap.String("org_name", org.Name),
+		zap.String("org_id", org.ID),
+		zap.String("trial_end_date", sub.TrialEndDate.String()),
+	)
+
 	// raise on-trial billing warning
 	_, err = s.DB.UpsertBillingIssue(ctx, &database.UpsertBillingIssueOptions{
 		OrgID: org.ID,
@@ -418,6 +427,21 @@ func (s *Service) CleanupTrialBillingIssues(ctx context.Context, orgID string) e
 	return nil
 }
 
+// CleanupCreditBillingIssues removes free-plan credit billing issues (called on upgrade to Growth)
+func (s *Service) CleanupCreditBillingIssues(ctx context.Context, orgID string) error {
+	for _, t := range []database.BillingIssueType{
+		database.BillingIssueTypeCreditLow,
+		database.BillingIssueTypeCreditCritical,
+		database.BillingIssueTypeCreditExhausted,
+	} {
+		err := s.DB.DeleteBillingIssueByTypeForOrg(ctx, orgID, t)
+		if err != nil && !errors.Is(err, database.ErrNotFound) {
+			return fmt.Errorf("failed to delete credit billing issue: %w", err)
+		}
+	}
+	return nil
+}
+
 // CleanupSubscriptionBillingIssues removes subscription related billing issues
 func (s *Service) CleanupSubscriptionBillingIssues(ctx context.Context, orgID string) error {
 	err := s.DB.DeleteBillingIssueByTypeForOrg(ctx, orgID, database.BillingIssueTypeNeverSubscribed)
@@ -481,6 +505,17 @@ func (s *Service) CheckBlockingBillingErrors(ctx context.Context, orgID string)
 		return fmt.Errorf("subscription cancelled")
 	}
 
+	be, err = s.DB.FindBillingIssueByTypeForOrg(ctx, orgID, database.BillingIssueTypeCreditExhausted)
+	if err != nil {
+		if !errors.Is(err, database.ErrNotFound) {
+			return err
+		}
+	}
+
+	if be != nil {
+		return fmt.Errorf("free credit exhausted")
+	}
+
 	return nil
 }
 

admin/billing/biller.go

@@ -62,6 +62,14 @@
 
 	ReportUsage(ctx context.Context, usage []*Usage) error
 
+	// GetCreditBalance returns the credit balance for the given customer.
+	// Returns nil if the customer has no credit grants (e.g. not on a free plan).
+	GetCreditBalance(ctx context.Context, customerID string) (*CreditBalance, error)
+	// AddCredits adds a credit grant to the given customer. Returns the new total balance.
+	AddCredits(ctx context.Context, customerID string, amount float64, expiryDate time.Time, description string) (*CreditBalance, error)
+	// VoidCredits voids all active credit grants for the given customer (called on upgrade from Free to Growth).
+	VoidCredits(ctx context.Context, customerID string) error
+
 	GetReportingGranularity() UsageReportingGranularity
 	GetReportingWorkerCron() string
 
@@ -81,6 +89,8 @@
 	TeamPlanType
 	ManagedPlanType
 	EnterprisePlanType
+	FreePlanType
+	GrowthPlanType
 )
 
 type Plan struct {
@@ -108,12 +118,12 @@
 type planMetadata struct {
 	Default                        bool   `mapstructure:"default"`
 	Public                         bool   `mapstructure:"public"`
-	StorageLimitBytesPerDeployment *int64 `mapstructure:"storage_limit_bytes_per_deployment"`
-	NumProjects                    *int   `mapstructure:"num_projects"`
-	NumDeployments                 *int   `mapstructure:"num_deployments"`
-	NumSlotsTotal                  *int   `mapstructure:"num_slots_total"`
-	NumSlotsPerDeployment          *int   `mapstructure:"num_slots_per_deployment"`
-	NumOutstandingInvites          *int   `mapstructure:"num_outstanding_invites"`
+	StorageLimitBytesPerDeployment *int64  `mapstructure:"storage_limit_bytes_per_deployment"`
+	NumProjects                    *int    `mapstructure:"num_projects"`
+	NumDeployments                 *int    `mapstructure:"num_deployments"`
+	NumSlotsTotal                  *int    `mapstructure:"num_slots_total"`
+	NumSlotsPerDeployment          *int    `mapstructure:"num_slots_per_deployment"`
+	NumOutstandingInvites          *int    `mapstructure:"num_outstanding_invites"`
 }
 
 type Subscription struct {
@@ -136,6 +146,14 @@
 	PortalURL         string
 }
 
+type CreditBalance struct {
+	TotalCredit     float64
+	UsedCredit      float64
+	RemainingCredit float64
+	ExpiryDate      time.Time
+	BurnRatePerDay  float64 // Estimated daily burn rate based on recent usage
+}
+
 type Usage struct {
 	CustomerID     string
 	MetricName     string

admin/billing/noop.go

@@ -109,6 +109,18 @@ func (n noop) UnmarkCustomerTaxExempt(ctx context.Context, customerID string) er
 	return nil
 }
 
+func (n noop) GetCreditBalance(ctx context.Context, customerID string) (*CreditBalance, error) {
+	return nil, nil
+}
+
+func (n noop) AddCredits(ctx context.Context, customerID string, amount float64, expiryDate time.Time, description string) (*CreditBalance, error) {
+	return nil, nil
+}
+
+func (n noop) VoidCredits(ctx context.Context, customerID string) error {
+	return nil
+}
+
 func (n noop) ReportUsage(ctx context.Context, usage []*Usage) error {
 	return nil
 }