refactor: added separate functions to output favourite and owned restaurants

Author: isabel-amaral

php/output-functions/user-info/draw-user-info.php

@@ -1,12 +1,49 @@
 <?php
+    function outputFavouriteRestaurants() { 
+        require_once('database/db-connection.php');
+        require_once('database/data-fetching/favourites.php');
+        $db = getDatabaseConnection('database/restaurants.db');
+        $favourites = getAllFavourites($db, $_SESSION['userID']); ?>
+        <section id="favourite-restaurants">
+            <article>
+                <h2>Your Favourite Restaurants</h2>
+                <ul>
+                <?php foreach ($favourites as $favourite) { ?>
+                    <li><a href="../restaurant-page.php?id=<?=$favourite['restaurantID']?>"><?=$favourite['name']?></a></li>
+                <?php
+                } ?>
+                </ul>
+            </article>
+        </section>
+    <?php
+    }
+
+    function outputUserRestaurants() {
+        require_once('database/db-connection.php');
+        require_once('database/data-fetching/restaurants.php');
+        $db = getDatabaseConnection('database/restaurants.db');
+        $restaurants = getRestaurantbyOwner($db, $_SESSION['userID']); ?>
+        <section id="restaurants">
+            <article>
+                <h2>Your Restaurants</h2>
+                <ul>
+                <?php foreach ($restaurants as $restaurant) { ?>
+                    <li><a href="../restaurant-page.php?id=<?=$restaurant['restaurantID']?>"><?=$restaurant['name']?></a></li>
+                <?php
+                } ?>
+                </ul>
+                <button class="button" type="button" onclick="location.href='../restaurant-register-page.php'">Add Restaurant</button>
+            </article>
+        </section>
+    <?php
+    }
+
     function outputUserInfo(){ 
         require_once('database/db-connection.php');
         require_once('database/data-fetching/user.php');
         require_once('database/data-fetching/restaurants.php');
-        require_once('database/data-fetching/favourites.php');
         $db = getDatabaseConnection('database/restaurants.db');
-        $user = getUserbyId($db,$_SESSION['userID']);
-        ?>
+        $user = getUserbyId($db,$_SESSION['userID']); ?>
         <main>
             <section id="userInfo">
                 <p>Username:</p>
@@ -22,38 +59,12 @@ function outputUserInfo(){
                 <button class="button" id="user-order-button" type="button" onclick="location.href='../user-orders-page.php'">My orders</button>
             </section>
 
-            <section id="favourite-restaurants">
-                <article>
-                    <h2>Your Favourite Restaurants</h2>
-                    <ul>
-                    <?php
-                    $favourites = getAllFavourites($db, $_SESSION['userID']);
-                    foreach ($favourites as $favourite) { ?>
-                        <li><a href="../restaurant-page.php?id=<?=$favourite['restaurantID']?>"><?=$favourite['name']?></a></li>
-                    <?php
-                    }
-                    ?>
-                    </ul>
-                </article>
-            </section>
-
-            <?php if($user['owner'] === 1) { ?>
-                <section id="restaurants">
-                    <article>
-                        <h2>Your Restaurants</h2>
-                        <ul>
-                        <?php
-                        $restaurants = getRestaurantbyOwner($db, $_SESSION['userID']);
-                        foreach ($restaurants as $restaurant) { ?>
-                            <li><a href="../restaurant-page.php?id=<?=$restaurant['restaurantID']?>"><?=$restaurant['name']?></a></li>
-                        <?php
-                        } ?>
-                        </ul>
-                        <button class="button" type="button" onclick="location.href='../restaurant-register-page.php'">Add Restaurant</button>
-                    </article>
-                </section>
             <?php
-            } ?>
+            outputFavouriteRestaurants();
+            if($user['owner'] === 1)
+                outputUserRestaurants();
+            ?>
+
         </main>
    <?php 
    }