Merge pull request #274 from moovfinancial/ledg-3715-fixes

invoices: fix err response on CreateInvoice

Author: vxio

pkg/moov/call.go

@@ -24,7 +24,7 @@ func callStatus(name string, retryable bool) CallStatus {
 }
 
 var (
-	StatusCompleted = callStatus("completed", false) // Completely fully
+	StatusCompleted = callStatus("completed", false) // Completed fully
 	StatusStarted   = callStatus("started", true)    // Returned as async. This can be due to timing out, or started as async
 
 	StatusBadRequest       = callStatus("bad_request", false)       // bad request, body, headers, etc...
@@ -295,6 +295,16 @@ func CompletedListOrError[A interface{}](resp CallResponse) ([]A, error) {
 	}
 }
 
+// Helper for a common pattern of successful API calls returning an object body or an error
+func StartedObjectOrError[A interface{}](resp CallResponse) (*A, error) {
+	switch resp.Status() {
+	case StatusStarted:
+		return UnmarshalObjectResponse[A](resp)
+	default:
+		return nil, resp
+	}
+}
+
 var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"")
 
 func escapeQuotes(s string) string {

pkg/moov/invoice_api.go

@@ -14,11 +14,10 @@ func (c Client) CreateInvoice(ctx context.Context, accountID string, invoice Cre
 		JsonBody(invoice),
 	)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("calling http: %w", err)
 	}
 
-	out, err := UnmarshalObjectResponse[Invoice](resp)
-	return out, err
+	return StartedObjectOrError[Invoice](resp)
 }
 
 // GetInvoice retrieves an invoice by ID
@@ -28,7 +27,7 @@ func (c Client) GetInvoice(ctx context.Context, accountID, invoiceID string) (*I
 		AcceptJson(),
 	)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("calling http: %w", err)
 	}
 
 	return CompletedObjectOrError[Invoice](resp)
@@ -42,7 +41,7 @@ func (c Client) UpdateInvoice(ctx context.Context, accountID, invoiceID string,
 		JsonBody(invoice),
 	)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("calling http: %w", err)
 	}
 
 	return CompletedObjectOrError[Invoice](resp)
@@ -56,7 +55,7 @@ func (c Client) MarkInvoicePaid(ctx context.Context, accountID, invoiceID string
 		JsonBody(payment),
 	)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("calling http: %w", err)
 	}
 
 	return CompletedObjectOrError[Invoice](resp)
@@ -70,7 +69,7 @@ func (c Client) MarkInvoicePaid(ctx context.Context, accountID, invoiceID string
 // 		AcceptJson(),
 // 	)
 // 	if err != nil {
-// 		return nil, err
+// 		return nil, fmt.Errorf("calling http: %w), err
 // 	}
 
 // 	return CompletedObjectOrError[Invoice](resp)
@@ -117,7 +116,7 @@ func (c Client) ListInvoices(ctx context.Context, accountID string, filters ...L
 	args := prependArgs(filters, AcceptJson())
 	resp, err := c.CallHttp(ctx, Endpoint(http.MethodGet, pathInvoices, accountID), args...)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("calling http: %w", err)
 	}
 
 	return CompletedListOrError[Invoice](resp)