From 4f77d50e8bbe8160b3cdf467ff668091e13306ec Mon Sep 17 00:00:00 2001
From: No1mann <no1trevormann@gmail.com>
Date: Fri, 1 Nov 2024 22:21:11 -0400
Subject: [PATCH] Update Cache Script

---
 .vscode/launch.json                           |  58 +++--
 website/index.html                            |  20 +-
 website/script.js                             |  43 ++--
 website/style.css                             |   7 +
 workers/tiltify-cache/src/api.ts              | 149 ++++++++-----
 workers/tiltify-cache/src/constants.ts        |  12 +
 .../src/{ => dependencies}/tiltify.ts         |  22 +-
 .../src/dependencies/yogscast.ts              |  12 +
 workers/tiltify-cache/src/do/graphData.ts     | 147 +++++++++++++
 workers/tiltify-cache/src/do/tiltifyData.ts   |  74 +++++++
 workers/tiltify-cache/src/index.ts            | 207 +-----------------
 workers/tiltify-cache/src/{ => types}/env.ts  |   1 +
 workers/tiltify-cache/tsconfig.json           |   7 +-
 workers/tiltify-cache/wrangler.toml           |  77 ++++---
 wrangler.toml                                 |  29 ++-
 15 files changed, 501 insertions(+), 364 deletions(-)
 create mode 100644 workers/tiltify-cache/src/constants.ts
 rename workers/tiltify-cache/src/{ => dependencies}/tiltify.ts (85%)
 create mode 100644 workers/tiltify-cache/src/dependencies/yogscast.ts
 create mode 100644 workers/tiltify-cache/src/do/graphData.ts
 create mode 100644 workers/tiltify-cache/src/do/tiltifyData.ts
 rename workers/tiltify-cache/src/{ => types}/env.ts (93%)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2b20dfc..07f5745 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,31 +2,59 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Run Cache Service",
+            "name": "Add Local KV's",
             "type": "f5anything",
             "request": "launch",
-            "command": "cd ${workspaceFolder}/workers/tiltify-cache/ ; npm run dev",
-            "terminalName": "cache",
-            "terminalIndex": 2,
+            "command": "cd ${workspaceFolder}/workers/tiltify-cache/ ; npm run kv-causes:local ; npm run kv-summary:local ; npm run kv-trends-previous:local",
+            "terminalName": "Other",
+            "terminalIndex": 0,
             "showTerminal": true
         },
         {
             "name": "Run Website & API",
-            "type": "f5anything",
+            "type": "node",
             "request": "launch",
-            "command": "cd ${workspaceFolder} ; npm run dev",
-            "terminalName": "Website",
-            "terminalIndex": 1,
-            "showTerminal": true
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev"
+            ],
+            "cwd": "${workspaceFolder}",
+            "console": "integratedTerminal",
+            "outputCapture": "std"
         },
         {
-            "name": "Add Local KV's",
-            "type": "f5anything",
+            "name": "Run Cache Service",
+            "type": "node",
             "request": "launch",
-            "command": "cd ${workspaceFolder}/workers/tiltify-cache/ ; npm run kv-causes:local ; npm run kv-summary:local ; npm run kv-trends-previous:local",
-            "terminalName": "Other",
-            "terminalIndex": 0,
-            "showTerminal": true
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev"
+            ],
+            "cwd": "${workspaceFolder}/workers/tiltify-cache",
+            "console": "integratedTerminal",
+            "outputCapture": "std"
+        },
+        {
+            "name": "Attach Debugger to Cache Service",
+            "type": "node",
+            "request": "attach",
+            "port": 9229,
+            "cwd": "${workspaceFolder}/workers/tiltify-cache",
+            "resolveSourceMapLocations": null,
+            "attachExistingChildren": false,
+            "autoAttachChildProcesses": false,
+
+        }
+    ],
+    "compounds": [
+        {
+            "name": "Debug Cache Service",
+            "configurations": [
+                "Run Cache Service",
+                "Attach Debugger to Cache Service"
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/website/index.html b/website/index.html
index 186dc2e..1512eb6 100644
--- a/website/index.html
+++ b/website/index.html
@@ -5,6 +5,12 @@
     </div>
     <p></p>
   </div>
+  <div class="ui segment" id="error" style="display: none;">
+    <div class="ui active inverted dimmer" style="background-color: #1b1c1d00">
+      <div><i class="times icon huge"></i></div>
+      <span class="ui big text">Error Loading Tracker</span>
+    </div>
+  </div>
   <div id="content" style="display: none;">
     <div class="ui compact huge segment" id="currencySelectorObj" style="right: 20px;">
       <label style="margin-right: 11px;">$</label>
@@ -76,10 +82,12 @@ <h3>Raised Since <span class="jj-start-year"></span></h3>
                 <h3>Previous Years</h3>
               </div>
               <div class="body">
-                <table class="ui large celled striped table unstackable" style="min-width: 250px !important;" id="yearsTable">
+                <table class="ui large celled striped table unstackable" style="min-width: 250px !important;"
+                  id="yearsTable">
                   <thead>
                     <tr>
-                      <th class="center aligned six wide" style="min-width: 60px; border-left: 1px solid rgba(34,36,38,.1);">Year
+                      <th class="center aligned six wide"
+                        style="min-width: 60px; border-left: 1px solid rgba(34,36,38,.1);">Year
                       </th>
                       <th class="center aligned ten wide" style="min-width: 60px;">Raised</th>
                     </tr>
@@ -89,14 +97,16 @@ <h3>Previous Years</h3>
             </div>
           </div>
           <div class="flexable" style="flex: 50%; align-self: start;" id="rightGrid">
-            <div class="ui segment jj-pink-border-top fit-content centered full-width" style="min-height: 1305px;">
+            <div class="ui segment jj-pink-border-top fit-content centered full-width">
               <div class="header">
                 <h2>Charities</h2>
               </div>
               <div class="body">
                 <p style="text-align: center; margin-top: 5px; margin-bottom: 25px;">
-                  The <span class="jj-year"></span> Jingle Jam is raising money to support <span class="jj-cause-count"></span> important causes,
-                  ranging from physical and mental health, diversity and inclusion, global crisis relief, and safeguarding the 
+                  The <span class="jj-year"></span> Jingle Jam is raising money to support <span
+                    class="jj-cause-count"></span> important causes,
+                  ranging from physical and mental health, diversity and inclusion, global crisis relief, and
+                  safeguarding the
                   planet. Here's how your donations will make a difference.
                 </p>
                 <div class="ui horizontal raised doubling cards" id="charityCards">
diff --git a/website/script.js b/website/script.js
index 43224ca..7527f60 100644
--- a/website/script.js
+++ b/website/script.js
@@ -37,14 +37,19 @@
         //Start loops
         await tiltifyLoop();
 
-        afterLoadSetup();
-
-        await getPrevious();
-        await graphLoop(true);
-        hideLoader();
-
-        //Start the timed loop
-        timedLoop();
+        if(JingleJam.model){
+            afterLoadSetup();
+    
+            await getPrevious();
+            await graphLoop(true);
+            hideLoader();
+    
+            //Start the timed loop
+            timedLoop();
+        }
+        else {
+            $('#loader').hide();
+        }
     };
 
     //Runs before the initial data is loaded
@@ -527,13 +532,21 @@
         //Also check if the next update time is less than 0 because of the browser tab check
         if (!JingleJam.model || (JingleJam.pageIsVisible && JingleJam.isLive() && getNextUpdateTime() <= 0)) {
             JingleJam.oldModel = JingleJam.model;
-            JingleJam.model = await getTiltify();
+            try {
+                JingleJam.model = await getTiltify();
+
+                $('#embedContainer #error').hide();
+            } catch {
+                $('#embedContainer #error').show();
+            }
 
-            JingleJam.model.history.reverse();
+            if(JingleJam.model){
+                JingleJam.model.history.reverse();
 
-            if (JingleJam.isLive()){
-                await updateCounts();
-                await createGraph();
+                if (JingleJam.isLive()){
+                    await updateCounts();
+                    await createGraph();
+                }   
             }
         }
     }
@@ -548,6 +561,10 @@
 
     //Gets the next update time based on the model update date
     function getNextUpdateTime() {
+        if(!JingleJam.model){
+            return 0;
+        }
+        
         let now = new Date();
         let modelUpdateTime = JingleJam.model.date ? new Date(JingleJam.model.date) : new Date();
 
diff --git a/website/style.css b/website/style.css
index da276ec..4f693bd 100644
--- a/website/style.css
+++ b/website/style.css
@@ -29,6 +29,13 @@
     background-color: #fafafa;
 }
 
+#embedContainer #error {
+    height: calc(100vh - 145px);
+    box-shadow: none;
+    border: 0;
+    background-color: #fafafa;
+}
+
 #embedContainer .ui.slider .inner .track-fill {
     background-color: #e21251 !important;
 }
diff --git a/workers/tiltify-cache/src/api.ts b/workers/tiltify-cache/src/api.ts
index 05614d9..f7efb36 100644
--- a/workers/tiltify-cache/src/api.ts
+++ b/workers/tiltify-cache/src/api.ts
@@ -1,14 +1,15 @@
-import { roundAmount, sortByKey } from "./utils";
-import { getCampaign, getEvent, getCampaigns, getYogscastAPI } from "./tiltify";
-import { ApiResponse } from "./types/ApiResponse";
-import { Env } from "./env";
-import { Cause } from "./types/Cause";
-import { DonationHistory } from "./types/DonationHistory";
-import { TiltifyUserCampaign } from "./types/tiltify/TiltifyUserCampaign";
-import { TiltifyFundraisingEvent } from "./types/tiltify/TiltifyFundraisingEvent";
-import { YogscastDonationData } from "./types/yogscast/YogscastDonationData";
-import { Campaign } from "./types/Campaign";
-import { TiltifyFundraisingEventCampaign } from "./types/tiltify/TiltifyFundraisingEventCampaign";
+import { roundAmount, sortByKey } from "tiltify-cache/utils";
+import { getCampaign, getEvent, getCampaigns } from "tiltify-cache/dependencies/tiltify";
+import { get as getYogscastAPI } from "tiltify-cache/dependencies/yogscast";
+import { ApiResponse } from "tiltify-cache/types/ApiResponse";
+import { Env } from "tiltify-cache/types/env";
+import { Cause } from "tiltify-cache/types/Cause";
+import { DonationHistory } from "tiltify-cache/types/DonationHistory";
+import { TiltifyUserCampaign } from "tiltify-cache/types/tiltify/TiltifyUserCampaign";
+import { TiltifyFundraisingEvent } from "tiltify-cache/types/tiltify/TiltifyFundraisingEvent";
+import { YogscastDonationData } from "tiltify-cache/types/yogscast/YogscastDonationData";
+import { Campaign } from "tiltify-cache/types/Campaign";
+import { TiltifyFundraisingEventCampaign } from "tiltify-cache/types/tiltify/TiltifyFundraisingEventCampaign";
 
 const maxSim = 6; // Maximum number of simultaneous fetches
 const maxNumOfCampaigns = 100;
@@ -26,42 +27,47 @@ const allCharitiesRegionId = 566;
 // Pre-2023 Jingle Jam dollar amount = 3371741.16
 // End of 2023 yogscast dollar amount = 5747814.82
 async function getSummaryData(env: Env): Promise<ApiResponse> {
-  let apiResponse = getDefaultResponse(env);
+  let apiResponse = await getDefaultResponse(env);
   let campaignsComputed: Campaign[] = [];
 
   try {
-    // INITIAL KV LOOKUPS
-    const causes: Cause[] = JSON.parse(await env.JINGLE_JAM_DATA.get('causes') || "") || [];
-    const summary: DonationHistory[] = JSON.parse(await env.JINGLE_JAM_DATA.get('summary') || "") || [];
-    apiResponse = getDefaultResponse(env, causes, summary, env.CONVERSION_RATE);
-
-    // INITIAL TILTIFY LOOKUPS
-    const requests = [
-      getCampaign(env.YOGSCAST_USERNAME_SLUG, env.YOGSCAST_CAMPAIGN_SLUG), // Gets Yogscast Campaign Data
-      getEvent(env.CAUSE_SLUG, env.FUNDRAISER_SLUG), // Gets Yearly Event Level Data
-      getYogscastAPI()
-    ];
-
-    const results = await Promise.all(requests);
+    // Perform all Tiltify and Yogscast lookups in parallel
+    const results = await Promise.all([
+      getCampaign(env.YOGSCAST_USERNAME_SLUG, env.YOGSCAST_CAMPAIGN_SLUG),  // Gets Yogscast Campaign Data
+      getEvent(env.CAUSE_SLUG, env.FUNDRAISER_SLUG),                        // Gets Yearly Event Level Data
+      getYogscastAPI()                                                      // Gets Yogscast API Data
+    ]);
 
     const yogscastCampaign: TiltifyUserCampaign | null = results[0] as TiltifyUserCampaign | null;
     const eventData: TiltifyFundraisingEvent | null = results[1] as TiltifyFundraisingEvent | null;
     const yogscastAPI: YogscastDonationData | null = results[2] as YogscastDonationData | null;
 
-    // SUMMARY DATA
+    /*
+      Summary Data:
+        - Yogscast Raised
+        - Fundraisers Raised
+        - Average Conversion Rate
+        - Collections Redeemed
+        - Collections Total
+        - Donation Count
+    */
+
+    // Get the total amount raised from the whole event (Yogscast & Fundraisers)
     const totalPounds = parseFloat(eventData?.totalAmountRaised.value || "0");
-    const yogscastPounds = parseFloat(yogscastCampaign?.totalAmountRaised.value || "0");
-    const yogscastDollars = roundAmount(parseFloat(yogscastCampaign?.user.totalAmountRaised.value || "0") - env.DOLLAR_OFFSET);
-    const fundraiserPounds = roundAmount(totalPounds - yogscastPounds);
 
-    apiResponse.raised.yogscast = yogscastPounds;
-    apiResponse.raised.fundraisers = fundraiserPounds;
+    apiResponse.raised.yogscast = parseFloat(yogscastCampaign?.totalAmountRaised.value || "0"); // Get amount raised directly from the Yogscast Tiltify campaign
+    apiResponse.raised.fundraisers = roundAmount(totalPounds - apiResponse.raised.yogscast); // Subtract Yogscast amount from total amount raised from the whole event
+
+    // Calculate the average conversion rate over the period of the event
+    const yogscastDollars = roundAmount(parseFloat(yogscastCampaign?.user.totalAmountRaised.value || "0") - env.DOLLAR_OFFSET);
+    const division = yogscastDollars / apiResponse.raised.yogscast;
 
-    apiResponse.avgConversionRate = env.CONVERSION_RATE;
-    const division = yogscastDollars / yogscastPounds;
     if (!isNaN(division) && isFinite(division)) {
       apiResponse.avgConversionRate = roundAmount(division, 10);
     }
+    else {
+      apiResponse.avgConversionRate = env.CONVERSION_RATE;
+    }
 
     // Gets collections counts
     try {
@@ -75,21 +81,27 @@ async function getSummaryData(env: Env): Promise<ApiResponse> {
       apiResponse.collections.redeemed = 0;
     }
 
-    // Donation counts from Yogscast API
+    // Get donation counts from Yogscast API
     apiResponse.donations.count = yogscastAPI?.donations || apiResponse.collections.redeemed || 0;
 
-    // CAMPAIGN DATA
+    /*
+      Campaigns:
+        - Campaign List
+        - Raised for each Cause
+    */
+
+    // Get the list of campaigns
     let campaigns: { node: TiltifyFundraisingEventCampaign }[] = [];
     let offset = 0;
     let end = false;
 
+    // Get all campaigns from the fundraiser
     if (env.FUNDRAISER_PUBLIC_ID) {
+      // Fetch all campaigns in parallel (chunks of 6 requests with 20 campaigns each)
       while (offset <= maxCampaigns && !end) {
-        const requests = Array.from({ length: maxSim }, () => getCampaigns(env.FUNDRAISER_PUBLIC_ID, offset));
+        const regionResponses = await Promise.all(Array.from({ length: maxSim }, () => getCampaigns(env.FUNDRAISER_PUBLIC_ID, offset)));
         offset += 20 * maxSim;
 
-        const regionResponses = await Promise.all(requests);
-
         for (const response of regionResponses) {
           const campaignsData = response.publishedCampaigns;
           campaigns = campaigns.concat(campaignsData.edges);
@@ -101,56 +113,67 @@ async function getSummaryData(env: Env): Promise<ApiResponse> {
         }
       }
 
+      // Cycle through all campaigns and calculate the amount raised for each cause
       let campaignAmountPounds = 0;
       for (const campaign of campaigns) {
         const campaignRegionId = campaign.node.region?.id || 0;
-        const isYogscastCampaign = campaign.node.user?.slug === env.YOGSCAST_USERNAME_SLUG;
-        const isAllCharitiesCampaign = !campaignRegionId || campaignRegionId === allCharitiesRegionId;
+        const isAllCauseCampaign = !campaignRegionId || campaignRegionId === allCharitiesRegionId;
 
-        let amount = parseFloat(campaign.node.totalAmountRaised?.value || '0');
-        campaignAmountPounds += amount;
+        // Detemine the cause amount
+        let raisedAmount = parseFloat(campaign.node.totalAmountRaised?.value || '0');
+        campaignAmountPounds += raisedAmount;
 
-        if (isAllCharitiesCampaign) {
-          amount /= apiResponse.causes.length;
+        // If the campaign donates to all charities, divide the amount by the number of causes
+        let causeAmount = raisedAmount;
+        if (isAllCauseCampaign) {
+          causeAmount = raisedAmount / apiResponse.causes.length;
         }
+        causeAmount = roundAmount(causeAmount);
 
-        amount = roundAmount(amount);
-
+        // Add the amount to the correct cause
         for (const cause of apiResponse.causes) {
-          if (cause.id === campaignRegionId || isAllCharitiesCampaign) {
-            if (isYogscastCampaign) {
-              cause.raised.yogscast += amount;
+          // If the campaign is for a specific cause or applies to all causes
+          if (cause.id === campaignRegionId || isAllCauseCampaign) {
+            // Add the amount to the correct cause (Yogscast or Fundraisers)
+            if (campaign.node.user?.slug === env.YOGSCAST_USERNAME_SLUG) {
+              cause.raised.yogscast += causeAmount;
             } else {
-              cause.raised.fundraisers += amount;
+              cause.raised.fundraisers += causeAmount;
             }
           }
         }
       }
 
+      // Clean up the raised amounts if the total raised amount is different from the sum of all campaign amounts
       const amountDifference = totalPounds - campaignAmountPounds;
       if (amountDifference > 0) {
+        // Fix the summary data
         apiResponse.raised.yogscast += amountDifference;
         apiResponse.raised.fundraisers -= amountDifference;
 
         apiResponse.raised.yogscast = roundAmount(apiResponse.raised.yogscast);
         apiResponse.raised.fundraisers = roundAmount(apiResponse.raised.fundraisers);
 
+        // Fix the cause data
         const causeAmount = amountDifference / apiResponse.causes.length;
         for (const cause of apiResponse.causes) {
           cause.raised.yogscast += causeAmount;
         }
       }
 
+      // Round the raised amounts for each cause
       for (const cause of apiResponse.causes) {
         cause.raised.fundraisers = roundAmount(cause.raised.fundraisers);
         cause.raised.yogscast = roundAmount(cause.raised.yogscast);
       }
     }
 
+    // Create and format the campaign list from the Tiltify API data
     for (const campaign of campaigns) {
       const description = campaign.node.description?.length > maxDescriptionLength
         ? `${campaign.node.description.slice(0, maxDescriptionLength)}...`
         : campaign.node.description;
+
       campaignsComputed.push({
         causeId: campaign.node.region?.id || null,
         name: campaign.node.name,
@@ -174,6 +197,7 @@ async function getSummaryData(env: Env): Promise<ApiResponse> {
       });
     }
 
+    // Sort the campaigns by the amount raised and limit the number of campaigns
     apiResponse.campaigns.count = campaignsComputed.length;
     apiResponse.campaigns.list = sortByKey(campaignsComputed, 'raised').slice(0, maxNumOfCampaigns);
 
@@ -184,7 +208,19 @@ async function getSummaryData(env: Env): Promise<ApiResponse> {
   return apiResponse;
 }
 
-function getDefaultResponse(env: Env, causes: Cause[] = [], donationHistory: DonationHistory[] = [], defaultConversionRate = 1, date = new Date()): ApiResponse {
+// Get the default response data before any Tiltify or Yogscast API calls
+async function getDefaultResponse(env: Env, date = new Date()): Promise<ApiResponse> {
+  let causes: Cause[] = [];
+  let donationHistory: DonationHistory[] = [];
+
+  try {
+    causes = JSON.parse(await env.JINGLE_JAM_DATA.get('causes') || "") || [];
+  } catch { }
+
+  try {
+    donationHistory = JSON.parse(await env.JINGLE_JAM_DATA.get('summary') || "") || [];
+  } catch { }
+
   const causeObjects: Cause[] = causes?.map(cause => ({
     id: cause.id,
     name: cause.name,
@@ -202,7 +238,7 @@ function getDefaultResponse(env: Env, causes: Cause[] = [], donationHistory: Don
       start: new Date(Date.UTC(env.YEAR, 11, 1, 17, 0, 0)),
       end: new Date(Date.UTC(env.YEAR, 11, 15, 0, 0, 0)),
     },
-    avgConversionRate: defaultConversionRate,
+    avgConversionRate: env.CONVERSION_RATE,
     raised: {
       yogscast: 0,
       fundraisers: 0,
@@ -223,15 +259,13 @@ function getDefaultResponse(env: Env, causes: Cause[] = [], donationHistory: Don
   };
 }
 
+
 const debugStartDate = new Date(2023, 9, 17, 20, 20, 10);
 const debugEndDate = new Date(2023, 10, 13, 22, 10, 0);
 
+// Create fake data for debugging purposes
 async function getDebugData(env: Env): Promise<ApiResponse> {
-  const causes: Cause[] = JSON.parse(await env.JINGLE_JAM_DATA.get('causes') || "") || [];
-  const defaultConversionRate = env.CONVERSION_RATE;
-  const summary: DonationHistory[] = JSON.parse(await env.JINGLE_JAM_DATA.get('summary') || "") || [];
-
-  const defaultResponse = getDefaultResponse(env, causes, summary, defaultConversionRate);
+  const defaultResponse = await getDefaultResponse(env);
 
   defaultResponse.event.start = debugStartDate;
   defaultResponse.event.end = debugEndDate;
@@ -252,6 +286,7 @@ async function getDebugData(env: Env): Promise<ApiResponse> {
   return defaultResponse;
 }
 
+// Get the latest data from the Tiltify and Yogscast APIs
 export async function getLatestData(env: Env): Promise<ApiResponse> {
   env.DONATION_DIFFERENCE = parseInt(env.DONATION_DIFFERENCE.toString());
   env.DOLLAR_OFFSET = parseFloat(env.DOLLAR_OFFSET.toString());
diff --git a/workers/tiltify-cache/src/constants.ts b/workers/tiltify-cache/src/constants.ts
new file mode 100644
index 0000000..2761766
--- /dev/null
+++ b/workers/tiltify-cache/src/constants.ts
@@ -0,0 +1,12 @@
+const UPDATE_TIME_GRAPH = 60 * 1000; // Refresh cache every 60 seconds
+const UPDATE_TIME_FREQ = 10; // Refresh graph every 10 minutes
+
+const GRAPH_API_PATH = '/api/graph/current'; // API Path for the Graph Data
+const TILTIFY_API_PATH = '/api/tiltify'; // API Path for the Tiltify Cache
+
+export { 
+    TILTIFY_API_PATH,
+    GRAPH_API_PATH,
+    UPDATE_TIME_GRAPH,
+    UPDATE_TIME_FREQ
+ };
\ No newline at end of file
diff --git a/workers/tiltify-cache/src/tiltify.ts b/workers/tiltify-cache/src/dependencies/tiltify.ts
similarity index 85%
rename from workers/tiltify-cache/src/tiltify.ts
rename to workers/tiltify-cache/src/dependencies/tiltify.ts
index c0faa3d..2842842 100644
--- a/workers/tiltify-cache/src/tiltify.ts
+++ b/workers/tiltify-cache/src/dependencies/tiltify.ts
@@ -1,8 +1,7 @@
-import { BaseTiltifyResponse } from "./types/tiltify/BaseResponse";
-import { TiltifyUserCampaign } from "./types/tiltify/TiltifyUserCampaign";
-import { TiltifyFundraisingEvent } from "./types/tiltify/TiltifyFundraisingEvent";
-import { FundraisingEventCampaignsData } from "./types/tiltify/TiltifyFundraisingEventCampaign";
-import { YogscastDonationData } from "./types/yogscast/YogscastDonationData";
+import { BaseTiltifyResponse } from "tiltify-cache/types/tiltify/BaseResponse";
+import { TiltifyUserCampaign } from "tiltify-cache/types/tiltify/TiltifyUserCampaign";
+import { TiltifyFundraisingEvent } from "tiltify-cache/types/tiltify/TiltifyFundraisingEvent";
+import { FundraisingEventCampaignsData } from "tiltify-cache/types/tiltify/TiltifyFundraisingEventCampaign";
 
 const TILTIFY_API_ENDPOINT = "https://api.tiltify.com/";
 const TILTIFY_API_OPTIONS: RequestInit = {
@@ -87,15 +86,4 @@ export async function getCampaigns(fundraiserPublicId: string, offset: number):
 
     const response = await fetch(TILTIFY_API_ENDPOINT, request);
     return ((await response.json()) as BaseTiltifyResponse<{ fundraisingEvent: FundraisingEventCampaignsData}>)?.data?.fundraisingEvent || null;
-}
-
-/*
-    Gets the data from the Yogscast API endpoint
-
-    Used for:
-        - Getting the donation count
-*/
-export async function getYogscastAPI(): Promise<YogscastDonationData> {
-    const response = await fetch('https://jinglejam.yogscast.com/api/total');
-    return await response.json();
-}
+}
\ No newline at end of file
diff --git a/workers/tiltify-cache/src/dependencies/yogscast.ts b/workers/tiltify-cache/src/dependencies/yogscast.ts
new file mode 100644
index 0000000..96c1bac
--- /dev/null
+++ b/workers/tiltify-cache/src/dependencies/yogscast.ts
@@ -0,0 +1,12 @@
+import { YogscastDonationData } from "tiltify-cache/types/yogscast/YogscastDonationData";
+
+/*
+    Gets the data from the Yogscast API endpoint
+
+    Used for:
+        - Getting the donation count
+*/
+export async function get(): Promise<YogscastDonationData> {
+    const response = await fetch('https://jinglejam.yogscast.com/api/total');
+    return await response.json();
+}
diff --git a/workers/tiltify-cache/src/do/graphData.ts b/workers/tiltify-cache/src/do/graphData.ts
new file mode 100644
index 0000000..72f05f0
--- /dev/null
+++ b/workers/tiltify-cache/src/do/graphData.ts
@@ -0,0 +1,147 @@
+import { Env } from "tiltify-cache/types/env";
+import { roundAmount } from "tiltify-cache/utils";
+import { CurrentGraphPoint } from "tiltify-cache/types/CurrentGraphPoint";
+import { ApiResponse } from "tiltify-cache/types/ApiResponse";
+import { GRAPH_API_PATH, TILTIFY_API_PATH, UPDATE_TIME_FREQ, UPDATE_TIME_GRAPH } from "tiltify-cache/constants";
+
+/*
+  Graph Data Durable Object
+
+  This Durable Object is responsible for caching the current graph data points for the Jingle Jam event.
+*/
+export class GraphData {
+    storage: DurableObjectStorage;
+    env: Env;
+
+    constructor(state: DurableObjectState, env: Env) {
+        this.storage = state.storage;
+        this.env = env;
+    }
+
+    // Handle HTTP requests from clients.
+    async fetch(request: Request): Promise<Response> {
+        const url = new URL(request.url);
+        console.log('Called ' + url.pathname);
+
+        // Get the current cached graph list
+        if (request.method === 'GET' && url.pathname === GRAPH_API_PATH) {
+            let data = await this.storage.get(this.env.DURABLE_OBJECT_CACHE_KEY) || null;
+
+            // If the cached value is not found first time load), create a default object and save it to the cache
+            if (!data) {
+                data = await this.defaultObject();
+                await this.storage.put(this.env.DURABLE_OBJECT_CACHE_KEY, data);
+            }
+
+            // Start the alarm if it is currently not started and it should be
+            let currentAlarm = await this.storage.getAlarm();
+            if (currentAlarm == null && this.env.ENABLE_GRAPH_REFRESH) {
+                this.storage.setAlarm(Date.now() + UPDATE_TIME_GRAPH);
+            }
+
+            return new Response(JSON.stringify(data));
+        }
+        // Manually update the current cached graph list
+        else if (request.method === 'POST' && url.pathname === GRAPH_API_PATH) {
+            // Check if the request is authorized
+            if (!this.env.ADMIN_TOKEN || request.headers.get('Authorization') !== this.env.ADMIN_TOKEN) {
+                return new Response("Unauthorized", { status: 401 });
+            }
+
+            // Set the graph list to the new data manually
+            const data = await request.json();
+            await this.storage.put(this.env.DURABLE_OBJECT_CACHE_KEY, data);
+            return new Response("Manual Update Success", { status: 200 });
+        }
+
+        return new Response("Not found", { status: 404 });
+    }
+
+    async alarm(): Promise<void> {
+        // Check if the graph refresh is enabled and set the alarm if it is
+        if (this.env.ENABLE_GRAPH_REFRESH) {
+            this.storage.setAlarm(Date.now() + UPDATE_TIME_GRAPH);
+        }
+
+        console.log('Alarm Called, fetching latest graph data...');
+
+        // Fetch the latest graph data
+        const startTime = new Date();
+        const graphData = await this.getLatestGraphData();
+        const endTime = new Date();
+
+        console.log(`Finished Fetching, caching result graph data... (${endTime.getTime() - startTime.getTime()}ms)`);
+
+        // Cache the latest graph data if it is not null
+        if (graphData !== null) {
+            await this.storage.put(this.env.DURABLE_OBJECT_CACHE_KEY, graphData);
+        }
+    }
+
+    // Get the latest, up-to-date graph data points
+    async getLatestGraphData(): Promise<CurrentGraphPoint[] | null> {
+        // Gets the current tiltify data from the real-time API endpoint
+        const tiltifyData = await this.getLatestData();
+
+        // Check if the tiltify data is null or the date is not divisible by the update time frequency
+        if (!tiltifyData || new Date(tiltifyData.date).getMinutes() % UPDATE_TIME_FREQ !== 0) {
+            return null;
+        }
+
+        //Check if the date is within the event start and end date
+        const date = new Date(tiltifyData.date);
+        const startDate = new Date(tiltifyData.event.start);
+        const endDate = new Date(tiltifyData.event.end);
+        if (date < startDate || date > endDate) {
+            return null;
+        }
+
+        // Get the previous graph data points
+        let graphData: CurrentGraphPoint[] = [];
+        try {
+            graphData = (await this.storage.get(this.env.DURABLE_OBJECT_CACHE_KEY)) || [];
+        } catch (e) { }
+
+        // If the graph data is empty, create a default object
+        if (graphData.length === 0) {
+            graphData = await this.defaultObject(tiltifyData);
+        }
+        // Data exists in the graph list, add the new data point
+        else {
+            const pounds = roundAmount(tiltifyData.raised.yogscast + tiltifyData.raised.fundraisers);
+            graphData.push(this.formatGraphData(date, pounds, roundAmount(pounds * tiltifyData.avgConversionRate)));
+        }
+
+        return graphData;
+    }
+
+    // Get the default graph data point (either empty list or a 0 point)
+    async defaultObject(data?: ApiResponse): Promise<CurrentGraphPoint[]> {
+        if (!data) {
+            data = await this.getLatestData();
+        }
+
+        if (!data) {
+            return [];
+        }
+
+        return [this.formatGraphData(new Date(data.event.start), 0, 0)];
+    }
+
+    // Create a graph data point from the tiltify data
+    formatGraphData(date: Date, pounds: number, dollars: number): CurrentGraphPoint {
+        return {
+            "date": date.getTime(),
+            "p": pounds,
+            "d": dollars
+        };
+    }
+
+    // Get the latest tiltify data from the real-time API endpoint
+    async getLatestData(): Promise<ApiResponse> {
+        const id = this.env.TILTIFY_DATA.idFromName(this.env.DURABLE_OBJECT_CACHE_KEY);
+        const obj = this.env.TILTIFY_DATA.get(id);
+        const resp = await obj.fetch("http://127.0.0.1" + TILTIFY_API_PATH);
+        return await resp.json();
+    }
+}
diff --git a/workers/tiltify-cache/src/do/tiltifyData.ts b/workers/tiltify-cache/src/do/tiltifyData.ts
new file mode 100644
index 0000000..26ed434
--- /dev/null
+++ b/workers/tiltify-cache/src/do/tiltifyData.ts
@@ -0,0 +1,74 @@
+
+import { Env } from "tiltify-cache/types/env";
+import { TILTIFY_API_PATH } from "tiltify-cache/constants";
+import { getLatestData } from "tiltify-cache/api";
+
+export class TiltifyData {
+    storage: DurableObjectStorage;
+    env: Env;
+
+    constructor(state: DurableObjectState, env: Env) {
+        this.storage = state.storage;
+        this.env = env;
+    }
+
+    // Handle HTTP requests from clients.
+    async fetch(request: Request): Promise<Response> {
+        const url = new URL(request.url);
+        console.log('Called ' + url.pathname);
+
+        if (request.method === 'GET' && url.pathname === TILTIFY_API_PATH) {
+            // Get the current cached value
+            let data = await this.storage.get(this.env.DURABLE_OBJECT_CACHE_KEY);
+
+            // Start the alarm if it is currently not started
+            let currentAlarm = await this.storage.getAlarm();
+            if (currentAlarm == null && this.env.ENABLE_REFRESH) {
+                this.storage.setAlarm(Date.now() + (this.env.REFRESH_TIME * 1000));
+            }
+
+            // If the cached value is null, fetch the latest data and save it to the cache
+            if (!data) {
+                data = await getLatestData(this.env);
+
+                if (this.env.ENABLE_REFRESH) {
+                    await this.storage.put(this.env.DURABLE_OBJECT_CACHE_KEY, data);
+                }
+            }
+
+            return new Response(JSON.stringify(data));
+        }
+        // Manually update the current cached tiltify data 
+        else if (request.method === 'POST' && url.pathname === TILTIFY_API_PATH) {
+            // Check if the request is authorized
+            if (!this.env.ADMIN_TOKEN || request.headers.get('Authorization') !== this.env.ADMIN_TOKEN) {
+                return new Response("Unauthorized", { status: 401 });
+            }
+
+            const data = await request.json();
+            await this.storage.put(this.env.DURABLE_OBJECT_CACHE_KEY, data);
+            return new Response("Manual Update Success", { status: 200 });
+        }
+
+        // Invalid API Endpoint
+        return new Response("Not found", { status: 404 });
+    }
+
+    async alarm(): Promise<void> {
+        if (this.env.ENABLE_REFRESH) {
+            this.storage.setAlarm(Date.now() + (this.env.REFRESH_TIME * 1000));
+        }
+
+        console.log('Alarm Called, fetching latest Tiltify data...');
+
+        const startTime = new Date();
+        const newData = await getLatestData(this.env);
+        const endTime = new Date();
+
+        console.log(`Finished Fetching, caching result Tiltify data... (${endTime.getTime() - startTime.getTime()}ms)`);
+
+        await this.storage.put(this.env.DURABLE_OBJECT_CACHE_KEY, newData);
+
+        console.log(`Finished Caching data... (${new Date().getTime() - endTime.getTime()}ms)`);
+    }
+}
diff --git a/workers/tiltify-cache/src/index.ts b/workers/tiltify-cache/src/index.ts
index 901e830..3e8cb72 100644
--- a/workers/tiltify-cache/src/index.ts
+++ b/workers/tiltify-cache/src/index.ts
@@ -1,207 +1,4 @@
-import { getLatestData } from "./api";
-import { Env } from "./env";
-import { roundAmount } from "./utils";
-import { CurrentGraphPoint } from "./types/CurrentGraphPoint";
-import { ApiResponse } from "./types/ApiResponse";
-
-const UPDATE_TIME_GRAPH = 60 * 1000; // Refresh cache every 60 seconds
-const UPDATE_TIME_FREQ = 10; // Refresh graph every 10 minutes
-
-const DO_CACHE_KEY = 'tiltify-cache'; // Key to store the cache
-const CACHE_NAME = 'tiltify-cache-2023'; // Cache Object Name
-
-const TILTIFY_API_PATH = '/api/tiltify'; // API Path for the Tiltify Cache
-const GRAPH_API_PATH = '/api/graph/current'; // API Path for the Graph Data
-
-export class TiltifyData {
-  storage: DurableObjectStorage;
-  env: Env;
-
-  constructor(state: DurableObjectState, env: Env) {
-    this.storage = state.storage;
-    this.env = env;
-  }
-
-  // Handle HTTP requests from clients.
-  async fetch(request: Request): Promise<Response> {
-    const url = new URL(request.url);
-    console.log('Called ' + url.pathname);
-
-    if (request.method === 'GET' && url.pathname === TILTIFY_API_PATH) {
-      // Get the current cached value
-      let data = await this.storage.get(DO_CACHE_KEY);
-
-      // Start the alarm if it is currently not started
-      let currentAlarm = await this.storage.getAlarm();
-      if (currentAlarm == null && this.env.ENABLE_REFRESH) {
-        this.storage.setAlarm(Date.now() + (this.env.REFRESH_TIME * 1000));
-      }
-
-      // If the cached value is null, fetch the latest data and save it to the cache
-      if (!data) {
-        data = await getLatestData(this.env);
-
-        if (this.env.ENABLE_REFRESH) {
-          await this.storage.put(DO_CACHE_KEY, data);
-        }
-      }
-
-      return new Response(JSON.stringify(data));
-    }
-    // Manually update the current cached tiltify data 
-    else if (request.method === 'POST' && url.pathname === TILTIFY_API_PATH) {
-      // Check if the request is authorized
-      if(!this.env.ADMIN_TOKEN || request.headers.get('Authorization') !== this.env.ADMIN_TOKEN) {
-        return new Response("Unauthorized", { status: 401 });
-      }
-      
-      const data = await request.json();
-      await this.storage.put(DO_CACHE_KEY, data);
-      return new Response("Manual Update Success", { status: 200 });
-    }
-
-    // Invalid API Endpoint
-    return new Response("Not found", { status: 404 });
-  }
-
-  async alarm(): Promise<void> {
-    if (this.env.ENABLE_REFRESH) {
-      this.storage.setAlarm(Date.now() + (this.env.REFRESH_TIME * 1000));
-    }
-
-    console.log('Alarm Called, fetching latest Tiltify data...');
-
-    const startTime = new Date();
-    const newData = await getLatestData(this.env);
-    const endTime = new Date();
-
-    console.log(`Finished Fetching, caching result Tiltify data... (${endTime.getTime() - startTime.getTime()}ms)`);
-
-    await this.storage.put(DO_CACHE_KEY, newData);
-
-    console.log(`Finished Caching data... (${new Date().getTime() - endTime.getTime()}ms)`);
-  }
-}
-
-export class GraphData {
-  storage: DurableObjectStorage;
-  env: Env;
-
-  constructor(state: DurableObjectState, env: Env) {
-    this.storage = state.storage;
-    this.env = env;
-  }
-
-  // Handle HTTP requests from clients.
-  async fetch(request: Request): Promise<Response> {
-    const url = new URL(request.url);
-    console.log('Called ' + url.pathname);
-
-    // Get the current cached graph list
-    if (request.method === 'GET' && url.pathname === GRAPH_API_PATH) {
-      let data = await this.storage.get(DO_CACHE_KEY) || null;
-
-      if (!data) {
-        data = await this.defaultObject();
-        await this.storage.put(DO_CACHE_KEY, data);
-      }
-
-      let currentAlarm = await this.storage.getAlarm();
-      if (currentAlarm == null && this.env.ENABLE_GRAPH_REFRESH) {
-        this.storage.setAlarm(Date.now() + UPDATE_TIME_GRAPH);
-      }
-
-      return new Response(JSON.stringify(data));
-    } 
-    // Manually update the current cached graph list
-    else if (request.method === 'POST' && url.pathname === GRAPH_API_PATH) {
-      // Check if the request is authorized
-      if(!this.env.ADMIN_TOKEN || request.headers.get('Authorization') !== this.env.ADMIN_TOKEN) {
-        return new Response("Unauthorized", { status: 401 });
-      }
-
-      const data = await request.json();
-      await this.storage.put(DO_CACHE_KEY, data);
-      return new Response("Manual Update Success", { status: 200 });
-    }
-
-    return new Response("Not found", { status: 404 });
-  }
-
-  async alarm(): Promise<void> {
-    if (this.env.ENABLE_GRAPH_REFRESH) {
-      this.storage.setAlarm(Date.now() + UPDATE_TIME_GRAPH);
-    }
-
-    console.log('Alarm Called, fetching latest graph data...');
-
-    const startTime = new Date();
-    const graphData = await this.getLatestGraphData();
-    const endTime = new Date();
-
-    console.log(`Finished Fetching, caching result graph data... (${endTime.getTime() - startTime.getTime()}ms)`);
-
-    if (graphData !== null) {
-      await this.storage.put(DO_CACHE_KEY, graphData);
-    }
-  }
-
-  async getLatestGraphData(): Promise<CurrentGraphPoint[] | null> {
-    const tiltifyData = await this.getLatestData();
-
-    if (!tiltifyData || new Date(tiltifyData.date).getMinutes() % UPDATE_TIME_FREQ !== 0) {
-      return null;
-    }
-
-    const date = new Date(tiltifyData.date);
-    const startDate = new Date(tiltifyData.event.start);
-    const endDate = new Date(tiltifyData.event.end);
-
-    if (date < startDate || date > endDate) {
-      return null;
-    }
-
-    let graphData: CurrentGraphPoint[] = [];
-    try {
-      graphData = (await this.storage.get(DO_CACHE_KEY)) || [];
-    } catch (e) { }
-
-    if (graphData.length === 0) {
-      graphData = await this.defaultObject(tiltifyData);
-    }
-
-    const pounds = roundAmount(tiltifyData.raised.yogscast + tiltifyData.raised.fundraisers);
-    graphData.push({
-      "date": date.getTime(),
-      "p": pounds,
-      "d": roundAmount(pounds * tiltifyData.avgConversionRate),
-    });
-
-    return graphData;
-  }
-
-  async defaultObject(data?: ApiResponse): Promise<CurrentGraphPoint[]> {
-    if (!data) {
-      data = await this.getLatestData();
-    }
-
-    if (!data) {
-      return [];
-    }
-
-    return [{
-      "date": new Date(data.event.start).getTime(),
-      "p": 0,
-      "d": 0
-    }];
-  }
-
-  async getLatestData(): Promise<ApiResponse> {
-    const id = this.env.TILTIFY_DATA.idFromName(CACHE_NAME);
-    const obj = this.env.TILTIFY_DATA.get(id);
-    const resp = await obj.fetch("http://127.0.0.1" + TILTIFY_API_PATH);
-    return await resp.json();
-  }
-}
+export { GraphData } from "tiltify-cache/do/graphData";
+export { TiltifyData } from "tiltify-cache/do/tiltifyData";
 
 export default {};
\ No newline at end of file
diff --git a/workers/tiltify-cache/src/env.ts b/workers/tiltify-cache/src/types/env.ts
similarity index 93%
rename from workers/tiltify-cache/src/env.ts
rename to workers/tiltify-cache/src/types/env.ts
index f59eb3b..c133c6e 100644
--- a/workers/tiltify-cache/src/env.ts
+++ b/workers/tiltify-cache/src/types/env.ts
@@ -9,6 +9,7 @@ export interface Env {
     FUNDRAISER_PUBLIC_ID: string;
     YOGSCAST_CAMPAIGN_SLUG: string;
     YOGSCAST_USERNAME_SLUG: string;
+    DURABLE_OBJECT_CACHE_KEY: string;
     REFRESH_TIME: number;
     ENABLE_REFRESH: boolean;
     ENABLE_GRAPH_REFRESH: boolean;
diff --git a/workers/tiltify-cache/tsconfig.json b/workers/tiltify-cache/tsconfig.json
index f532c1f..bf30d2e 100644
--- a/workers/tiltify-cache/tsconfig.json
+++ b/workers/tiltify-cache/tsconfig.json
@@ -7,7 +7,12 @@
     "noEmit": true,
     "strictNullChecks": true,
     "lib": ["es2021"],
-    "types": ["@cloudflare/workers-types"]
+    "types": ["@cloudflare/workers-types"],
+    "rootDir": "src",
+    "baseUrl": ".",
+    "paths": {
+      "tiltify-cache/*": ["src/*"]
+    }
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules"]
diff --git a/workers/tiltify-cache/wrangler.toml b/workers/tiltify-cache/wrangler.toml
index 460905d..6fdd0bf 100644
--- a/workers/tiltify-cache/wrangler.toml
+++ b/workers/tiltify-cache/wrangler.toml
@@ -5,14 +5,17 @@ compatibility_date = "2024-09-02"
 workers_dev = true
 logpush = true
 kv_namespaces = [
-  { binding = "JINGLE_JAM_DATA", id = "9d285e05684c4887acb7731de7a41a4e", preview_id = "6a08d74af525475baefa19a93f0ba136" }
+  { binding = "JINGLE_JAM_DATA", id = "9d285e05684c4887acb7731de7a41a4e", preview_id = "6a08d74af525475baefa19a93f0ba136" },
 ]
 
 [observability]
-    enabled = true
+enabled = true
 
 [durable_objects]
-bindings = [{name = "TILTIFY_DATA", class_name = "TiltifyData"}, {name = "GRAPH_DATA", class_name = "GraphData"}]
+bindings = [
+  { name = "TILTIFY_DATA", class_name = "TiltifyData"},
+  { name = "GRAPH_DATA", class_name = "GraphData" },
+]
 
 [[migrations]]
 tag = "v1"
@@ -23,45 +26,47 @@ tag = "v2"
 new_classes = ["GraphData"]
 
 [vars]
-YEAR=2024
-COLLECTIONS_AVAILABLE=100000
-DOLLAR_OFFSET=5747814.82
-DONATION_DIFFERENCE=0
-CONVERSION_RATE=1.33
-CAUSE_SLUG="jingle-jam"
-FUNDRAISER_SLUG="jingle-jam-2024"
-FUNDRAISER_PUBLIC_ID="1c690c40-a2f6-48b3-9a88-5a8cb69d4734"
-YOGSCAST_CAMPAIGN_SLUG="jingle-jam-2024"
-YOGSCAST_USERNAME_SLUG="yogscast"
-REFRESH_TIME=10
-ENABLE_REFRESH=false
-ENABLE_GRAPH_REFRESH=false
-ENABLE_DEBUG=false
-
-
-
+YEAR = 2024
+COLLECTIONS_AVAILABLE = 100000
+DOLLAR_OFFSET = 5747814.82
+DONATION_DIFFERENCE = 0
+CONVERSION_RATE = 1.33
+CAUSE_SLUG = "jingle-jam"
+FUNDRAISER_SLUG = "jingle-jam-2024"
+FUNDRAISER_PUBLIC_ID = "1c690c40-a2f6-48b3-9a88-5a8cb69d4734"
+YOGSCAST_CAMPAIGN_SLUG = "jingle-jam-2024"
+YOGSCAST_USERNAME_SLUG = "yogscast"
+DURABLE_OBJECT_CACHE_KEY = "tiltify-data-2024"
+REFRESH_TIME = 10
+ENABLE_REFRESH = false
+ENABLE_GRAPH_REFRESH = false
+ENABLE_DEBUG = false
 
 
 [env.development]
 kv_namespaces = [
-  { binding = "JINGLE_JAM_DATA", id = "c9634f49deeb4618b3c3f1980f777f7a", preview_id = "6a08d74af525475baefa19a93f0ba136" }
+  { binding = "JINGLE_JAM_DATA", id = "c9634f49deeb4618b3c3f1980f777f7a", preview_id = "6a08d74af525475baefa19a93f0ba136" },
 ]
 
 [env.development.durable_objects]
-bindings = [{name = "TILTIFY_DATA", class_name = "TiltifyData"}, {name = "GRAPH_DATA", class_name = "GraphData"}]
+bindings = [
+  { name = "TILTIFY_DATA", class_name = "TiltifyData" },
+  { name = "GRAPH_DATA", class_name = "GraphData" },
+]
 
 [env.development.vars]
-YEAR=2023
-COLLECTIONS_AVAILABLE=100000
-DOLLAR_OFFSET=3371741.16
-DONATION_DIFFERENCE=329
-CONVERSION_RATE=1.263
-CAUSE_SLUG="jingle-jam"
-FUNDRAISER_SLUG="jingle-jam-2023"
-FUNDRAISER_PUBLIC_ID="8601c634-c8a4-4a90-ac64-da037c683b46"
-YOGSCAST_CAMPAIGN_SLUG="jingle-jam-2023"
-YOGSCAST_USERNAME_SLUG="yogscast"
-REFRESH_TIME=600
-ENABLE_REFRESH=true
-ENABLE_GRAPH_REFRESH=false
-ENABLE_DEBUG=false
\ No newline at end of file
+YEAR = 2023
+COLLECTIONS_AVAILABLE = 100000
+DOLLAR_OFFSET = 3371741.16
+DONATION_DIFFERENCE = 329
+CONVERSION_RATE = 1.263
+CAUSE_SLUG = "jingle-jam"
+FUNDRAISER_SLUG = "jingle-jam-2023"
+FUNDRAISER_PUBLIC_ID = "8601c634-c8a4-4a90-ac64-da037c683b46"
+YOGSCAST_CAMPAIGN_SLUG = "jingle-jam-2023"
+YOGSCAST_USERNAME_SLUG = "yogscast"
+DURABLE_OBJECT_CACHE_KEY = "tiltify-data-2023"
+REFRESH_TIME = 600
+ENABLE_REFRESH = true
+ENABLE_GRAPH_REFRESH = false
+ENABLE_DEBUG = false
diff --git a/wrangler.toml b/wrangler.toml
index b9f913a..db38d3a 100644
--- a/wrangler.toml
+++ b/wrangler.toml
@@ -3,27 +3,26 @@ compatibility_date = "2024-09-02"
 pages_build_output_dir = "./website"
 
 kv_namespaces = [
-        { binding = "JINGLE_JAM_DATA", id = "9d285e05684c4887acb7731de7a41a4e", preview_id = "6a08d74af525475baefa19a93f0ba136" }
-    ]
+    { binding = "JINGLE_JAM_DATA", id = "9d285e05684c4887acb7731de7a41a4e", preview_id = "6a08d74af525475baefa19a93f0ba136" },
+]
 
 [observability]
-    enabled = true
+enabled = true
 
 [durable_objects]
-    bindings = [
-        { name = "TILTIFY_DATA", class_name = "TiltifyData", script_name = "tiltify-cache" }, 
-        { name = "GRAPH_DATA", class_name = "GraphData", script_name = "tiltify-cache" }
-    ]
+bindings = [
+    { name = "TILTIFY_DATA", class_name = "TiltifyData", script_name = "tiltify-cache" },
+    { name = "GRAPH_DATA", class_name = "GraphData", script_name = "tiltify-cache" },
+]
 
 
-    
 [env.preview]
-    kv_namespaces = [
-        { binding = "JINGLE_JAM_DATA", id = "c9634f49deeb4618b3c3f1980f777f7a", preview_id = "6a08d74af525475baefa19a93f0ba136" }
-    ]
+kv_namespaces = [
+    { binding = "JINGLE_JAM_DATA", id = "c9634f49deeb4618b3c3f1980f777f7a", preview_id = "6a08d74af525475baefa19a93f0ba136" },
+]
 
 [env.preview.durable_objects]
-    bindings = [
-        { name = "TILTIFY_DATA", class_name = "TiltifyData", script_name = "tiltify-cache-development" }, 
-        { name = "GRAPH_DATA", class_name = "GraphData", script_name = "tiltify-cache-development" }
-    ]
\ No newline at end of file
+bindings = [
+    { name = "TILTIFY_DATA", class_name = "TiltifyData", script_name = "tiltify-cache-development" },
+    { name = "GRAPH_DATA", class_name = "GraphData", script_name = "tiltify-cache-development" },
+]