Merge pull request lichess-org#14412 from kraktus/suspended_paypal

ornicar · web-flow · commit 9983d5b8ea3c · 2024-01-08T10:43:36.000+01:00
Paypal: consider SUSPENDED subscription status as cancelled
diff --git a/modules/plan/src/main/PayPalClient.scala b/modules/plan/src/main/PayPalClient.scala
@@ -116,7 +116,9 @@ final private class PayPalClient(
 
   def getSubscription(id: PayPalSubscriptionId): Fu[Option[PayPalSubscription]] =
     getOne[PayPalSubscription](s"${path.subscriptions}/$id") recover {
-      case CantParseException(json, _) if json.str("status").has("CANCELLED") => none
+      case CantParseException(json, _)
+          if json.str("status").exists(status => status == "CANCELLED" || status == "SUSPENDED") =>
+        none
     }
 
   def getEvent(id: PayPalEventId): Fu[Option[PayPalEvent]] =

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,9 @@ final private class PayPalClient(`
`116`	`116`
`117`	`117`	`def getSubscription(id: PayPalSubscriptionId): Fu[Option[PayPalSubscription]] =`
`118`	`118`	`getOne[PayPalSubscription](s"${path.subscriptions}/$id") recover {`
`119`		`- case CantParseException(json, _) if json.str("status").has("CANCELLED") => none`
	`119`	`+ case CantParseException(json, _)`
	`120`	`+ if json.str("status").exists(status => status == "CANCELLED" \|\| status == "SUSPENDED") =>`
	`121`	`+ none`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`def getEvent(id: PayPalEventId): Fu[Option[PayPalEvent]] =`