killbill-memoizeit

Call TrimTenant later

10/26/2018 6:55:35 PM

Prem Ramanathan

Commit: b5eecd4

Tree: ba2364a

Parents: e0ca2f5

Changes

util/src/main/resources/wipeoutTenant.sql 12(+6 -6)

Details

util/src/main/resources/wipeoutTenant.sql 12(+6 -6)

diff --git a/util/src/main/resources/wipeoutTenant.sql b/util/src/main/resources/wipeoutTenant.sql
index d29a2ab..51364d3 100644
--- a/util/src/main/resources/wipeoutTenant.sql
+++ b/util/src/main/resources/wipeoutTenant.sql
@@ -21,8 +21,9 @@ BEGIN
     select record_id from tenants WHERE api_key = p_api_key into v_tenant_record_id;
     select id from tenants WHERE api_key = p_api_key into v_tenant_id;
 
-    -- Trim the tenant first
-    CALL trimTenant(p_api_key);
+    DELETE FROM _invoice_payment_control_plugin_auto_pay_off
+        WHERE account_id in (
+            SELECT id from accounts where tenant_record_id = v_tenant_record_id);
 
     DELETE FROM catalog_override_block_definition WHERE tenant_record_id = v_tenant_record_id;
     DELETE FROM catalog_override_phase_definition WHERE tenant_record_id = v_tenant_record_id;
@@ -36,11 +37,10 @@ BEGIN
 
     DELETE FROM tenant_kvs WHERE tenant_record_id = v_tenant_record_id;
 
-    DELETE FROM tenants WHERE id = v_tenant_id;
+    -- Trim the tenant
+    CALL trimTenant(p_api_key);
 
-    DELETE FROM _invoice_payment_control_plugin_auto_pay_off
-        WHERE account_id in (
-            SELECT id from accounts where tenant_record_id = v_tenant_record_id);
+    DELETE FROM tenants WHERE id = v_tenant_id;
 
     -- NOT DELETED TABLES
     -- analytics_currency_conversion