From 20c24685ac6edbbd881c4b459e36ea8929df5a0e Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Wed, 22 May 2024 21:26:00 +0400
Subject: [PATCH 01/15] add pagination to product reviews, including controller
 logic and view updates

---
 src/controllers/Product.php | 29 ++++++++++++
 src/views/Product.php       | 88 +++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+)

diff --git a/src/controllers/Product.php b/src/controllers/Product.php
index 8a2d609..1e7aec9 100644
--- a/src/controllers/Product.php
+++ b/src/controllers/Product.php
@@ -19,6 +19,8 @@ class Product
 {
     use Controller;
 
+    private static int $MAX_REVIEWS_PER_PAGE = 2;
+
     private ?ProductModel $product = null; // product to be displayed
     private array $view_data;
     private ?User $signed_user; // currently logged-in user
@@ -231,6 +233,27 @@ private function showCommentForm(): void
             $this->view_data['comment_form_info'] ['quote_date'] = $comment->getCreatedDate()->format('Y');
         }
     }
+        /**
+     * @return int Page number on shop page. Defaults to 1.
+     */
+    public function getPageNumber(): int
+    {
+        return (int)($_GET['page'] ?? 1);
+    }
+
+    /**
+     * @param $reviews
+     * @return array Reviews which should be displayed on current page
+     */
+    public function applyPagination($reviews): array
+    {
+        // Slice the products based on pagination
+        return array_slice(
+            $reviews,
+            ($this->getPageNumber() - 1) * Product::$MAX_REVIEWS_PER_PAGE,
+            Product::$MAX_REVIEWS_PER_PAGE
+        );
+    }
 
     private function validateURL(): bool
     {
@@ -275,7 +298,13 @@ public function index(): void
             array($this, "filterReviews")
         );
 
+        // Slice the reviews based on pagination
+        $paginated_reviews = $this->applyPagination($this->view_data['product_reviews']);
+
+        $this->view_data['product_reviews'] = $paginated_reviews;
         $this->view_data['rating_distribution'] = $this->formatRatingDistribution();
+        $this->view_data['current_page_number'] = $this->getPageNumber();
+        $this->view_data['total_pages'] = (int)ceil(count($this->view_data['product_reviews']) / Product::$MAX_REVIEWS_PER_PAGE);
 
         $this->view(
             'Product',
diff --git a/src/views/Product.php b/src/views/Product.php
index c1fd697..d5c7544 100644
--- a/src/views/Product.php
+++ b/src/views/Product.php
@@ -189,6 +189,68 @@ function printComment(StdClass $comment): void
     EOL;
 }
 
+/**
+ * Returns a query string that maintains all current query string parameters and page number.
+ * @param int $page_number
+ * @return string Query string link for page item
+ */
+function getPageItemLink(int $page_number): string
+{
+    // create a string with all past query parameters except page and url
+    unset($_GET['page']);
+    unset($_GET['url']);
+
+    $link = '?' . http_build_query($_GET);
+
+    // add page number as query parameter
+    $link .= '&page=' . $page_number;
+
+    return $link;
+}
+
+/**
+ * Prints page item in HTML format.
+ *
+ * @param int $current_page_number
+ * @param int $page_number Page number of page item
+ * @return void
+ */
+function displayPageItem(int $current_page_number, int $page_number): void
+{
+    $page_link = getPageItemLink($page_number);
+    $className = "page-item" . ($page_number === $current_page_number ? " active" : "");
+
+    echo <<< EOL
+    <li class="$className">
+        <a class="page-link" href="$page_link">$page_number</a>
+    </li>
+    EOL;
+}
+
+/**
+ * Prints navigation button in HTML format
+ * @param int $current_page_number
+ * @param int $total_pages Total number of pages
+ * @param bool $is_left True indicates left navigation button.
+ * @return void
+ */
+function displayNavigationButton(int $current_page_number, int $total_pages, bool $is_left): void
+{
+    $page_link = getPageItemLink($current_page_number + ($is_left ? -1 : 1));
+    $link_content = htmlspecialchars($is_left ? "<" : ">");
+    $className = "page-item";
+
+    if (($current_page_number === 1 && $is_left) || ($current_page_number === $total_pages && !$is_left)) {
+        $className .= " disabled";
+    }
+
+    echo <<< EOL
+    <li class="$className">
+        <a class="page-link" href="$page_link">$link_content</a>
+    </li>
+    EOL;
+}
+
 ?>
 <dialog id="my-modal">
     <article>
@@ -388,6 +450,7 @@ class="close"
         </div>
     </div>
 
+
     <form id="review-form" action="" method="get">
         <label for="filter-by">Filter by</label>
         <select id="filter-by" required>
@@ -416,4 +479,29 @@ class="close"
     </div>
 </main>
 
+<nav class="container" style="display: flex; justify-content: center">
+    <ul class="pagination">
+        <?php
+        // Display previous page button
+        displayNavigationButton(
+            $current_page_number,
+            $total_pages,
+            true
+        );
+
+        // Display each page item
+        for ($page_num = 1; $page_num <= $total_pages; $page_num++) {
+            displayPageItem($current_page_number, $page_num);
+        }
+
+        // Display next page button
+        displayNavigationButton(
+            $current_page_number,
+            $total_pages,
+            false
+        );
+        ?>
+    </ul>
+</nav>
+
 <script src="/js/product_view.bundle.js"></script>
\ No newline at end of file

From 3159a392950f5f4c4a38b2460a9db17833d269d6 Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Thu, 23 May 2024 20:53:32 +0400
Subject: [PATCH 02/15] update OrderProduct model to allow getByID to retrieve
 by order_id only, and add 'View' button to Profile view

---
 src/controllers/Orders.php  | 80 +++++++++++++++++++++++++++++++++++++
 src/models/OrderProduct.php | 43 +++++++++++---------
 src/views/Orders.php        | 46 +++++++++++++++++++++
 src/views/Profile.php       |  1 +
 4 files changed, 152 insertions(+), 18 deletions(-)
 create mode 100644 src/controllers/Orders.php
 create mode 100644 src/views/Orders.php

diff --git a/src/controllers/Orders.php b/src/controllers/Orders.php
new file mode 100644
index 0000000..ac65f75
--- /dev/null
+++ b/src/controllers/Orders.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Steamy\Controller;
+
+use Steamy\Core\Controller;
+use Steamy\Core\Utility;
+use Steamy\Model\Order;
+use Steamy\Model\OrderProduct;
+
+class Orders
+{
+    use Controller;
+
+    private array $view_data = [];
+
+    private function validateURL(): bool
+    {
+    $url = Utility::getURL();
+    $parts = explode('/', $url);
+    // Check if the URL matches the expected pattern
+    $isValidURL = preg_match('/^orders\/\d+$/', $url) === 1;
+    return $isValidURL;
+    }
+
+    private function getOrderIDFromURL(): ?int
+    {
+    if ($this->validateURL()) {
+        $url = Utility::getURL();
+        $parts = explode('/', $url);
+        // Check if the last part of the URL is a valid integer
+        $lastPart = end($parts);
+        if (is_numeric($lastPart)) {
+            return (int)$lastPart;
+        } else {
+            return null;
+        }
+    }
+    return null;
+    }
+
+
+    private function handleInvalidURL(): void
+    {
+        if (!$this->validateURL()) {
+            (new Error())->handlePageNotFoundError();
+            die();
+        }
+    }
+
+    public function index(): void
+    {
+        $this->handleInvalidURL();
+
+        $order_id = $this->getOrderIDFromURL();
+        if ($order_id === null) {
+            (new Error())->handlePageNotFoundError();
+            die();
+        }
+
+        $order = Order::getByID($order_id);
+        if (!$order) {
+            (new Error())->handlePageNotFoundError();
+            die();
+        }
+
+        $order_products = OrderProduct::getByID($order_id);
+
+        $this->view_data['orders'] = $order;
+        $this->view_data['orderproduct'] = $order_products;
+
+        $this->view(
+            'orders',
+            $this->view_data,
+            'Order',
+            enableIndexing: false
+        );
+    }
+}
diff --git a/src/models/OrderProduct.php b/src/models/OrderProduct.php
index 2c79e13..5c4d7be 100644
--- a/src/models/OrderProduct.php
+++ b/src/models/OrderProduct.php
@@ -87,29 +87,36 @@ public function validate(): array
         return $errors;
     }
 
-    public static function getByID(int $order_id, int $product_id): ?OrderProduct
+    public static function getByID(int $order_id, int $product_id = null): ?OrderProduct
     {
-        $query = <<< EOL
-        select * from order_product
-        where order_id = :order_id and product_id = :product_id
-        EOL;
+    $query = 'SELECT * FROM order_product WHERE order_id = :order_id';
+    $params = ['order_id' => $order_id];
 
-        $result = self::query($query, ['order_id' => $order_id, 'product_id' => $product_id]);
-        if (empty($result)) {
-            return null;
-        }
-        $result = $result[0];
+    if ($product_id !== null) {
+        $query .= ' AND product_id = :product_id';
+        $params['product_id'] = $product_id;
+    }
 
-        return new OrderProduct(
-            product_id: $result->product_id,
-            cup_size: $result->cup_size,
-            milk_type: $result->milk_type,
-            quantity: $result->quantity,
-            unit_price: (float)$result->unit_price,
-            order_id: $result->order_id,
-        );
+    $result = self::query($query, $params);
+    if (empty($result)) {
+        return null;
     }
 
+    // Assuming there's only one product for a given order if product_id is not provided
+    if ($product_id === null) {
+        $result = $result[0];
+    }
+
+    return new OrderProduct(
+        product_id: $result->product_id,
+        cup_size: $result->cup_size,
+        milk_type: $result->milk_type,
+        quantity: $result->quantity,
+        unit_price: (float)$result->unit_price,
+        order_id: $result->order_id,
+    );
+   }
+
     public function getOrderID(): int
     {
         return $this->order_id;
diff --git a/src/views/Orders.php b/src/views/Orders.php
new file mode 100644
index 0000000..ee3839e
--- /dev/null
+++ b/src/views/Orders.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @var Order $orders 
+ * @var OrderProduct $orderproduct 
+ */
+
+use Steamy\Model\Order;
+use Steamy\Model\OrderProduct;
+?>
+
+<main class="container">
+    <h1>Order #<?= filter_var($orders->getOrderID(), FILTER_SANITIZE_NUMBER_INT); ?></h1>
+    <section>
+        <h2>Order Details</h2>
+        <p><strong>Order ID:</strong> <?= filter_var($orders->getOrderID(), FILTER_SANITIZE_NUMBER_INT); ?></p>
+        <p><strong>Date:</strong> <?= htmlspecialchars($orders->getCreatedDate()->format('Y-m-d H:i:s')) ?></p>
+        <p><strong>Status:</strong> <?= htmlspecialchars(ucfirst($orders->getStatus()->value)) ?></p>
+        <p><strong>Total Price:</strong> $<?= htmlspecialchars(number_format($orders->calculateTotalPrice(), 2)) ?></p>
+    </section>
+    
+    <section>
+        <h2>Order Items</h2>
+        <table>
+            <tr>
+                <th>Product Name</th>
+                <th>Quantity</th>
+                <th>Milk Type</th>
+                <th>Cup Size</th>
+                <th>Price</th>
+            </tr>
+            <?php
+            foreach ($orderproduct as $item): ?>
+                <tr>
+                    <td><?= htmlspecialchars($item->getProductName()) ?></td>
+                    <td><?= htmlspecialchars($item->getQuantity()) ?></td>
+                    <td><?= htmlspecialchars($item->getMilkType()) ?></td>
+                    <td><?= htmlspecialchars($item->getCupSize()) ?></td>
+                    <td>$<?= htmlspecialchars(number_format($item->getPrice(), 2)) ?></td>
+                </tr>
+            <?php endforeach; ?>
+        </table>
+    </section>
+</main>
diff --git a/src/views/Profile.php b/src/views/Profile.php
index e4b95f3..f4cfa03 100644
--- a/src/views/Profile.php
+++ b/src/views/Profile.php
@@ -105,6 +105,7 @@
                         <td>\$$totalPrice</td>
                         <td class="grid">
                             <button>cancel</button>
+                            <a href="/orders/$id"><button type="button">View</button></a>
                         </td>
                     </tr>
                     EOL;

From 6537490f8cd390b9035bf96f37b7a0be97372118 Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Thu, 23 May 2024 21:17:20 +0400
Subject: [PATCH 03/15] refactor ClientTest.php: replace testGetByEmail with
 separate tests for getByID, getByEmail, updateUser, and deleteUser, using
 data providers for getByID and getByEmail tests

---
 tests/ClientTest.php | 135 +++++++++++++++++++++++++++++++++----------
 1 file changed, 105 insertions(+), 30 deletions(-)

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index 61865f9..329c3fb 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -112,34 +112,109 @@ public function testVerifyPassword(): void
     self::assertFalse($this->dummy_client->verifyPassword(" abcd"));
 }
 
-public function testGetByEmail(): void
-{
-    // Test for valid email
-    // Save the dummy record to the database
-    $this->dummy_client->save();
-    // Fetch the client by email
-    $fetched_client = Client::getByEmail($this->dummy_client->getEmail());
-    // Assert that the fetched client is not null
-    self::assertNotNull($fetched_client);
-
-    // Assert the attributes of the fetched client
-    self::assertEquals("john_u@gmail.com", $fetched_client->getEmail());
-    self::assertEquals("john", $fetched_client->getFirstName());
-    self::assertEquals("johhny", $fetched_client->getLastName());
-    self::assertEquals("13213431", $fetched_client->getPhoneNo());
-    self::assertEquals("Royal Road, Curepipe, Moka", $fetched_client->getAddress()->getFormattedAddress());
-
-    // Delete the dummy record
-    $fetched_client->deleteUser();
-
-    // Add a small delay to ensure the deletion operation is completed
-    usleep(500000); // 500 milliseconds = 0.5 seconds
-
-    // Fetch the client by email again
-    $fetched_client = Client::getByEmail($this->dummy_client->getEmail());
-
-    // Test for invalid email
-    // Assert that the fetched client is null or false
-    self::assertNull($fetched_client);
-}
+    /**
+     * @dataProvider getByIDProvider
+     */
+    public static function testGetByID(int $userID, ?string $expectedEmail): void
+    {
+        $client = Client::getByID($userID);
+        if ($expectedEmail !== null) {
+            self::assertNotNull($client);
+            self::assertEquals($expectedEmail, $client->getEmail());
+        } else {
+            self::assertNull($client);
+        }
+    }
+
+    public static function getByIDProvider(): array
+    {
+        return [
+            [999, null], // Non-existing user
+            [-1, null], // Negative ID
+        ];
+    }
+
+    /**
+     * @dataProvider getByEmailProvider
+     */
+    public static function testGetByEmail(string $email, ?string $expectedEmail): void
+    {
+        $client = Client::getByEmail($email);
+        if ($expectedEmail !== null) {
+            self::assertNotNull($client);
+            self::assertEquals($expectedEmail, $client->getEmail());
+        } else {
+            self::assertNull($client);
+        }
+    }
+
+    public static function getByEmailProvider(): array
+    {
+        return [
+            ['john_u@gmail.com', 'john_u@gmail.com'], // Existing email
+            ['nonexistent@gmail.com', null], // Non-existing email
+            ['invalidemail', null], // Invalid email format
+        ];
+    }
+
+    /**
+     * @dataProvider updateUserProvider
+     */
+    public static function testUpdateUser(bool $updatePassword, bool $success): void
+    {
+        // Create a client with a known ID
+        $client = Client::getByEmail('john_u@gmail.com');
+        if ($client === null) {
+            self::fail('Failed to fetch client');
+        }
+
+        // Update user and check if successful
+        $client->setFirstName('UpdatedName');
+        $client->setLastName('UpdatedLastName');
+        $client->getAddress()->setCity('UpdatedCity');
+
+        if ($updatePassword) {
+            $client->setPassword('newPassword');
+        }
+
+        $result = $client->updateUser($updatePassword);
+        self::assertEquals($success, $result);
+
+        // Check if data was actually updated in the database
+        $updatedClient = Client::getByID($client->getUserID());
+        if ($updatedClient === null) {
+            self::fail('Failed to fetch updated client');
+        }
+
+        self::assertEquals('UpdatedName', $updatedClient->getFirstName());
+        self::assertEquals('UpdatedLastName', $updatedClient->getLastName());
+        self::assertEquals('UpdatedCity', $updatedClient->getAddress()->getCity());
+    }
+
+    public static function updateUserProvider(): array
+    {
+        return [
+            [false, true], // Update without password change
+            [true, true],  // Update with password change
+        ];
+    }
+
+    public function testDeleteUser(): void
+    {
+        // Fetch the client by email to get its ID
+        $client = Client::getByEmail('john_u@gmail.com');
+        if ($client === null) {
+            self::fail('Failed to fetch client');
+        }
+
+        // Delete the user
+        $client->deleteUser();
+
+        // Attempt to fetch the user again
+        $deletedClient = Client::getByID($client->getUserID());
+
+        // Ensure the user does not exist anymore
+        self::assertNull($deletedClient);
+    }
+
 }

From 5261613e83f17136ffd98951bfb479e25d099ded Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Sat, 25 May 2024 08:27:31 +0400
Subject: [PATCH 04/15] reformat code, add whitespace, and rearrange methods

---
 tests/ClientTest.php | 170 +++++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 79 deletions(-)

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index 329c3fb..6eb2a10 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -17,8 +17,13 @@ public function setUp(): void
     {
         $address = new Location("Royal Road", "Curepipe", 1);
         $this->dummy_client = new Client(
-            "john_u@gmail.com", "john", "johhny", "abcd",
-            "13213431", $address);
+            "john_u@gmail.com",
+            "john",
+            "johhny",
+            "abcd",
+            "13213431",
+            $address
+        );
 
         $success = $this->dummy_client->save();
         if (!$success) {
@@ -26,91 +31,99 @@ public function setUp(): void
         }
     }
 
-public function tearDown(): void
-{
-    $this->dummy_client = null;
+    public function tearDown(): void
+    {
+        $this->dummy_client = null;
 
         // Clear all data from client and user tables
         self::query('DELETE FROM client; DELETE FROM user;');
-}
+    }
 
-public function testConstructor(): void
-{
-    // check if fields were correctly set
-    self::assertEquals("john_u@gmail.com", $this->dummy_client->getEmail());
-    self::assertEquals("john", $this->dummy_client->getFirstName());
-    self::assertEquals("johhny", $this->dummy_client->getLastName());
-    self::assertEquals("13213431", $this->dummy_client->getPhoneNo());
-    self::assertEquals("Royal Road, Curepipe, Moka", $this->dummy_client->getAddress()->getFormattedAddress());
-}
+    public function testConstructor(): void
+    {
+        // check if fields were correctly set
+        self::assertEquals("john_u@gmail.com", $this->dummy_client->getEmail());
+        self::assertEquals("john", $this->dummy_client->getFirstName());
+        self::assertEquals("johhny", $this->dummy_client->getLastName());
+        self::assertEquals("13213431", $this->dummy_client->getPhoneNo());
+        self::assertEquals("Royal Road, Curepipe, Moka", $this->dummy_client->getAddress()->getFormattedAddress());
+    }
 
-public function testToArray(): void
-{
-    $result = $this->dummy_client->toArray();
-
-    // check if all required keys are present
-    $this->assertArrayHasKey('user_id', $result);
-    $this->assertArrayHasKey('email', $result);
-    $this->assertArrayHasKey('first_name', $result);
-    $this->assertArrayHasKey('last_name', $result);
-    $this->assertArrayHasKey('phone_no', $result);
-    $this->assertArrayHasKey('district_id', $result);
-    $this->assertArrayHasKey('street', $result);
-    $this->assertArrayHasKey('city', $result);
-    $this->assertArrayHasKey('password', $result);
-
-    // check if actual values are correct
-    self::assertEquals("john_u@gmail.com", $result['email']);
-    self::assertEquals("john", $result['first_name']);
-    self::assertEquals("johhny", $result['last_name']);
-    self::assertEquals("13213431", $result['phone_no']);
-    self::assertEquals("Royal Road", $result['street']);
-    self::assertEquals("Curepipe", $result['city']);
-    self::assertEquals(1, $result['district_id']);
-}
+    public function testToArray(): void
+    {
+        $result = $this->dummy_client->toArray();
+
+        // check if all required keys are present
+        $this->assertArrayHasKey('user_id', $result);
+        $this->assertArrayHasKey('email', $result);
+        $this->assertArrayHasKey('first_name', $result);
+        $this->assertArrayHasKey('last_name', $result);
+        $this->assertArrayHasKey('phone_no', $result);
+        $this->assertArrayHasKey('district_id', $result);
+        $this->assertArrayHasKey('street', $result);
+        $this->assertArrayHasKey('city', $result);
+        $this->assertArrayHasKey('password', $result);
+
+        // check if actual values are correct
+        self::assertEquals("john_u@gmail.com", $result['email']);
+        self::assertEquals("john", $result['first_name']);
+        self::assertEquals("johhny", $result['last_name']);
+        self::assertEquals("13213431", $result['phone_no']);
+        self::assertEquals("Royal Road", $result['street']);
+        self::assertEquals("Curepipe", $result['city']);
+        self::assertEquals(1, $result['district_id']);
+    }
 
-public function testValidate(): void
-{
-    $client = new Client(
-        "", "", "", "abcd",
-        "", new Location(), // pass an empty Location object for testing
-    );
-
-    // Test if existence checks work
-    self::assertEquals([
-        'email' => 'Invalid email format',
-        'first_name' => 'First name must be at least 3 characters long',
-        'last_name' => 'Last name must be at least 3 characters long',
-        'phone_no' => 'Phone number must be at least 7 characters long',
-        'district' => 'District does not exist'
-    ], $client->validate());
-
-    // Test for range checks
-    $client = new Client(
-        "a@a.com", "Jo", "Doe", "1234567",
-        "123456", new Location(), // pass an empty Location object for testing
-    );
-
-    self::assertEquals([
-        'first_name' => 'First name must be at least 3 characters long',
-        'phone_no' => 'Phone number must be at least 7 characters long',
-        'district' => 'District does not exist'
-    ], $client->validate());
-}
+    public function testValidate(): void
+    {
+        $client = new Client(
+            "",
+            "",
+            "",
+            "abcd",
+            "",
+            new Location(), // pass an empty Location object for testing
+        );
+
+        // Test if existence checks work
+        self::assertEquals([
+            'email' => 'Invalid email format',
+            'first_name' => 'First name must be at least 3 characters long',
+            'last_name' => 'Last name must be at least 3 characters long',
+            'phone_no' => 'Phone number must be at least 7 characters long',
+            'district' => 'District does not exist'
+        ], $client->validate());
+
+        // Test for range checks
+        $client = new Client(
+            "a@a.com",
+            "Jo",
+            "Doe",
+            "1234567",
+            "123456",
+            new Location(), // pass an empty Location object for testing
+        );
+
+        self::assertEquals([
+            'first_name' => 'First name must be at least 3 characters long',
+            'phone_no' => 'Phone number must be at least 7 characters long',
+            'district' => 'District does not exist'
+        ], $client->validate());
+    }
 
-public function testVerifyPassword(): void
-{
-    // verify true password
-    self::assertTrue($this->dummy_client->verifyPassword("abcd"));
+    public function testVerifyPassword(): void
+    {
+        // verify true password
+        self::assertTrue($this->dummy_client->verifyPassword("abcd"));
 
-    // reject empty string
-    self::assertFalse($this->dummy_client->verifyPassword(""));
+        // reject empty string
+        self::assertFalse($this->dummy_client->verifyPassword(""));
 
-    // reject any other string
-    self::assertFalse($this->dummy_client->verifyPassword("abcde"));
-    self::assertFalse($this->dummy_client->verifyPassword("abcd "));
-    self::assertFalse($this->dummy_client->verifyPassword(" abcd"));
-}
+        // reject any other string
+        self::assertFalse($this->dummy_client->verifyPassword("abcde"));
+        self::assertFalse($this->dummy_client->verifyPassword("abcd "));
+        self::assertFalse($this->dummy_client->verifyPassword(" abcd"));
+    }
 
     /**
      * @dataProvider getByIDProvider
@@ -216,5 +229,4 @@ public function testDeleteUser(): void
         // Ensure the user does not exist anymore
         self::assertNull($deletedClient);
     }
-
 }

From 69440a9bf186717e36b251493d573e9f36978d23 Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Sat, 25 May 2024 17:00:46 +0400
Subject: [PATCH 05/15] add PHPDoc comments

---
 src/controllers/Product.php | 3 ++-
 src/views/Product.php       | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/controllers/Product.php b/src/controllers/Product.php
index 1e7aec9..ee45971 100644
--- a/src/controllers/Product.php
+++ b/src/controllers/Product.php
@@ -233,7 +233,8 @@ private function showCommentForm(): void
             $this->view_data['comment_form_info'] ['quote_date'] = $comment->getCreatedDate()->format('Y');
         }
     }
-        /**
+    
+    /**
      * @return int Page number on shop page. Defaults to 1.
      */
     public function getPageNumber(): int
diff --git a/src/views/Product.php b/src/views/Product.php
index d5c7544..564cd4f 100644
--- a/src/views/Product.php
+++ b/src/views/Product.php
@@ -3,6 +3,8 @@
 declare(strict_types=1);
 
 /**
+ * @var $current_page_number Current page number.
+ * @var $total_pages Total number of pages
  * @var $product Product product information
  * @var $product_reviews Review[] List of product reviews to be displayed with any filters applied
  * @var $current_review_filter string

From 8787cad8b5a5eeefac2cb3280e4e7c0089722b2b Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Thu, 30 May 2024 19:57:46 +0400
Subject: [PATCH 06/15] set fixed height to each action button

---
 src/views/Profile.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Profile.php b/src/views/Profile.php
index 44fe1f9..6051efe 100644
--- a/src/views/Profile.php
+++ b/src/views/Profile.php
@@ -112,10 +112,10 @@
 
                         <td>
                             <form style="display: flex; gap:1em;" method="post">
-                                <a href="/orders/$id"><button type="button">View</button></a>
+                                <a style="height: 60px" class="secondary" href="/orders/$id" role="button">View</a>
                                 <input type="hidden" name="order_id" value="$id">
-                                <button type="submit" name="cancel_order" $cancelDisabled>Cancel</button>
-                                <button type="submit" name="reorder">Reorder</button>
+                                <button style="height: 60px" type="submit" name="reorder">Reorder</button>
+                                <button style="height: 60px" type="submit" name="cancel_order" $cancelDisabled>Cancel</button>
                             </form>
                         </td>
                     </tr>

From 242c6d6fa485a9bafb9fc132930639673bb970d6 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Thu, 30 May 2024 19:58:44 +0400
Subject: [PATCH 07/15] use better variable names, fix bug with
 htmlspecialchars()

---
 src/views/Orders.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/views/Orders.php b/src/views/Orders.php
index ee3839e..a51e937 100644
--- a/src/views/Orders.php
+++ b/src/views/Orders.php
@@ -3,24 +3,25 @@
 declare(strict_types=1);
 
 /**
- * @var Order $orders 
- * @var OrderProduct $orderproduct 
+ * @var Order $order Current order
+ * @var OrderProduct[] $line_items Line items for current order
  */
 
 use Steamy\Model\Order;
 use Steamy\Model\OrderProduct;
+
 ?>
 
 <main class="container">
-    <h1>Order #<?= filter_var($orders->getOrderID(), FILTER_SANITIZE_NUMBER_INT); ?></h1>
+    <h1>Order #<?= filter_var($order->getOrderID(), FILTER_SANITIZE_NUMBER_INT); ?></h1>
     <section>
         <h2>Order Details</h2>
-        <p><strong>Order ID:</strong> <?= filter_var($orders->getOrderID(), FILTER_SANITIZE_NUMBER_INT); ?></p>
-        <p><strong>Date:</strong> <?= htmlspecialchars($orders->getCreatedDate()->format('Y-m-d H:i:s')) ?></p>
-        <p><strong>Status:</strong> <?= htmlspecialchars(ucfirst($orders->getStatus()->value)) ?></p>
-        <p><strong>Total Price:</strong> $<?= htmlspecialchars(number_format($orders->calculateTotalPrice(), 2)) ?></p>
+        <p><strong>Order ID:</strong> <?= filter_var($order->getOrderID(), FILTER_SANITIZE_NUMBER_INT); ?></p>
+        <p><strong>Date:</strong> <?= htmlspecialchars($order->getCreatedDate()->format('Y-m-d H:i:s')) ?></p>
+        <p><strong>Status:</strong> <?= htmlspecialchars(ucfirst($order->getStatus()->value)) ?></p>
+        <p><strong>Total Price:</strong> $<?= htmlspecialchars(number_format($order->calculateTotalPrice(), 2)) ?></p>
     </section>
-    
+
     <section>
         <h2>Order Items</h2>
         <table>
@@ -29,18 +30,19 @@
                 <th>Quantity</th>
                 <th>Milk Type</th>
                 <th>Cup Size</th>
-                <th>Price</th>
+                <th>Unit Price</th>
             </tr>
             <?php
-            foreach ($orderproduct as $item): ?>
+            foreach ($line_items as $item): ?>
                 <tr>
                     <td><?= htmlspecialchars($item->getProductName()) ?></td>
-                    <td><?= htmlspecialchars($item->getQuantity()) ?></td>
+                    <td><?= filter_var($item->getQuantity(), FILTER_SANITIZE_NUMBER_INT) ?></td>
                     <td><?= htmlspecialchars($item->getMilkType()) ?></td>
                     <td><?= htmlspecialchars($item->getCupSize()) ?></td>
-                    <td>$<?= htmlspecialchars(number_format($item->getPrice(), 2)) ?></td>
+                    <td>$<?= (number_format($item->getUnitPrice(), 2)) ?></td>
                 </tr>
-            <?php endforeach; ?>
+            <?php
+            endforeach; ?>
         </table>
     </section>
 </main>

From 401db2bb77f28ff9c8a618d2462941ca0d98b7d8 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Thu, 30 May 2024 19:59:19 +0400
Subject: [PATCH 08/15] format file, update view data variable names, fetch
 line items appropriately

---
 src/controllers/Orders.php | 42 ++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/controllers/Orders.php b/src/controllers/Orders.php
index ac65f75..1cc1205 100644
--- a/src/controllers/Orders.php
+++ b/src/controllers/Orders.php
@@ -17,27 +17,25 @@ class Orders
 
     private function validateURL(): bool
     {
-    $url = Utility::getURL();
-    $parts = explode('/', $url);
-    // Check if the URL matches the expected pattern
-    $isValidURL = preg_match('/^orders\/\d+$/', $url) === 1;
-    return $isValidURL;
+        $url = Utility::getURL();
+        // Check if the URL matches the expected pattern
+        return preg_match('/^orders\/\d+$/', $url) === 1;
     }
 
     private function getOrderIDFromURL(): ?int
     {
-    if ($this->validateURL()) {
-        $url = Utility::getURL();
-        $parts = explode('/', $url);
-        // Check if the last part of the URL is a valid integer
-        $lastPart = end($parts);
-        if (is_numeric($lastPart)) {
-            return (int)$lastPart;
-        } else {
-            return null;
+        if ($this->validateURL()) {
+            $url = Utility::getURL();
+            $parts = explode('/', $url);
+            // Check if the last part of the URL is a valid integer
+            $lastPart = end($parts);
+            if (is_numeric($lastPart)) {
+                return (int)$lastPart;
+            } else {
+                return null;
+            }
         }
-    }
-    return null;
+        return null;
     }
 
 
@@ -56,24 +54,24 @@ public function index(): void
         $order_id = $this->getOrderIDFromURL();
         if ($order_id === null) {
             (new Error())->handlePageNotFoundError();
-            die();
+            return;
         }
 
         $order = Order::getByID($order_id);
         if (!$order) {
             (new Error())->handlePageNotFoundError();
-            die();
+            return;
         }
 
-        $order_products = OrderProduct::getByID($order_id);
+        $order_products = Order::getOrderProducts($order->getOrderID());
 
-        $this->view_data['orders'] = $order;
-        $this->view_data['orderproduct'] = $order_products;
+        $this->view_data['order'] = $order;
+        $this->view_data['line_items'] = $order_products;
 
         $this->view(
             'orders',
             $this->view_data,
-            'Order',
+            'Order #' . $order_id,
             enableIndexing: false
         );
     }

From 8cdc565df187eeb1b2677d8234ccd6372b5b90ff Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 31 May 2024 07:44:43 +0400
Subject: [PATCH 09/15] create view and controller for pagination component

---
 src/controllers/Pagination.php |  76 ++++++++++++++++++
 src/views/Pagination.php       | 136 +++++++++++++++++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 src/controllers/Pagination.php
 create mode 100644 src/views/Pagination.php

diff --git a/src/controllers/Pagination.php b/src/controllers/Pagination.php
new file mode 100644
index 0000000..4f5bec7
--- /dev/null
+++ b/src/controllers/Pagination.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Steamy\Controller;
+
+/**
+ * Controller for managing the pagination component
+ */
+class Pagination
+{
+    private int $items_per_page;
+    private int $total_items;
+    private int $current_page_number;
+
+    public function __construct(int $items_per_page = 1, int $total_items = 1, int $current_page = 1)
+    {
+        $this->items_per_page = $items_per_page;
+        $this->total_items = $total_items;
+        $this->current_page_number = $current_page;
+    }
+
+    /**
+     * Returns a query string that maintains all current query string parameters, except page number.
+     * @return string Query string
+     */
+    private function getCurrentQueryString(): string
+    {
+        // create a string with all past query parameters except page and url
+        unset($_GET['page']);
+        unset($_GET['url']);
+
+        return '?' . http_build_query($_GET);
+    }
+
+    /**
+     * @param array $array
+     * @return array New array containing only elements to be displayed on current page
+     */
+    public function getCurrentItems(array $array): array
+    {
+        return array_slice(
+            $array,
+            ($this->current_page_number - 1) * $this->items_per_page,
+            $this->items_per_page
+        );
+    }
+
+    /**
+     * Returns HTML code need to display pagination items
+     * @return string
+     */
+    public function getHTML(): string
+    {
+        $current_page_number = $this->current_page_number;
+        $total_pages = (int)ceil((float)$this->total_items / $this->items_per_page);
+        $query_string = $this->getCurrentQueryString();
+
+        $view_file_path = __DIR__ . '/../views/Pagination.php';
+        $html = '';
+
+        // get content from view file
+        ob_start();
+        include $view_file_path;
+        $html = ob_get_contents();
+        ob_end_clean();
+
+        return $html;
+    }
+
+    public function index(): void
+    {
+        // we don't want the page /pagination to be accessible
+        (new Error())->handlePageNotFoundError();
+    }
+}
diff --git a/src/views/Pagination.php b/src/views/Pagination.php
new file mode 100644
index 0000000..729d1cd
--- /dev/null
+++ b/src/views/Pagination.php
@@ -0,0 +1,136 @@
+<?php
+
+declare(strict_types=1);
+
+/***
+ * The following variables have been defined in the Pagination controller.
+ * @var int $current_page_number Current page number.
+ * @var int $total_pages Total number of pages
+ * @var string $query_string Query string for current page
+ */
+
+/**
+ * Prints page item in HTML format.
+ *
+ * @param int $current_page_number
+ * @param int $page_number Page number of page item
+ * @param string $query_string
+ * @return void
+ */
+function displayPageItem(int $current_page_number, int $page_number, string $query_string): void
+{
+    $page_link = $query_string . "&page=$page_number";
+    $className = "page-item" . ($page_number === $current_page_number ? " active" : "");
+
+    echo <<< EOL
+    <li class="$className">
+        <a class="page-link" href="$page_link">$page_number</a>
+    </li>
+    EOL;
+}
+
+/**
+ * Prints navigation button in HTML format
+ * @param int $current_page_number
+ * @param int $total_pages Total number of pages
+ * @param string $query_string
+ * @param bool $is_left True indicates left navigation button.
+ * @return void
+ */
+function displayNavigationButton(int $current_page_number, int $total_pages, string $query_string, bool $is_left): void
+{
+    $page_number = $current_page_number + ($is_left ? -1 : 1);
+    $page_link = $query_string . "&page=$page_number";
+
+    $link_content = htmlspecialchars($is_left ? "<" : ">");
+    $className = "page-item";
+
+    if (($current_page_number === 1 && $is_left) || ($current_page_number === $total_pages && !$is_left)) {
+        $className .= " disabled";
+    }
+
+    echo <<< EOL
+    <li class="$className">
+        <a class="page-link" href="$page_link">$link_content</a>
+    </li>
+    EOL;
+}
+
+?>
+
+<style>
+  .pagination {
+    display: flex;
+    list-style: none;
+    border-radius: 0.25rem;
+    gap: 0.45rem;
+    margin-top: 2cm;
+  }
+
+
+  .page-item {
+    --bs-padding-x: 0.5rem;
+    --bs-padding-y: 0.25rem;
+  }
+
+  .page-link {
+    position: relative;
+    display: block;
+    padding: var(--bs-padding-y) var(--bs-padding-x);
+    text-decoration: none;
+    transition: color .25s ease-in-out, background-color .25s ease-in-out;
+    outline: 1px solid #dee2e6;
+  }
+
+  .page-link:hover {
+    z-index: 2;
+    background-color: var(--contrast-hover);
+    color: var(--contrast-inverse);
+  }
+
+  .page-link:focus {
+    z-index: 3;
+    outline: 0;
+    box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.25);
+  }
+
+  .page-item.active .page-link {
+    z-index: 3;
+    background-color: var(--contrast);
+    color: var(--contrast-inverse);
+  }
+
+  .page-item.disabled .page-link {
+    color: var(--form-element-disabled-opacity);
+    outline-color: var(--form-element-disabled-border-color);
+    pointer-events: none;
+    background-color: var(--form-element-disabled-background-color);
+  }
+</style>
+
+<nav class="container" style="display: flex; justify-content: center">
+    <ul class="pagination">
+        <?php
+        // Display previous page button
+        displayNavigationButton(
+            $current_page_number,
+            $total_pages,
+            $query_string,
+            true
+        );
+
+        // Display each page item
+        for ($page_num = 1; $page_num <= $total_pages; $page_num++) {
+            displayPageItem($current_page_number, $page_num, $query_string);
+        }
+
+        // Display next page button
+        displayNavigationButton(
+            $current_page_number,
+            $total_pages,
+            $query_string,
+            false
+        );
+        ?>
+    </ul>
+</nav>
\ No newline at end of file

From 0e8c4ddaacc668e02a34c2e8115672b449aa6a1a Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 31 May 2024 07:45:37 +0400
Subject: [PATCH 10/15] remove css for pagination

---
 public/styles/views/Shop.css | 48 ------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/public/styles/views/Shop.css b/public/styles/views/Shop.css
index bd9d5dd..f82c1f1 100644
--- a/public/styles/views/Shop.css
+++ b/public/styles/views/Shop.css
@@ -61,52 +61,4 @@ article header {
   #item-grid {
     grid-template-columns: repeat(1, 1fr);
   }
-}
-
-.pagination {
-  display: flex;
-  list-style: none;
-  border-radius: 0.25rem;
-  gap: 0.45rem;
-  margin-top: 2cm;
-}
-
-
-.page-item {
-  --bs-padding-x: 0.5rem;
-  --bs-padding-y: 0.25rem;
-}
-
-.page-link {
-  position: relative;
-  display: block;
-  padding: var(--bs-padding-y) var(--bs-padding-x);
-  text-decoration: none;
-  transition: color .25s ease-in-out, background-color .25s ease-in-out;
-  outline: 1px solid #dee2e6;
-}
-
-.page-link:hover {
-  z-index: 2;
-  background-color: var(--contrast-hover);
-  color: var(--contrast-inverse);
-}
-
-.page-link:focus {
-  z-index: 3;
-  outline: 0;
-  box-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.25);
-}
-
-.page-item.active .page-link {
-  z-index: 3;
-  background-color: var(--contrast);
-  color: var(--contrast-inverse);
-}
-
-.page-item.disabled .page-link {
-  color: var(--form-element-disabled-opacity);
-  outline-color: var(--form-element-disabled-border-color);
-  pointer-events: none;
-  background-color: var(--form-element-disabled-background-color);
 }
\ No newline at end of file

From 09eaa0115e89efcfca675673f0a1d8df3b28a8ff Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 31 May 2024 07:47:27 +0400
Subject: [PATCH 11/15] use pagination component

---
 src/controllers/Product.php | 35 ++++++--------
 src/controllers/Shop.php    | 43 +++++++----------
 src/views/Product.php       | 92 ++-----------------------------------
 src/views/Shop.php          | 91 +-----------------------------------
 4 files changed, 35 insertions(+), 226 deletions(-)

diff --git a/src/controllers/Product.php b/src/controllers/Product.php
index ee45971..25270dd 100644
--- a/src/controllers/Product.php
+++ b/src/controllers/Product.php
@@ -6,7 +6,6 @@
 
 use Steamy\Core\Controller;
 use Steamy\Core\Utility;
-use Steamy\Model\Client;
 use Steamy\Model\Comment;
 use Steamy\Model\Review;
 use Steamy\Model\User;
@@ -233,7 +232,7 @@ private function showCommentForm(): void
             $this->view_data['comment_form_info'] ['quote_date'] = $comment->getCreatedDate()->format('Y');
         }
     }
-    
+
     /**
      * @return int Page number on shop page. Defaults to 1.
      */
@@ -242,20 +241,6 @@ public function getPageNumber(): int
         return (int)($_GET['page'] ?? 1);
     }
 
-    /**
-     * @param $reviews
-     * @return array Reviews which should be displayed on current page
-     */
-    public function applyPagination($reviews): array
-    {
-        // Slice the products based on pagination
-        return array_slice(
-            $reviews,
-            ($this->getPageNumber() - 1) * Product::$MAX_REVIEWS_PER_PAGE,
-            Product::$MAX_REVIEWS_PER_PAGE
-        );
-    }
-
     private function validateURL(): bool
     {
         return preg_match("/^shop\/products\/[0-9]+$/", Utility::getURL()) === 1;
@@ -294,18 +279,24 @@ public function index(): void
             $this->handleCommentSubmission();
         }
 
-        $this->view_data['product_reviews'] = array_filter(
+        // get all reviews that match criteria
+        $all_matching_reviews = array_filter(
             $this->view_data['product_reviews'],
             array($this, "filterReviews")
         );
 
-        // Slice the reviews based on pagination
-        $paginated_reviews = $this->applyPagination($this->view_data['product_reviews']);
+        $pagination_controller = new Pagination(
+            Product::$MAX_REVIEWS_PER_PAGE,
+            count($all_matching_reviews),
+            $this->getPageNumber()
+        );
+
+        // get html code for displaying pagination
+        $this->view_data['review_pagination'] = $pagination_controller->getHTML();
+
+        $this->view_data['product_reviews'] = $pagination_controller->getCurrentItems($all_matching_reviews);
 
-        $this->view_data['product_reviews'] = $paginated_reviews;
         $this->view_data['rating_distribution'] = $this->formatRatingDistribution();
-        $this->view_data['current_page_number'] = $this->getPageNumber();
-        $this->view_data['total_pages'] = (int)ceil(count($this->view_data['product_reviews']) / Product::$MAX_REVIEWS_PER_PAGE);
 
         $this->view(
             'Product',
diff --git a/src/controllers/Shop.php b/src/controllers/Shop.php
index 69a4c38..d04ca5b 100644
--- a/src/controllers/Shop.php
+++ b/src/controllers/Shop.php
@@ -16,7 +16,7 @@ class Shop
 {
     use Controller;
 
-    private array $data;
+    private array $view_data;
     private static int $MAX_PRODUCTS_PER_PAGE = 4;
 
     /**
@@ -154,20 +154,6 @@ public function getPageNumber(): int
         return (int)($_GET['page'] ?? 1);
     }
 
-    /**
-     * @param $products
-     * @return array Products which should be displayed on current page
-     */
-    public function applyPagination($products): array
-    {
-        // Slice the products based on pagination
-        return array_slice(
-            $products,
-            ($this->getPageNumber() - 1) * Shop::$MAX_PRODUCTS_PER_PAGE,
-            Shop::$MAX_PRODUCTS_PER_PAGE
-        );
-    }
-
     public function index(): void
     {
         // check if URL follows format /shop/products/<number>
@@ -187,22 +173,27 @@ public function index(): void
         // get all products that match user criteria
         $filtered_products = $this->getMatchingProducts();
 
-        // Slice the products based on pagination
-        $paginated_products = $this->applyPagination($filtered_products);
+        // get html for pagination
+        $pagination_controller = new Pagination(
+            Shop::$MAX_PRODUCTS_PER_PAGE,
+            count($filtered_products),
+            $this->getPageNumber()
+        );
+
+        $this->view_data['pagination'] = $pagination_controller->getHTML();
+        $this->view_data['products'] = $pagination_controller->getCurrentItems($filtered_products);
 
-        // Initialize view variables (existing functionality)
-        $this->data['products'] = $paginated_products;
-        $this->data['search_keyword'] = $_GET['keyword'] ?? "";
-        $this->data['categories'] = Product::getCategories();
-        $this->data['sort_option'] = $_GET['sort'] ?? "";
-        $this->data['selected_categories'] = $_GET['categories'] ?? [];
-        $this->data['current_page_number'] = $this->getPageNumber();
-        $this->data['total_pages'] = (int)ceil(count($filtered_products) / Shop::$MAX_PRODUCTS_PER_PAGE);
+        // Initialize view variables
+        $this->view_data['search_keyword'] = $_GET['keyword'] ?? "";
+        $this->view_data['categories'] = Product::getCategories();
+        $this->view_data['sort_option'] = $_GET['sort'] ?? "";
+        $this->view_data['selected_categories'] = $_GET['categories'] ?? [];
+        $this->view_data['current_page_number'] = $this->getPageNumber();
 
         // Render the view with pagination information
         $this->view(
             'Shop',
-            $this->data,
+            $this->view_data,
             'Shop',
             template_tags: $this->getLibrariesTags(['aos']),
             template_meta_description: "Explore a delightful selection of aromatic coffees, teas, and delectable
diff --git a/src/views/Product.php b/src/views/Product.php
index 564cd4f..c177424 100644
--- a/src/views/Product.php
+++ b/src/views/Product.php
@@ -3,8 +3,6 @@
 declare(strict_types=1);
 
 /**
- * @var $current_page_number Current page number.
- * @var $total_pages Total number of pages
  * @var $product Product product information
  * @var $product_reviews Review[] List of product reviews to be displayed with any filters applied
  * @var $current_review_filter string
@@ -13,6 +11,7 @@
  * @var $default_rating int default rating in form
  * @var $rating_distribution string An array containing the percentages of ratings
  * @var $comment_form_info ?array Array with information to be displayed on comment form
+ * @var $review_pagination string HTML code for review pagination
  */
 
 use Steamy\Core\Utility;
@@ -191,69 +190,8 @@ function printComment(StdClass $comment): void
     EOL;
 }
 
-/**
- * Returns a query string that maintains all current query string parameters and page number.
- * @param int $page_number
- * @return string Query string link for page item
- */
-function getPageItemLink(int $page_number): string
-{
-    // create a string with all past query parameters except page and url
-    unset($_GET['page']);
-    unset($_GET['url']);
-
-    $link = '?' . http_build_query($_GET);
-
-    // add page number as query parameter
-    $link .= '&page=' . $page_number;
-
-    return $link;
-}
-
-/**
- * Prints page item in HTML format.
- *
- * @param int $current_page_number
- * @param int $page_number Page number of page item
- * @return void
- */
-function displayPageItem(int $current_page_number, int $page_number): void
-{
-    $page_link = getPageItemLink($page_number);
-    $className = "page-item" . ($page_number === $current_page_number ? " active" : "");
-
-    echo <<< EOL
-    <li class="$className">
-        <a class="page-link" href="$page_link">$page_number</a>
-    </li>
-    EOL;
-}
-
-/**
- * Prints navigation button in HTML format
- * @param int $current_page_number
- * @param int $total_pages Total number of pages
- * @param bool $is_left True indicates left navigation button.
- * @return void
- */
-function displayNavigationButton(int $current_page_number, int $total_pages, bool $is_left): void
-{
-    $page_link = getPageItemLink($current_page_number + ($is_left ? -1 : 1));
-    $link_content = htmlspecialchars($is_left ? "<" : ">");
-    $className = "page-item";
-
-    if (($current_page_number === 1 && $is_left) || ($current_page_number === $total_pages && !$is_left)) {
-        $className .= " disabled";
-    }
-
-    echo <<< EOL
-    <li class="$className">
-        <a class="page-link" href="$page_link">$link_content</a>
-    </li>
-    EOL;
-}
-
 ?>
+
 <dialog id="my-modal">
     <article>
         <a href="#"
@@ -452,7 +390,6 @@ class="close"
         </div>
     </div>
 
-
     <form id="review-form" action="" method="get">
         <label for="filter-by">Filter by</label>
         <select id="filter-by" required>
@@ -481,29 +418,6 @@ class="close"
     </div>
 </main>
 
-<nav class="container" style="display: flex; justify-content: center">
-    <ul class="pagination">
-        <?php
-        // Display previous page button
-        displayNavigationButton(
-            $current_page_number,
-            $total_pages,
-            true
-        );
-
-        // Display each page item
-        for ($page_num = 1; $page_num <= $total_pages; $page_num++) {
-            displayPageItem($current_page_number, $page_num);
-        }
-
-        // Display next page button
-        displayNavigationButton(
-            $current_page_number,
-            $total_pages,
-            false
-        );
-        ?>
-    </ul>
-</nav>
+<?= $review_pagination ?>
 
 <script src="/js/product_view.bundle.js"></script>
\ No newline at end of file
diff --git a/src/views/Shop.php b/src/views/Shop.php
index c1200bf..d3f3e0f 100644
--- a/src/views/Shop.php
+++ b/src/views/Shop.php
@@ -10,8 +10,7 @@
  * @var string[] $selected_categories Array of selected categories
  * @var string $search_keyword keyword used to filter products
  * @var string $sort_option Sort By option selected by user
- * @var int $current_page_number Current page number.
- * @var int $total_pages Total number of pages
+ * @var string $pagination HTML code pagination
  */
 
 use Steamy\Model\Product;
@@ -40,69 +39,6 @@ function displayProduct(Product $product): void
         </a>
     EOL;
 }
-
-/**
- * Returns a query string that maintains all current query string parameters and page number.
- * @param int $page_number
- * @return string Query string link for page item
- */
-function getPageItemLink(int $page_number): string
-{
-    // create a string with all past query parameters except page and url
-    unset($_GET['page']);
-    unset($_GET['url']);
-
-    $link = '?' . http_build_query($_GET);
-
-    // add page number as query parameter
-    $link .= '&page=' . $page_number;
-
-    return $link;
-}
-
-/**
- * Prints page item in HTML format.
- *
- * @param int $current_page_number
- * @param int $page_number Page number of page item
- * @return void
- */
-function displayPageItem(int $current_page_number, int $page_number): void
-{
-    $page_link = getPageItemLink($page_number);
-    $className = "page-item" . ($page_number === $current_page_number ? " active" : "");
-
-    echo <<< EOL
-    <li class="$className">
-        <a class="page-link" href="$page_link">$page_number</a>
-    </li>
-    EOL;
-}
-
-/**
- * Prints navigation button in HTML format
- * @param int $current_page_number
- * @param int $total_pages Total number of pages
- * @param bool $is_left True indicates left navigation button.
- * @return void
- */
-function displayNavigationButton(int $current_page_number, int $total_pages, bool $is_left): void
-{
-    $page_link = getPageItemLink($current_page_number + ($is_left ? -1 : 1));
-    $link_content = htmlspecialchars($is_left ? "<" : ">");
-    $className = "page-item";
-
-    if (($current_page_number === 1 && $is_left) || ($current_page_number === $total_pages && !$is_left)) {
-        $className .= " disabled";
-    }
-
-    echo <<< EOL
-    <li class="$className">
-        <a class="page-link" href="$page_link">$link_content</a>
-    </li>
-    EOL;
-}
-
 ?>
 
 <form method="get" class="container">
@@ -161,30 +97,7 @@ function displayNavigationButton(int $current_page_number, int $total_pages, boo
     </div>
 </main>
 
-<nav class="container" style="display: flex; justify-content: center">
-    <ul class="pagination">
-        <?php
-        // Display previous page button
-        displayNavigationButton(
-            $current_page_number,
-            $total_pages,
-            true
-        );
-
-        // Display each page item
-        for ($page_num = 1; $page_num <= $total_pages; $page_num++) {
-            displayPageItem($current_page_number, $page_num);
-        }
-
-        // Display next page button
-        displayNavigationButton(
-            $current_page_number,
-            $total_pages,
-            false
-        );
-        ?>
-    </ul>
-</nav>
+<?= $pagination ?>
 
 <script>
   document.addEventListener("DOMContentLoaded", function() {

From fba4a7fc58b32c112b5a684a9a8f6d4e784444c1 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 31 May 2024 07:59:51 +0400
Subject: [PATCH 12/15] fix bug with nav button

right nav button was not disabled when total_pages=0
---
 src/views/Pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Pagination.php b/src/views/Pagination.php
index 729d1cd..56dd65e 100644
--- a/src/views/Pagination.php
+++ b/src/views/Pagination.php
@@ -45,7 +45,7 @@ function displayNavigationButton(int $current_page_number, int $total_pages, str
     $link_content = htmlspecialchars($is_left ? "<" : ">");
     $className = "page-item";
 
-    if (($current_page_number === 1 && $is_left) || ($current_page_number === $total_pages && !$is_left)) {
+    if (($current_page_number <= 1 && $is_left) || ($current_page_number >= $total_pages && !$is_left)) {
         $className .= " disabled";
     }
 

From b073d0c22510328b282bab9d93aa84817c4e3f00 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 31 May 2024 08:08:06 +0400
Subject: [PATCH 13/15] handle more corner cases in displayNavigationButton

---
 src/views/Pagination.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/Pagination.php b/src/views/Pagination.php
index 56dd65e..54dd056 100644
--- a/src/views/Pagination.php
+++ b/src/views/Pagination.php
@@ -45,7 +45,11 @@ function displayNavigationButton(int $current_page_number, int $total_pages, str
     $link_content = htmlspecialchars($is_left ? "<" : ">");
     $className = "page-item";
 
-    if (($current_page_number <= 1 && $is_left) || ($current_page_number >= $total_pages && !$is_left)) {
+    if (($current_page_number > $total_pages) || // invalid page number
+        ($current_page_number < 1) || // invalid page number
+        ($current_page_number === 1 && $is_left) || // first page
+        ($current_page_number === $total_pages && !$is_left) // last page
+    ) {
         $className .= " disabled";
     }
 

From 93721c5dd5d83f9179610b8f884e751b92370002 Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Sat, 1 Jun 2024 08:23:05 +0400
Subject: [PATCH 14/15] rename `deleteOrder` to `cancelOrder` in `Order` model,
 update implementation to update order status to 'cancelled' instead of
 deleting, and update `Profile` controller and view to reflect the change

---
 src/controllers/Profile.php |  2 +-
 src/models/Order.php        | 12 +++---------
 src/views/Profile.php       |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/controllers/Profile.php b/src/controllers/Profile.php
index f6c7892..e518acb 100644
--- a/src/controllers/Profile.php
+++ b/src/controllers/Profile.php
@@ -145,7 +145,7 @@ public function cancelOrder(): void
         }
 
         // Cancel the order
-        $order->deleteOrder();
+        $order->cancelOrder();
     }
 
     private function handleProfileEditSubmission(): void
diff --git a/src/models/Order.php b/src/models/Order.php
index c20cd86..07377be 100644
--- a/src/models/Order.php
+++ b/src/models/Order.php
@@ -260,21 +260,15 @@ public static function getByID(int $order_id): ?Order
     }
 
     /**
-     * Deletes the order and associated line items from the database.
+     * Cancels the order and associated line items from the database.
      */
-    public function deleteOrder(): void
+    public function cancelOrder(): void
     {
         $conn = self::connect();
         $conn->beginTransaction();
 
         try {
-            // Delete line items first
-            $query = "DELETE FROM order_product WHERE order_id = :order_id";
-            $stm = $conn->prepare($query);
-            $stm->execute(['order_id' => $this->order_id]);
-
-            // Delete the order itself
-            $query = "DELETE FROM `order` WHERE order_id = :order_id";
+            $query = "UPDATE `order` SET status = 'cancelled' WHERE order_id = :order_id";
             $stm = $conn->prepare($query);
             $stm->execute(['order_id' => $this->order_id]);
 
diff --git a/src/views/Profile.php b/src/views/Profile.php
index 6051efe..3987139 100644
--- a/src/views/Profile.php
+++ b/src/views/Profile.php
@@ -100,7 +100,7 @@
                     $totalPrice = htmlspecialchars(number_format($order->calculateTotalPrice(), 2));
 
                     // Determine button states
-                    $cancelDisabled = $order->getStatus()->value === 'completed' ? 'disabled' : '';
+                    $cancelDisabled = ($order->getStatus()->value === 'completed' || $order->getStatus()->value === 'cancelled') ? 'disabled' : '';
 
                     echo <<< EOL
                     <tr>

From d17eeef78606b9e3f8d15b88a61001a9aa2b4eac Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Sat, 1 Jun 2024 18:08:05 +0400
Subject: [PATCH 15/15] in getByID, product_id should not be null

---
 src/models/OrderProduct.php | 46 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/models/OrderProduct.php b/src/models/OrderProduct.php
index 5c4d7be..efb4ce4 100644
--- a/src/models/OrderProduct.php
+++ b/src/models/OrderProduct.php
@@ -87,35 +87,33 @@ public function validate(): array
         return $errors;
     }
 
-    public static function getByID(int $order_id, int $product_id = null): ?OrderProduct
+    /**
+     * order_id and product_id are the primary of the record to be searched.
+     * @param int $order_id
+     * @param int $product_id
+     * @return OrderProduct|null
+     */
+    public static function getByID(int $order_id, int $product_id): ?OrderProduct
     {
-    $query = 'SELECT * FROM order_product WHERE order_id = :order_id';
-    $params = ['order_id' => $order_id];
-
-    if ($product_id !== null) {
-        $query .= ' AND product_id = :product_id';
-        $params['product_id'] = $product_id;
-    }
+        $query = 'SELECT * FROM order_product WHERE order_id = ? and product_id= ?';
+        $params = [$order_id, $product_id];
 
-    $result = self::query($query, $params);
-    if (empty($result)) {
-        return null;
-    }
+        $result = self::query($query, $params);
+        if (empty($result)) {
+            return null;
+        }
 
-    // Assuming there's only one product for a given order if product_id is not provided
-    if ($product_id === null) {
         $result = $result[0];
-    }
 
-    return new OrderProduct(
-        product_id: $result->product_id,
-        cup_size: $result->cup_size,
-        milk_type: $result->milk_type,
-        quantity: $result->quantity,
-        unit_price: (float)$result->unit_price,
-        order_id: $result->order_id,
-    );
-   }
+        return new OrderProduct(
+            product_id: $result->product_id,
+            cup_size: $result->cup_size,
+            milk_type: $result->milk_type,
+            quantity: $result->quantity,
+            unit_price: (float)$result->unit_price,
+            order_id: $result->order_id,
+        );
+    }
 
     public function getOrderID(): int
     {