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

Implemented filters for no condition or measurement

Browse Source
This commit is contained in:
VLE2FE
2020-09-02 16:19:40 +02:00
parent bdff2c96d3
commit 364ad1964e
4 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/routes/sample.spec.ts
View File

@@ -440,6 +440,48 @@ describe('/sample', () => {
done();
});
});
it('filters for empty conditions', done => {
TestHelper.request(server, done, {
method: 'get',
url: '/samples?status[]=new&status[]=validated&fields[]=number&fields[]=condition&filters[]=%7B%22mode%22%3A%22eq%22%2C%22field%22%3A%22condition%22%2C%22values%22%3A%5B%7B%7D%5D%7D',
auth: {basic: 'janedoe'},
httpStatus: 200
}).end((err, res) => {
if (err) return done(err);
const json = require('../test/db.json');
should(res.body).have.lengthOf(
json.collections.samples
.filter(e => e.status !== 'deleted')
.filter(e => Object.keys(e.condition).length === 0)
.length
);
should(res.body).matchEach(sample => {
should(sample.condition).be.eql({});
});
done();
});
});
it('filters for samples without measurements', done => {
TestHelper.request(server, done, {
method: 'get',
url: '/samples?status[]=new&status[]=validated&fields[]=number&fields[]=_id&filters[]=%7B%22mode%22%3A%22eq%22%2C%22field%22%3A%22measurements%22%2C%22values%22%3A%5Bnull%5D%7D',
auth: {basic: 'janedoe'},
httpStatus: 200
}).end((err, res) => {
if (err) return done(err);
const json = require('../test/db.json');
should(res.body).have.lengthOf(
json.collections.samples
.filter(e => e.status !== 'deleted')
.filter(e => !json.collections.measurements.find(el => el.sample_id.toString() === e._id.toString()))
.length
);
should(res.body).matchEach(sample => {
should(json.collections.measurements.find(el => el.sample_id.toString() === sample._id)).be.eql(undefined);
});
done();
});
});
it('returns comment fields', done => {
TestHelper.request(server, done, {
method: 'get',

9
src/routes/sample.ts
View File

@@ -219,6 +219,15 @@ router.get('/samples', async (req, res, next) => {
}
}
if (sortFilterKeys.find(e => e === 'measurements')) { // filter for samples without measurements
queryPtr.push({$lookup: {
from: 'measurements', let: {sId: '$_id'},
pipeline: [{$match:{$expr:{$and:[{$eq:['$sample_id','$$sId']}]}}}, {$project: {_id: true}}],
as: 'measurementCount'
}},
{$match: {measurementCount: {$size: 0}}}
);
}
const measurementFilterFields = _.uniq(sortFilterKeys.filter(e => /measurements\./.test(e))
.map(e => e.split('.')[1])); // filter measurement names and remove duplicates from parameters
if (sortFilterKeys.find(e => /measurements\./.test(e))) { // add measurement fields

8
src/routes/validate/sample.ts
View File

@@ -98,6 +98,7 @@ export default class SampleValidate {
'user_id',
'material._id',
'material.numbers',
'measurements',
`measurements.${globals.spectrum.spectrum}.${globals.spectrum.dpt}`,
];
@@ -226,6 +227,12 @@ export default class SampleValidate {
});
field = 'value';
}
else if (field === 'measurements') {
validator = Joi.object({
value: Joi.object({}).allow(null).disallow({})
});
field = 'value';
}
else if (field === 'notes.comment') {
field = 'comment';
validator = this.sample.notes
@@ -234,6 +241,7 @@ export default class SampleValidate {
validator = Joi.object(this.sample);
}
const {value, error} = validator.validate({[field]: e});
console.log(error);
if (error) throw error; // reject invalid values
return value[field];
});