Added pre validation

models/Site.js

@@ -16,7 +16,7 @@ const sitesSchema = new mongoose.Schema({
     address:{
         first_line:{
             type:String,
-            required:[true,'Please enter your address'],
+            required:[true,'Please enter your address']
 
         },
         city:{
@@ -61,11 +61,11 @@ const sitesSchema = new mongoose.Schema({
     charges_param:
         {
             electricity:{
-                type:Number,
+                type:Number
 
             },
             water:{
-                type:Number,
+                type:Number
 
             }
 
@@ -75,7 +75,8 @@ const sitesSchema = new mongoose.Schema({
     Type:{
         enum:['Room','Land','Shops'],
         type:String,
-        required:true
+        required:true,
+        trim: true
     },
 
     alloted_tenant:{
@@ -93,4 +94,13 @@ const sitesSchema = new mongoose.Schema({
 
 },{timestamps:true});
 
+sitesSchema.pre("save", (next) => {
+    if(this.status<2){
+        return Promise.reject("This site is not empty.")
+    }
+    else{
+        return next();
+    }
+})
+
 module.exports = mongoose.models.Site || mongoose.model("Site",sitesSchema)

models/Transaction.js

@@ -1,4 +1,6 @@
 const mongoose = require("mongoose");
+import { sendError } from "/helpers/help";
+var Charge  = require("../models/Charge")
 mongoose.Promise = global.Promise;
 
 const tranSchema = new mongoose.Schema({
@@ -27,4 +29,20 @@ const tranSchema = new mongoose.Schema({
     }
 },{timestamps:true});
 
+tranSchema.pre('save', (next) => {
+    var chargeId = this.charge_id;
+
+    Charge.findById(chargeId, function(err, chargeData){
+        if(err) return sendError(res,err.message,500)
+        else{
+            if(chargeData.isPaid==true){
+                return next();
+            }
+            else{
+                return next("Tenant has not completed the transaction");
+            }
+        }
+    })
+})
+
 module.exports = mongoose.models.Transaction || mongoose.model("Transaction",tranSchema)

models/history.js

@@ -38,26 +38,19 @@ const historySchema = new mongoose.Schema({
 },{timestamps:true})
 
 module.exports = mongoose.models.History || mongoose.model("History",historySchema)
-/*historySchema.pre("save",(next) => {
-
-if(this.requested('requested_at')){
-   this.requested_at = Date.now;
-   next(); 
-}
-
-else if(this.joined('joined_at')){
-    this.joined_at = Date.now;
-    next(); 
-}
-
-else if(this.left('leave_at')){
-    this.leave_at = Date.now;
-    next(); 
-}
-
-else{
-    return next();
-}
+historySchema.pre("save",(next) => {
+
+    var tenantId = this.tenant_id;
+    var siteId = this.site_id;
+
+    if(tenantId && siteId){
+        if(this.status<2){
+            return Promise.reject('New document cannot be created');
+        }
+            else{
+                return next();
+        }
+    }
 
 })
-*/
+

models/landlord.js

@@ -63,6 +63,7 @@ const landlordSchema = new mongoose.Schema(
     verification: {
       type: String,
       enum: ["Aadhar", "VoterID", "PanCard"],
+      trim: true
     },
     account: {
       acc_num: {
@@ -80,28 +81,28 @@ const landlordSchema = new mongoose.Schema(
 );
 
 //when landlord updates password
-// landlordSchema.pre('save',(next)=>{
+landlordSchema.pre('save',(next)=>{
 
-//     if(!this.isModified('password')){
-//         return next();
-//     }
-//     const user = this;
-//     bcrypt.genSalt(10, function(err, salt){
-//         if (err){ return next(err) }
+    if(!this.isModified('password')){
+        return next();
+    }
+    const user = this;
+    bcrypt.genSalt(10, function(err, salt){
+        if (err){ return next(err) }
 
-//         bcrypt.hash(user.password, salt, null, function(err, hash){
-//             if(err){return next(err)}
+        bcrypt.hash(user.password, salt, null, function(err, hash){
+            if(err){return next(err)}
 
-//             else if(user.password == hash){
-//                 return next("new password cannot be same as previous password")
-//             }
+            else if(user.password == hash){
+                return next("new password cannot be same as previous password")
+            }
 
-//             user.password = hash;
-//             next();
-//         })
-//     })
+            user.password = hash;
+            next();
+        })
+    })
 
-// });
+});
 
 module.exports =
   mongoose.models.Landlord || mongoose.model("Landlord", landlordSchema);

models/tenant.js

@@ -88,11 +88,19 @@ const tenantSchema = new mongoose.Schema({
 },{timestamps:true});
 
 //when tenant updates password
-/*
+
 tenantSchema.pre('save',(next)=>{
 
     var user = this;
-    console.log(user)
+    //console.log(user)
+
+    var num = user.contact.toString();
+    if(num.length>=10){
+        next();
+    }
+    else{
+        return next("Contact number should have at least 10 digits.")
+    }
 
     bcrypt.genSalt(10, function(err, salt){
         if (err){ return next(err) }
@@ -110,6 +118,6 @@ tenantSchema.pre('save',(next)=>{
     })
 
 });
-*/
+
 
 module.exports = mongoose.models.Tenant || mongoose.model("Tenant",tenantSchema);

pages/api/profile/acceptsite.js

@@ -98,7 +98,7 @@ export default async function handler(req, res) {
                     })
                 }
                 else{
-                    return sendError(res,"can't send as status is not 0 for this history",500)
+                    return sendError(res,"Can't send as status is not 0 for this history",500)
                 }
             }
             else{