Shafei's branch

backend/Controllers/AdminController.js

@@ -6,8 +6,8 @@ const Reservation = require('../Models/Reservation');
 const transporter = nodemailer.createTransport({
     service:"hotmail",
     auth: {
-        user:"guccsen704@outlook.com",
-        pass:"Hossam2021"
+        user:"hossamgus704@outlook.com",
+        pass:"Hossam21"
     }
 });
 

backend/Controllers/UserController.js

@@ -1,12 +1,15 @@
 const User = require('../Models/User');
 const Reservation = require('../Models/Reservation');
 const Flight = require('../Models/Flight');
+const bcrypt = require('bcrypt');
+const nodemailer = require('nodemailer');
+const saltRounds = 10;
 
 const reserveSelectedSeats = async function(depID,returnID,assignedDepartureSeats,assignedReturnSeats,cabinclass) {
 
-    updateReservationSeats(depID,cabinclass,assignedDepartureSeats);
+    updateReservationSeats(depID,cabinclass,assignedDepartureSeats , false);
 
-    updateReservationSeats(returnID,cabinclass,assignedReturnSeats);
+    updateReservationSeats(returnID,cabinclass,assignedReturnSeats , false);
 
 }
 
@@ -17,6 +20,7 @@ exports.getUserById = async function(req,res) {
   await User.findById(ID)
   .then( (user) => {
       res.status(200)
+      res.send({statusCode:200})
       res.json(user)
   })
   .catch( (err) => {
@@ -31,7 +35,7 @@ exports.updateUserById = async function(req,res) {
   await User.findByIdAndUpdate(ID, req.body.user, {new: true, runValidators: true})
       .then( (user) => {
           res.status(200)
-          res.json(user)
+          res.send({statusCode:200 , data: user})
       })
       .catch( (err) => {
         res.send({statusCode : err.status, message : err.message})
@@ -44,26 +48,28 @@ exports.getAllReservedSeats = async function(req,res) {
   Reservation.find()
       .then( (reservedflights) => {
           //res.status(200)
-          res.json(reservedflights)
+          res.send({statusCode:200 , data:reservedflights})
       })
       .catch( (err) => {
           //res.status(404)
+          res.send({statusCode:404})
           console.log(err)})
 
 }
 
 exports.getReservedFlightById = async function(req,res) {
 
 
-  let ID = req.params.getID
+  let ID = req.params.id;
 
   Reservation.findById(ID)
       .then( (reservedflights) => {
           //res.status(200)
-          res.json(reservedflights)
+          res.send({statusCode:200 , data:reservedflights})
       })
       .catch( (err) => {
           //res.status(404)
+          res.send({statusCode:404})
           console.log(err)})
 }
 
@@ -80,6 +86,7 @@ exports.createReservedFlight = async function(req,res) {
       .then( (reservedflights) => {
           //res.status(200)
          console.log('CREATED RESERVATION');
+         res.send({statusCode: 200 , reservationNumber: reservedflights.reservationNumber,object:reservedflights});
       })
       .catch( (err) => {
           if (err.name === "ValidationError") {
@@ -114,7 +121,7 @@ exports.getAllreservedFlights = async function(req,res) {
 
   await Reservation.find({reservedUserID : ID + ''})
           .then( (reservation) => {
-              res.send(reservation)
+              res.send({"reservation":reservation,statusCode:200})
           })
           .catch( (err) => {
               res.send({statusCode : err.status, message : err.message})
@@ -125,15 +132,56 @@ exports.getAllreservedFlights = async function(req,res) {
 
 exports.deleteReservedFlightById = async function(req,res) {
 
-  let ID = req.params.deleteID
+  let ID = req.params.id;
+
 
   Reservation.findByIdAndDelete(ID)
-      .then( (reservedflights) => {
-          //res.status(200)
-          res.json(reservedflights)
+      .then(async (reservedflights) => {
+
+
+        await updateReservationSeats(reservedflights.reservedFlightIDs[0],
+            reservedflights.cabinClass,
+            reservedflights.assignedDepartureSeats , true);
+        await updateReservationSeats(reservedflights.reservedFlightIDs[1],
+            reservedflights.cabinClass,
+            reservedflights.assignedReturnSeats , true);
+
+
+            let IDuser = reservedflights.reservedUserID;
+            let useremail= null;
+
+            await User.findById(IDuser)
+            .then( (user) => {
+
+                useremail= user.email;
+
+            })
+            .catch( (err) => {
+                res.send({statusCode : err.status, message : err.message})
+                console.log(err.status)})
+
+            const option ={
+                from:'guccsen704@gmail.com',
+                to:useremail,
+                subject :"Cancelled flight",
+                text:"Your flight was cancelled , you will be refunded by "+ reservedflights.price
+
+                };
+
+                transporter.sendMail(option, (err,info)=>{
+
+                if(err){
+                    console.log(err);
+                    return;
+                }
+                console.log("Sent: "+ info.response);
+                })
+
+            res.send({statusCode:200});
       })
       .catch( (err) => {
           //res.status(404)
+          res.send({statusCode:400});
           console.log(err)})
 }
 
@@ -142,12 +190,23 @@ const updateFlight = async function(ID,reservedSeats){
 
     await Flight.findByIdAndUpdate(ID, reservedSeats, {new: true, runValidators: true})
     .then( (flights) => {
-        console.log(flights)})
+        console.log(flights)
+        res.send({statusCode:200})
+    })
 
 }
 
+//create transporter for sender data
+const transporter = nodemailer.createTransport({
+    service: 'gmail',
+   auth: {
+       user:'guccsen704@gmail.com',
+       pass:'Hossam2021'
+   }
+});
+
 
-const updateReservationSeats = async function(ID,cabinclass,assignedSeats){
+const updateReservationSeats = async function(ID,cabinclass,assignedSeats , isCancelled){
 
     let oldFlight = null; 
 
@@ -160,8 +219,8 @@ const updateReservationSeats = async function(ID,cabinclass,assignedSeats){
     if(cabinclass.toLowerCase() === 'economy'){
 
         for (let i = 0; i < oldFlight.reservedEconomySeats.length; i++) {
-            if(assignedSeats.contains(i))
-                newDepSeats[i] = true;
+            if(assignedSeats.includes(i + ''))
+                newDepSeats[i] = !isCancelled;
             else
                 newDepSeats[i] = oldFlight.reservedEconomySeats[i];
         }
@@ -174,8 +233,8 @@ const updateReservationSeats = async function(ID,cabinclass,assignedSeats){
     }else {
 
         for (let i = 0; i < oldFlight.reservedBusinessSeats.length; i++) {
-            if(assignedSeats.includes(i))
-                newDepSeats[i] = true;
+            if(assignedSeats.includes(i + ''))
+                newDepSeats[i] = !isCancelled;
             else
                 newDepSeats[i] = oldFlight.reservedBusinessSeats[i];
         }
@@ -187,4 +246,95 @@ const updateReservationSeats = async function(ID,cabinclass,assignedSeats){
     }
 
     updateFlight(ID,oldFlight);
+}
+
+exports.register = async function(req,res) {
+
+    let newuser = new User(req.body.newuser);
+    bcrypt.hash(newuser.password, saltRounds).then(function(hash) {
+        newuser.password = hash ;
+    });
+    await newuser.save()
+        .then( (user) => {
+            res.status(200)
+            res.json(user)
+            res.send({statusCode:200})
+        })
+        .catch( (err) => {
+            if (err.name === "ValidationError") {
+                let errors = {};
+
+                Object.keys(err.errors).forEach((key) => {
+                  errors[key] = err.errors[key].message;
+                });
+                console.log(errors);
+                return res.status(400).send({statusCode : err.status, errors});
+              }
+              if (err.name === "MongoServerError"){
+                let errors = {};
+                errors[Object.keys(err.keyValue)[0]] = "duplicate key error";
+                console.log(errors);
+
+                return res.status(400).send({statusCode : err.status, errors})
+            }
+
+            res.send({statusCode : err.status, message : err.message})
+            console.log(err.status)})
+}
+
+exports.sendsummary = async function(req,res){
+
+    let ID = req.params.id;
+
+    let IDuser = req.body.userid;
+    let useremail= null;
+    await User.findById(IDuser)
+    .then( (user) => {
+
+        useremail= 'hossamnew16@gmail.com';
+
+    })
+    .catch( (err) => {
+      //  res.send({statusCode : err.status, message : err.message})
+        console.log(err.status)})
+
+
+
+
+
+
+    await Reservation.findById(ID)
+    .then( (reservedflights) => {
+
+            //recevier info
+    const option ={
+    from:'guccsen704@gmail.com',
+    to:useremail,
+    subject :"Summary",
+    text: "Dear Customer ," +
+        "\n Here is your summary for the reservation : " +
+        "\n Reservation number : "+ reservedflights.reservationNumber + "\n" +
+        "Number of seats : "+ reservedflights.assignedSeats.length + "\n Assigned departure seats : " +  reservedflights.assignedDepartureSeats
+        + "\n Assigned return seats : "+ reservedflights.assignedReturnSeats + "\n Total price : " +reservedflights.price
+        + "\n Number of adults : "+reservedflights.numberOfAdults + "\n Number of children : "+ reservedflights.numberOfChildren +
+        "\n Thank you for choosing Weeb Airlines."
+
+
+    };
+
+
+    transporter.sendMail(option, (err,info)=>{
+
+    if(err){
+        console.log(err);
+        return;
+    }
+    console.log("Sent: "+ info.response);
+    })
+            res.status(200)
+            res.json(reservedflights)
+        })
+        .catch( (err) => {
+            res.send({statusCode : err.status, message : err.message})
+            console.log(err.status)})
 }

backend/Models/Reservation.js

@@ -54,6 +54,10 @@ const reservationSchema = new Schema ({
         type : String,
         required : true,
     },
+    payed:{
+        type:Boolean,
+        default:false
+    }
 
 }, {timestamps:true})
 

backend/Models/User.js

@@ -21,6 +21,18 @@ const userSchema = new Schema({
     email:{
         type:String,
         required:true
+    },
+    telephoneNumber:{
+        type:String,
+        required:true
+    },
+    countryNumber:{
+        type:String,
+        required:true
+    },
+    address:{
+        type:String,
+        required:true
     }
 });