Merge branch 'master' into feature/order-columns

# Conflicts:
#	Dockerfile
#	templates/productList.html.twig

.gitignore

@@ -1,5 +1,5 @@
 /vendor/
 .idea
-*.sqlite
+database.sqlite
 var/cache/
 .env.local

Dockerfile

@@ -1,8 +1,8 @@
 FROM php:8.3-cli
 
 WORKDIR /usr/src/app
-ENV PHP_MEMORY_LIMIT=1500M
-RUN echo "memory_limit=1500M" > /usr/local/etc/php/conf.d/memory-limit.ini
+ENV PHP_MEMORY_LIMIT=512M
+RUN echo "memory_limit=512M" > /usr/local/etc/php/conf.d/memory-limit.ini
 RUN apt-get update && apt-get install -y \
     git \
     unzip \

README.md

@@ -4,7 +4,7 @@
 
 1. Clone repository using `git clone https://git.techtube.pl/krzysiej/ryobi-crawler.git`
 2. Cd into project directory `cd ryobi-crawler`
-3. Build and start docker container `docker compose up -d --build --force-recreate`
+3. Build and start docker container `docker compose up -d`
 4. Run `docker compose exec php-app php console.php app:migrate` file to create `database.sqlite` and create tables. 
 5. Run `docker compose exec php-app php console.php app:scrape` command to scrape all the products from the ryobi website.
 6. Access web interface using `localhost:9001` address in web browser.
@@ -17,17 +17,10 @@
 3. Refresh cache on production by removing cache directory: `rm -rf var/cache`
 4. Start and build image in one go with command: `docker compose up -d --build --force-recreate`
 
-## Bonus 
-
-### Install composer package
-
-1. Run `bin/composer require vendor/package-name`
-
-
 ## Running Cron
 
 For now only way of running `app:scrape` command on schedule is to use host crontab.
-1. Run `crontab -e` command to edit a host crontab job file
+1. Run `crontab -e` command to edit host crontab job file
 2. Add a new line with e.g. line like this `0 1 * * * cd /var/project/directory/ && docker compose exec php-app php console.php app:scrape`
 3. Save and exit file editor. Cron will execute `app:scrape` once per day.
 

bin/cacheclean

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-bin/cli rm -rf var/cache

bin/cachewarmup

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-bin/cli php console.php app:cache:warm-twig

bin/composer

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-[ -z "$1" ] && bin/cli composer list && exit
-bin/cli composer "$@"

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"

composer.json

@@ -11,9 +11,7 @@
         "symfony/twig-bundle": "^7.1",
         "symfony/dotenv": "^7.1",
         "twig/intl-extra": "^3.13",
-        "twig/extra-bundle": "^3.13",
-        "symfony/cache": "^7.2",
-        "twig/cache-extra": "^3.21"
+        "twig/extra-bundle": "^3.13"
     },
     "autoload": {
         "psr-4": {

console.php

@@ -2,16 +2,18 @@
 
 include_once 'vendor/autoload.php';
 
-use Krzysiej\RyobiCrawler\Kernel;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Krzysiej\RyobiCrawler\Command\Migrate;
+use Krzysiej\RyobiCrawler\Command\ScrapeWebsite;
+
+use Symfony\Component\Console\Application;
 
 if (php_sapi_name() !== 'cli') {
     header('Location: browser.php');
     echo 'Execute this script in cli only';
     exit;
 }
-$kernel = new Kernel('dev', true);
-$application = new Application($kernel);
-$application->setName('Ryobi website scraper application');
-$application->setVersion('1.2.0');
+
+$application = new Application('Ryobi website scraper application', '1.1.1');
+$application->add(new ScrapeWebsite());
+$application->add(new Migrate());
 $application->run();

index.php

@@ -1,11 +1,46 @@
 <?php
 
-use Krzysiej\RyobiCrawler\Kernel;
+use Krzysiej\RyobiCrawler\Twig\AppExtension;
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 require 'vendor/autoload.php';
 
+class Kernel extends BaseKernel
+{
+    use MicroKernelTrait;
+
+    public function registerBundles(): iterable
+    {
+        return [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
+        ];
+    }
+
+    protected function configureContainer(ContainerConfigurator $container): void
+    {
+        $container->extension('framework', [
+            'secret' => 'S0ME_SECRET'
+        ]);
+        $container->services()
+            ->load('Krzysiej\\RyobiCrawler\\Controller\\', __DIR__.'/src/Controller/*')
+            ->autowire()
+            ->autoconfigure()
+        ;
+        $container->services()->set(AppExtension::class)->tag('twig.extension');
+    }
+
+    protected function configureRoutes(RoutingConfigurator $routes): void
+    {
+        $routes->import(__DIR__.'/src/Controller/', 'attribute');
+    }
+}
 (new Dotenv())->bootEnv(__DIR__.'/.env');
 
 $kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);

src/Command/CacheWarmCommand.php

@@ -1,84 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Krzysiej\RyobiCrawler\Command;
-
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\HttpFoundation\Request;
-use Illuminate\Database\Capsule\Manager as Capsule;
-use Krzysiej\RyobiCrawler\Models\Product;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Twig\Environment;
-
-#[AsCommand(name: 'app:cache:warm-twig', description: 'Warmup twig cache')]
-class CacheWarmCommand extends Command
-{
-    public function __construct(
-        private Environment $twig,
-        private RequestStack $requestStack,
-        private FilesystemAdapter $cache,
-    ) {
-        parent::__construct();
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $this->cache->clear();
-
-        $capsule = new Capsule;
-        $capsule->addConnection([
-            'driver' => 'sqlite',
-            'database' => __DIR__ . '/../../database.sqlite',
-        ]);
-        $capsule->setAsGlobal();
-        $capsule->bootEloquent();
-
-        $progress = new ProgressBar($output);
-        $progress->start();
-        $products = Product::with([
-            'price' => fn($query) => $query->orderByDesc('created_at'),
-            'stock' => fn($query) => $query->orderByDesc('created_at'),
-        ])->get();
-        $progress->setMaxSteps(count($products));
-
-        $request = Request::create('/cache-warm');
-        $this->requestStack->push($request);
-
-        foreach ($products as $product) {
-            $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();
-            $this->twig->render('product.html.twig', [
-                'product' => $product,
-                'price_list' => $this->prepareChartData($priceDates, $priceList),
-                'stock_list' => $this->prepareChartData($stockDates, $stockList),
-                'price_dates' => implode("','", $priceDates),
-            ]);
-            $progress->advance();
-        }
-
-        $progress->finish();
-        $output->writeln('');
-        $output->writeln('DONE');
-
-        return Command::SUCCESS;
-    }
-
-    private function prepareChartData($set1, $set2): string
-    {
-        $data = [];
-        foreach ($set1 as $key => $value) {
-            $data[] = ['x' => $value, 'y' => $set2[$key]];
-        }
-        $stringData = json_encode($data);
-
-        return str_replace(['"x"', '"y"'], ['x', 'y'], $stringData);
-    }
-}

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;
@@ -22,19 +21,20 @@ class ScrapeWebsite extends Command
 {
     private Client $client;
 
-    public function __construct(protected Capsule $database)
-    {
-        parent::__construct();
-    }
-
     protected function configure(): void
     {
+        $capsule = new Capsule;
+        $capsule->addConnection([
+            'driver' => 'sqlite',
+            'database' => __DIR__ . '/../../database.sqlite',
+        ]);
+        $capsule->setAsGlobal();
+        $capsule->bootEloquent();
         $this->client = new Client();
     }
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $output->writeln('Scrape products');
         $progress = new ProgressBar($output);
         $progress->start();
         $products = $this->getProducts();
@@ -44,27 +44,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 +90,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/BaseController.php

@@ -2,8 +2,9 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
+use Illuminate\Database\Eloquent\Builder;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\HttpFoundation\Request;
 use Twig\Environment;
 use Illuminate\Database\Capsule\Manager as Capsule;
 
@@ -11,7 +12,26 @@ class BaseController extends AbstractController
 {
     protected Environment $twig;
 
-    public function __construct(protected FilesystemAdapter $cache, protected Capsule $database)
+    public function __construct()
     {
+        $capsule = new Capsule;
+        $capsule->addConnection(['driver' => 'sqlite', 'database' => __DIR__ . '/../../database.sqlite']);
+        $capsule->setAsGlobal();
+        $capsule->bootEloquent();
+    }
+
+    protected function handleOrderProducts(Builder $builder, Request $request): Builder
+    {
+        $builder->orderByDesc('starred')->orderByDesc('created_by');
+        if ($request->query->get('order')) {
+            $orderField = $request->query->get('order');
+            $direction = 'desc';
+            if (str_starts_with($orderField, '-')) {
+                $direction = 'asc';
+            }
+            $builder->orderBy($request->query->get('order'), $direction);
+        }
+
+        return $builder;
     }
 }

src/Controller/CategoryController.php

@@ -11,11 +11,7 @@ final class CategoryController extends BaseController
     #[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]);
-        }
-
-        $products = Product::with(['price', 'lowestPrice'])
+        $products = Product::with('price')
             ->selectRaw('products.*')
             ->distinct('products.id')
             ->fromRaw('products, json_each(products.categories)')
@@ -23,7 +19,6 @@ final class CategoryController extends BaseController
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();
-
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'category_'.$category]);
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/DiscontinuedController.php

@@ -13,14 +13,12 @@ final class DiscontinuedController extends BaseController
     #[Route('/discontinued', name: 'app_discontinued')]
     public function __invoke(): Response
     {
-        if($this->cache->getItem('list_discontinued')->isHit()) {
-            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'])
             ->get();
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'discontinued']);
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/IndexController.php

@@ -3,22 +3,17 @@
 namespace Krzysiej\RyobiCrawler\Controller;
 
 use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends BaseController
 {
     #[Route('/', name: 'app_home')]
-    public function __invoke(): Response
+    public function __invoke(Request $request): Response
     {
-        if ($this->cache->getItem('list_all')->isHit()) {
-            return $this->render('productList.html.twig', ['listType' => 'all']);
-        }
-        $products = Product::with(['currentStock'])
-            ->orderByDesc('starred')
-            ->orderByDesc('created_by')
-            ->get();
-
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'all']);
+        $products = Product::with(['currentStock', 'price', 'currentPrice']);
+        $products = $this->handleOrderProducts($products, $request)->get();
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

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;
@@ -13,15 +14,12 @@ final class NewController extends BaseController
     #[Route('/new', name: 'app_new')]
     public function __invoke(): Response
     {
-        if($this->cache->getItem('list_new')->isHit()) {
-            return $this->render('productList.html.twig', ['listType' => 'new']);
-        }
-
         $products = Product::where('created_at', '>', now()->modify('-30 days')->format('Y-m-d'))
             ->orderByDesc('starred')
+            ->orderByDesc('name')
             ->orderByDesc('created_by')
-            ->with(['currentPrice', 'lowestPrice'])
+            ->with(['currentPrice'])
             ->get();
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'new']);
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/ProductController.php

@@ -19,10 +19,6 @@ 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()) {
-            return $this->render('product.html.twig', ['product' => ['id' => $productId]]);
-        }
-
         $product = Product::with([
             'price' => fn($query) => $query->orderBy('created_at', 'desc'),
             'stock' => fn($query) => $query->orderBy('created_at', 'desc'),
@@ -30,34 +26,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;
@@ -11,15 +12,11 @@ final class PromosController extends BaseController
     #[Route('/promos', name: 'app_promos')]
     public function __invoke(): Response
     {
-        if($this->cache->getItem('list_promos')->isHit()) {
-            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'])
+            ->with(['currentPrice'])
             ->get();
-        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'promos']);
+        return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/SearchController.php

@@ -17,6 +17,6 @@ final class SearchController extends BaseController
             ->orWhere([['name', 'like', "%$search%"]])
             ->orWhere([['subTitle', 'like', "%$search%"]])->get();
 
-        return $this->render('productList.html.twig', ['products' => $products ?? [], 'search' => $search, 'listType' => 'search_'.$search]);
+        return $this->render('productList.html.twig', ['products' => $products ?? [], 'search' => $search]);
     }
 }

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/DatabaseFactory.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace Krzysiej\RyobiCrawler;
-
-use Illuminate\Database\Capsule\Manager as Capsule;
-class DatabaseFactory
-{
-    public static function create(Capsule $capsule): void
-    {
-        $capsule->addConnection(['driver' => 'sqlite', 'database' => __DIR__ . '/../database.sqlite']);
-        $capsule->setAsGlobal();
-        $capsule->bootEloquent();
-    }
-}

src/Kernel.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace Krzysiej\RyobiCrawler;
-
-use Illuminate\Database\Capsule\Manager;
-use Krzysiej\RyobiCrawler\Twig\AppExtension;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Bundle\TwigBundle\TwigBundle;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
-use Twig\Extra\Cache\CacheExtension;
-use Twig\Extra\Cache\CacheRuntime;
-use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
-
-class Kernel extends BaseKernel
-{
-    use MicroKernelTrait;
-
-    public function registerBundles(): iterable
-    {
-        return [
-            new FrameworkBundle(),
-            new TwigBundle(),
-            new TwigExtraBundle(),
-        ];
-    }
-
-    protected function configureContainer(ContainerConfigurator $container): void
-    {
-        $container->extension('framework', [
-            'secret' => 'S0ME_SECRET'
-        ]);
-        $services = $container->services()->defaults()->autowire()->autoconfigure();
-        $services->set(Manager::class)->configurator([DatabaseFactory::class, 'create']);
-        $services->load('Krzysiej\\RyobiCrawler\\', __DIR__ )
-            ->exclude('../src/{Models,Twig,DatabaseFactory.php,Kernel.php}');
-        $services->set('twig.extension.cache', AppExtension::class)->tag('twig.extension');
-        $services->set(CacheExtension::class)->tag('twig.extension');
-        $services->set(FilesystemAdapter::class)->args([
-                '$directory' => __DIR__ . '/../var/cache/twig_blocks'
-            ]);
-        $services->set('twig.runtime.cache', CacheRuntime::class)->args([new Reference(FilesystemAdapter::class)])->tag('twig.runtime');
-    }
-
-    protected function configureRoutes(RoutingConfigurator $routes): void
-    {
-        $routes->import(__DIR__ . '/Controller/', 'attribute');
-    }
-}

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
 {
@@ -47,15 +41,6 @@ class Product extends Model
         return $this->hasOne(Price::class)->latestOfMany('created_at');
     }
 
-    public function lowestPrice(): HasOne
-    {
-        return $this->hasOne(Price::class)->ofMany('price', 'MIN');
-    }
-    public function newestPrice(): HasOne
-    {
-        return $this->hasOne(Price::class)->latest();
-    }
-
     public function stock(): HasMany
     {
         return $this->hasMany(Stock::class);
@@ -63,7 +48,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 +70,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

@@ -19,10 +19,8 @@ class AppExtension extends AbstractExtension
     {
         return [
             new TwigFunction('promosCount', [$this, 'promosCount']),
-            new TwigFunction('allCount', [$this, 'allCount']),
             new TwigFunction('newCount', [$this, 'newCount']),
             new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
-            new TwigFunction('lowestPriceCount', [$this, 'lowestPriceCount']),
         ];
     }
 
@@ -33,14 +31,9 @@ class AppExtension extends AbstractExtension
         ];
     }
 
-    public function allCount(): int
-    {
-        return Product::count();
-    }
-
     public function promosCount(): int
     {
-        return Product::whereRaw('priceCurrent < productStandardPrice')->count();
+        return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->with(['currentPrice'])->count();
     }
 
     public function newCount(): int
@@ -50,15 +43,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

@@ -1,7 +1,6 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
-{% cache 'product' ~ product.id %}
     <div class="table-responsive">
         <table class='table table-hover'>
             <tr>
@@ -83,7 +82,6 @@
                 ]
             },
             options: {
-                spanGaps: false,
                 responsive: true,
                 animation: false,
                 scales: {
@@ -131,6 +129,5 @@
             }
         });
     </script>
-{% endcache %}
 {% endblock %}
 

templates/productList.html.twig

@@ -1,18 +1,17 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
-{% cache 'list_' ~ listType %}
 <div class="table-responsive">
+    {{ app.request.get('order') }}
     <table class='table table-hover'>
         <thead>
         <tr>
             <th></th>
             <th></th>
-            <th>Name</th>
+            <th><a href="{{ path( app.request.get('_route') , {'order': app.request.get('order') is same as('-name')?'name':'-name'|default('-name')}) }}">Name</a></th>
             <th>Categories</th>
             <th></th>
-            <th class="text-end">Lowest Price</th>
-            <th class="text-end">Current Price</th>
+            <th><a href="{{ path( app.request.get('_route') , {'order': app.request.get('order') is same as('-price')?'price':'-price'|default('-price')}) }}">Price</a></th>
             <th></th>
         </tr>
         </thead>
@@ -29,7 +28,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>
@@ -38,7 +37,7 @@
                 </td>
                 <td class="align-middle">
                     <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';" >
-                        <ol class="breadcrumb mb-0">
+                        <ol class="breadcrumb">
                             {% 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 %}
@@ -46,19 +45,12 @@
                     </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">{{ 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>&nbsp;<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>
@@ -66,5 +58,4 @@
         {% endfor %}
     </table>
 </div>
-{% endcache %}
 {% endblock %}

templates/template.html.twig

@@ -18,23 +18,15 @@
         </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>
-                    </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>
-                    <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>
-                    </li>
-                {% endcache %}
+                <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_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>
+                </li>
             </ul>
 
             <form class="form-floating d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
@@ -47,7 +39,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>