fix: Fix tracking issues and remove active_load from user model

v1/src/lib/Handlers/Account/index.js

@@ -71,7 +71,7 @@ async function login( email , password ){
     let safe_password = toSha256( password + pwd_secret );
     const user = await UserModel.findOne({
         email , password : safe_password
-    },{ password : 0 , session_token : 0 , session_token_exp : 0 }).populate('company');
+    },{ password : 0 , session_token : 0 , session_token_exp : 0 }).populate(['company','vehicle']);
     return user;
 }
 
@@ -79,7 +79,7 @@ async function login_with_session_token( session_token ){
     const user = await UserModel.findOne({
         session_token,
         session_token_exp : { $gte: new Date() }
-    },{ password : 0 , session_token : 0 , session_token_exp : 0 }).populate('company');
+    },{ password : 0 , session_token : 0 , session_token_exp : 0 }).populate(['company','vehicle']);
     return user;
 }
 

v1/src/lib/Handlers/Users.handler.js

@@ -7,7 +7,7 @@ const { getPagination } = require( `${ROOT_PATH}/${LIB_PATH}/Misc.js` );
 const usersModel = getModel('users');
 const companiesModel = getModel('companies');
 
-const populate_list = ['company','branch','vehicle','active_load','categories'];
+const populate_list = ['company','branch','vehicle','categories'];
 const generic = new GenericHandler( usersModel, "first_name", populate_list );
 
 async function getUserById( id , filter ){

v1/src/lib/Models/users.model.js

@@ -35,8 +35,6 @@ const schema = new Schema({
 
     vehicle: { type: Schema.Types.ObjectId, ref: 'vehicles' },
 
-    active_load: { type: Schema.Types.ObjectId, ref: 'loads' },
-
     categories: [{ type: Schema.Types.ObjectId, ref: 'productcategories' }],
     user_city: [{ type: String }],
     user_state: [{ type: String }],

v1/src/lib/Models/vehicles.model.js

@@ -1,18 +1,6 @@
 const mongoose = require('mongoose');
 const { Schema } = mongoose;
 
-const pointSchema = new Schema({
-    type: {
-        type: String,
-        enum: ['Point'],
-        required: true
-    },
-    coordinates: {
-        type: [Number],
-        required: true
-    }
-});
-
 const schema = new Schema({
     company: { type: Schema.Types.ObjectId, ref: 'companies', required: true }, // carrier
     company_name : { type: String, required: true },
@@ -50,7 +38,6 @@ const schema = new Schema({
 
     last_location_lat: { type: String },
     last_location_lng: { type: String },
-    last_location_geo: { type: pointSchema },
     last_location_time: { type: Date },
     createdAt: { type : Date, required : true, default : () => { return Date.now(); } }
 });