Merge pull request #351 from mozilla-it/fix-350-ingest-new-deleted-customer

Handle POST of new deleted customer

Author: jwhitlock

ctms/app.py

@@ -87,7 +87,7 @@
 app = FastAPI(
     title="ConTact Management System (CTMS)",
     description="CTMS API (work in progress)",
-    version="1.1.2",
+    version="1.1.3",
 )
 SessionLocal = None
 METRICS_REGISTRY = CollectorRegistry()
@@ -961,7 +961,7 @@ def _process_stripe_object(
             status_code=409, detail="Deadlock or other issue, try again"
         ) from e
 
-    email_id = obj.get_email_id()
+    email_id = obj.get_email_id() if obj else None
     if data["object"] == "customer" and re_trace_email.match(data.get("email", "")):
         trace_email = data["email"]
     else:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "ctms"
-version = "1.1.2"
+version = "1.1.3"
 description = "Contact Management System API"
 authors = [
     "Brian Stack <bstack@mozilla.com>",

tests/unit/test_api_stripe.py

@@ -11,6 +11,7 @@
 
 from ctms.app import app, get_pubsub_claim
 from ctms.models import PendingAcousticRecord
+from tests.unit.sample_data import fake_stripe_id
 from tests.unit.test_ingest_stripe import (
     stripe_customer_data,
     stripe_invoice_data,
@@ -137,6 +138,21 @@ def test_api_post_conflicting_fxa_id(dbsession, client, contact_with_stripe_cust
     assert log["fxa_id_conflict"] == data["description"]
 
 
+def test_api_post_deleted_new_customer(dbsession, client):
+    """A new customer who starts out deleted is skipped."""
+    stripe_id = fake_stripe_id("cus", "new_but_deleted")
+    data = {"deleted": True, "id": stripe_id, "object": "customer"}
+    with capture_logs() as caplog:
+        resp = client.post("/stripe", json=data)
+    assert resp.status_code == 200
+    assert resp.json() == {"status": "OK"}
+    assert len(caplog) == 1
+    log = caplog[0]
+    assert log["ingest_actions"] == {
+        "skipped": [f"customer:{stripe_id}"],
+    }
+
+
 def test_api_post_stripe_from_pubsub_customer(
     dbsession, pubsub_client, example_contact
 ):
@@ -304,3 +320,18 @@ def test_api_post_pubsub_conflicting_fxa_id(
         "deleted": [f"customer:{old_id}"],
     }
     assert log["fxa_id_conflict"] == data["description"]
+
+
+def test_api_post_stripe_from_pubsub_deleted_new_customer(dbsession, pubsub_client):
+    """A new customer who starts out deleted is skipped."""
+    stripe_id = fake_stripe_id("cus", "new_but_deleted")
+    data = {"deleted": True, "id": stripe_id, "object": "customer"}
+    with capture_logs() as caplog:
+        resp = pubsub_client.post("/stripe_from_pubsub", json=pubsub_wrap(data))
+    assert resp.status_code == 200
+    assert resp.json() == {"status": "OK", "count": 1}
+    assert len(caplog) == 1
+    log = caplog[0]
+    assert log["ingest_actions"] == {
+        "skipped": [f"customer:{stripe_id}"],
+    }