Merge branch 'dev'

dilmaheu · May 16, 2024 · 6b82fba · 6b82fba
2 parents 527558d + cfbc281
commit 6b82fba
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/src/utils/D1Strapi.ts b/src/utils/D1Strapi.ts
@@ -8,7 +8,7 @@ export default async function D1Strapi(
   alternateENV?: typeof env,
 ): Promise<StrapiCollections> {
   if (!strapiCollections) {
-    const { results } = await ((env || alternateENV).USERS as D1Database)
+    const { results } = await ({ ...alternateENV, ...env }.USERS as D1Database)
       .prepare("SELECT * FROM strapi")
       .all();
 

diff --git a/src/workers/dilmahtea-me-baserow/src/types/env.ts b/src/workers/dilmahtea-me-baserow/src/types/env.ts
@@ -3,6 +3,9 @@ export interface ENV {
   CROWDFUNDINGS: KVNamespace;
   ECOMMERCE_PAYMENTS: KVNamespace;
 
+  // D1
+  USERS: D1Database;
+
   // BASEROW
   BASEROW_TOKEN: string;
   BASEROW_CROWDFUNDING_TABLE_ID: string;

diff --git a/src/workers/dilmahtea-me-email/src/types/env.ts b/src/workers/dilmahtea-me-email/src/types/env.ts
@@ -7,6 +7,9 @@ export interface ENV {
   // KV NAMESPACES
   MAILS: KVNamespace;
 
+  // D1
+  USERS: D1Database;
+
   // SECRETS
   CF_SECURE_WORKER_TOKEN: string;
 }
diff --git a/src/workers/dilmahtea-me-retry-workers/src/types/env.ts b/src/workers/dilmahtea-me-retry-workers/src/types/env.ts
@@ -5,6 +5,9 @@ export interface ENV {
   // KV
   WORKER_REQUESTS: KVNamespace;
 
+  // D1
+  USERS: D1Database;
+
   // SERVICES
   EMAIL: Fetcher;
 

diff --git a/src/workers/dilmahtea-me-retry-workers/src/utils/sendErrorEmail.ts b/src/workers/dilmahtea-me-retry-workers/src/utils/sendErrorEmail.ts
@@ -9,7 +9,8 @@ export default async function sendErrorEmail(
 ) {
   let notifySales, subject, body;
 
-  const { recurringElement } = await D1Strapi();
+  // @ts-ignore
+  const { recurringElement } = await D1Strapi(env);
 
   const { DEV_EMAIL, SALES_EMAIL } = recurringElement.data.attributes;