Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue-78-data filtering added #96

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions src/routes/datas/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Joi from 'joi';
import { Op } from 'sequelize';

import models from '../../models';

Expand Down Expand Up @@ -204,6 +205,80 @@ const deleteById = async (req, res, next) => {
}
};

const getDataByDate = async (req, res, next) => {
const { id ,startDate,endDate} = req.params;
try {
const data = await models.datas.findAll({
where: {
dataset_id:id,
created_at: { [Op.and]: [{ [Op.gte]: startDate }, { [Op.lte]: endDate }] }
},
});
if(data.length > 0){
res.send({
data,
});
}else {
res.send({
errors: [
{
message: 'Data not found in this time interval',
},
],
});
}

} catch (error) {
return res.send({
errors: [
{
message: err.message,
},
],
});
}
}

const getDataByLocation = async (req,res,next) => {
const {applicationId,datasetId,longitude, latitude} = req.params;
const application = await models.locations.findOne({

where: {
application_id:applicationId,
longitude: { [Op.lte]: longitude },
latitude:{ [Op.lte]: latitude },
},
});
if(!application){
res.send({
errors: [
{
message: 'Application not found in this location',
},
],
});
}

const data = await models.datas.findAll({
where: {
dataset_id:datasetId,
},
});

if(!data){
res.send({
errors: [
{
message: 'Data not found in this location',
},
],
});
}
res.send({
data,
});
}

export default {
prefix: '/datas',
inject: (router) => {
Expand All @@ -212,5 +287,8 @@ export default {
router.post('/', add);
router.put('/update', update);
router.delete('/:id', deleteById);
router.get('/data-sets/:id/:startDate/:endDate',getDataByDate);
router.get('/application/:applicationId/data-sets/:datasetId/:longitude/:latitude',getDataByLocation);

},
};