Merge remote-tracking branch 'origin/master' into handle-stripe-invoi…

…ce-pay-failed-01
brave-intl · Nov 8, 2024 · ac0cb3b · ac0cb3b
2 parents bbc4b96 + eba1bb2
commit ac0cb3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/services/skus/controllers.go b/services/skus/controllers.go
@@ -1089,7 +1089,7 @@ func handleWebhookPlayStoreH(w http.ResponseWriter, r *http.Request, svc *Servic
 
 			return handlers.RenderContent(ctx, struct{}{}, w, http.StatusOK)
 
-		case errors.Is(err, model.ErrNoRowsChangedOrder), errors.Is(err, model.ErrNoRowsChangedOrderPayHistory):
+		case errors.Is(err, model.ErrNoRowsChangedOrder):
 			l.Warn().Err(err).Msg("failed to process play store notification")
 
 			// No rows have changed whilst processing.
@@ -1180,7 +1180,7 @@ func handleWebhookAppStoreH(w http.ResponseWriter, r *http.Request, svc *Service
 
 			return handlers.RenderContent(ctx, struct{}{}, w, http.StatusOK)
 
-		case errors.Is(err, model.ErrNoRowsChangedOrder), errors.Is(err, model.ErrNoRowsChangedOrderPayHistory):
+		case errors.Is(err, model.ErrNoRowsChangedOrder):
 			l.Warn().Err(err).Msg("failed to process app store notification")
 
 			// No rows have changed whilst processing.
@@ -1313,7 +1313,7 @@ func handleStripeWebhook(svc *Service) handlers.AppHandler {
 
 				return handlers.RenderContent(ctx, struct{}{}, w, http.StatusOK)
 
-			case errors.Is(err, model.ErrNoRowsChangedOrder), errors.Is(err, model.ErrNoRowsChangedOrderPayHistory):
+			case errors.Is(err, model.ErrNoRowsChangedOrder):
 				l.Warn().Err(err).Msg("failed to process stripe notification")
 
 				// No rows have changed whilst processing.

diff --git a/services/skus/model/model.go b/services/skus/model/model.go
@@ -22,7 +22,6 @@ const (
 	ErrOrderNotPaid                           Error = "order not paid"
 	ErrIssuerNotFound                         Error = "model: issuer not found"
 	ErrNoRowsChangedOrder                     Error = "model: no rows changed in orders"
-	ErrNoRowsChangedOrderPayHistory           Error = "model: no rows changed in order_payment_history"
 	ErrExpiredStripeCheckoutSessionIDNotFound Error = "model: expired stripeCheckoutSessionId not found"
 	ErrInvalidOrderNoItems                    Error = "model: invalid order: no items"
 	ErrNoStripeCheckoutSessID                 Error = "model: order: no stripe checkout session id"