Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit c65f710

Browse files
Revert "#12 - Fix issue where invalid model attributes did not raise validation errors"
This reverts commit bb44d9f.
1 parent bb44d9f commit c65f710

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

app.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
* The application entry point
33
*/
44

5-
// Commenting out since logger wrapper is now set in elasticsearch wrapper
6-
// require('./src/bootstrap')
5+
require('./src/bootstrap')
76
const config = require('config')
87
const express = require('express')
98
const cross = require('cors')

src/bootstrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function buildServices (dir) {
2121
let serviceName = curPath.split('modules')[1]
2222
serviceName = serviceName.substr(1, serviceName.length - 4)
2323
logger.info(`add decorates for service --> ${serviceName}`)
24-
logger.buildService(serviceName, require(curPath)) // eslint-disable-line
24+
logger.buildService(serviceName, require(curPath)); // eslint-disable-line
2525
}
2626
})
2727
}

src/common/es-helper.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,8 +1145,6 @@ function wrapElasticSearchOp (methods, Model) {
11451145
// methods: create, search, patch, get, remove
11461146
const resource = getResource(Model.name)
11471147

1148-
logger.buildService(Model.name, methods)
1149-
11501148
return _.mapValues(methods, func => {
11511149
if (func.name === 'search') {
11521150
return async (...args) => {

src/modules/user/service.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,8 @@ const models = require('../../models/index')
77
const helper = require('../../common/helper')
88
const methods = helper.getServiceMethods(
99
models.User,
10-
{
11-
handle: joi.string().required(),
12-
firstName: joi.string().required(),
13-
lastName: joi.string().required()
14-
},
15-
{
16-
handle: joi.string(),
17-
firstName: joi.string(),
18-
lastName: joi.string()
19-
},
10+
{ handle: joi.string().required() },
11+
{ handle: joi.string() },
2012
{ handle: joi.string(), roleId: joi.string() },
2113
async query => {
2214
let prefix = 'select * from DUser'

0 commit comments

Comments
 (0)