From 40a92d844a45b27d0edab1326dfd25a17ade2e07 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 12 May 2022 21:51:17 -0400 Subject: [PATCH] fix --- wrenchboard/src/shared_tool/site_crons.cc | 34 ++--------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/wrenchboard/src/shared_tool/site_crons.cc b/wrenchboard/src/shared_tool/site_crons.cc index 00d6bb6d..4ab71b8b 100644 --- a/wrenchboard/src/shared_tool/site_crons.cc +++ b/wrenchboard/src/shared_tool/site_crons.cc @@ -75,37 +75,7 @@ long InterestPending(CVars in, CVars &out) { long PastDueWarings(CVars in, CVars &out) { logfmt(logINFO, "ENTER PastDueWarings()"); long contract_id = 0; - const PGresult *res = pgsql_query("SELECT mc.id AS contract_id, mc.member_id,mc.auto_remind " - " FROM members_jobs_contract mc " - " LEFT JOIN members m ON m.id=mc.client_id " - " WHERE mc.status IN (1,2) AND mc.auto_remind > 2 " - " AND delivery_date < now() GROUP BY mc.member_id ,mc.auto_remind, contract_id ORDER BY mc.auto_remind DESC"); - if (res != NULL && pgsql_num_rows(res) > 0) { - for (int i = 0, n = pgsql_num_rows(res); i < n; i++) { - mapf = pgsql_fetch_assoc(res, i); - if (f.empty()) continue; - CVars rec; - map_to_cvars(f, rec); - // note we send once in the loop - // we need the loop to mar items but wanted to send the email only once - if ( contract_id != rec["contract_id"].Long() ){ - contract_id = rec["contract_id"].Long(); - cron_email(WRB_CRONJOB_PASTDUE_ALERT, rec, out); // send the cron email - } - pgsql_exec("UPDATE members_jobs_contract SET auto_remind=auto_remind + 1 "\ - "WHERE member_id=%lu AND id = %lu ", rec["member_id"].Long(),rec["contract_id"].Long()); - - } - } - logfmt(logINFO, "/PastDueWarings()"); - return 0; -} - - -long PastDueWarings(CVars in, CVars &out) { - logfmt(logINFO, "ENTER PastDueWarings()"); - long contract_id = 0; - const PGresult *res = pgsql_query("SELECT mc.id AS contract_id, mc.member_id,mc.auto_remind " + const PGresult *res = pgsql_query("SELECT mc.id AS contract_id, mc.member_id,mc.auto_remind " " FROM members_jobs_contract mc " " LEFT JOIN members m ON m.id=mc.client_id " " WHERE mc.status IN (1,2) AND mc.auto_remind < 3 " @@ -123,7 +93,7 @@ long PastDueWarings(CVars in, CVars &out) { cron_email(WRB_CRONJOB_PASTDUE_ALERT, rec, out); // send the cron email } pgsql_exec("UPDATE members_jobs_contract SET auto_remind=auto_remind + 1 "\ - "WHERE member_id=%lu AND id = 4 ", rec["member_id"].Long(),rec["contract_id"].Long()); + "WHERE member_id=%lu AND id = %lu ", rec["member_id"].Long(),rec["contract_id"].Long()); } }