rename view

Author: max-baz

app/api/cron/route.ts

@@ -1,7 +1,7 @@
 import {
+  autoRenewFailedRecurringDonations,
   charge,
   logError,
-  renewAutoCancelledDonations,
   sendNewEmails,
 } from "src";
 
@@ -19,7 +19,7 @@ export async function POST(req: Request) {
 
     await charge();
     await sendNewEmails();
-    await renewAutoCancelledDonations();
+    await autoRenewFailedRecurringDonations();
 
     return Response.json({ message: "OK" });
   } catch (err) {

db/migrations/99999999999999_views.sql

@@ -12,9 +12,9 @@ annual_tax_report_gavebrev_since,
 annual_tax_report_gaveskema,
 annual_tax_report_pending_update,
 charged_donations,
-charged_donations_internal,
 charged_donations_by_transfer,
 charged_donations_by_transfer_internal,
+charged_donations_internal,
 charged_memberships,
 charged_memberships_internal,
 charged_or_created_donations,
@@ -28,7 +28,7 @@ donations_to_email,
 donor_acquisition,
 donor_impact_report,
 failed_recurring_donations,
-failed_recurring_donations_to_auto_cancel,
+failed_recurring_donations_to_auto_renew,
 gavebrev_checkins_to_create,
 gwwc_money_moved,
 ignored_renewals,
@@ -612,7 +612,7 @@ select
     on failed_recurring_donations to reader_sensitive;
 
 ---------
-create view failed_recurring_donations_to_auto_cancel as
+create view failed_recurring_donations_to_auto_renew as
 with
     latest_charges as (
         select
@@ -636,11 +636,11 @@ select
 from
     latest_charges
 where
-    rn <= 3
+    rn <= 6
 group by
     donation_id
 having
-    count(*) = 3
+    count(*) = 6
     and bool_and(status = 'error')
 order by
     1
@@ -649,10 +649,10 @@ limit
 
 grant
 select
-    on failed_recurring_donations_to_auto_cancel to reader_sensitive;
+    on failed_recurring_donations_to_auto_renew to reader_sensitive;
 
 grant
-update on failed_recurring_donations_to_auto_cancel to writer;
+update on failed_recurring_donations_to_auto_renew to writer;
 
 --------------------------------------
 create view annual_tax_report_const as

db/schema.sql

@@ -2217,10 +2217,10 @@ CREATE VIEW giveffektivt.failed_recurring_donations AS
 
 
 --
--- Name: failed_recurring_donations_to_auto_cancel; Type: VIEW; Schema: giveffektivt; Owner: -
+-- Name: failed_recurring_donations_to_auto_renew; Type: VIEW; Schema: giveffektivt; Owner: -
 --
 
-CREATE VIEW giveffektivt.failed_recurring_donations_to_auto_cancel AS
+CREATE VIEW giveffektivt.failed_recurring_donations_to_auto_renew AS
  WITH latest_charges AS (
          SELECT c.donation_id,
             c.status,
@@ -2231,9 +2231,9 @@ CREATE VIEW giveffektivt.failed_recurring_donations_to_auto_cancel AS
         )
  SELECT donation_id AS id
    FROM latest_charges
-  WHERE (rn <= 3)
+  WHERE (rn <= 6)
   GROUP BY donation_id
- HAVING ((count(*) = 3) AND bool_and((status = 'error'::giveffektivt.charge_status)))
+ HAVING ((count(*) = 6) AND bool_and((status = 'error'::giveffektivt.charge_status)))
   ORDER BY donation_id
  LIMIT 2;
 

src/donation/failed.ts

@@ -5,7 +5,7 @@ import {
   generateRenewPaymentUrl,
   getDonationToUpdateQuickpayPaymentInfoById,
   getFailedRecurringDonations,
-  getFailedRecurringDonationsToAutoCancel,
+  getFailedRecurringDonationsToAutoRenew,
   logError,
   recreateQuickpayFailedRecurringDonation,
   sendFailedRecurringDonationEmail,
@@ -68,9 +68,9 @@ export async function getRenewPaymentLink(
   });
 }
 
-export async function renewAutoCancelledDonations() {
+export async function autoRenewFailedRecurringDonations() {
   await dbExecuteInTransaction(async (db) => {
-    const ids = await getFailedRecurringDonationsToAutoCancel(db);
+    const ids = await getFailedRecurringDonationsToAutoRenew(db);
     await sendFailedRecurringDonationEmails(db, ids);
   });
 }

src/donation/repository.ts

@@ -237,12 +237,12 @@ export async function getFailedRecurringDonations(
   return (await client.query("select * from failed_recurring_donations")).rows;
 }
 
-export async function getFailedRecurringDonationsToAutoCancel(
+export async function getFailedRecurringDonationsToAutoRenew(
   client: PoolClient,
 ) {
   return (
     await client.query(
-      "select id from failed_recurring_donations_to_auto_cancel for update skip locked",
+      "select id from failed_recurring_donations_to_auto_renew for update skip locked",
     )
   ).rows.map((d) => d.id);
 }