Clean up code to make documenting easier

Author: iAmWillShepherd

supabase/functions/_utils/config.ts

@@ -1,19 +1,30 @@
 import Stripe from "https://esm.sh/stripe@10.13.0?target=deno&deno-std=0.165.0"
+import * as OneSignal from "https://esm.sh/@onesignal/node-onesignal@1.0.
 
+// OneSignal
+export const _OnesignalAppId_ = Deno.env.get("ONESIGNAL_APP_ID")!
+const _OnesignalUserAuthKey_ = Deno.env.get("USER_AUTH_KEY")!
+export const _OnesignalRestApiKey_ = Deno.env.get("ONESIGNAL_REST_API_KEY")!
+
+const configuration = OneSignal.createConfiguration({
+  userKey: _OnesignalUserAuthKey_,
+  appKey: _OnesignalAppId_,
+})
+export const onesignal = new OneSignal.DefaultApi(configuration)
+
+// Supabase
 export const _SupabaseUrl_ = Deno.env.get("SUPABASE_URL")!
 export const _SupabaseServiceRoleKey_ = Deno.env.get(
   "SUPABASE_SERVICE_ROLE_KEY"
 )!
+
+// Stripe
 export const _StripePublishableKey_ = Deno.env.get("STRIPE_PUBLISHABLE_KEY")!
 export const _StripeWebhookSecret_ = Deno.env.get("STRIPE_WEBHOOK_SECRET")!
-
 const _stripeSecretKey_ = Deno.env.get("STRIPE_SECRET_KEY")!
 export const stripe = Stripe(_stripeSecretKey_, {
   httpClient: Stripe.createFetchHttpClient(),
 })
-export const _OnesignalAppId_ = Deno.env.get("ONESIGNAL_APP_ID")!
-export const _OnesignalUserAuthKey_ = Deno.env.get("USER_AUTH_KEY")!
-export const _OnesignalRestApiKey_ = Deno.env.get("ONESIGNAL_REST_API_KEY")!
 
 // For debugging environment
 // console.log("Runtime environmentDeno\n\t", Deno.env.toObject())

supabase/functions/push-order-confirmation-to-customer/index.ts

@@ -1,28 +1,19 @@
 import { serve } from "https://deno.land/std@0.131.0/http/server.ts"
 import * as OneSignal from "https://esm.sh/@onesignal/node-onesignal@1.0.0-beta7"
 import {
+  onesignal,
   _OnesignalAppId_,
   _OnesignalRestApiKey_,
   _OnesignalUserAuthKey_,
 } from "../_utils/config.ts"
 import { getCustomerProfile } from "../_utils/supabase.ts"
 
-const notifMessage = (amount: number, currency: string) =>
+const generateMessage = (amount: number, currency: string) =>
   `You just spent ${amount / 100} ${(currency as String).toUpperCase()}.`
 
 serve(async (req) => {
-  // Load secrets
-
-  // Create OneSignal client
-  const configuration = OneSignal.createConfiguration({
-    userKey: _OnesignalUserAuthKey_,
-    appKey: _OnesignalRestApiKey_,
-  })
-  const onesignalClient = new OneSignal.DefaultApi(configuration)
-
   try {
-    const json = await req.json()
-    const { record } = json
+    const { record } = await req.json()
     const customerId = record.stripe_customer_id
     const profile: string | null = await getCustomerProfile(customerId)
     if (!profile) {
@@ -33,10 +24,10 @@ serve(async (req) => {
     const notification = new OneSignal.Notification()
     notification.app_id = _OnesignalAppId_
     notification.include_external_user_ids = [profile]
-    notification.contents = { en: notifMessage(record.amount, record.currency) }
-    const onesignalApiRes = await onesignalClient.createNotification(
-      notification
-    )
+    notification.contents = {
+      en: generateMessage(record.amount, record.currency),
+    }
+    const onesignalApiRes = await onesignal.createNotification(notification)
 
     return new Response(
       JSON.stringify({ onesignalResponse: onesignalApiRes }),

supabase/functions/push-to-all-subs/index.ts

@@ -1,33 +1,27 @@
 import { serve } from "https://deno.land/std@0.131.0/http/server.ts"
 import * as OneSignal from "https://esm.sh/@onesignal/node-onesignal@1.0.0-beta7"
+import {
+  onesignal,
+  _OnesignalAppId_,
+  _OnesignalUserAuthKey_,
+} from "../_utils/config.ts"
 
 serve(async (req) => {
-  // Load secrets
-  const appId = Deno.env.get("ONESIGNAL_APP_ID")!
-  const userAuthKey = Deno.env.get("USER_AUTH_KEY")!
-  const restApiKey = Deno.env.get("ONESIGNAL_REST_API_KEY")!
-
   // Create OneSignal client
-  const configuration = OneSignal.createConfiguration({
-    userKey: userAuthKey,
-    appKey: restApiKey,
-  })
-  const client = new OneSignal.DefaultApi(configuration)
 
   try {
-    const data = await req.json()
-    const { message } = data
+    const { message } = await req.json()
 
     // Build OneSignal notification object
     const notification = new OneSignal.Notification()
-    notification.app_id = appId
+    notification.app_id = _OnesignalAppId_
     notification.contents = {
       en: message,
     }
     notification.included_segments = ["Subscribed Users"]
 
     // // Call OneSignal API to push notification
-    const res = await client.createNotification(notification)
+    const res = await onesignal.createNotification(notification)
     console.log("OneSignal response", res)
 
     return new Response(JSON.stringify(data), {