From dc2189c269063723073df100e9b9c3a2c5e61f39 Mon Sep 17 00:00:00 2001 From: Mr Swift Date: Mon, 19 Aug 2024 00:04:35 +0330 Subject: [PATCH] Fix json style --- server/_env.js | 4 ++-- server/controllers/GPS.Award.js | 20 ++++++++++++-------- server/controllers/GPS.AwardRequest.js | 4 +++- server/controllers/GPS.BankAccount.js | 4 +++- server/controllers/GPS.Device.js | 12 +++++++++--- server/controllers/GPS.InstalledDevice.js | 23 ++++++++++++++--------- server/controllers/GPS.Request.js | 16 ++++++++++++---- server/controllers/GPS.Withdraw.js | 12 +++++++++--- 8 files changed, 64 insertions(+), 31 deletions(-) diff --git a/server/_env.js b/server/_env.js index dc682a3..1d75de1 100644 --- a/server/_env.js +++ b/server/_env.js @@ -1,7 +1,7 @@ const EnvirementVariables = { // node envirements - isDev: process.env.NODE_ENV === 'development', -// isDev: true, + // isDev: process.env.NODE_ENV === 'development', + isDev: true, isProduction: process.env.NODE_ENV === 'production', // server ports diff --git a/server/controllers/GPS.Award.js b/server/controllers/GPS.Award.js index 54c83b5..456d98a 100644 --- a/server/controllers/GPS.Award.js +++ b/server/controllers/GPS.Award.js @@ -16,10 +16,12 @@ module.exports.createAward = [ const { score, title, desc, expireDate } = req.body; const fixDate = new Date(expireDate) const award = await Award.create({ score, title, desc, expireDate:fixDate }) - res.status(201).json({ - msg: _sr.fa.response.success_save, - data: award - }) + // res.status(201).json({ + // msg: _sr.fa.response.success_save, + // data: award + // }) + res.status(201).json(award) + } ] @@ -72,10 +74,12 @@ module.exports.update =[ data.desc = desc; data.expireDate = new Date(expireDate) data.save() - res.status(200).json({ - msg: _sr.fa.response.success_save, - data - }) + // res.status(200).json({ + // msg: _sr.fa.response.success_save, + // data + // }) + res.status(201).json(data) + } } diff --git a/server/controllers/GPS.AwardRequest.js b/server/controllers/GPS.AwardRequest.js index cdeda43..09deb91 100644 --- a/server/controllers/GPS.AwardRequest.js +++ b/server/controllers/GPS.AwardRequest.js @@ -26,7 +26,9 @@ module.exports.sendRequest = [ awardId:req.body.awardId, userId:req.user_id }) - res.status(200).json({ msg:_sr.fa.response.success_save, data}) + // res.status(200).json({ msg:_sr.fa.response.success_save, data}) + res.status(201).json(data) + }else{ res.status(400).json({ msg: "امتیاز شما برای این مورد کافی نیست" }) diff --git a/server/controllers/GPS.BankAccount.js b/server/controllers/GPS.BankAccount.js index 56855c5..1e8fe72 100644 --- a/server/controllers/GPS.BankAccount.js +++ b/server/controllers/GPS.BankAccount.js @@ -65,6 +65,8 @@ module.exports.deleteCard = [ }, { new:true } ).select('id cardBank') - res.status(200).json({ msg: "با موفقیت حذف شد ", data: userData }) + // res.status(200).json({ msg: "با موفقیت حذف شد ", data: userData }) + res.status(201).json(userData) + } ] \ No newline at end of file diff --git a/server/controllers/GPS.Device.js b/server/controllers/GPS.Device.js index 4167d01..0da37d8 100644 --- a/server/controllers/GPS.Device.js +++ b/server/controllers/GPS.Device.js @@ -25,7 +25,9 @@ module.exports.addCode = [ checkValidations(validationResult), async (req, res) => { const data = await Device.create(req.body) - res.status(201).json({ msg: _sr.fa.response.success_save, data }) + // res.status(201).json({ msg: _sr.fa.response.success_save, data }) + res.status(201).json(data) + } ] @@ -39,7 +41,9 @@ module.exports.importExel = async (req, res) => { const exelFile = await readXlsxFile(Buffer.from(file.data)); const data = await creator(exelFile) - res.status(201).json({ msg: _sr.fa.response.success_save, data }) + // res.status(201).json({ msg: _sr.fa.response.success_save, data }) + res.status(201).json(data) + } catch (error) { @@ -136,7 +140,9 @@ module.exports.updateDevice = [ }, { new: true } ) - res.status(200).json({ msg: _sr.fa.response.success_save, data }) + // res.status(200).json({ msg: _sr.fa.response.success_save, data }) + res.status(200).json(data) + } ] diff --git a/server/controllers/GPS.InstalledDevice.js b/server/controllers/GPS.InstalledDevice.js index 915441d..d2838f2 100644 --- a/server/controllers/GPS.InstalledDevice.js +++ b/server/controllers/GPS.InstalledDevice.js @@ -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: { diff --git a/server/controllers/GPS.Request.js b/server/controllers/GPS.Request.js index 78ef4a6..401058f 100644 --- a/server/controllers/GPS.Request.js +++ b/server/controllers/GPS.Request.js @@ -26,7 +26,9 @@ module.exports.gpsRequest = [ profilePic, userId: req.user_id, }) - res.status(201).json({ msg: 'درخواست شما با موفقیت ثبت شد', date: request }) + // res.status(201).json({ msg: 'درخواست شما با موفقیت ثبت شد', date: request }) + res.status(201).json(request) + } } @@ -100,7 +102,9 @@ module.exports.changeStatus = [ }, { new: true } ).select('first_name last_name') - res.status(200).json({ msg: 'با موفقیت به روز شد', data: userData }) + // res.status(200).json({ msg: 'با موفقیت به روز شد', data: userData }) + res.status(201).json(userData) + }else{ const userData = await User.findByIdAndUpdate( @@ -116,7 +120,9 @@ module.exports.changeStatus = [ }, { new: true } ).select('first_name last_name') - res.status(200).json({ msg: 'با موفقیت به روز شد', data: userData }) + // res.status(200).json({ msg: 'با موفقیت به روز شد', data: userData }) + res.status(200).json(userData) + } break; @@ -128,7 +134,9 @@ module.exports.changeStatus = [ }, { new: true }) - res.status(200).json({ msg: 'با موفقیت به روز شد', data }) + // res.status(200).json({ msg: 'با موفقیت به روز شد', data }) + res.status(201).json(data) + break; } default: diff --git a/server/controllers/GPS.Withdraw.js b/server/controllers/GPS.Withdraw.js index 4f016cf..1e30b7c 100644 --- a/server/controllers/GPS.Withdraw.js +++ b/server/controllers/GPS.Withdraw.js @@ -29,7 +29,9 @@ module.exports.createRequest = [ user.dollarBalance = 0; user.walletBalance = 0; user.save() - res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + // res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + res.status(201).json(request) + } } catch (error) { @@ -113,7 +115,9 @@ module.exports.updateReq = [ case "accept": { request.status = 1; request.save() - res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + // res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + res.status(201).json(request) + break; } case "deposit": { @@ -121,7 +125,9 @@ module.exports.updateReq = [ request.depositDate = new Date(); request.trackingNumber = req.body.trackingNumber || 0; request.save() - res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + // res.status(201).json({ msg: _sr.fa.response.success_save, data: request }) + res.status(201).json(request) + break; } default: {