Update functions to accept new settings format + faculty_email field

_shared/utils.ts

@@ -206,12 +206,14 @@ export const sendOrgEmail = async (
     subject = subject.replace(/{ORG_NAME}/g, orgName);
     text = text.replace(/{ORG_NAME}/g, orgName);
 
-    await Transport.sendMail({
-        from: Deno.env.get('NODEMAILER_FROM')!,
-        bcc: recipientEmails,
-        subject,
-        text,
-    });
+    if (recipientEmails?.length > 0) {
+        await Transport.sendMail({
+            from: Deno.env.get('NODEMAILER_FROM')!,
+            bcc: recipientEmails,
+            subject,
+            text,
+        });
+    }
 };
 
 export const sendMemberEmail = async (
@@ -283,3 +285,16 @@ export const sendMemberEmail = async (
         text,
     });
 };
+
+export const fetchMemberRequirement = async () => {
+    type styp = {
+        setting_value: number;
+    };
+    const { data } = await supabaseAdmin.from('settings')
+        .select(`
+                setting_value
+            `).eq('name', 'required_members')
+        .single()
+        .returns<styp>();
+    return data?.setting_value || 0;
+};

approve-member/index.ts

@@ -1,7 +1,11 @@
 import { createClient } from 'https://esm.sh/@supabase/supabase-js@2';
 import corsHeaders from '../_shared/cors.ts';
 import supabaseAdmin from '../_shared/supabaseAdmin.ts';
-import { sendMemberEmail, sendOrgEmail } from '../_shared/utils.ts';
+import {
+    fetchMemberRequirement,
+    sendMemberEmail,
+    sendOrgEmail,
+} from '../_shared/utils.ts';
 import { footer } from '../_shared/strings.ts';
 
 type BodyType = {
@@ -110,18 +114,7 @@ We hope you enjoy your club experience at Stuy.` + footer;
     if (orgData && orgData.length && !orgDataError) {
         const org = orgData[0];
 
-        type styp = {
-            required_members: number;
-        };
-        const { data: siteSettings } = await supabaseAdmin.from('settings')
-            .select(`
-                required_members
-            `)
-            .returns<styp[]>();
-        let required_members = 0;
-        if (siteSettings) {
-            required_members = siteSettings[0].required_members;
-        }
+        const required_members = await fetchMemberRequirement();
 
         if (
             org.state === 'LOCKED' &&

approve-organization/index.ts

@@ -1,5 +1,5 @@
 import { createClient } from 'https://esm.sh/@supabase/supabase-js@2';
-import { sendOrgEmail } from '../_shared/utils.ts';
+import { fetchMemberRequirement, sendOrgEmail } from '../_shared/utils.ts';
 import corsHeaders from '../_shared/cors.ts';
 import { footer } from '../_shared/strings.ts';
 
@@ -33,15 +33,7 @@ Deno.serve(async (req: Request) => {
     const { data: userData } = await supabaseClient.auth.getUser(jwt);
     const user = userData.user;
 
-    const { data: siteSettings } = await supabaseClient.from('settings')
-        .select(`
-	required_members
-    `)
-        .returns<styp[]>();
-    let required_members = 0;
-    if (siteSettings) {
-        required_members = siteSettings[0].required_members;
-    }
+    const required_members = await fetchMemberRequirement();
 
     /* Failed to fetch supabase user */
     if (!user) {

create-organization/index.ts

@@ -21,6 +21,7 @@ type BodyType = {
     is_returning: boolean;
     returning_info: string;
     fair?: boolean;
+    faculty_email?: string;
 };
 
 const RESERVED_PATHS = [
@@ -52,6 +53,25 @@ Deno.serve(async (req: Request) => {
         { global: { headers: { Authorization: authHeader } } },
     );
 
+    type styp = {
+        setting_value: number;
+    };
+    const { data } = await supabaseAdmin.from('settings')
+        .select(`
+                setting_value
+            `).eq('name', 'charter_deadline')
+        .single()
+        .returns<styp>();
+    if (data?.setting_value) {
+        const deadline = new Date(data.setting_value);
+        if (new Date() > deadline) {
+            return new Response(
+                `Chartering for this year has been disabled as of ${deadline.toLocaleString()}.`,
+                { status: 403 },
+            );
+        }
+    }
+
     const jwt = authHeader.split(' ')[1];
     const { data: userData } = await supabaseClient.auth.getUser(jwt);
     const user = userData.user;

export-voters/index.ts

@@ -45,8 +45,11 @@ Deno.serve(async (req: Request) => {
     // verify JWT provided by the user
     try {
         const ecPublicKey = await jose.importSPKI(key, 'RS256');
-        const { payload: { user: userPayload } } = await jose.jwtVerify(jwt, ecPublicKey);
-
+        const { payload: { user: userPayload } } = await jose.jwtVerify(
+            jwt,
+            ecPublicKey,
+        );
+
         if (!userPayload.adminPrivileges) {
             return new Response(
                 JSON.stringify({