Skip to content

Commit

Permalink
Merge pull request #57 from matt212/static-server
Browse files Browse the repository at this point in the history 
Static server .LTGM AutomateD Mocha chai all tests  73 test cases has passed . hence approving this PR
  • Loading branch information
@matt212
matt212 authored Aug 24, 2024
2 parents c8d13a3 + 786bb11 commit a4e0f49
Show file tree
Hide file tree
Showing 9 changed files with 992 additions and 132 deletions.
27 changes: 25 additions & 2 deletions app/config/db.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ module.exports.pgQueryStream = function (sql) {
//pipe 1,000,000 rows to stdout without blowing up your memory usage

module.exports.query = function (sql) {

return new Promise((resolve, reject) => {
pool.connect(function (err, client, release) {
if (err) {
Expand All @@ -113,7 +113,7 @@ module.exports.query = function (sql) {
}
client.query(sql, function (err, result) {
if (err) {
console.log(sql)
console.log(err)
release(true)
reject(err)
} else {
Expand All @@ -125,6 +125,29 @@ module.exports.query = function (sql) {
})
}

module.exports.queryParameterized = function (sql,customvalues) {

return new Promise((resolve, reject) => {
pool.connect(function (err, client, release) {
if (err) {
release(true)
reject(err)
}
client.query(sql,customvalues, function (err, result) {
if (err) {
console.log(err)
release(true)
reject(err)
} else {
release(true)
resolve(result)
}
})
})
})
}


// the pool also supports checking out a client for
// multiple operations, such as a transaction
module.exports.connect = function (callback) {
Expand Down
4 changes: 1 addition & 3 deletions app/public/admin/js/app/app_employees.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,7 @@ basefunction().mroleMultiKeysLoad(currentModName).then(function (data) {
var killzone = data.rows
killzone.forEach((element, index) => {

console.log(`keys:` + Object.keys(element))
console.log(`values:` + element[Object.keys(element)])
console.log(element)

})
});
// let radioModular=function(data)
Expand Down
39 changes: 25 additions & 14 deletions app/ref/routes/employees.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,25 @@ async function routes (fastify, options) {
},
async (request, reply) => {
dep.assignVariables(mod)
let validationConfig = require('./utils/' +
mod.Name +
'/validationConfig.js')
reply.header('x-token', request.session.get('userLoggedInfor'))
reply.view(
`${mod.Name}/${mod.Name}_client.ejs`,
dep.pageRenderObj(request, reply, validationConfig)
)

try {
dep.assignVariables(mod)
let validationConfig = require('./utils/' +
mod.Name +
'/validationConfig.js')
reply.header('x-token', request.session.get('userLoggedInfor'))
let ejsRelease = (request.session["releaseEnv"] == "public-release" ? '-release' : '')

reply.view(
`${mod.Name}/${mod.Name}${ejsRelease}.ejs`,
dep.pageRenderObj(request, reply, validationConfig)
)
} catch (error) {
dep.captureErrorLog({ "error": error, "url":"/", "modname": mod.Name, "payload": request.body })

}


}
)
fastify.post(
Expand All @@ -68,7 +79,7 @@ async function routes (fastify, options) {
})
.catch(function (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[0], "modname": mod.Name, "payload": request.body })
reply.code(400).send(error.trim())
reply.code(400).send(error)
})
}
)
Expand All @@ -87,13 +98,13 @@ async function routes (fastify, options) {
req.body = request.body
//dep.searchtype
dep
.searchtypeOptimizedBase(req, reply, mod)
.searchtypeOptimizedBaseParameterized(req, reply, mod)
.then(arg => {
reply.send(arg)
})
.catch(function (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[1], "modname": mod.Name, "payload": request.body })
reply.code(400).send({ status: error.trim() })
reply.code(400).send({ status: error })
})
}
)
Expand All @@ -113,13 +124,13 @@ async function routes (fastify, options) {
req.body = request.body
//dep.searchtype
dep
.searchtypeOptimizedBaseCount(req, reply, mod)
.searchtypeOptimizedBaseCountParamterized(req, reply, mod)
.then(arg => {
reply.send(arg)
})
.catch(function (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[2], "modname": mod.Name, "payload": request.body })
reply.code(400).send({ status: error.trim() })
reply.code(400).send({ status: error })
})
}
)
Expand All @@ -140,7 +151,7 @@ async function routes (fastify, options) {
try
{
dep.assignVariables(mod)
dep.SearchTypeGroupBy(request, reply, mod)
dep.SearchTypeGroupByParameterized(request, reply, mod)
}
catch (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtypegroupby, "modname": mod.Name, "payload": request.body })
Expand Down
77 changes: 40 additions & 37 deletions app/routes/employees.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { isError } = require('util')
let dep = require('./utils/dependentVariables')
let mod = Object.assign(
{},
Expand All @@ -21,14 +22,14 @@ async function routes(fastify, options) {
'/validationConfig.js')
reply.header('x-token', request.session.get('userLoggedInfor'))
let ejsRelease = (request.session["releaseEnv"] == "public-release" ? '-release' : '')

reply.view(
`${mod.Name}/${mod.Name}${ejsRelease}.ejs`,
dep.pageRenderObj(request, reply, validationConfig)
)
} catch (error) {
dep.captureErrorLog({ "error": error, "url":"/", "modname": mod.Name, "payload": request.body })
dep.captureErrorLog({ "error": error, "url": "/", "modname": mod.Name, "payload": request.body })

}
}
)
Expand All @@ -51,9 +52,9 @@ async function routes(fastify, options) {
reply.send(arg)
})
.catch(function (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[0], "modname": mod.Name, "payload": request.body })
reply.code(400).send(error.trim())
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtype[0], "modname": mod.Name, "payload": request.body })

reply.code(400).send(error)
})
}
)
Expand All @@ -73,14 +74,16 @@ async function routes(fastify, options) {

//dep.searchtype
dep
.searchtypeOptimizedBase(req, reply, mod)
//.searchtypeOptimizedBase(req, reply, mod)
.searchtypeOptimizedBaseParameterized(req, reply, mod)
.then(arg => {
reply.send(arg)
})
.catch(function (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[1], "modname": mod.Name, "payload": request.body })
.catch(function (err) {

reply.code(400).send({ status: error.trim() })
dep.captureErrorLog({ "error": err, "url": dep.routeUrls.searchtype[1], "modname": mod.Name, "payload": request.body })

reply.code(400).send({ status: err })
})
}
)
Expand All @@ -101,14 +104,14 @@ async function routes(fastify, options) {
req.body = request.body
//dep.searchtype
dep
.searchtypeOptimizedBaseCount(req, reply, mod)
.searchtypeOptimizedBaseCountParamterized(req, reply, mod)
.then(arg => {
reply.send(arg)
})
.catch(function (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[2], "modname": mod.Name, "payload": request.body })
reply.code(400).send({ status: error.trim() })
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtype[2], "modname": mod.Name, "payload": request.body })

reply.code(400).send({ status: error })
})
}
)
Expand All @@ -124,14 +127,14 @@ async function routes(fastify, options) {
},
async (request, reply) => {
try {
dep.assignVariables(mod)
dep.SearchTypeGroupBy(request, reply, mod)
}
catch (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtypegroupby, "modname": mod.Name, "payload": request.body })
}
})
dep.assignVariables(mod)
dep.SearchTypeGroupByParameterized(request, reply, mod)
}
catch (error) {
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtypegroupby, "modname": mod.Name, "payload": request.body })

}
})
fastify.post(
dep.routeUrls.create,
{
Expand All @@ -143,8 +146,8 @@ async function routes(fastify, options) {
dep.assignVariables(mod)
dep.createRecord(request, reply)
} catch (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.create, "modname": mod.Name, "payload": request.body })
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.create, "modname": mod.Name, "payload": request.body })

}
}
)
Expand All @@ -158,8 +161,8 @@ async function routes(fastify, options) {
dep.assignVariables(mod)
dep.exportExcel(request, reply, mod, fastify)
} catch (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.exportexcel, "modname": mod.Name, "payload": request.body })
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.exportexcel, "modname": mod.Name, "payload": request.body })

}
}
)
Expand All @@ -175,8 +178,8 @@ async function routes(fastify, options) {
return dep.uploadContent(request, reply)
} catch (error) {

dep.captureErrorLog({ "error": error,"url":dep.routeUrls.uploadcontent, "modname": mod.Name, "payload": request.body })
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.uploadcontent, "modname": mod.Name, "payload": request.body })

}
}
)
Expand All @@ -190,8 +193,8 @@ async function routes(fastify, options) {
try {
dep.updateRecord(request, reply)
} catch (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.update, "modname": mod.Name, "payload": request.body })
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.update, "modname": mod.Name, "payload": request.body })

}
}
)
Expand All @@ -205,8 +208,8 @@ async function routes(fastify, options) {
dep.assignVariables(mod)
dep.searchtypegroupbyId(request, reply, mod)
} catch (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtypegroupbyId, "modname": mod.Name, "payload": request.body })
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtypegroupbyId, "modname": mod.Name, "payload": request.body })

}
}
)
Expand All @@ -220,8 +223,8 @@ async function routes(fastify, options) {
dep.assignVariables(mod)
dep.deleteHardRecord(request, reply)
} catch (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.delete, "modname": mod.Name, "payload": request.body })
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.delete, "modname": mod.Name, "payload": request.body })

}
}
)
Expand All @@ -245,9 +248,9 @@ async function routes(fastify, options) {
reply.send(arg)
})
.catch(function (error) {
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.pivotresult, "modname": mod.Name, "payload": request.body })
reply.code(400).send(error.trim())
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.pivotresult, "modname": mod.Name, "payload": request.body })

reply.code(400).send(error)
})
}
)
Expand Down
Loading

0 comments on commit a4e0f49

Please sign in to comment.