todaysPrompt... refactored

checkAndPublish.mjs

@@ -3,7 +3,7 @@ import createNote from "./firefish-calls/createNote.mjs"
 import makeText from "./makeText.mjs"
 import insertPublished from "./database-calls/insertPublished.mjs"
 import logger from "./logger.mjs"
-import todaysPromptAlreadyPublished from "./database-calls/todaysPromptAlreadyPublished.mjs"
+import {todaysPromptAlreadyPublished} from "./database-calls/db.mjs"
 
 
 export default  async function checkAndPublish () {

database-calls/db.mjs

@@ -1,5 +1,6 @@
 import Knex from 'knex'
 import logger from '../logger.mjs'
+import { isoDate } from "../utilities.mjs"
 
 export const db = Knex({
   client: 'sqlite3', // or 'better-sqlite3'
@@ -7,13 +8,29 @@ export const db = Knex({
     filename: "data/database"
   },
   useNullAsDefault: true
-  })
+})
 
- export const getWords = async (db) => {
+export const getWords = async () => {
-  const childLogger = logger.child({db})
+  const childLogger = logger.child({ db })
   childLogger.trace("getWords called")
   return db
     .select("word")
     .from("dictionary")
 }
 
+export const valueExistsInTable = async (table,column,value) =>{
+  const number = await db(table)
+    .count('* as count')
+    .where(column, value)
+    .catch(error => { throw error })
+  return number[0].count > 0
+}
+
+
+export const todaysPromptAlreadyPublished = async () => {
+  return valueExistsInTable('published','date',isoDate())
+}
+
+export const wordIsAlreadyInBuffer = async (word) => {
+  return valueExistsInTable('buffer','word',word)
+}