Fix json style
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
const { body, param, validationResult } = require('express-validator');
|
||||
const { _sr } = require('../plugins/serverResponses');
|
||||
const { checkValidations } = require('../plugins/controllersHelperFunctions');
|
||||
const User = require('../models/User');
|
||||
const InstalledDevice = require('../models/GPS.InstalledDevice');
|
||||
@@ -30,7 +29,9 @@ module.exports.deviceRegistration = [
|
||||
const newRequest = await InstalledDevice.create(data);
|
||||
device.status = 1;
|
||||
device.save()
|
||||
res.status(201).json({ msg: _sr.fa.response.success_save, data: newRequest })
|
||||
// res.status(201).json({ msg: _sr.fa.response.success_save, data: newRequest })
|
||||
res.status(201).json(newRequest)
|
||||
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -61,7 +62,7 @@ module.exports.getAllForUser = async (req, res) => {
|
||||
const data = await InstalledDevice.find({
|
||||
userId: req.user_id,
|
||||
$or: [
|
||||
{ IMEI: { $regex: search } },
|
||||
{ IMEI: { $regex: search } },
|
||||
],
|
||||
}).skip(page).limit(rows).sort({ created_at: -1 }).populate('deviceId')
|
||||
|
||||
@@ -88,11 +89,11 @@ module.exports.getAllForAdmin = async (req, res) => {
|
||||
page = req.query.page
|
||||
page = page * rows - rows
|
||||
}
|
||||
const search = req.query?.search ? req.query.search : ""
|
||||
|
||||
const search = req.query?.search ? req.query.search : ""
|
||||
|
||||
const data = await InstalledDevice.find({
|
||||
$or: [
|
||||
{ IMEI: { $regex: search } },
|
||||
{ IMEI: { $regex: search } },
|
||||
]
|
||||
}).sort({ status: 1 }).skip(page).limit(rows)
|
||||
.populate('deviceId')
|
||||
@@ -130,7 +131,7 @@ module.exports.updateInstalled = [
|
||||
|
||||
|
||||
await Score.create({
|
||||
title:"ثبت دستگاه",
|
||||
title: "ثبت دستگاه",
|
||||
deviceId: device.id,
|
||||
score: device.score,
|
||||
userId: installedDevice.userId
|
||||
@@ -138,7 +139,9 @@ module.exports.updateInstalled = [
|
||||
user.save()
|
||||
device.save()
|
||||
installedDevice.save()
|
||||
res.status(201).json({ msg: _sr.fa.response.success_save, data: installedDevice })
|
||||
// res.status(201).json({ msg: _sr.fa.response.success_save, data: installedDevice })
|
||||
res.status(200).json(installedDevice)
|
||||
|
||||
break;
|
||||
}
|
||||
case "reject": {
|
||||
@@ -146,7 +149,9 @@ module.exports.updateInstalled = [
|
||||
installedDevice.save()
|
||||
device.status = 0;
|
||||
device.save()
|
||||
res.status(201).json({ msg: _sr.fa.response.success_save, data: installedDevice })
|
||||
// res.status(201).json({ msg: _sr.fa.response.success_save, data: installedDevice })
|
||||
res.status(200).json(installedDevice)
|
||||
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
|
||||
Reference in New Issue
Block a user