Skip to content

fix: return empty invoice if no upcoming invoice #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rsbh merged 1 commit into from
Feb 1, 2024
Merged

fix: return empty invoice if no upcoming invoice #482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions billing/invoice/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package invoice

import (
"context"
"errors"
"fmt"
"time"

grpczap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
"github.com/raystack/frontier/billing/customer"
"github.com/raystack/frontier/pkg/metadata"
"github.com/stripe/stripe-go/v75"
Expand Down Expand Up @@ -52,6 +54,7 @@ func (s *Service) List(ctx context.Context, filter Filter) ([]Invoice, error) {
}

func (s *Service) GetUpcoming(ctx context.Context, customerID string) (Invoice, error) {
logger := grpczap.Extract(ctx)
custmr, err := s.customerService.GetByID(ctx, customerID)
if err != nil {
return Invoice{}, fmt.Errorf("failed to find customer: %w", err)
Expand All @@ -64,6 +67,11 @@ func (s *Service) GetUpcoming(ctx context.Context, customerID string) (Invoice,
},
})
if err != nil {
var stripeErr *stripe.Error
if errors.As(err, &stripeErr) && stripeErr.Code == stripe.ErrorCodeInvoiceUpcomingNone {
logger.Debug(fmt.Sprintf("no upcoming invoice: %v", stripeErr))
return Invoice{}, nil
}
return Invoice{}, fmt.Errorf("failed to get upcoming invoice: %w", err)
}

Expand Down