Render category tree on category pages

src/Command/Migrate.php

@@ -112,7 +112,7 @@ class Migrate extends Command
                     'productsUrl' => 'https://uk.ryobitools.eu/api/product-listing/get-products',
                     'cultureCode' => 'en-GB',
                     'currency' => 'GBP',
-                    'locale' => 'uk',
+                    'locale' => 'en',
                     'created_at' => now(),
                     'updated_at' => now(),
                 ]
@@ -181,72 +181,19 @@ 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 (!$this->hasIndex('products_skuid_country_id_unique')) {
+        if (!count(Capsule::select('SELECT name FROM sqlite_master WHERE type = "index" and name = "products_skuid_country_id_unique"'))) {
             Capsule::schema()->table('products', function (Blueprint $table) {
-                if ($this->hasIndex('products_skuid_unique')) {
-                    $table->integer('skuID')->unique(false)->change();
-                }
+                $table->integer('skuID')->unique(false)->change();
                 $table->unique(['skuID', 'country_id']);
             });
         }
 
-        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]));
+        Capsule::schema()->table('products', function (Blueprint $table) {
+            $table->foreign('id')->references('product_id')->on('stocks');
+        });
     }
 }

src/Command/ScrapeWebsite.php

@@ -38,7 +38,7 @@ class ScrapeWebsite extends Command
         $progress = new ProgressBar($output);
         $countries = Country::all();
         foreach($countries as $country) {
-            $output->writeln('Country name: ' . $country->countryName);
+            $output->writeln('Country name: ' . $country->countryName."\n");
             $progress->start();
             $products = $this->getProducts($country);
             $progress->setMaxSteps(count($products));
@@ -120,7 +120,6 @@ 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/CategoryController.php

@@ -8,19 +8,19 @@ use Symfony\Component\Routing\Attribute\Route;
 
 final class CategoryController extends BaseController
 {
-    #[Route('/category/{category?}',  name: 'app_category')]
-    public function __invoke(?string $category): Response
+    #[Route('/category/{category}', name: 'app_category')]
+    public function __invoke(string $category): Response
     {
-        if($this->cache->getItem('list_category_'.$category)->isHit()) {
-            return $this->render('productList.html.twig', ['listType' => 'category_'.$category]);
-        }
+//        if($this->cache->getItem('list_category_'.$category)->isHit()) {
+//            return $this->render('productList.html.twig', ['listType' => 'category_'.$category]);
+//        }
 
         /** @var Product[] $products */
         $products = Product::with(['price', 'lowestPrice'])
             ->selectRaw('products.*')
             ->distinct('products.id')
-            ->when(!is_null($category) , fn ($q) => $q->whereRaw('json_each.value = ?', [$category]))
             ->fromRaw('products, json_each(products.categories)')
+            ->whereRaw('json_each.value = ?', [$category])
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();

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::orderByDesc('starred')
+        $products = Product::with(['currentStock'])
+            ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();
 
-
         return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'all']);
     }
 }

src/Controller/PromosController.php

@@ -8,25 +8,18 @@ use Symfony\Component\Routing\Attribute\Route;
 
 final class PromosController extends BaseController
 {
-    #[Route('/promos/{promo?}', name: 'app_promos')]
-    public function __invoke(?string $promo): Response
+    #[Route('/promos', name: 'app_promos')]
+    public function __invoke(): Response
     {
-        if ($this->cache->getItem('list_promos')->isHit()) {
-            return $this->render('productList.html.twig', ['listType' => 'promos' . $promo]);
+        if($this->cache->getItem('list_promos')->isHit()) {
+            return $this->render('productList.html.twig', ['listType' => 'promos']);
         }
 
-        $products = Product::when(is_null($promo), fn($q) => $q->whereRaw('priceCurrent < productStandardPrice'))
+        $products = Product::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();
-
-
-        $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()]);
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'promos']);
     }
 }

src/Models/Product.php

@@ -9,7 +9,6 @@ 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;
 
 /**
@@ -29,7 +28,6 @@ use function Symfony\Component\Clock\now;
  * @property float $lowestProductPrice30Days
  * @property Date $lastSeen
  * @property integer $stock
- * @property Object $promotions
  */
 class Product extends Model
 {
@@ -60,10 +58,9 @@ class Product extends Model
     {
         return $this->hasOne(Price::class)->ofMany('price', 'MIN');
     }
-
     public function newestPrice(): HasOne
     {
-        return $this->hasOne(Price::class)->latest()->take(1);
+        return $this->hasOne(Price::class)->latest();
     }
 
     public function stock(): HasMany
@@ -73,7 +70,7 @@ class Product extends Model
 
     public function currentStock(): HasOne
     {
-        return $this->stock()->one()->ofMany()->withDefault(fn(Stock $stock) => $stock->stock = 0)->take(1);
+        return $this->stock()->one()->ofMany()->withDefault(fn (Stock $stock) => $stock->stock = 0);
     }
 
     public function toggleStarred(): self
@@ -91,23 +88,10 @@ 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/product.html.twig

@@ -11,7 +11,6 @@
                 <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: '>';">
@@ -23,7 +22,7 @@
                         </ol>
                     </nav>
                 </td>
-                <td><a href='https://{{ product.country.locale }}.ryobitools.eu{{ product.url }}'>link</a></td>
+                <td><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
             </tr>
             <tr>
                 <td colspan="5">

templates/productList.html.twig

@@ -1,97 +1,75 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
-    {% cache 'list_' ~ listType %}
+{% cache 'list_' ~ listType %}
 
-        {% if listType starts with 'category_' %}
-            {{ renderCategoryTree(categoryTree, category) | raw }}
-        {% endif %}
+{%  if listType starts with 'category_' %}
+    {{ 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 %}
+<div class="table-responsive">
+    <table class='table table-hover'>
+        <thead>
+        <tr>
+            <th></th>
+            <th></th>
+            <th>Name</th>
+            <th>Categories</th>
+            <th></th>
+            <th class="text-end">Lowest Price</th>
+            <th class="text-end">Current Price</th>
+            <th></th>
+        </tr>
+        </thead>
+        {% for product in products %}
+            <tr>
+                <td class="align-middle font-weight-bold h3"><a class="text-warning text-decoration-none"
+                                                                href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a></td>
+                <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70' class='img-thumbnail' alt='{{ product.name }}'/></td>
+                <td class="align-middle">
+                    <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
+                    {% if product.stock > 0 %}
+                        <span class="badge text-bg-light">stock: {{ product.stock }}</span>
+                    {% else %}
+                        <span class="badge text-bg-warning">out of stock</span>
+                    {% endif %}
+                    {% if product.isDiscontinued() %}
+                        <span class="badge text-bg-secondary"  data-bs-toggle="tooltip" data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span>
+                    {% endif %}
+                    {% if product.isNew() %}
+                        <span class="badge text-bg-success">is new</span>
+                    {% endif %}
+                    <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>
+                </td>
+                <td class="align-middle">
+                    <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';" >
+                        <ol class="breadcrumb mb-0">
+                            {% for category in product.categories %}
+                                <li class="breadcrumb-item" aria-current="page"><a class="breadcrumb-item text-decoration-none"  href="{{ path('app_category', {'category': category}) }}">{{ category }}</a></li>
+                            {%  endfor %}
+                        </ol>
+                    </nav>
+                </td>
+                <td class="align-middle"><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
+                <td class="align-middle text-end">
+                    {% if product.isDiscontinued() or product.priceCurrent == product.productStandardPrice %}
+                        {{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}
+                    {% else %}
+                        {% if product.priceLowest != product.priceCurrent %}{{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}{%else%}<span class="badge text-bg-info">now lowest</span>{% endif %}</td>
+                    {% 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">
-                <table class='table table-hover'>
-                    <thead>
-                    <tr>
-                        <th></th>
-                        <th></th>
-                        <th>Name</th>
-                        <th>Categories</th>
-                        <th></th>
-                        <th class="text-end">Lowest Price</th>
-                        <th class="text-end">Current Price</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    {% for product in products %}
-                        <tr>
-                            <td class="align-middle font-weight-bold h3"><a class="text-warning text-decoration-none"
-                                                                            href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a>
-                            </td>
-                            <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70'
-                                                                                class='img-thumbnail'
-                                                                                alt='{{ product.name }}'/></td>
-                            <td class="align-middle">
-                                <a href='{{ path('app_product', {'productId': product.id}) }}'
-                                   class="text-decoration-none">{{ product.name }}</a>
-                                {% if product.stock > 0 %}
-                                    <span class="badge text-bg-light">stock: {{ product.stock }}</span>
-                                {% else %}
-                                    <span class="badge text-bg-warning">out of stock</span>
-                                {% endif %}
-                                {% if product.isDiscontinued() %}
-                                    <span class="badge text-bg-secondary" data-bs-toggle="tooltip"
-                                          data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span>
-                                {% endif %}
-                                {% if product.isNew() %}
-                                    <span class="badge text-bg-success">is new</span>
-                                {% endif %}
-                                <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: '>';">
-                                    <ol class="breadcrumb mb-0">
-                                        {% for category in product.categories %}
-                                            <li class="breadcrumb-item" aria-current="page"><a
-                                                        class="breadcrumb-item text-decoration-none"
-                                                        href="{{ path('app_category', {'category': category}) }}">{{ category }}</a>
-                                            </li>
-                                        {% endfor %}
-                                    </ol>
-                                </nav>
-                            </td>
-                            <td class="align-middle"><a href='https://{{ product.country.locale }}.ryobitools.eu{{ product.url }}'>link</a></td>
-                            <td class="align-middle text-end">
-                                {% if product.isDiscontinued() or product.priceCurrent == product.productStandardPrice %}
-                                {{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}
-                                {% else %}
-                                {% if product.priceLowest != product.priceCurrent %}{{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}{% else %}
-                                    <span class="badge text-bg-info">now lowest</span>{% endif %}</td>
-                            {% endif %}
-
-                            <td class="align-middle text-end">{{ product.priceCurrent | format_currency(product.country.currency, {}, product.country.locale) }}</td>
-                            <td class="align-middle">
-                                <div class="d-flex flex-row">
-                                    {% if product.priceCurrent != product.productStandardPrice %}<span
-                                            class="badge text-bg-warning text-decoration-line-through flex-fill">{{ product.productStandardPrice | format_currency(product.country.currency, {}, product.country.locale) }}</span>
-                                        <span
-                                                class="badge text-bg-success flex-fill">{{ ((1 - product.priceCurrent / product.productStandardPrice)*100)|number_format(0) }}%</span>
-                                    {% endif %}
-                                </div>
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
-            </div>
-        {% endif %}
-    {% endcache %}
+                <td class="align-middle text-end">{{ product.priceCurrent | format_currency(product.country.currency, {}, product.country.locale) }}</td>
+                <td class="align-middle">
+                    <div class="d-flex flex-row">
+                        {% if product.priceCurrent != product.productStandardPrice %}<span
+                                class="badge text-bg-warning text-decoration-line-through flex-fill">{{ product.productStandardPrice | format_currency(product.country.currency, {}, product.country.locale) }}</span> <span
+                                class="badge text-bg-success flex-fill">{{ ((1 - product.priceCurrent / product.productStandardPrice)*100)|number_format(0) }}%</span>
+                        {% endif %}
+                    </div>
+                </td>
+            </tr>
+        {% endfor %}
+    </table>
+</div>
+{% endcache %}
 {% endblock %}