Merge

server/controllers/GPS.User.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-unused-vars */
 const bcrypt = require('bcryptjs')
 const { body, validationResult, param } = require('express-validator')
+const uid = require('uuid')
 const User = require('../models/GPS.User')
 const { _sr } = require('../plugins/serverResponses')
 const { SMS } = require('../plugins/SMS_Module')
@@ -130,6 +131,9 @@ module.exports.register_user = [
     checkValidations(validationResult),
     async (req, res) => {
         try {
+            const provinceId = uid.v4()
+            const cityId = uid.v4()
+
             const {
                 first_name,
                 last_name,
@@ -143,8 +147,8 @@ module.exports.register_user = [
 
             const data = {
                 last_name,
-                province_name,
-                city_name,
+                province_name:{id:provinceId,provinceName:province_name},
+                city_name:{id:cityId,cityName:city_name},
                 shopName
             }
             data.first_name = nameOptimizer(first_name)
@@ -250,7 +254,8 @@ module.exports.update_user = [
                 req.params.id,
                 data
             )
-            return res.json({ message: _faSr.response.success_save })
+            const user = await User.findById(req.params.id)
+            return res.json({ message: _faSr.response.success_save ,user })
         } catch (err) {
             const registerFailurMsg = 'مشکلی در به روز رسانی پیش آمده، لطفا مجددا تلاش کنید'
             throw new Error(registerFailurMsg)
@@ -383,7 +388,7 @@ module.exports.resetpass_otp = [
 module.exports.getCurrent = async (req, res) => {
     const user = await User.findById(req.user_id).select('-password -token -otp -seenByAdmin')
     if (!user || !user.active) return res.ststus(404).json({ msg: _sr.fa.not_found.user_id })
-    else return res.status(200).json(user)
+    else return res.status(200).json({user})
 }
 
 module.exports.getUsersForAdmin = async (req, res) => {