Skip to content

Commit a4e0f49

Browse files
matt212matt212
authored
Merge pull request #57 from matt212/static-server
Static server .LTGM AutomateD Mocha chai all tests 73 test cases has passed . hence approving this PR
2 parents c8d13a3 + 786bb11 commit a4e0f49

File tree

9 files changed

+992
-132
lines changed

9 files changed

+992
-132
lines changed

‎app/config/db.js

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ module.exports.pgQueryStream = function (sql) {
104104
//pipe 1,000,000 rows to stdout without blowing up your memory usage
105105

106106
module.exports.query = function (sql) {
107-
107+
108108
return new Promise((resolve, reject) => {
109109
pool.connect(function (err, client, release) {
110110
if (err) {
@@ -113,7 +113,7 @@ module.exports.query = function (sql) {
113113
}
114114
client.query(sql, function (err, result) {
115115
if (err) {
116-
console.log(sql)
116+
console.log(err)
117117
release(true)
118118
reject(err)
119119
} else {
@@ -125,6 +125,29 @@ module.exports.query = function (sql) {
125125
})
126126
}
127127

128+
module.exports.queryParameterized = function (sql,customvalues) {
129+
130+
return new Promise((resolve, reject) => {
131+
pool.connect(function (err, client, release) {
132+
if (err) {
133+
release(true)
134+
reject(err)
135+
}
136+
client.query(sql,customvalues, function (err, result) {
137+
if (err) {
138+
console.log(err)
139+
release(true)
140+
reject(err)
141+
} else {
142+
release(true)
143+
resolve(result)
144+
}
145+
})
146+
})
147+
})
148+
}
149+
150+
128151
// the pool also supports checking out a client for
129152
// multiple operations, such as a transaction
130153
module.exports.connect = function (callback) {

‎app/public/admin/js/app/app_employees.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ basefunction().mroleMultiKeysLoad(currentModName).then(function (data) {
150150
var killzone = data.rows
151151
killzone.forEach((element, index) => {
152152

153-
console.log(`keys:` + Object.keys(element))
154-
console.log(`values:` + element[Object.keys(element)])
155-
console.log(element)
153+
156154
})
157155
});
158156
// let radioModular=function(data)

‎app/ref/routes/employees.js

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,25 @@ async function routes (fastify, options) {
3939
},
4040
async (request, reply) => {
4141
dep.assignVariables(mod)
42-
let validationConfig = require('./utils/' +
43-
mod.Name +
44-
'/validationConfig.js')
45-
reply.header('x-token', request.session.get('userLoggedInfor'))
46-
reply.view(
47-
`${mod.Name}/${mod.Name}_client.ejs`,
48-
dep.pageRenderObj(request, reply, validationConfig)
49-
)
42+
43+
try {
44+
dep.assignVariables(mod)
45+
let validationConfig = require('./utils/' +
46+
mod.Name +
47+
'/validationConfig.js')
48+
reply.header('x-token', request.session.get('userLoggedInfor'))
49+
let ejsRelease = (request.session["releaseEnv"] == "public-release" ? '-release' : '')
50+
51+
reply.view(
52+
`${mod.Name}/${mod.Name}${ejsRelease}.ejs`,
53+
dep.pageRenderObj(request, reply, validationConfig)
54+
)
55+
} catch (error) {
56+
dep.captureErrorLog({ "error": error, "url":"/", "modname": mod.Name, "payload": request.body })
57+
58+
}
59+
60+
5061
}
5162
)
5263
fastify.post(
@@ -68,7 +79,7 @@ async function routes (fastify, options) {
6879
})
6980
.catch(function (error) {
7081
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[0], "modname": mod.Name, "payload": request.body })
71-
reply.code(400).send(error.trim())
82+
reply.code(400).send(error)
7283
})
7384
}
7485
)
@@ -87,13 +98,13 @@ async function routes (fastify, options) {
8798
req.body = request.body
8899
//dep.searchtype
89100
dep
90-
.searchtypeOptimizedBase(req, reply, mod)
101+
.searchtypeOptimizedBaseParameterized(req, reply, mod)
91102
.then(arg => {
92103
reply.send(arg)
93104
})
94105
.catch(function (error) {
95106
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[1], "modname": mod.Name, "payload": request.body })
96-
reply.code(400).send({ status: error.trim() })
107+
reply.code(400).send({ status: error })
97108
})
98109
}
99110
)
@@ -113,13 +124,13 @@ async function routes (fastify, options) {
113124
req.body = request.body
114125
//dep.searchtype
115126
dep
116-
.searchtypeOptimizedBaseCount(req, reply, mod)
127+
.searchtypeOptimizedBaseCountParamterized(req, reply, mod)
117128
.then(arg => {
118129
reply.send(arg)
119130
})
120131
.catch(function (error) {
121132
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[2], "modname": mod.Name, "payload": request.body })
122-
reply.code(400).send({ status: error.trim() })
133+
reply.code(400).send({ status: error })
123134
})
124135
}
125136
)
@@ -140,7 +151,7 @@ async function routes (fastify, options) {
140151
try
141152
{
142153
dep.assignVariables(mod)
143-
dep.SearchTypeGroupBy(request, reply, mod)
154+
dep.SearchTypeGroupByParameterized(request, reply, mod)
144155
}
145156
catch (error) {
146157
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtypegroupby, "modname": mod.Name, "payload": request.body })

‎app/routes/employees.js

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const { isError } = require('util')
12
let dep = require('./utils/dependentVariables')
23
let mod = Object.assign(
34
{},
@@ -21,14 +22,14 @@ async function routes(fastify, options) {
2122
'/validationConfig.js')
2223
reply.header('x-token', request.session.get('userLoggedInfor'))
2324
let ejsRelease = (request.session["releaseEnv"] == "public-release" ? '-release' : '')
24-
25+
2526
reply.view(
2627
`${mod.Name}/${mod.Name}${ejsRelease}.ejs`,
2728
dep.pageRenderObj(request, reply, validationConfig)
2829
)
2930
} catch (error) {
30-
dep.captureErrorLog({ "error": error, "url":"/", "modname": mod.Name, "payload": request.body })
31-
31+
dep.captureErrorLog({ "error": error, "url": "/", "modname": mod.Name, "payload": request.body })
32+
3233
}
3334
}
3435
)
@@ -51,9 +52,9 @@ async function routes(fastify, options) {
5152
reply.send(arg)
5253
})
5354
.catch(function (error) {
54-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[0], "modname": mod.Name, "payload": request.body })
55-
56-
reply.code(400).send(error.trim())
55+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtype[0], "modname": mod.Name, "payload": request.body })
56+
57+
reply.code(400).send(error)
5758
})
5859
}
5960
)
@@ -73,14 +74,16 @@ async function routes(fastify, options) {
7374

7475
//dep.searchtype
7576
dep
76-
.searchtypeOptimizedBase(req, reply, mod)
77+
//.searchtypeOptimizedBase(req, reply, mod)
78+
.searchtypeOptimizedBaseParameterized(req, reply, mod)
7779
.then(arg => {
7880
reply.send(arg)
7981
})
80-
.catch(function (error) {
81-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[1], "modname": mod.Name, "payload": request.body })
82+
.catch(function (err) {
8283

83-
reply.code(400).send({ status: error.trim() })
84+
dep.captureErrorLog({ "error": err, "url": dep.routeUrls.searchtype[1], "modname": mod.Name, "payload": request.body })
85+
86+
reply.code(400).send({ status: err })
8487
})
8588
}
8689
)
@@ -101,14 +104,14 @@ async function routes(fastify, options) {
101104
req.body = request.body
102105
//dep.searchtype
103106
dep
104-
.searchtypeOptimizedBaseCount(req, reply, mod)
107+
.searchtypeOptimizedBaseCountParamterized(req, reply, mod)
105108
.then(arg => {
106109
reply.send(arg)
107110
})
108111
.catch(function (error) {
109-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtype[2], "modname": mod.Name, "payload": request.body })
110-
111-
reply.code(400).send({ status: error.trim() })
112+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtype[2], "modname": mod.Name, "payload": request.body })
113+
114+
reply.code(400).send({ status: error })
112115
})
113116
}
114117
)
@@ -124,14 +127,14 @@ async function routes(fastify, options) {
124127
},
125128
async (request, reply) => {
126129
try {
127-
dep.assignVariables(mod)
128-
dep.SearchTypeGroupBy(request, reply, mod)
129-
}
130-
catch (error) {
131-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtypegroupby, "modname": mod.Name, "payload": request.body })
132-
133-
}
134-
})
130+
dep.assignVariables(mod)
131+
dep.SearchTypeGroupByParameterized(request, reply, mod)
132+
}
133+
catch (error) {
134+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtypegroupby, "modname": mod.Name, "payload": request.body })
135+
136+
}
137+
})
135138
fastify.post(
136139
dep.routeUrls.create,
137140
{
@@ -143,8 +146,8 @@ async function routes(fastify, options) {
143146
dep.assignVariables(mod)
144147
dep.createRecord(request, reply)
145148
} catch (error) {
146-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.create, "modname": mod.Name, "payload": request.body })
147-
149+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.create, "modname": mod.Name, "payload": request.body })
150+
148151
}
149152
}
150153
)
@@ -158,8 +161,8 @@ async function routes(fastify, options) {
158161
dep.assignVariables(mod)
159162
dep.exportExcel(request, reply, mod, fastify)
160163
} catch (error) {
161-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.exportexcel, "modname": mod.Name, "payload": request.body })
162-
164+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.exportexcel, "modname": mod.Name, "payload": request.body })
165+
163166
}
164167
}
165168
)
@@ -175,8 +178,8 @@ async function routes(fastify, options) {
175178
return dep.uploadContent(request, reply)
176179
} catch (error) {
177180

178-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.uploadcontent, "modname": mod.Name, "payload": request.body })
179-
181+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.uploadcontent, "modname": mod.Name, "payload": request.body })
182+
180183
}
181184
}
182185
)
@@ -190,8 +193,8 @@ async function routes(fastify, options) {
190193
try {
191194
dep.updateRecord(request, reply)
192195
} catch (error) {
193-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.update, "modname": mod.Name, "payload": request.body })
194-
196+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.update, "modname": mod.Name, "payload": request.body })
197+
195198
}
196199
}
197200
)
@@ -205,8 +208,8 @@ async function routes(fastify, options) {
205208
dep.assignVariables(mod)
206209
dep.searchtypegroupbyId(request, reply, mod)
207210
} catch (error) {
208-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.searchtypegroupbyId, "modname": mod.Name, "payload": request.body })
209-
211+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.searchtypegroupbyId, "modname": mod.Name, "payload": request.body })
212+
210213
}
211214
}
212215
)
@@ -220,8 +223,8 @@ async function routes(fastify, options) {
220223
dep.assignVariables(mod)
221224
dep.deleteHardRecord(request, reply)
222225
} catch (error) {
223-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.delete, "modname": mod.Name, "payload": request.body })
224-
226+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.delete, "modname": mod.Name, "payload": request.body })
227+
225228
}
226229
}
227230
)
@@ -245,9 +248,9 @@ async function routes(fastify, options) {
245248
reply.send(arg)
246249
})
247250
.catch(function (error) {
248-
dep.captureErrorLog({ "error": error,"url":dep.routeUrls.pivotresult, "modname": mod.Name, "payload": request.body })
249-
250-
reply.code(400).send(error.trim())
251+
dep.captureErrorLog({ "error": error, "url": dep.routeUrls.pivotresult, "modname": mod.Name, "payload": request.body })
252+
253+
reply.code(400).send(error)
251254
})
252255
}
253256
)

0 commit comments

Comments
 (0)