banana/definma-api
Archived
2
Fork 0
Code Releases Activity

updated to new model format

Browse Source
This commit is contained in:
VLE2FE 2020-08-28 08:13:19 +02:00
parent ed37ce6aeb
commit 349ff16191
4 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/routes/model.spec.ts
View File

@ -26,11 +26,10 @@ describe('/model', () => {
should(group).have.only.keys('group', 'models'); should(group).have.only.keys('group', 'models');
should(group).have.property('group').be.type('string'); should(group).have.property('group').be.type('string');
should(group.models).matchEach(model => { should(group.models).matchEach(model => {
should(model).have.only.keys('_id', 'name', 'url', 'label'); should(model).have.only.keys('_id', 'name', 'url');
should(model).have.property('_id').be.type('string'); should(model).have.property('_id').be.type('string');
should(model).have.property('name').be.type('string'); should(model).have.property('name').be.type('string');
should(model).have.property('url').be.type('string'); should(model).have.property('url').be.type('string');
should(model).have.property('label').be.type('string');
}); });
}); });
done(); done();
@ -48,7 +47,7 @@ describe('/model', () => {
should(res.body).matchEach(group => { should(res.body).matchEach(group => {
should(group).have.only.keys('group', 'models'); should(group).have.only.keys('group', 'models');
should(group).have.property('group').be.type('string'); should(group).have.property('group').be.type('string');
should(group).have.property('models', [{_id: '120000000000000000000001', name: 'Model A', url: 'http://model-a.com', label: 'ml/g'}]); should(group).have.property('models', [{_id: '120000000000000000000001', name: 'Model A', url: 'http://model-a.com'}]);
}); });
done(); done();
}); });
@ -77,7 +76,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {basic: 'admin'}, auth: {basic: 'admin'},
httpStatus: 200, httpStatus: 200,
req: {name: 'Model C', url: 'http://model-c.com', label: 'ml/g'} req: {name: 'Model C', url: 'http://model-c.com'}
}).end((err, res) => { }).end((err, res) => {
if (err) return done(err); if (err) return done(err);
should(res.body).be.eql({status: 'OK'}); should(res.body).be.eql({status: 'OK'});
@ -85,7 +84,6 @@ describe('/model', () => {
if (err) return done(err); if (err) return done(err);
const model = res.models.find(e => e.name === 'Model C'); const model = res.models.find(e => e.name === 'Model C');
should(model).have.property('url', 'http://model-c.com'); should(model).have.property('url', 'http://model-c.com');
should(model).have.property('label', 'ml/g');
done(); done();
}); });
}); });
@ -96,7 +94,7 @@ describe('/model', () => {
url: '/model/classification', url: '/model/classification',
auth: {basic: 'admin'}, auth: {basic: 'admin'},
httpStatus: 200, httpStatus: 200,
req: {name: 'Model 0.1', url: 'http://model-0-1.com', label: 'group'} req: {name: 'Model 0.1', url: 'http://model-0-1.com'}
}).end((err, res) => { }).end((err, res) => {
if (err) return done(err); if (err) return done(err);
should(res.body).be.eql({status: 'OK'}); should(res.body).be.eql({status: 'OK'});
@ -104,10 +102,9 @@ describe('/model', () => {
if (err) return done(err); if (err) return done(err);
should(res).have.only.keys('_id', 'group', 'models', '__v'); should(res).have.only.keys('_id', 'group', 'models', '__v');
should(res).have.property('group', 'classification'); should(res).have.property('group', 'classification');
should(res.models[0]).have.only.keys('_id', 'name', 'url', 'label'); should(res.models[0]).have.only.keys('_id', 'name', 'url');
should(res.models[0]).have.property('name', 'Model 0.1'); should(res.models[0]).have.property('name', 'Model 0.1');
should(res.models[0]).have.property('url', 'http://model-0-1.com'); should(res.models[0]).have.property('url', 'http://model-0-1.com');
should(res.models[0]).have.property('label', 'group');
done(); done();
}); });
}); });
@ -118,7 +115,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {basic: 'admin'}, auth: {basic: 'admin'},
httpStatus: 200, httpStatus: 200,
req: {name: 'Model A', url: 'http://model-a-new.com', label: 'ml/cm3'} req: {name: 'Model A', url: 'http://model-a-new.com'}
}).end((err, res) => { }).end((err, res) => {
if (err) return done(err); if (err) return done(err);
should(res.body).be.eql({status: 'OK'}); should(res.body).be.eql({status: 'OK'});
@ -126,26 +123,6 @@ describe('/model', () => {
if (err) return done(err); if (err) return done(err);
const model = res.models.find(e => e.name === 'Model A'); const model = res.models.find(e => e.name === 'Model A');
should(model).have.property('url', 'http://model-a-new.com'); should(model).have.property('url', 'http://model-a-new.com');
should(model).have.property('label', 'ml/cm3');
done();
});
});
});
it('accepts an empty label', done => {
TestHelper.request(server, done, {
method: 'post',
url: '/model/VN',
auth: {basic: 'admin'},
httpStatus: 200,
req: {name: 'Model C', url: 'http://model-c.com', label: ''}
}).end((err, res) => {
if (err) return done(err);
should(res.body).be.eql({status: 'OK'});
ModelModel.findOne({group: 'VN'}).lean().exec((err, res) => {
if (err) return done(err);
const model = res.models.find(e => e.name === 'Model C');
should(model).have.property('url', 'http://model-c.com');
should(model).have.property('label', '');
done(); done();
}); });
}); });
@ -156,7 +133,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {basic: 'admin'}, auth: {basic: 'admin'},
httpStatus: 400, httpStatus: 400,
req: {name: '', url: 'http://model-c.com', label: 'ml/g'}, req: {name: '', url: 'http://model-c.com'},
res:{status: 'Invalid body format', details: '"name" is not allowed to be empty'} res:{status: 'Invalid body format', details: '"name" is not allowed to be empty'}
}); });
}); });
@ -166,7 +143,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {basic: 'admin'}, auth: {basic: 'admin'},
httpStatus: 400, httpStatus: 400,
req: {url: 'http://model-c.com', label: 'ml/g'}, req: {url: 'http://model-c.com'},
res:{status: 'Invalid body format', details: '"name" is required'} res:{status: 'Invalid body format', details: '"name" is required'}
}); });
}); });
@ -176,7 +153,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {basic: 'admin'}, auth: {basic: 'admin'},
httpStatus: 400, httpStatus: 400,
req: {name: 'Model C', url: 'model-c', label: 'ml/g'}, req: {name: 'Model C', url: 'model-c'},
res:{status: 'Invalid body format', details: '"url" must be a valid uri'} res:{status: 'Invalid body format', details: '"url" must be a valid uri'}
}); });
}); });
@ -186,7 +163,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {basic: 'admin'}, auth: {basic: 'admin'},
httpStatus: 400, httpStatus: 400,
req: {name: 'Model C', label: 'ml/g'}, req: {name: 'Model C'},
res:{status: 'Invalid body format', details: '"url" is required'} res:{status: 'Invalid body format', details: '"url" is required'}
}); });
}); });
@ -196,7 +173,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {basic: 'janedoe'}, auth: {basic: 'janedoe'},
httpStatus: 403, httpStatus: 403,
req: {name: 'Model C', url: 'http://model-c.com', label: 'ml/g'} req: {name: 'Model C', url: 'http://model-c.com'}
}); });
}); });
it('rejects an API key', done => { it('rejects an API key', done => {
@ -205,7 +182,7 @@ describe('/model', () => {
url: '/model/VN', url: '/model/VN',
auth: {key: 'admin'}, auth: {key: 'admin'},
httpStatus: 401, httpStatus: 401,
req: {name: 'Model C', url: 'http://model-c.com', label: 'ml/g'} req: {name: 'Model C', url: 'http://model-c.com'}
}); });
}); });
it('rejects an unauthorized request', done => { it('rejects an unauthorized request', done => {
@ -213,7 +190,7 @@ describe('/model', () => {
method: 'post', method: 'post',
url: '/model/VN', url: '/model/VN',
httpStatus: 401, httpStatus: 401,
req: {name: 'Model C', url: 'http://model-c.com', label: 'ml/g'} req: {name: 'Model C', url: 'http://model-c.com'}
}); });
}); });
}); });
@ -232,10 +209,9 @@ describe('/model', () => {
if (err) return done(err); if (err) return done(err);
should(res).have.only.keys('_id', 'group', 'models'); should(res).have.only.keys('_id', 'group', 'models');
should(res).have.property('group', 'VN'); should(res).have.property('group', 'VN');
should(res.models[0]).have.only.keys('_id', 'name', 'url', 'label'); should(res.models[0]).have.only.keys('_id', 'name', 'url');
should(res.models[0]).have.property('name', 'Model B'); should(res.models[0]).have.property('name', 'Model B');
should(res.models[0]).have.property('url', 'http://model-b.com'); should(res.models[0]).have.property('url', 'http://model-b.com');
should(res.models[0]).have.property('label', 'ml/g');
done(); done();
}); });
}); });

1
src/routes/model.ts
View File

@ -33,7 +33,6 @@ router.post('/model/:group', (req, res, next) => {
if (!req.auth(res, ['dev', 'admin'], 'basic')) return; if (!req.auth(res, ['dev', 'admin'], 'basic')) return;
const {error, value: model} = ModelValidate.input(req.body); const {error, value: model} = ModelValidate.input(req.body);
console.log(error);
if (error) return res400(error, res); if (error) return res400(error, res);
ModelModel.findOne({group: req.params.group}).lean().exec((err, data) => { ModelModel.findOne({group: req.params.group}).lean().exec((err, data) => {

5
src/routes/validate/model.ts
View File

@ -16,11 +16,6 @@ export default class ModelValidate { // validate input for model
url: Joi.string() url: Joi.string()
.uri() .uri()
.max(512) .max(512)
.required(),
label: Joi.string()
.allow('')
.max(128)
.required() .required()
}) })
}; };

9
src/test/db.json
View File

@ -736,14 +736,12 @@
{ {
"_id": {"$oid":"120000000000000000000001"}, "_id": {"$oid":"120000000000000000000001"},
"name": "Model A", "name": "Model A",
"url": "http://model-a.com", "url": "http://model-a.com"
"label": "ml/g"
}, },
{ {
"_id": {"$oid":"120000000000000000000002"}, "_id": {"$oid":"120000000000000000000002"},
"name": "Model B", "name": "Model B",
"url": "http://model-b.com", "url": "http://model-b.com"
"label": "ml/g"
} }
] ]
}, },
@ -753,8 +751,7 @@
{ {
"_id": {"$oid":"120000000000000000000003"}, "_id": {"$oid":"120000000000000000000003"},
"name": "Model 1", "name": "Model 1",
"url": "http://model-1.com", "url": "http://model-1.com"
"label": "weight %"
} }
] ]
} }