db calls refactor
This commit is contained in:
parent
4a5882fcc2
commit
8b31e86879
|
@ -1,30 +0,0 @@
|
|||
import logger from "../logger.mjs"
|
||||
import { db } from "./db.mjs"
|
||||
import config from "../config.mjs"
|
||||
|
||||
const blocklist = db.union([
|
||||
db('bad_words').select('word'),
|
||||
db('medical_dictionary').select('word'),
|
||||
db('published').select('word')
|
||||
])
|
||||
|
||||
export default async () => {
|
||||
logger.trace("getAcceptablePrompt called")
|
||||
try {
|
||||
return db('dictionary')
|
||||
.select('*')
|
||||
.where({
|
||||
derivative: 0,
|
||||
scientific: 0,
|
||||
})
|
||||
.andWhere('count', '<', config.maxCount)
|
||||
.andWhere('count', '>', config.minCount)
|
||||
.andWhere('word', 'not in', blocklist)
|
||||
.whereRaw('length(word) > 3')
|
||||
.whereNotNull('pronunciation')
|
||||
.orderByRaw('count desc')
|
||||
} catch (error) {
|
||||
logger.error("getAcceptablePrompts failed!")
|
||||
throw error
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
import logger from "../logger.mjs"
|
||||
import getAcceptablePrompts from "../database-calls/getAcceptablePrompts.mjs"
|
||||
import { checkSpelling } from "spellchecker"
|
||||
import { wordIsAlreadyInBuffer, getAcceptablePrompts } from "../database-calls/db.mjs"
|
||||
|
||||
export default async function (note) {
|
||||
const childLogger = logger.child({note})
|
||||
|
@ -13,7 +13,7 @@ export default async function (note) {
|
|||
const word = textArray[0]
|
||||
if(checkSpelling(word)){
|
||||
if(await getAcceptablePrompts().indexOf(word)!=-1){
|
||||
if(/*wordIsAlreadyInBuffer*/true){
|
||||
if(!wordIsAlreadyInBuffer(word)){
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
|
||||
export default async () => {
|
||||
|
||||
}
|
Loading…
Reference in New Issue