[stripe] When creating a Subscription, don't specify a custom billing cycle anchor date - let it go from date to date instead

Author: jankeromnes

components/server/ee/src/user/stripe-service.ts

@@ -154,15 +154,12 @@ export class StripeService {
                 taxInformation: customer.tax,
             });
         }
-        const startOfNextMonth = new Date(new Date().toISOString().slice(0, 7) + "-01"); // First day of this month (YYYY-MM-01)
-        startOfNextMonth.setMonth(startOfNextMonth.getMonth() + 1); // Add one month
 
         await reportStripeOutcome("subscriptions_create", () => {
             return this.getStripe().subscriptions.create({
                 customer: customer.id,
                 items: [{ price: priceId }],
                 automatic_tax: { enabled: isAutomaticTaxSupported },
-                billing_cycle_anchor: Math.round(startOfNextMonth.getTime() / 1000),
             });
         });
     }

components/usage/pkg/stripe/stripe.go

@@ -338,8 +338,6 @@ func (c *Client) CreateSubscription(ctx context.Context, customerID string, pric
 		return nil, fmt.Errorf("no priceID specified")
 	}
 
-	startOfNextMonth := getStartOfNextMonth(time.Now())
-
 	params := &stripe.SubscriptionParams{
 		Customer: stripe.String(customerID),
 		Items: []*stripe.SubscriptionItemsParams{
@@ -350,7 +348,6 @@ func (c *Client) CreateSubscription(ctx context.Context, customerID string, pric
 		AutomaticTax: &stripe.SubscriptionAutomaticTaxParams{
 			Enabled: stripe.Bool(isAutomaticTaxSupported),
 		},
-		BillingCycleAnchor: stripe.Int64(startOfNextMonth.Unix()),
 	}
 
 	subscription, err := c.sc.Subscriptions.New(params)
@@ -361,15 +358,6 @@ func (c *Client) CreateSubscription(ctx context.Context, customerID string, pric
 	return subscription, err
 }
 
-func getStartOfNextMonth(t time.Time) time.Time {
-	currentYear, currentMonth, _ := t.Date()
-
-	firstOfMonth := time.Date(currentYear, currentMonth, 1, 0, 0, 0, 0, time.UTC)
-	startOfNextMonth := firstOfMonth.AddDate(0, 1, 0)
-
-	return startOfNextMonth
-}
-
 func (c *Client) SetDefaultPaymentForCustomer(ctx context.Context, customerID string, setupIntentId string) (*stripe.Customer, error) {
 	if customerID == "" {
 		return nil, fmt.Errorf("no customerID specified")

components/usage/pkg/stripe/stripe_test.go

@@ -7,7 +7,6 @@ package stripe
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/gitpod-io/gitpod/usage/pkg/db"
 
@@ -91,9 +90,3 @@ func TestCustomerQueriesForTeamIds_MultipleQueries(t *testing.T) {
 		})
 	}
 }
-
-func TestStartOfNextMonth(t *testing.T) {
-	ts := time.Date(2022, 10, 1, 0, 0, 0, 0, time.UTC)
-
-	require.Equal(t, time.Date(2022, 11, 1, 0, 0, 0, 0, time.UTC), getStartOfNextMonth(ts))
-}