client/tier: change ReportUsage required params to positional argumen…

…ts (#217)

api/api_test.go

@@ -100,11 +100,9 @@ func TestAPISubscribe(t *testing.T) {
 		t.Helper()
 		defer maybeFailNow(t)
 		fn := mpn(feature)
-		err := tc.ReportUsage(ctx, apitypes.ReportRequest{
-			Org:     org,
-			Feature: fn,
+		err := tc.ReportUsage(ctx, org, fn.String(), n, &tier.ReportParams{
 			At:      time.Now().Add(1 * time.Minute),
-			N:       n,
+			Clobber: false,
 		})
 		diff.Test(t, t.Errorf, err, wantErr)
 	}
@@ -403,11 +401,7 @@ func TestTierReport(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if err := tc.ReportUsage(ctx, apitypes.ReportRequest{
-		Org:     "org:test",
-		Feature: mpn("feature:t"),
-		N:       10,
-
+	if err := tc.ReportUsage(ctx, "org:test", "feature:t", 10, &tier.ReportParams{
 		// Report the usage at a time in the near future to avoid
 		// complaints from Stripe about being too early (e.g. the same
 		// start time as the current phase) or too late (e.g. > 5mins

api/apitypes/apitypes.go

@@ -49,7 +49,7 @@ type ReportRequest struct {
 	Org     string
 	Feature refs.Name
 	N       int
-	At      time.Time
+	At      time.Time // default is time.Now()
 	Clobber bool
 }
 

client/tier/client.go

@@ -198,9 +198,29 @@ func (c *Client) Report(ctx context.Context, org, feature string, n int) error {
 	return err
 }
 
+type ReportParams struct {
+	At      time.Time // default is time.Now()
+	Clobber bool      // default is false
+}
+
 // ReportUsage reports usage based on the provided ReportRequest fields.
-func (c *Client) ReportUsage(ctx context.Context, r apitypes.ReportRequest) error {
-	_, err := fetch.OK[struct{}, *apitypes.Error](ctx, c.client(), "POST", c.baseURL("/v1/report"), r)
+func (c *Client) ReportUsage(ctx context.Context, org, feature string, n int, rp *ReportParams) error {
+	var p ReportParams
+	if rp != nil {
+		p = *rp
+	}
+	fn, err := refs.ParseName(feature)
+	if err != nil {
+		return err
+	}
+	r := apitypes.ReportRequest{
+		Org:     org,
+		Feature: fn,
+		N:       n,
+		At:      p.At,
+		Clobber: p.Clobber,
+	}
+	_, err = fetch.OK[struct{}, *apitypes.Error](ctx, c.client(), "POST", c.baseURL("/v1/report"), r)
 	return err
 }