fix: bc mark invoice not working

dwarvesf · Apr 12, 2023 · 4ec7b76 · 4ec7b76
1 parent be49bea
commit 4ec7b76
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/pkg/controller/invoice/new.go b/pkg/controller/invoice/new.go
@@ -33,4 +33,5 @@ type IController interface {
 	UpdateStatus(in UpdateStatusInput) (*model.Invoice, error)
 	MarkInvoiceAsError(invoice *model.Invoice) (*model.Invoice, error)
 	MarkInvoiceAsPaid(invoice *model.Invoice, sendThankYouEmail bool) (*model.Invoice, error)
+	MarkInvoiceAsPaidByBasecampWebhookMessage(invoice *model.Invoice, msg *model.BasecampWebhookMessage) (*model.Invoice, error)
 }
diff --git a/pkg/controller/invoice/update_status.go b/pkg/controller/invoice/update_status.go
@@ -156,6 +156,24 @@ func (c *controller) MarkInvoiceAsPaid(invoice *model.Invoice, sendThankYouEmail
 	return invoice, nil
 }
 
+func (c *controller) MarkInvoiceAsPaidByBasecampWebhookMessage(invoice *model.Invoice, msg *model.BasecampWebhookMessage) (*model.Invoice, error) {
+	l := c.logger.Fields(logger.Fields{
+		"controller": "invoice",
+		"method":     "MarkInvoiceAsPaidByBasecampWebhookMessage",
+		"req":        invoice,
+	})
+	invoice.Status = model.InvoiceStatusPaid
+
+	c.processPaidInvoice(l, &processPaidInvoiceRequest{
+		Invoice:          invoice,
+		InvoiceTodoID:    msg.Recording.ID,
+		InvoiceBucketID:  msg.Recording.Bucket.ID,
+		SentThankYouMail: true,
+	})
+
+	return invoice, nil
+}
+
 func (c *controller) processPaidInvoice(l logger.Logger, req *processPaidInvoiceRequest) {
 	wg := &sync.WaitGroup{}
 	wg.Add(3)

diff --git a/pkg/handler/webhook/basecamp.go b/pkg/handler/webhook/basecamp.go
@@ -113,7 +113,8 @@ func (h *handler) markInvoiceAsPaid(msg *model.BasecampWebhookMessage) error {
 		return nil
 	}
 
-	if _, err := h.controller.Invoice.MarkInvoiceAsPaid(invoice, true); err != nil {
+	// if _, err := h.controller.Invoice.MarkInvoiceAsPaid(invoice, true); err != nil {
+	if _, err := h.controller.Invoice.MarkInvoiceAsPaidByBasecampWebhookMessage(invoice, msg); err != nil {
 		h.service.Basecamp.CommentResult(msg.Recording.Bucket.ID, msg.Recording.ID, h.service.Basecamp.BuildFailedComment(err.Error()))
 		return err
 	}