From d20763408a282201b362972d884541ad41e9df1c Mon Sep 17 00:00:00 2001
From: Naidu <leelasoma@armintasolutions.com>
Date: Fri, 28 Jun 2024 16:15:30 +0530
Subject: [PATCH] changes

---
 src/controllers/storeController.js |  8 +++++++-
 src/index.js                       | 15 ++++++++-------
 src/models/store.js                | 14 +++++++-------
 src/routes/storeRoute.js           |  1 +
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/controllers/storeController.js b/src/controllers/storeController.js
index 423dc264..02d0153a 100644
--- a/src/controllers/storeController.js
+++ b/src/controllers/storeController.js
@@ -16,6 +16,8 @@ exports.installSignUp = async (request, reply) => {
         //name,
         phone,
         address,
+        address1,
+        address2,
         installationId,
         emails,
         password,
@@ -28,6 +30,7 @@ exports.installSignUp = async (request, reply) => {
         alternativeNumber,
         firstName,
         lastName,
+        city,
         createdBy,
         updatedBy,
       } = request.body;
@@ -51,7 +54,9 @@ exports.installSignUp = async (request, reply) => {
       const install = new Install({
         //name,
         phone,
-        address,
+        address, 
+         address1,
+        address2,
         installationId,
         emails,
         services: { password: { bcrypt: hashedPassword } },
@@ -64,6 +69,7 @@ exports.installSignUp = async (request, reply) => {
         alternativeNumber,
         firstName,
         lastName,
+        city,
         createdBy,
         updatedBy,
 
diff --git a/src/index.js b/src/index.js
index 6074f290..938b5624 100644
--- a/src/index.js
+++ b/src/index.js
@@ -279,9 +279,9 @@ fastify.post("/api/login", {
 
 fastify.post("/api/installotplogin", {
   schema: {
-    description: "This is for Login Otp Boy",
+    description: "This is for Login Otp Installation",
     tags: ["Install"],
-    summary: "This is for Login Otp Boy",
+    summary: "This is for Login Otp Installation",
     body: {
       type: "object",
       required: ["phone", "phoneVerificationCode"],
@@ -340,7 +340,7 @@ fastify.post("/api/installotplogin", {
             } else {
               const token = fastify.jwt.sign(
                 {
-                  name: user.name,
+                  firstName: user.firstName,
                 },
                 { expiresIn: "30d" }
               );
@@ -348,7 +348,7 @@ fastify.post("/api/installotplogin", {
               const profilePicture = await ProfilePictureInstall.findOne({
                 customerId: user._id,
               });
-
+console.log(user)
               const responsePayload = {
                 simplydata: {
                   error: false,
@@ -356,9 +356,9 @@ fastify.post("/api/installotplogin", {
                   access_token: token,
                   email: user.emails,
                   phone: user.phone,
-                  name: user.name,
-                  address1: user.profile.address1,
-                  address2: user.profile.address2,
+                  //name: user.name,
+                  address1: user.address1,
+                  address2: user.address2,
                   phoneVerified: user.phoneVerified,
                   oneTimePasswordSetFlag: user.oneTimePasswordSetFlag,
                   type: user.profile.role,
@@ -368,6 +368,7 @@ fastify.post("/api/installotplogin", {
                   manager: user.manager,
                   firstName: user.firstName,
                   lastName: user.lastName,
+                  address: user.address,
                   alternativeNumber: user.alternativeNumber,
                 },
               };
diff --git a/src/models/store.js b/src/models/store.js
index 8c81f868..1f11d440 100644
--- a/src/models/store.js
+++ b/src/models/store.js
@@ -15,14 +15,14 @@ const installationschema = new mongoose.Schema({
     oneTimePasswordSetFlag: { type: Boolean, default: false },
     emails: [{ email: String, verified: { type: Boolean, default: false } }],
     services: { password: { bcrypt: String } },
-    
+    alternativeNumber: { type: String, default: null },
+    firstName: { type: String, default: null },
+    lastName: { type: String, default: null },
+    address1: { type: String, default: null },
+    address2: { type: String, default: null },
+    city: { type: String, default: null },
     profile: {
-      alternativeNumber: { type: String, default: null },
-      firstName: { type: String, default: null },
-      lastName: { type: String, default: null },
-      address1: { type: String, default: null },
-      address2: { type: String, default: null },
-      city: { type: String, default: null },
+     
       state: { type: String, default: null },
       country: { type: String, default: null },
     },
diff --git a/src/routes/storeRoute.js b/src/routes/storeRoute.js
index 18af0a14..c131b5a2 100644
--- a/src/routes/storeRoute.js
+++ b/src/routes/storeRoute.js
@@ -28,6 +28,7 @@ module.exports = function (fastify, opts, next) {
               //name: { type: 'string' },
               team: { type: 'string', default: null },
               manager: { type: 'string', default: null },
+              address: { type: 'string', default: null },
               address1: { type: 'string', default: null },
               address2: { type: 'string', default: null },
               city: { type: 'string', default: null },