debug api connections

swapnil-ahlawat · Mar 29, 2021 · 9e6ba8b · 9e6ba8b
1 parent 48944ba
commit 9e6ba8b
Show file tree

Hide file tree

Showing 12 changed files with 161 additions and 73 deletions.
diff --git a/Backend/controllers/package-controllers.js b/Backend/controllers/package-controllers.js
@@ -8,11 +8,14 @@ const scanPackage= async(req, res, next) => {
     const identifiedPackage = await Package.findOne({serialNumber}).exec().catch((error) => {
         return next(error);
     });
+    if(!identifiedPackage){
+        res.sendStatus(404);
+    }
     let userPhoneNo= identifiedPackage.userPhoneNo;
     identifiedPackage.userPhoneNo= phoneNo;
     identifiedPackage.packageTag= packageTag;
     identifiedPackage.save();
-
+    console.log(userPhoneNo);
     res.json({
         message: 'Tag changed sucessfully!',
         userPhoneNo: userPhoneNo
@@ -42,6 +45,7 @@ const addPackage= async(req, res, next) => {
 
     res.json({
         message: 'Added the packages successfully!',
+        restaurant: identifiedRestaurant.name
     });
 }
 
@@ -50,7 +54,7 @@ const removePackage = async(req, res, next) => {
     const {serialNumber} = req.body;
     await Package.deleteOne({serialNumber}, function(error) {
         if(error){
-            sendStatus(404);
+            res.sendStatus(404);
         }
     })
 

diff --git a/Backend/controllers/user-controllers.js b/Backend/controllers/user-controllers.js
@@ -3,15 +3,14 @@ const User = require('../database/User');
 const Order= require('../database/Order');
 
 const placeOrder= async(req, res, next) =>{
-    const {reusablePackageFlag, restaurantPhoneNo, restaurantCourier, orderItems, customer, walletUsed, total} = req.body;
-    let order={customerName:customer.name, customerAddress: customer.address, customerPhoneNo: customer.phoneNo, reusablePackageFlag, foodItems: orderItems}
+    const {reusablePackageFlag, restaurantPhoneNo, restaurantCourier, orderItems, customer, walletUsed, total, subtotal} = req.body;
+    let order={customerName:customer.name, customerAddress: customer.address, customerPhoneNo: customer.phoneNo, reusablePackageFlag, foodItems: orderItems, total:total, subtotal: subtotal}
     let orderModel = new Order(order);
     await orderModel.save();
 
     let identifiedRestaurant = await User.findOne({phoneNo: restaurantPhoneNo, userType: "Restaurant"}).exec().catch((error) => {
         return next(error);
     });
-
     identifiedRestaurant.orders.push({orderID: orderModel._id.toString()});
     await identifiedRestaurant.save();
 
@@ -85,6 +84,9 @@ const addWalletMoney= async(req, res, next) =>{
     let identifiedUser= await User.findOne({phoneNo, userType:"Customer"}).exec().catch((error) => {
         return next(error);
     });
+    if(!identifiedUser){
+        res.sendStatus(404);
+    }
     let money= identifiedUser.wallet;
     money+= parseFloat(amount);
     identifiedUser.wallet= money;

diff --git a/Backend/database/Order.js b/Backend/database/Order.js
@@ -24,7 +24,14 @@ const order = new mongoose.Schema({
         price:{
             type: Float, required: true       
         }
-    }]
+    },  
+    ],
+    total:{
+        type:Number,
+    },
+    subtotal:{
+        type:Number
+    }
 });
 
 module.exports = Order = mongoose.model('Order', order);
diff --git a/Frontend/constants/theme.js b/Frontend/constants/theme.js
@@ -1,6 +1,6 @@
 import { Dimensions } from "react-native";
 const { width, height } = Dimensions.get("window");
-export const LINK= "https://2fe833c33bc6.ngrok.io"
+export const LINK= "https://882406c64343.ngrok.io"
 export const COLORS = {
     // base colors
     primary: "#3FC060", // green

diff --git a/Frontend/screens/Cart.js b/Frontend/screens/Cart.js
@@ -216,6 +216,15 @@ const Order = ({ route, navigation }) => {
     }
     function renderPlaceOrderButton(){
         const placeOrderHandler = async () => {
+            let hello={reusablePackageFlag: reusablePackage,
+                restaurantPhoneNo: restaurant.phoneNo,
+                restaurantCourier: restaurant.courier.name,
+                orderItems: orderItems,
+                customer: global.user,
+                walletUsed: checked,
+                total: calculateTotal(),
+                subtotal: sumOrder()}
+            console.log(hello);
             try {
                 const response = await fetch(LINK+'/user/placeOrder', {
                   method: 'POST',
@@ -230,7 +239,8 @@ const Order = ({ route, navigation }) => {
                     orderItems: orderItems,
                     customer: global.user,
                     walletUsed: checked,
-                    total: sumOrder()
+                    total: calculateTotal(),
+                    subtotal: sumOrder()
                   })
                 });
                 const responseData = await response.json();

diff --git a/Frontend/screens/CustomerHome.js b/Frontend/screens/CustomerHome.js
@@ -139,7 +139,7 @@ const CustomerHome = ({ navigation }) => {
             },
             courier: {
                 avatar: images.avatar_2,
-                name: "Jackson"
+                name: "Piyush Maheshwari"
             },
             menu: [
                 {
@@ -192,7 +192,7 @@ const CustomerHome = ({ navigation }) => {
             },
             courier: {
                 avatar: images.avatar_3,
-                name: "James"
+                name: "Piyush Maheshwari"
             },
             menu: [
                 {
@@ -221,7 +221,7 @@ const CustomerHome = ({ navigation }) => {
             },
             courier: {
                 avatar: images.avatar_4,
-                name: "Ahmad"
+                name: "Piyush Maheshwari"
             },
             menu: [
                 {
@@ -250,7 +250,7 @@ const CustomerHome = ({ navigation }) => {
             },
             courier: {
                 avatar: images.avatar_4,
-                name: "Muthu"
+                name: "Piyush Maheshwari"
             },
             menu: [
                 {
@@ -305,7 +305,7 @@ const CustomerHome = ({ navigation }) => {
             },
             courier: {
                 avatar: images.avatar_1,
-                name: "Jessie"
+                name: "Piyush Maheshwari"
             },
             menu: [
                 {

diff --git a/Frontend/screens/PersonnelHome.js b/Frontend/screens/PersonnelHome.js
@@ -14,12 +14,6 @@ import { icons, images, SIZES, COLORS, FONTS, LINK } from '../constants'
 
 const PersonnelHome = ({ navigation }) => {
 
-    // Dummy Datas
-
-    const deliveryPersonData = {
-        Name: "Prakash",
-    }
-
     const deliveryData = [
         {
             order_id: 1,
@@ -32,10 +26,6 @@ const PersonnelHome = ({ navigation }) => {
             quantity: "2 items",
             payment_mode: "Cash on delivery",
             delivery_made: false,
-            location: {
-                latitude: 1.5347282806345879,
-                longitude: 110.35632207358996,
-            },
               order_details: [
                 {   food_id: 1,
                     name: "Zinger Burger",
@@ -63,10 +53,6 @@ const PersonnelHome = ({ navigation }) => {
             restaurant: "Amrik Sukhdev Dhaba",
             order_deadline: "March 24,2019 15:42",
             payment_mode: "Uber Wallet",
-            location: {
-                latitude: 1.5347282806345879,
-                longitude: 120.35632207358996,
-            },
              order_details: [
                 {  food_id: 1,
                     name: "Red-sauce Pasta",
@@ -114,10 +100,6 @@ const PersonnelHome = ({ navigation }) => {
             address: "Pacific C",
             payment_mode: "Cash on delivery",
             resuablePackage: true,
-            location: {
-                latitude: 1.2347282806345879,
-                longitude: 120.35632207358996,
-            },
               order_details: [
                 {   food_id: 1,
                     name: "Red-sauce Pasta",
@@ -143,7 +125,7 @@ const PersonnelHome = ({ navigation }) => {
     const [orders, setOrders] = useState(null)
     const [fetchFlag,setFetchFlag] = useState(true)
 
-    const inFocus = navigation.addListener('focus', () => {
+    const inFocus = navigation.addListener('state', () => {
         setFetchFlag(true) 
     });
 
@@ -180,7 +162,7 @@ const PersonnelHome = ({ navigation }) => {
         }
         } catch (err) {
             console.log(err)
-            return null
+            alert("Server Unreachable.");
         }
     }};
 
@@ -210,7 +192,7 @@ const PersonnelHome = ({ navigation }) => {
                         paddingRight: SIZES.padding,
                         justifyContent: 'center'
                     }}
-                    onPress={() => navigation.goBack()}
+                    onPress={() => navigation.navigate("SignUp")}
                 >
                     <Image
                         source={icons.signOut}

diff --git a/Frontend/screens/RestaurantHome.js b/Frontend/screens/RestaurantHome.js
@@ -10,14 +10,14 @@ import {
     Platform,
     StatusBar
 } from "react-native";
-import { icons, images, SIZES, COLORS, FONTS } from '../constants'
+import { icons, images, SIZES, COLORS, FONTS, LINK } from '../constants'
 
-const RestaurantHome = ({ navigation }) => {
+const RestaurantHome = ({route, navigation }) => {
 
     const [orders, setOrders] = useState(null)
     const [fetchFlag,setFetchFlag] = useState(true)
 
-    const inFocus = navigation.addListener('focus', () => {
+    const inFocus = navigation.addListener('state', () => {
         setFetchFlag(true) 
       });
 
@@ -27,17 +27,13 @@ const RestaurantHome = ({ navigation }) => {
         };
       }, [navigation]);
 
-
-
-
-
     async function fetchOrder(){
         if (fetchFlag)
         {
         setFetchFlag(false)
         console.log(global.user.phoneNo)
 
-        var url = "https://4c77f765204e.ngrok.io/user/restaurant?phoneNo=" + global.user.phoneNo + "&userType=Restaurant"
+        var url = LINK+"/user/restaurant?phoneNo=" + global.user.phoneNo + "&userType=Restaurant"
         console.log(url)
         try {
         const response = await fetch(url, {
@@ -57,8 +53,8 @@ const RestaurantHome = ({ navigation }) => {
         setOrders(responseData.pendingOrders)
       }
      } catch (err) {
-        console.log(err)
-        return null
+        console.log(err);
+        alert("Server Unreachable.");
       }
     }      
     };
@@ -88,7 +84,7 @@ const RestaurantHome = ({ navigation }) => {
                         paddingRight: SIZES.padding,
                         justifyContent: 'center'
                     }}
-                    onPress={() => navigation.goBack()}
+                    onPress={() => navigation.navigate("SignUp")}
                 >
                     <Image
                         source={icons.signOut}
@@ -128,8 +124,8 @@ const RestaurantHome = ({ navigation }) => {
                         paddingHorizontal: SIZES.padding
                     }}
                 >
-                        <Text style={{ ...FONTS.body3,color: COLORS.black }}>{item.customerName}</Text>
-                        <Text style={{ ...FONTS.body3,color: COLORS.black }}>{item.foodItems.length}</Text>
+                        <Text style={{ ...FONTS.body3,color: COLORS.black }}>{item?.customerName}</Text>
+                        <Text style={{ ...FONTS.body3,color: COLORS.black }}>{item?.foodItems.length}</Text>
                  </View>   
                 <View
                     style={{
@@ -139,7 +135,7 @@ const RestaurantHome = ({ navigation }) => {
                      }}
                 >
                     {/* <Text style={{ ...FONTS.body3,color: COLORS.black  }}>{item.address}</Text> */}
-                    <Text style={{ ...FONTS.body3,color: COLORS.black  }}>{item.customerAddress}</Text>
+                    <Text style={{ ...FONTS.body3,color: COLORS.black  }}>{item?.customerAddress}</Text>
                 </View>
                 <View
                     style={{
@@ -149,7 +145,7 @@ const RestaurantHome = ({ navigation }) => {
                      }}
                 >
                     {/* <Text style={{ ...FONTS.body3,color: COLORS.black  }}>{item.address}</Text> */}
-                    <Text style={{ ...FONTS.body3,color: COLORS.black  }}>{item.customerPhoneNo}</Text>
+                    <Text style={{ ...FONTS.body3,color: COLORS.black  }}>{item?.customerPhoneNo}</Text>
                 </View>
 
             </TouchableOpacity>
@@ -160,7 +156,7 @@ const RestaurantHome = ({ navigation }) => {
             <Text style={{paddingVertical:10, ...FONTS.h2,color: COLORS.white }}>In Progress ({orders?.length})</Text>
             <FlatList
                 data={orders}
-                keyExtractor={item => `${item._id}`}
+                keyExtractor={item => `${item?._id}`}
                 renderItem={renderItem}
                 contentContainerStyle={{
                     paddingBottom: 30