Start of changing tabled to flexboxes

bin/update

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 echo "Updating project"
 git pull origin master
-bin/cacheclean
+bin/cli rm -rf var/cache
 echo "Project updated"

src/Command/Migrate.php

@@ -24,10 +24,11 @@ class Migrate extends Command
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        if ($input->getOption(self::RECREATE_OPTION)) {
+        if (true === $input->hasOption(self::RECREATE_OPTION)) {
             unlink(__DIR__ . '/../../database.sqlite');
-            touch(__DIR__ . '/../../database.sqlite');
+            //sleep(5);
         }
+        touch(__DIR__ . '/../../database.sqlite');
         $capsule = new Capsule;
         $capsule->addConnection([
             'driver' => 'sqlite',
@@ -38,7 +39,6 @@ class Migrate extends Command
         $this->createProductsTable();
         $this->createPricesTable();
         $this->createStocksTable();
-        $this->addColumns();
 
         return Command::SUCCESS;
     }
@@ -94,37 +94,4 @@ class Migrate extends Command
             });
         }
     }
-
-    public function addColumns(): void
-    {
-        if (!Capsule::schema()->hasColumn('products', 'priceCurrent')) {
-            Capsule::schema()->table('products', function (Blueprint $table) {
-                $table->float('priceCurrent')->default(0);
-            });
-        }
-
-        if (!Capsule::schema()->hasColumn('products', 'priceLowest')) {
-            Capsule::schema()->table('products', function (Blueprint $table) {
-                $table->float('priceLowest')->default(0);
-            });
-        }
-
-        if (!Capsule::schema()->hasColumn('products', 'productStandardPrice')) {
-            Capsule::schema()->table('products', function (Blueprint $table) {
-                $table->float('productStandardPrice')->default(0);
-            });
-        }
-
-        if (!Capsule::schema()->hasColumn('products', 'lowestProductPrice30Days')) {
-            Capsule::schema()->table('products', function (Blueprint $table) {
-                $table->float('lowestProductPrice30Days')->default(0);
-            });
-        }
-
-        if (!Capsule::schema()->hasColumn('products', 'lastSeen')) {
-            Capsule::schema()->table('products', function (Blueprint $table) {
-                $table->date('lastSeen')->nullable();
-            });
-        }
-    }
 }

src/Command/ScrapeWebsite.php

@@ -7,7 +7,6 @@ namespace Krzysiej\RyobiCrawler\Command;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Database\Capsule\Manager as Capsule;
-use Illuminate\Support\Facades\Date;
 use Krzysiej\RyobiCrawler\Models\Price;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Krzysiej\RyobiCrawler\Models\Stock;
@@ -34,7 +33,6 @@ class ScrapeWebsite extends Command
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $output->writeln('Scrape products');
         $progress = new ProgressBar($output);
         $progress->start();
         $products = $this->getProducts();
@@ -44,27 +42,8 @@ class ScrapeWebsite extends Command
             $progress->advance();
         }
         $progress->finish();
-        $output->writeln('Scrape products - DONE');
         $output->writeln('');
-
-        $output->writeln('Update prices');
-        $products = Product::all();
-        $progress->setMaxSteps(count($products));
-        $progress->start();
-        foreach($products as $product) {
-            $newestPrice = $product->newestPrice;
-            $product->priceCurrent = $newestPrice->price;
-            $product->productStandardPrice = $newestPrice->productStandardPrice;
-            $product->lowestProductPrice30Days = $newestPrice->lowestProductPrice30Days;
-            $product->priceLowest = $product->lowestPrice->price;
-            $product->lastSeen = $newestPrice->created_at->format('Y-m-d');
-            $product->save(['timestamps' => false]);
-            $progress->advance();
-        }
-        $progress->finish();
-        $output->writeln('');
-        $output->writeln('Update prices - DONE');
-        $output->writeln('COMMAND - DONE');
+        $output->writeln('DONE');
 
         return Command::SUCCESS;
     }
@@ -109,7 +88,6 @@ class ScrapeWebsite extends Command
         $productModel->variantCode = $product->variantCode;
         $productModel->modelCode = $product->modelCode;
         $productModel->url = $product->url;
-        $productModel->lastSeen = date("Y-m-d");
         $productModel->touch('updated_at');
         $productModel->save();
         $priceExists = $productModel->price()->whereRaw("strftime('%Y-%m-%d', created_at) = ?", [date('Y-m-d')])->exists();

src/Controller/DiscontinuedController.php

@@ -17,9 +17,10 @@ final class DiscontinuedController extends BaseController
             return $this->render('productList.html.twig', ['listType' => 'discontinued']);
         }
 
-        $products = Product::where('lastSeen', '<', now()->format('Y-m-d'))
+        $products = Product::where('updated_at', '<', now()->format('Y-m-d'))
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
+            ->with(['currentPrice', 'lowestPrice'])
             ->get();
         return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'discontinued']);
     }

src/Controller/IndexController.php

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

src/Controller/LowestPriceController.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Krzysiej\RyobiCrawler\Controller;
-
-use Krzysiej\RyobiCrawler\Models\Product;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-use function Symfony\Component\Clock\now;
-
-final class LowestPriceController extends BaseController
-{
-    #[Route('/lowest-price', name: 'app_lowest_price', methods: ['GET'])]
-    public function __invoke(): Response
-    {
-        $listType = 'lowest_price';
-        if($this->cache->getItem('lowest_price')->isHit()) {
-            return $this->render('productList.html.twig', ['listType' => $listType]);
-        }
-
-        $products = Product::whereRaw('priceCurrent = priceLowest')
-            ->whereRaw('lastSeen = "'.now()->format('Y-m-d').'"')
-            ->whereRaw('priceCurrent < productStandardPrice')
-            ->orderByDesc('starred')
-            ->orderByDesc('created_by')
-            ->with(['currentPrice', 'lowestPrice'])
-            ->get();
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => $listType]);
-    }
-}

src/Controller/NewController.php

@@ -2,6 +2,7 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
+use Illuminate\Database\Eloquent\Builder;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;

src/Controller/ProductController.php

@@ -3,6 +3,7 @@
 namespace Krzysiej\RyobiCrawler\Controller;
 
 use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Twig\Error\LoaderError;
@@ -19,7 +20,7 @@ final class ProductController extends BaseController
     #[Route('/product/{productId<\d+>}', name: 'app_product')]
     public function __invoke(int $productId): Response
     {
-        if ($this->cache->getItem('product' . $productId)->isHit()) {
+        if($this->cache->getItem('product'.$productId)->isHit()) {
             return $this->render('product.html.twig', ['product' => ['id' => $productId]]);
         }
 
@@ -30,34 +31,26 @@ final class ProductController extends BaseController
         if (null === $product) {
             throw $this->createNotFoundException('Product not found');
         }
-        $priceList = $product->price()->pluck('price', 'created_at')->mapWithKeys(fn($price, $createdAt) => [explode(' ', $createdAt)[0] => $price])->toArray();
-        $stockList = $product->stock()->pluck('stock', 'created_at')->mapWithKeys(fn($stock, $createdAt) => [explode(' ', $createdAt)[0] => $stock])->toArray();
+        $priceList = $product->price()->pluck('price');
+        $stockList = $product->stock()->pluck('stock');
+        $priceDates = $product->price()->pluck('created_at')->map(fn($date) => $date->format('Y-m-d'))->toArray();
+        $stockDates = $product->stock()->pluck('created_at')->map(fn($date) => $date->format('Y-m-d'))->toArray();
+
         return $this->render('product.html.twig', [
             'product' => $product,
-            'price_list' => $this->prepareChartData($priceList),
-            'stock_list' => $this->prepareChartData($stockList),
-            'price_dates' => implode("','", $this->dateRange(array_key_first($priceList), array_key_last($priceList))),
+            'price_list' => $this->prepareChartData($priceDates, $priceList),
+            'stock_list' => $this->prepareChartData($stockDates, $stockList),
+            'price_dates' => implode("','", $priceDates),
         ]);
     }
 
-    private function prepareChartData($set1): string
+    private function prepareChartData($set1, $set2): string
     {
-        $dates = $this->dateRange(array_key_first($set1), array_key_last($set1));
-        $data = array_map(fn($date) => ['x' => $date, 'y' => $set1[$date] ?? null], $dates);
+        $data = [];
+        foreach ($set1 as $key => $value) {
+            $data[] = ['x' => $value, 'y' => $set2[$key]];
+        }
         $stringData = json_encode($data);
-
         return str_replace(['"x"', '"y"'], ['x', 'y'], $stringData);
     }
-
-    private function dateRange($dateStart, $dateEnd): array
-    {
-        $from = new \DateTime($dateStart);
-        $to = new \DateTime($dateEnd);
-        $range = [];
-        for ($date = clone $from; $date < $to; $date->modify('+1 day')) {
-            $range[] = $date->format('Y-m-d');
-        }
-
-        return $range;
-    }
 }

src/Controller/PromosController.php

@@ -2,6 +2,7 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
+use Illuminate\Database\Eloquent\Builder;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -15,7 +16,7 @@ final class PromosController extends BaseController
             return $this->render('productList.html.twig', ['listType' => 'promos']);
         }
 
-        $products = Product::whereRaw('priceCurrent < productStandardPrice')
+        $products = Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->with(['currentPrice', 'lowestPrice'])

src/Controller/StarController.php

@@ -12,18 +12,7 @@ final class StarController extends BaseController
     #[Route('/star/{productId<\d+>}', name: 'app_star')]
     public function __invoke(int $productId, Request $request): Response
     {
-        $this->cache->deleteItems(['list_all', 'list_promos', 'list_new', 'list_discontinued']);
-        $referer = $request->headers->get('referer');
-        if (str_contains($referer, '/category/')) {
-            preg_match('#/category/(.*)#i', $referer, $matches);
-            $this->cache->deleteItem('list_category_'.urldecode($matches[1]));
-        }
-        if (str_contains($referer, '/search?search=')) {
-            preg_match('#/search\?search=(.*)#i', $referer, $matches);
-            $this->cache->deleteItem('list_search_'.urldecode($matches[1]));
-        }
-
         Product::find($productId)->toggleStarred()->save();
-        return $this->redirect($referer);
+        return $this->redirect($request->headers->get('referer'));
     }
 }

src/Models/Product.php

@@ -2,7 +2,6 @@
 
 namespace Krzysiej\RyobiCrawler\Models;
 
-use Carbon\Traits\Date;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -21,11 +20,6 @@ use function Symfony\Component\Clock\now;
  * @property string $modelCode
  * @property string $url
  * @property int $starred
- * @property float $priceCurrent
- * @property float $priceLowest
- * @property float $productStandardPrice
- * @property float $lowestProductPrice30Days
- * @property Date $lastSeen
  */
 class Product extends Model
 {
@@ -51,10 +45,6 @@ class Product extends Model
     {
         return $this->hasOne(Price::class)->ofMany('price', 'MIN');
     }
-    public function newestPrice(): HasOne
-    {
-        return $this->hasOne(Price::class)->latest();
-    }
 
     public function stock(): HasMany
     {
@@ -63,7 +53,9 @@ 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(function (Stock $stock) {
+            $stock->stock = 0;
+        });
     }
 
     public function toggleStarred(): self
@@ -83,7 +75,7 @@ class Product extends Model
 
     public function isDiscontinued(): bool
     {
-        return $this->lastSeen < now()->format('Y-m-d');
+        return $this->updated_at->format('Y-m-d') < now()->format('Y-m-d');
     }
     public function isNew(): bool
     {

src/Twig/AppExtension.php

@@ -22,7 +22,6 @@ class AppExtension extends AbstractExtension
             new TwigFunction('allCount', [$this, 'allCount']),
             new TwigFunction('newCount', [$this, 'newCount']),
             new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
-            new TwigFunction('lowestPriceCount', [$this, 'lowestPriceCount']),
         ];
     }
 
@@ -32,7 +31,6 @@ class AppExtension extends AbstractExtension
             new TwigFilter('findByCreatedAtDate', [$this, 'findByCreatedAtDate']),
         ];
     }
-
     public function allCount(): int
     {
         return Product::count();
@@ -40,7 +38,7 @@ class AppExtension extends AbstractExtension
 
     public function promosCount(): int
     {
-        return Product::whereRaw('priceCurrent < productStandardPrice')->count();
+        return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->count();
     }
 
     public function newCount(): int
@@ -50,15 +48,7 @@ class AppExtension extends AbstractExtension
 
     public function discontinuedCount(): int
     {
-        return Product::where('lastSeen', '<>', now()->format('Y-m-d'))->count();
-    }
-
-    public function lowestPriceCount(): int
-    {
-        return Product::whereRaw('priceCurrent = priceLowest')
-            ->whereRaw('lastSeen = "'.now()->format('Y-m-d').'"')
-            ->whereRaw('priceCurrent < productStandardPrice')
-            ->count();
+        return Product::where('updated_at', '<', now()->format('Y-m-d'))->count();
     }
 
     public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null

templates/product.html.twig

@@ -83,7 +83,6 @@
                 ]
             },
             options: {
-                spanGaps: false,
                 responsive: true,
                 animation: false,
                 scales: {

templates/productList.html.twig

@@ -3,21 +3,22 @@
 {% block content %}
 {% cache 'list_' ~ listType %}
 <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>
+{#    <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>
+            <div class="d-inline-flex">
+
                 <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>
@@ -29,7 +30,7 @@
                         <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>
+                        <span class="badge text-bg-secondary"  data-bs-toggle="tooltip" data-bs-title="Last update: {{ product.updated_at }}">is discontinued</span>
                     {% endif %}
                     {% if product.isNew() %}
                         <span class="badge text-bg-success">is new</span>
@@ -46,25 +47,19 @@
                     </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('PLN', {}, 'pl') }}
-                    {% else %}
-                        {% if product.priceLowest != product.priceCurrent %}{{ product.priceLowest | format_currency('PLN', {}, 'pl') }}{%else%}<span class="badge text-bg-info">now lowest</span>{% endif %}</td>
-                    {% endif %}
-
-                <td class="align-middle text-end">{{ product.priceCurrent | format_currency('PLN', {}, 'pl') }}</td>
+                <td class="align-middle text-end">{% if product.lowestPrice.price != product.price.last.price  %}{{ product.lowestPrice.price | format_currency('PLN', {}, 'pl') }}{% endif %}</td>
+                <td class="align-middle text-end">{{ product.price.last.price | format_currency('PLN', {}, 'pl') }}</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('PLN', {}, 'pl') }}</span> <span
-                                class="badge text-bg-success flex-fill">{{ ((1 - product.priceCurrent / product.productStandardPrice)*100)|number_format(0) }}%</span>
+                        {% if product.price.last.price != product.price.last.productStandardPrice %}<span
+                                class="badge text-bg-warning text-decoration-line-through flex-fill">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span> <span
+                                class="badge text-bg-success flex-fill">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>
                         {% endif %}
                     </div>
                 </td>
-            </tr>
+            </div>
         {% endfor %}
-    </table>
+{#    </table>#}
 </div>
 {% endcache %}
 {% endblock %}

templates/template.html.twig

@@ -18,16 +18,13 @@
         </button>
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                {% cache "menu_count" ~ listType|default('') %}
+                {% cache "menu_count" %}
                     <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>
                     </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>
                     </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>
-                    </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>
                     </li>
@@ -47,7 +44,8 @@
 
 </nav>
 {% block content %}{% endblock %}
-<script src="/templates/js/bootstrap.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
+
 </body>
 </html>