Add indexes to the database.

Reviewed-on: #59
Co-authored-by: Krzysiej <krzysiej@gmail.com>
Co-committed-by: Krzysiej <krzysiej@gmail.com>

src/Command/Migrate.php

@@ -181,19 +181,72 @@ class Migrate extends Command
                 $table->integer('stock')->nullable();
             });
         }
+        if (!Capsule::schema()->hasColumn('products', 'promotions')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->json('promotions')->nullable();
+            });
+        }
     }
 
     public function index(): void
     {
-        if (!count(Capsule::select('SELECT name FROM sqlite_master WHERE type = "index" and name = "products_skuid_country_id_unique"'))) {
+        if (!$this->hasIndex('products_skuid_country_id_unique')) {
             Capsule::schema()->table('products', function (Blueprint $table) {
-                $table->integer('skuID')->unique(false)->change();
+                if ($this->hasIndex('products_skuid_unique')) {
+                    $table->integer('skuID')->unique(false)->change();
+                }
                 $table->unique(['skuID', 'country_id']);
             });
         }
 
-        Capsule::schema()->table('products', function (Blueprint $table) {
-            $table->foreign('id')->references('product_id')->on('stocks');
-        });
+        if (!$this->hasIndex('prices_product_id_index')) {
+            Capsule::schema()->table('prices', function (Blueprint $table) {
+                $table->index('product_id');
+            });
+        }
+
+        if (!$this->hasIndex('products_id_index')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->index('id');
+            });
+        }
+
+        if (!$this->hasIndex('stocks_product_id_stock_index')) {
+            Capsule::schema()->table('stocks', function (Blueprint $table) {
+                $table->index(['product_id', 'stock']);
+            });
+        }
+
+        if (!$this->isFK('products', 'id', 'stocks', 'product_id')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->foreign('id')->references('product_id')->on('stocks');
+            });
+        }
+
+        if (!$this->isFK('products', 'id', 'prices', 'product_id')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->foreign('id')->references('product_id')->on('prices');
+            });
+        }
+        if (!$this->isFK('products', 'country_id', 'countries', 'id')) {
+            Capsule::schema()->table('products', function (Blueprint $table) {
+                $table->foreign('country_id')->references('id')->on('countries');
+            });
+        }
+    }
+
+    private function isFK(string $table, string $column, string $fTable, string $fColumn): bool
+    {
+        $fkColumns = Capsule::schema()->getForeignKeys($table);
+
+        return !empty(array_filter($fkColumns, fn($fkColumn) => ($fkColumn['foreign_table'] == $fTable &&
+            in_array($fColumn, $fkColumn['foreign_columns']) &&
+            in_array($column, $fkColumn['columns']))
+        ));
+    }
+
+    private function hasIndex(string $indexName): bool
+    {
+        return !!count(Capsule::select('SELECT name FROM sqlite_master WHERE type = "index" and name = ?', [$indexName]));
     }
 }

src/Command/ScrapeWebsite.php

@@ -120,6 +120,7 @@ class ScrapeWebsite extends Command
         $productModel->lastSeen = date("Y-m-d");
         $productModel->touch('updated_at');
         $productModel->country()->associate($country);
+        $productModel->promotions = $product->promotions;
         $productModel->save();
         $priceExists = $productModel->price()->whereRaw("strftime('%Y-%m-%d', created_at) = ?", [date('Y-m-d')])->exists();
 

src/Controller/IndexController.php

@@ -14,11 +14,11 @@ final class IndexController extends BaseController
         if ($this->cache->getItem('list_all')->isHit()) {
             return $this->render('productList.html.twig', ['listType' => 'all']);
         }
-        $products = Product::with(['currentStock'])
-            ->orderByDesc('starred')
+        $products = Product::orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();
 
+
         return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'all']);
     }
 }

src/Controller/PromosController.php

@@ -8,18 +8,25 @@ use Symfony\Component\Routing\Attribute\Route;
 
 final class PromosController extends BaseController
 {
-    #[Route('/promos', name: 'app_promos')]
-    public function __invoke(): Response
+    #[Route('/promos/{promo?}', name: 'app_promos')]
+    public function __invoke(?string $promo): Response
     {
-        if($this->cache->getItem('list_promos')->isHit()) {
-            return $this->render('productList.html.twig', ['listType' => 'promos']);
+        if ($this->cache->getItem('list_promos')->isHit()) {
+            return $this->render('productList.html.twig', ['listType' => 'promos' . $promo]);
         }
 
-        $products = Product::whereRaw('priceCurrent < productStandardPrice')
+        $products = Product::when(is_null($promo), fn($q) => $q->whereRaw('priceCurrent < productStandardPrice'))
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->with(['currentPrice', 'lowestPrice'])
+            ->when(!is_null($promo), fn($q) => $q->whereRaw("json_extract(promotions, '$.slug') LIKE ?", $promo))
             ->get();
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'promos']);
+
+
+        $promos = Product::select($this->database->getConnection()->raw("distinct json_extract(promotions, '$.slug') as slug, json_extract(promotions, '$.tag') as tag"))
+            ->whereRaw("json_extract(promotions, '$.tag') is not null")
+            ->get();
+
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'promos' . $promo, 'promos' => $promos->toArray()]);
     }
 }

src/Models/Product.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
+use Illuminate\Support\Str;
 use function Symfony\Component\Clock\now;
 
 /**
@@ -28,6 +29,7 @@ use function Symfony\Component\Clock\now;
  * @property float $lowestProductPrice30Days
  * @property Date $lastSeen
  * @property integer $stock
+ * @property Object $promotions
  */
 class Product extends Model
 {
@@ -58,9 +60,10 @@ class Product extends Model
     {
         return $this->hasOne(Price::class)->ofMany('price', 'MIN');
     }
+
     public function newestPrice(): HasOne
     {
-        return $this->hasOne(Price::class)->latest();
+        return $this->hasOne(Price::class)->latest()->take(1);
     }
 
     public function stock(): HasMany
@@ -70,7 +73,7 @@ class Product extends Model
 
     public function currentStock(): HasOne
     {
-        return $this->stock()->one()->ofMany()->withDefault(fn (Stock $stock) => $stock->stock = 0);
+        return $this->stock()->one()->ofMany()->withDefault(fn(Stock $stock) => $stock->stock = 0)->take(1);
     }
 
     public function toggleStarred(): self
@@ -88,10 +91,23 @@ class Product extends Model
         );
     }
 
+    public function promotions(): Attribute
+    {
+        return Attribute::make(
+            get: fn(?string $value) => json_decode($value ?? '{"hasPromotion": false}', 1),
+            set: function (\stdClass $value) {
+                $value->slug = Str::slug($value->tag);
+
+                return json_encode($value);
+            }
+        );
+    }
+
     public function isDiscontinued(): bool
     {
         return $this->lastSeen < now()->format('Y-m-d');
     }
+
     public function isNew(): bool
     {
         return $this->created_at->format('Y-m-d') > now()->modify('-30 days')->format('Y-m-d');

templates/footer.html.twig

@@ -1,9 +0,0 @@
-<div class="container">
-    <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
-        <div class="col-md-4 d-flex align-items-center">
-            <span class="mb-3 mb-md-0 text-body-secondary">© 2025 Company, Inc</span>
-            <a class="align-items-center text-decoration-none" data-bs-theme-value="light">☀️ Light</a>
-            <a class="align-items-center text-decoration-none" data-bs-theme-value="dark">🌕 Dark</a>
-        </div>
-    </footer>
-</div>

templates/product.html.twig

@@ -11,6 +11,7 @@
                 <td>
                     <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
                     <span class="badge text-bg-light"><a href="{{ path('app_search', {'search': product.subTitle}) }}" class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
+                    {% if product.promotions is not null and product.promotions.hasPromotion %}<a href="{{ path('app_promos', {'promo': product.promotions.slug}) }}"><span class="badge bg-info">PROMO: {{ product.promotions.tag }}</span></a>{% endif %}
                 </td>
                 <td>
                     <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">

templates/productList.html.twig

@@ -7,6 +7,12 @@
             {{ renderCategoryTree(categoryTree, category) | raw }}
         {% endif %}
 
+        {% if listType starts with 'promos' %}
+            {% for promo in promos %}
+                <a href="{{ path('app_promos', {'promo': promo.slug}) }}"><span class="badge bg-info">PROMO: {{ promo.tag }}</span></a>
+            {% endfor %}
+        {% endif %}
+
 
         {% if (listType starts with 'category_' and category == null)  or not (listType starts with 'category_') or (listType starts with 'category_' and category is not null)   %}
             <div class="table-responsive">
@@ -49,6 +55,7 @@
                                 <span class="badge text-bg-light"><a
                                             href="{{ path('app_search', {'search': product.subTitle}) }}"
                                             class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
+                                {% if product.promotions is not null and product.promotions.hasPromotion %}<a href="{{ path('app_promos', {'promo': product.promotions.slug}) }}"><span class="badge bg-info">PROMO: {{ product.promotions.tag }}</span></a>{% endif %}
                             </td>
                             <td class="align-middle">
                                 <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">

templates/template.html.twig

@@ -1,81 +1,11 @@
 <!doctype html>
-<html lang="en" data-bs-theme="">
+<html lang="en" data-bs-theme="light">
 <head>
-    <script>
-        (() => {
-            'use strict'
-
-            const getStoredTheme = () => localStorage.getItem('theme')
-            const setStoredTheme = theme => localStorage.setItem('theme', theme)
-
-            const getPreferredTheme = () => {
-                const storedTheme = getStoredTheme()
-                if (storedTheme) {
-                    return storedTheme
-                }
-
-                return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
-            }
-
-            const setTheme = theme => {
-                if (theme === 'auto') {
-                    document.documentElement.setAttribute('data-bs-theme', (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'))
-                } else {
-                    document.documentElement.setAttribute('data-bs-theme', theme)
-                }
-            }
-
-            setTheme(getPreferredTheme())
-
-            const showActiveTheme = (theme, focus = false) => {
-                const themeSwitcher = document.querySelector('#bd-theme')
-
-                if (!themeSwitcher) {
-                    return
-                }
-
-                const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
-
-                document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
-                    element.classList.remove('active')
-                })
-
-                btnToActive.classList.add('active')
-
-                if (focus) {
-                    themeSwitcher.focus()
-                }
-            }
-
-            window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
-                const storedTheme = getStoredTheme()
-                if (storedTheme !== 'light' && storedTheme !== 'dark') {
-                    setTheme(getPreferredTheme())
-                }
-            })
-
-            window.addEventListener('DOMContentLoaded', () => {
-                showActiveTheme(getPreferredTheme())
-
-                document.querySelectorAll('[data-bs-theme-value]')
-                    .forEach(toggle => {
-                        toggle.addEventListener('click', () => {
-                            const theme = toggle.getAttribute('data-bs-theme-value')
-                            setStoredTheme(theme)
-                            setTheme(theme)
-                            showActiveTheme(theme, true)
-                        })
-                    })
-            })
-        })()
-
-    </script>
     <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>Ryobi crawler</title>
-    <link href="/templates/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="/templates/css/bootstrap.min.css" rel="stylesheet" />
     <script src="/templates/js/script.js" defer></script>
 </head>
 <body>
@@ -83,47 +13,32 @@
     <div class="container-fluid">
         <a class="navbar-brand" href="{{ path('app_home') }}">Crawler</a>
 
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
-                aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                 {% cache "menu_count" ~ listType|default('') %}
                     <li class="nav-item">
-                        <a class="nav-link {% if app.request.pathinfo == path('app_home') %}active shadow-sm bg-body rounded{% endif %}"
-                           aria-current="page" href="{{ path('app_home') }}">All products <span
-                                    class="badge text-bg-secondary">{{ allCount() }}</span></a>
+                        <a class="nav-link {% if app.request.pathinfo == path('app_home') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_home') }}">All products <span class="badge text-bg-secondary">{{ allCount() }}</span></a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {% if app.request.pathinfo == path('app_promos') %}active shadow-sm bg-body rounded{% endif %}"
-                           aria-current="page" href="{{ path('app_promos') }}">Promos <span
-                                    class="badge text-bg-secondary">{{ promosCount() }}</span></a>
+                        <a class="nav-link {% if app.request.pathinfo == path('app_promos') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_promos') }}">Promos <span class="badge text-bg-secondary">{{ promosCount() }}</span></a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {% if app.request.pathinfo == path('app_lowest_price') %}active shadow-sm bg-body rounded{% endif %}"
-                           aria-current="page" href="{{ path('app_lowest_price') }}">Lowest price <span
-                                    class="badge text-bg-secondary">{{ lowestPriceCount() }}</span></a>
+                        <a class="nav-link {% if app.request.pathinfo == path('app_lowest_price') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_lowest_price') }}">Lowest price <span class="badge text-bg-secondary">{{ lowestPriceCount() }}</span></a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {% if app.request.pathinfo == path('app_new') %}active shadow-sm bg-body rounded{% endif %}"
-                           aria-current="page" href="{{ path('app_new') }}">New in last 30 days <span
-                                    class="badge text-bg-secondary">{{ newCount() }}</span></a>
+                        <a class="nav-link {% if app.request.pathinfo == path('app_new') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_new') }}">New in last 30 days <span class="badge text-bg-secondary">{{ newCount() }}</span></a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link {% if app.request.pathinfo == path('app_discontinued') %}active shadow-sm bg-body rounded{% endif %}"
-                           aria-current="page" href="{{ path('app_discontinued') }}">Discontinued <span
-                                    class="badge text-bg-secondary">{{ discontinuedCount() }}</span></a>
+                        <a class="nav-link {% if app.request.pathinfo == path('app_discontinued') %}active shadow-sm bg-body rounded{% endif %}" aria-current="page" href="{{ path('app_discontinued') }}">Discontinued <span class="badge text-bg-secondary">{{ discontinuedCount() }}</span></a>
                     </li>
                 {% endcache %}
-                {#                <li class="nav-item dropdown"> #}
-                {#                   #}
-                {#                </li> #}
             </ul>
 
             <form class="form-floating d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
-                <input class="form-control me-2 form-control-sm" type="search" id="floatingInputValue" name="search"
-                       placeholder="Search term eg. 36v or RCS18X" value="{{ search|default('') }}">
+                <input class="form-control me-2 form-control-sm" type="search" id="floatingInputValue" name="search" placeholder="Search term eg. 36v or RCS18X" value="{{ search|default('') }}">
                 <button class="btn btn-outline-success" type="submit">Search</button>
                 <label for="floatingInputValue">Search term eg. 36v or RCS18X</label>
             </form>
@@ -132,7 +47,6 @@
 
 </nav>
 {% block content %}{% endblock %}
-{{ include('footer.html.twig') }}
 <script src="/templates/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>