From 5e2dddef4313c90c03926b0a715e461a4a7b12c9 Mon Sep 17 00:00:00 2001 From: Cassidy Symons Date: Tue, 26 Sep 2023 12:48:51 -0700 Subject: [PATCH] Adjust conditional + Lint --- microsetta_private_api/repo/melissa_repo.py | 2 +- microsetta_private_api/util/melissa.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/microsetta_private_api/repo/melissa_repo.py b/microsetta_private_api/repo/melissa_repo.py index 594ee3d2a..c9d9439d4 100644 --- a/microsetta_private_api/repo/melissa_repo.py +++ b/microsetta_private_api/repo/melissa_repo.py @@ -71,7 +71,7 @@ def check_duplicate(self, address_1, address_2, postal, country): # psycopg won't automatically handle = NULL vs. IS NULL sql = """SELECT * FROM campaign.melissa_address_queries WHERE (source_address_1 = %s - AND source_{0} + AND source_{0} AND source_postal = %s AND source_country = %s AND result_processed = true) diff --git a/microsetta_private_api/util/melissa.py b/microsetta_private_api/util/melissa.py index d85545e48..bef1f8ae1 100644 --- a/microsetta_private_api/util/melissa.py +++ b/microsetta_private_api/util/melissa.py @@ -119,7 +119,7 @@ def verify_address(address_1, address_2=None, address_3=None, city=None, r_good = True break - if not r_good and r_good_conditional and not r_errors_present: + if r_good_conditional and not r_errors_present: r_good = True r_address_1 = record_obj["AddressLine1"]