Fix #806: reset retry and last_retry on resync command

ctms/crud.py

@@ -330,9 +330,17 @@ def get_all_acoustic_records_count(
 def bulk_schedule_acoustic_records(db: Session, primary_emails: list[str]):
     """Mark a list of primary email as pending synchronization."""
     statement = _contact_base_query(db).filter(Email.primary_email.in_(primary_emails))
-    db.bulk_save_objects(
-        PendingAcousticRecord(email_id=email.email_id) for email in statement.all()
+    insert_stmt = insert(PendingAcousticRecord).values(
+        [{"email_id": email.email_id} for email in statement.all()]
     )
+    insert_stmt = insert_stmt.on_conflict_do_update(
+        index_elements=[PendingAcousticRecord.email_id],
+        set_={
+            "retry": 0,
+            "last_error": "",
+        },
+    )
+    db.execute(insert_stmt)
 
 
 def reset_retry_acoustic_records(db: Session):

tests/unit/bin/test_acoustic.py

@@ -33,6 +33,26 @@ def test_main_force_resync_by_email_list(dbsession, maximal_contact, tmpdir):
     assert len(dbsession.query(PendingAcousticRecord).all()) > 0
 
 
+def test_main_force_resync_will_reset_existing_retries(
+    dbsession, maximal_contact, tmpdir
+):
+    record = PendingAcousticRecord(
+        email_id=maximal_contact.email.email_id, retry=99, last_error="boom"
+    )
+    dbsession.add(record)
+    dbsession.flush()
+
+    f = tmpdir.join("temp.txt")
+    f.write(maximal_contact.email.primary_email)
+    do_resync(dbsession, assume_yes=True, emails_file=f)
+    dbsession.flush()
+
+    pending = dbsession.query(PendingAcousticRecord).all()
+    assert len(pending) == 1
+    assert pending[0].retry == 0
+    assert pending[0].last_error == ""
+
+
 def test_main_force_resync_by_reset_retry(dbsession, minimal_contact, maximal_contact):
     record = PendingAcousticRecord(email_id=minimal_contact.email.email_id, retry=99)
     dbsession.add(record)

tests/unit/test_crud.py

@@ -118,6 +118,7 @@ def test_get_email_miss(dbsession):
 
 def test_schedule_acoustic_record(dbsession, email_factory):
     email = email_factory()
+    dbsession.commit()
     schedule_acoustic_record(dbsession, email.email_id)
     dbsession.commit()