Modify api to take more shelter details

Author: rohitrp

server/api/shelters/model/Shelter.js

@@ -1,5 +1,6 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
+var moment = require('moment-timezone');
 
 const shelterModel = new Schema({
     name: { type: String, required: true },
@@ -8,6 +9,21 @@ const shelterModel = new Schema({
     city: { type: String, required: true },
     state: { type: String, required: true },
     user: { type: Schema.Types.ObjectId, ref: 'User' },
-    lngLat: { type: String, required: true }
+    lngLat: { type: String, required: true },
+    zipcode: { type: String, required: true },
+    propertyType: { type: String, },
+    infantFriendly: { type: String },
+    elderFriendly: { type: String },
+    official: { type: Boolean, default: false },
+    lastUpdated: { type: Date },
+    family: { type: String },
+    familyAgeMin: { type: String },
+    familyAgeMax: { type: String }
 });
+
+shelterModel.pre('save', function(next) {
+    this.lastUpdated = moment();
+    next();
+});
+
 module.exports = mongoose.model('Shelter', shelterModel);

server/api/shelters/routes/addShelter.js

@@ -6,15 +6,9 @@ module.exports = {
   path: '/api/shelters',
   options: {
     handler: async (request, h) => {
-        let shelter = new Shelter()
+        let shelter = new Shelter(request.payload)
 
-        shelter.name = request.payload.name
-        shelter.contact = request.payload.contact
-        shelter.address = request.payload.address
-        shelter.city = request.payload.city
-        shelter.state = request.payload.state
         shelter.user = request.auth.credentials.id
-        shelter.lngLat = request.payload.lngLat
 
         await shelter.save()
 
@@ -23,9 +17,9 @@ module.exports = {
       auth: {
         strategy: 'jwt'
       },
-      validate: {
-        payload: addShelterSchema
-      },
+      // validate: {
+      //   payload: addShelterSchema
+      // },
       description: 'Add shelter',
       notes: 'Adds shelter',
       tags: ['api', 'shelter']

server/api/shelters/schemas/addShelter.js

@@ -6,7 +6,8 @@ const addShelterSchema = Joi.object().keys({
   address: Joi.string().required(),
   city: Joi.string().required(),
   state: Joi.string().required(),
-  lngLat: Joi.string().required()
+  lngLat: Joi.string().required(),
+  zipcode: Joi.string().required()
 })
 
 module.exports = addShelterSchema

server/api/users/util/token.js

@@ -13,7 +13,7 @@ function createToken(user) {
         SECRET, 
         { 
             algorithm: 'HS256', 
-            expiresIn: '1h' 
+            expiresIn: '10h' 
         }
     )
 }

server/package-lock.json

@@ -18,6 +18,8 @@
     "inert": "^5.1.0",
     "joi": "^14.0.1",
     "jsonwebtoken": "^8.3.0",
+    "moment": "^2.24.0",
+    "moment-timezone": "^0.5.23",
     "mongoose": "^5.3.6",
     "request": "^2.88.0",
     "request-promise": "^4.2.2",