1 files changed, 29 insertions, 27 deletions

diff --git a/api/db/_setCurrentChallenge.ts b/api/db/_setCurrentChallenge.ts
index 0858a56..58031b1 100644
--- a/api/db/_setCurrentChallenge.ts
+++ b/api/db/_setCurrentChallenge.ts
@@ -2,34 +2,36 @@ import { sql } from '@vercel/postgres';
 import { CURRENT_CHALLENGES } from './_tables';
 
 export default async function setCurrentChallenge(userId: string, challenge: string) {
-  try {
-    const insert = `
-      INSERT INTO ${CURRENT_CHALLENGES.name} (
-        ${CURRENT_CHALLENGES.fields.userId},
-        ${CURRENT_CHALLENGES.fields.currentChallenge}
-      ) VALUES (
-        ${userId},
-        ${challenge}
-      );
-    `;
+  const insert = `
+    INSERT INTO ${CURRENT_CHALLENGES.name} (
+      ${CURRENT_CHALLENGES.fields.userId},
+      ${CURRENT_CHALLENGES.fields.currentChallenge}
+    ) VALUES (
+      ${userId},
+      ${challenge}
+    );
+  `;
+
+  const update = `
+    UPDATE TABLE ${CURRENT_CHALLENGES.name}
+    SET ${CURRENT_CHALLENGES.fields.currentChallenge} = ${challenge}
+    WHERE ${CURRENT_CHALLENGES.fields.userId} = '${userId}';
+  `;
 
-    const update = `
-      UPDATE TABLE ${CURRENT_CHALLENGES.name}
-      SET ${CURRENT_CHALLENGES.fields.currentChallenge} = ${challenge}
-      WHERE ${CURRENT_CHALLENGES.fields.userId} = '${userId}';
-    `;
+  const query = `
+    BEGIN
+      IF EXISTS (
+        SELECT ${CURRENT_CHALLENGES.fields.userId} FROM ${CURRENT_CHALLENGES.name}
+        WHERE ${CURRENT_CHALLENGES.fields.userId} = ${userId}
+      )
+        ${update};
+      ELSE
+        ${insert};
+  `;
 
-    await sql.query(`
-      BEGIN
-        IF EXISTS (
-          SELECT ${CURRENT_CHALLENGES.fields.userId} FROM ${CURRENT_CHALLENGES.name}
-          WHERE ${CURRENT_CHALLENGES.fields.userId} = ${userId}
-        )
-          ${update};
-        ELSE
-          ${insert};
-    `);
+  try {
+    await sql.query(query);
   } catch (err) {
-    throw new Error(`Failed to set current challenge for user with ID ${userId} in database.`, err);
+    throw new Error(`Failed to set current challenge for user with ID ${userId} in database. Query was ${query.replace(/\s+/g, ' ')}. ${err}`);
   }
-}
\ No newline at end of file
+}