refactored .thens as try catch

database-calls/db.mjs

@@ -15,22 +15,27 @@ export const getWords = async () => {
   return db
     .select("word")
     .from("dictionary")
-    .catch(error=>{throw error})
+    .catch(error => { throw error })
 }
 
-export const valueExistsInTable = async (table,column,value) =>{
+export const valueExistsInTable = async (table, column, value) => {
+  try {
     const number = await db(table)
       .count('* as count')
       .where(column, value)
-    .catch(error => { throw error })
       return number[0].count > 0
+  } catch (error) {
+    logger.error("valueExistsInTable failed!")
+    throw error
+  }
+  
 }
 
 
 export const todaysPromptAlreadyPublished = async () => {
-  return valueExistsInTable('published','date',isoDate())
+  return valueExistsInTable('published', 'date', isoDate())
 }
 
 export const wordIsAlreadyInBuffer = async (word) => {
-  return valueExistsInTable('buffer','word',word)
+  return valueExistsInTable('buffer', 'word', word)
 }

database-calls/getAcceptablePrompts.mjs

@@ -10,6 +10,7 @@ const blocklist = db.union([
 
 export default async () => {
     logger.trace("getAcceptablePrompt called")
+    try {
         return db('dictionary')
         .select('*')
         .where({
@@ -22,5 +23,8 @@ export default async () => {
         .whereRaw('length(word) > 3')
         .whereNotNull('pronunciation')
         .orderByRaw('count desc')
-        .catch(error=>{throw error})
+    } catch (error) {
+        logger.error("getAcceptablePrompts failed!")
+        throw error
+    }
 }

database-calls/insertPublished.mjs

@@ -37,27 +37,27 @@ const sampleRes = {
     reactions: {},
     reactionEmojis: [],
     emojis: [],
-      tags: [ 'micro365', 'writing', 'microfiction', 'vss', 'marmalade' ],
+    tags: ['micro365', 'writing', 'microfiction', 'vss', 'marmalade'],
     fileIds: [],
     files: [],
     replyId: null,
     renoteId: null
   }
-  }
+}
 
-export default async function insertPublished(res, word){
-  const childLogger = logger.child({res,word})
-  childLogger.trace("insertPublished called")
+export default async function insertPublished(res, word) {
+  logger.trace("insertPublished called")
+  try {
     return db('published')
       .insert({
         id: res.createdNote.id,
         word,
         date: isoDate(sampleRes.createdNote.createdAt)
       })
-    .then(res => {
-        childLogger.trace("succesful insertion into table: published")
-        return res
-    })
-    .catch(error => {throw error})  
+  } catch (error) {
+    logger.trace("succesful insertion into table: published")
+    throw error
+  }
+
 }
 //console.log(await insertPublished(sampleRes,'marmalade'))

database-calls/todaysPromptAlreadyPublished.mjs

@@ -1,11 +1,17 @@
 import { db } from "./db.mjs";
 import { isoDate } from "../utilities.mjs";
+import logger from "../logger.mjs";
 export default async function todaysPromptAlreadyPublished() {
+    try {
         const number = await db('published')
         .count('* as count')
         .where('date', isoDate())
-        .catch(error=>{throw error})
         return number[0].count > 0
+    } catch (error) {
+        logger.error("todaysPromptAlreadyPublished failed!")
+        throw error
+    }
+    
 }
 
 //console.log(await todaysPromptAlreadyPublished())