Skip to content

Commit cb8bc1a

Browse files
JKHeadleyJKHeadley
authored
refactor: remove dep on joi-objectid package (#303)
1 parent 348f3b6 commit cb8bc1a

File tree

4 files changed

+34
-58
lines changed

4 files changed

+34
-58
lines changed

‎package-lock.json

+1-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"test-unit": "tape ./tests/unit/*.tests.js",
2424
"test-e2e": "tape ./tests/e2e/*.tests.js",
2525
"test-joi": "tape ./tests/unit/joi-mongoose-helper.tests.js",
26+
"test-rest-helper": "tape ./tests/unit/rest-helper-factory.tests.js",
2627
"report-coverage": "nyc report --reporter=html --reporter=text-lcov > coverage.lcov && codecov",
2728
"patch-release-git": "git add . && git commit -a -m 'patch release' && git push && npm version patch && npm publish",
2829
"patch-release": "npm version patch && npm publish",
@@ -67,7 +68,6 @@
6768
"fs-extra": "^8.1.0",
6869
"hapi-swagger": "^14.5.5",
6970
"joi": "^17.6.0",
70-
"joi-objectid": "github:mkg20001/joi-objectid#chore/upgrade",
7171
"lodash": "~4.17.15",
7272
"loggin": "^3.0.2",
7373
"mongoose": "^6.4.6",

‎tests/unit/rest-helper-factory.tests.js

+31-45
Original file line numberDiff line numberDiff line change
@@ -2485,22 +2485,20 @@ test('rest-helper-factory.generateFindEndpoint', function(t) {
24852485
})
24862486
const joiStub = require('joi')
24872487
const joiObjectIdStub = function() {
2488-
return function() {
2489-
return {
2490-
required: function() {
2491-
return 'TEST'
2492-
}
2488+
return {
2489+
required: function() {
2490+
return 'TEST'
24932491
}
24942492
}
24952493
}
2494+
joiMongooseHelperStub.joiObjectId = joiObjectIdStub
24962495
const restHelperFactory = proxyquire(
24972496
'../../utilities/rest-helper-factory',
24982497
{
24992498
'./handler-helper-factory': handlerHelperStubWrapper,
25002499
'./query-helper': queryHelperStub,
25012500
'./joi-mongoose-helper': joiMongooseHelperStub,
2502-
joi: joiStub,
2503-
'joi-objectid': joiObjectIdStub
2501+
joi: joiStub
25042502
}
25052503
)(Log, mongoose, server)
25062504

@@ -4218,22 +4216,20 @@ test('rest-helper-factory.generateDeleteOneEndpoint', function(t) {
42184216
const joiStub = require('joi')
42194217

42204218
const joiObjectIdStub = function() {
4221-
return function() {
4222-
return {
4223-
required: function() {
4224-
return 'TEST'
4225-
}
4219+
return {
4220+
required: function() {
4221+
return 'TEST'
42264222
}
42274223
}
42284224
}
4225+
joiMongooseHelperStub.joiObjectId = joiObjectIdStub
42294226
const restHelperFactory = proxyquire(
42304227
'../../utilities/rest-helper-factory',
42314228
{
42324229
'./handler-helper-factory': handlerHelperStubWrapper,
42334230
'./query-helper': queryHelperStub,
42344231
'./joi-mongoose-helper': joiMongooseHelperStub,
4235-
joi: joiStub,
4236-
'joi-objectid': joiObjectIdStub
4232+
joi: joiStub
42374233
}
42384234
)(Log, mongoose, server)
42394235

@@ -5184,22 +5180,20 @@ test('rest-helper-factory.generateUpdateEndpoint', function(t) {
51845180
const joiStub = require('joi')
51855181

51865182
const joiObjectIdStub = function() {
5187-
return function() {
5188-
return {
5189-
required: function() {
5190-
return 'TEST'
5191-
}
5183+
return {
5184+
required: function() {
5185+
return 'TEST'
51925186
}
51935187
}
51945188
}
5189+
joiMongooseHelperStub.joiObjectId = joiObjectIdStub
51955190
const restHelperFactory = proxyquire(
51965191
'../../utilities/rest-helper-factory',
51975192
{
51985193
'./handler-helper-factory': handlerHelperStubWrapper,
51995194
'./query-helper': queryHelperStub,
52005195
'./joi-mongoose-helper': joiMongooseHelperStub,
5201-
joi: joiStub,
5202-
'joi-objectid': joiObjectIdStub
5196+
joi: joiStub
52035197
}
52045198
)(Log, mongoose, server)
52055199

@@ -6537,22 +6531,20 @@ test('rest-helper-factory.generateAssociationAddOneEndpoint', function(t) {
65376531
})
65386532
const joiStub = require('joi')
65396533
const joiObjectIdStub = function() {
6540-
return function() {
6541-
return {
6542-
required: function() {
6543-
return 'TEST'
6544-
}
6534+
return {
6535+
required: function() {
6536+
return 'TEST'
65456537
}
65466538
}
65476539
}
6540+
joiMongooseHelperStub.joiObjectId = joiObjectIdStub
65486541
const restHelperFactory = proxyquire(
65496542
'../../utilities/rest-helper-factory',
65506543
{
65516544
'./handler-helper-factory': handlerHelperStubWrapper,
65526545
'./query-helper': queryHelperStub,
65536546
'./joi-mongoose-helper': joiMongooseHelperStub,
6554-
joi: joiStub,
6555-
'joi-objectid': joiObjectIdStub
6547+
joi: joiStub
65566548
}
65576549
)(Log, mongoose, server)
65586550

@@ -7840,22 +7832,20 @@ test('rest-helper-factory.generateAssociationRemoveOneEndpoint', function(t) {
78407832
})
78417833
const joiStub = require('joi')
78427834
const joiObjectIdStub = function() {
7843-
return function() {
7844-
return {
7845-
required: function() {
7846-
return 'TEST'
7847-
}
7835+
return {
7836+
required: function() {
7837+
return 'TEST'
78487838
}
78497839
}
78507840
}
7841+
joiMongooseHelperStub.joiObjectId = joiObjectIdStub
78517842
const restHelperFactory = proxyquire(
78527843
'../../utilities/rest-helper-factory',
78537844
{
78547845
'./handler-helper-factory': handlerHelperStubWrapper,
78557846
'./query-helper': queryHelperStub,
78567847
'./joi-mongoose-helper': joiMongooseHelperStub,
7857-
joi: joiStub,
7858-
'joi-objectid': joiObjectIdStub
7848+
joi: joiStub
78597849
}
78607850
)(Log, mongoose, server)
78617851

@@ -9118,18 +9108,16 @@ test('rest-helper-factory.generateAssociationAddManyEndpoint', function(t) {
91189108
const joiStub = require('joi')
91199109

91209110
const joiObjectIdStub = function() {
9121-
return function() {
9122-
return Joi.string().valid('objectId')
9123-
}
9111+
return Joi.string().valid('objectId')
91249112
}
9113+
joiMongooseHelperStub.joiObjectId = joiObjectIdStub
91259114
const restHelperFactory = proxyquire(
91269115
'../../utilities/rest-helper-factory',
91279116
{
91289117
'./handler-helper-factory': handlerHelperStubWrapper,
91299118
'./query-helper': queryHelperStub,
91309119
'./joi-mongoose-helper': joiMongooseHelperStub,
9131-
joi: joiStub,
9132-
'joi-objectid': joiObjectIdStub
9120+
joi: joiStub
91339121
}
91349122
)(Log, mongoose, server)
91359123

@@ -9254,18 +9242,16 @@ test('rest-helper-factory.generateAssociationAddManyEndpoint', function(t) {
92549242
const joiStub = require('joi')
92559243

92569244
const joiObjectIdStub = function() {
9257-
return function() {
9258-
return Joi.string().valid('objectId')
9259-
}
9245+
return Joi.string().valid('objectId')
92609246
}
9247+
joiMongooseHelperStub.joiObjectId = joiObjectIdStub
92619248
const restHelperFactory = proxyquire(
92629249
'../../utilities/rest-helper-factory',
92639250
{
92649251
'./handler-helper-factory': handlerHelperStubWrapper,
92659252
'./query-helper': queryHelperStub,
92669253
'./joi-mongoose-helper': joiMongooseHelperStub,
9267-
joi: joiStub,
9268-
'joi-objectid': joiObjectIdStub
9254+
joi: joiStub
92699255
}
92709256
)(Log, mongoose, server)
92719257

‎utilities/rest-helper-factory.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
22

33
const Joi = require('joi')
4-
Joi.objectId = require('joi-objectid')(Joi)
54
const _ = require('lodash')
65
const assert = require('assert')
76
const joiMongooseHelper = require('./joi-mongoose-helper')
7+
Joi.objectId = joiMongooseHelper.joiObjectId
88
const validationHelper = require('./validation-helper')
99
const authHelper = require('./auth-helper')
1010
const chalk = require('chalk')

0 commit comments

Comments
 (0)