danak/asan-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix json style

Browse Source
This commit is contained in:
Mr Swift
2024-08-19 00:04:35 +03:30
parent 1faa12e156
commit dc2189c269
8 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/_env.js
+2 -2
View File
@@ -1,7 +1,7 @@
const EnvirementVariables = { const EnvirementVariables = {
// node envirements // node envirements
isDev: process.env.NODE_ENV === 'development', // isDev: process.env.NODE_ENV === 'development',
// isDev: true, isDev: true,
isProduction: process.env.NODE_ENV === 'production', isProduction: process.env.NODE_ENV === 'production',
// server ports // server ports
server/controllers/GPS.Award.js
+12 -8
View File
@@ -16,10 +16,12 @@ module.exports.createAward = [
const { score, title, desc, expireDate } = req.body; const { score, title, desc, expireDate } = req.body;
const fixDate = new Date(expireDate) const fixDate = new Date(expireDate)
const award = await Award.create({ score, title, desc, expireDate:fixDate }) const award = await Award.create({ score, title, desc, expireDate:fixDate })
res.status(201).json({ // res.status(201).json({
msg: _sr.fa.response.success_save, // msg: _sr.fa.response.success_save,
data: award // data: award
}) // })
res.status(201).json(award)
} }
] ]
@@ -72,10 +74,12 @@ module.exports.update =[
data.desc = desc; data.desc = desc;
data.expireDate = new Date(expireDate) data.expireDate = new Date(expireDate)
data.save() data.save()
res.status(200).json({ // res.status(200).json({
msg: _sr.fa.response.success_save, // msg: _sr.fa.response.success_save,
data // data
}) // })
res.status(201).json(data)
} }
} }
server/controllers/GPS.AwardRequest.js
+3 -1
View File
@@ -26,7 +26,9 @@ module.exports.sendRequest = [
awardId:req.body.awardId, awardId:req.body.awardId,
userId:req.user_id 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{ }else{
res.status(400).json({ msg: "امتیاز شما برای این مورد کافی نیست" }) res.status(400).json({ msg: "امتیاز شما برای این مورد کافی نیست" })
server/controllers/GPS.BankAccount.js
+3 -1
View File
@@ -65,6 +65,8 @@ module.exports.deleteCard = [
}, },
{ new:true } { new:true }
).select('id cardBank') ).select('id cardBank')
res.status(200).json({ msg: "با موفقیت حذف شد ", data: userData }) // res.status(200).json({ msg: "با موفقیت حذف شد ", data: userData })
res.status(201).json(userData)
} }
] ]
server/controllers/GPS.Device.js
+9 -3
View File
@@ -25,7 +25,9 @@ module.exports.addCode = [
checkValidations(validationResult), checkValidations(validationResult),
async (req, res) => { async (req, res) => {
const data = await Device.create(req.body) 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 exelFile = await readXlsxFile(Buffer.from(file.data));
const data = await creator(exelFile) 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) { } catch (error) {
@@ -136,7 +140,9 @@ module.exports.updateDevice = [
}, },
{ new: true } { 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)
} }
] ]
server/controllers/GPS.InstalledDevice.js
+10 -5
View File
@@ -1,5 +1,4 @@
const { body, param, validationResult } = require('express-validator'); const { body, param, validationResult } = require('express-validator');
const { _sr } = require('../plugins/serverResponses');
const { checkValidations } = require('../plugins/controllersHelperFunctions'); const { checkValidations } = require('../plugins/controllersHelperFunctions');
const User = require('../models/User'); const User = require('../models/User');
const InstalledDevice = require('../models/GPS.InstalledDevice'); const InstalledDevice = require('../models/GPS.InstalledDevice');
@@ -30,7 +29,9 @@ module.exports.deviceRegistration = [
const newRequest = await InstalledDevice.create(data); const newRequest = await InstalledDevice.create(data);
device.status = 1; device.status = 1;
device.save() 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)
} }
} }
] ]
@@ -130,7 +131,7 @@ module.exports.updateInstalled = [
await Score.create({ await Score.create({
title:"ثبت دستگاه", title: "ثبت دستگاه",
deviceId: device.id, deviceId: device.id,
score: device.score, score: device.score,
userId: installedDevice.userId userId: installedDevice.userId
@@ -138,7 +139,9 @@ module.exports.updateInstalled = [
user.save() user.save()
device.save() device.save()
installedDevice.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; break;
} }
case "reject": { case "reject": {
@@ -146,7 +149,9 @@ module.exports.updateInstalled = [
installedDevice.save() installedDevice.save()
device.status = 0; device.status = 0;
device.save() 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; break;
} }
default: { default: {
server/controllers/GPS.Request.js
+12 -4
View File
@@ -26,7 +26,9 @@ module.exports.gpsRequest = [
profilePic, profilePic,
userId: req.user_id, 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 } { new: true }
).select('first_name last_name') ).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{ }else{
const userData = await User.findByIdAndUpdate( const userData = await User.findByIdAndUpdate(
@@ -116,7 +120,9 @@ module.exports.changeStatus = [
}, },
{ new: true } { new: true }
).select('first_name last_name') ).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; break;
@@ -128,7 +134,9 @@ module.exports.changeStatus = [
}, },
{ new: true }) { new: true })
res.status(200).json({ msg: 'با موفقیت به روز شد', data }) // res.status(200).json({ msg: 'با موفقیت به روز شد', data })
res.status(201).json(data)
break; break;
} }
default: default:
server/controllers/GPS.Withdraw.js
+9 -3
View File
@@ -29,7 +29,9 @@ module.exports.createRequest = [
user.dollarBalance = 0; user.dollarBalance = 0;
user.walletBalance = 0; user.walletBalance = 0;
user.save() 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) { } catch (error) {
@@ -113,7 +115,9 @@ module.exports.updateReq = [
case "accept": { case "accept": {
request.status = 1; request.status = 1;
request.save() 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; break;
} }
case "deposit": { case "deposit": {
@@ -121,7 +125,9 @@ module.exports.updateReq = [
request.depositDate = new Date(); request.depositDate = new Date();
request.trackingNumber = req.body.trackingNumber || 0; request.trackingNumber = req.body.trackingNumber || 0;
request.save() 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; break;
} }
default: { default: {