Merge branch 'master' into feature/order-columns

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

Dockerfile

@@ -1,7 +1,8 @@
 FROM php:8.3-cli
 
 WORKDIR /usr/src/app
-
+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 \

bin/bash

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+bin/cli bash

bin/cli

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+docker compose exec php-app "$@"

bin/update

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

composer.json

@@ -1,7 +1,6 @@
 {
     "require": {
         "guzzlehttp/guzzle": "^7.0",
-        "symfony/var-dumper": "^7.0",
         "illuminate/database": "11.26.0.0",
         "ext-json": "*",
         "symfony/console": "^7.0",
@@ -18,5 +17,8 @@
         "psr-4": {
             "Krzysiej\\RyobiCrawler\\": "src/"
         }
+    },
+    "require-dev": {
+        "symfony/var-dumper": "^7.1"
     }
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4eef5feb5e2635d7fb7c69c8ed01a84c",
+    "content-hash": "a6920081bf40809334b8dda2da16752d",
     "packages": [
         {
             "name": "brick/math",
@@ -4123,16 +4123,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.1.5",
+            "version": "v7.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e20e03889539fd4e4211e14d2179226c513c010d"
+                "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e20e03889539fd4e4211e14d2179226c513c010d",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8",
-                "reference": "e20e03889539fd4e4211e14d2179226c513c010d",
+                "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8",
                 "shasum": ""
             },
             "require": {
@@ -4186,7 +4186,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.1.5"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.8"
             },
             "funding": [
                 {
@@ -4202,7 +4202,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T10:07:02+00:00"
+            "time": "2024-11-08T15:46:42+00:00"
         },
         {
             "name": "symfony/var-exporter",

src/Command/ScrapeWebsite.php

@@ -40,7 +40,6 @@ class ScrapeWebsite extends Command
         $products = $this->getProducts();
         $progress->setMaxSteps(count($products));
         foreach ($products as $product) {
-            //dd($product);
             $this->saveProduct($product);
             $progress->advance();
         }
@@ -91,6 +90,7 @@ class ScrapeWebsite extends Command
         $productModel->variantCode = $product->variantCode;
         $productModel->modelCode = $product->modelCode;
         $productModel->url = $product->url;
+        $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,7 +2,9 @@
 
 namespace Krzysiej\RyobiCrawler\Controller;
 
+use Illuminate\Database\Eloquent\Builder;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
 use Twig\Environment;
 use Illuminate\Database\Capsule\Manager as Capsule;
 
@@ -17,4 +19,19 @@ class BaseController extends AbstractController
         $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

@@ -13,6 +13,7 @@ final class CategoryController extends BaseController
     {
         $products = Product::with('price')
             ->selectRaw('products.*')
+            ->distinct('products.id')
             ->fromRaw('products, json_each(products.categories)')
             ->whereRaw('json_each.value = ?', [$category])
             ->orderByDesc('starred')

src/Controller/DiscontinuedController.php

@@ -0,0 +1,24 @@
+<?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 DiscontinuedController extends BaseController
+{
+    #[Route('/discontinued', name: 'app_discontinued')]
+    public function __invoke(): Response
+    {
+
+        $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]);
+    }
+}

src/Controller/IndexController.php

@@ -3,15 +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
     {
-        $products = Product::with('price')->orderByDesc('starred')->orderByDesc('created_by')->get();
+        $products = Product::with(['currentStock', 'price', 'currentPrice']);
+        $products = $this->handleOrderProducts($products, $request)->get();
         return $this->render('productList.html.twig', ['products' => $products]);
     }
 }

src/Controller/NewController.php

@@ -0,0 +1,25 @@
+<?php
+
+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;
+
+use function Symfony\Component\Clock\now;
+
+final class NewController extends BaseController
+{
+    #[Route('/new', name: 'app_new')]
+    public function __invoke(): Response
+    {
+        $products = Product::where('created_at', '>', now()->modify('-30 days')->format('Y-m-d'))
+            ->orderByDesc('starred')
+            ->orderByDesc('name')
+            ->orderByDesc('created_by')
+            ->with(['currentPrice'])
+            ->get();
+        return $this->render('productList.html.twig', ['products' => $products]);
+    }
+}

src/Controller/ProductController.php

@@ -26,9 +26,26 @@ final class ProductController extends BaseController
         if (null === $product) {
             throw $this->createNotFoundException('Product not found');
         }
+        $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();
 
-        $priceList = $product->price()->pluck('price')->implode(',');
+        return $this->render('product.html.twig', [
-        $priceDates = $product->price()->pluck('created_at')->map(fn($date) => $date->format('Y-m-d'))->implode("','");
+            'product' => $product,
-        return $this->render('product.html.twig', ['product' => $product, 'price_list' => $priceList, 'price_dates' => $priceDates]);
+            'price_list' => $this->prepareChartData($priceDates, $priceList),
+            'stock_list' => $this->prepareChartData($stockDates, $stockList),
+            'price_dates' => implode("','", $priceDates),
+        ]);
+    }
+
+    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/Controller/SearchController.php

@@ -13,7 +13,6 @@ final class SearchController extends BaseController
     public function __invoke(Request $request): Response
     {
         $search = $request->query->get('search');
-        //dd();
         $products = Product::with('price')
             ->orWhere([['name', 'like', "%$search%"]])
             ->orWhere([['subTitle', 'like', "%$search%"]])->get();

src/Models/Product.php

@@ -7,6 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
+use function Symfony\Component\Clock\now;
+
 /**
  * @property integer $skuID
  * @property string $name
@@ -44,6 +46,13 @@ class Product extends Model
         return $this->hasMany(Stock::class);
     }
 
+    public function currentStock(): HasOne
+    {
+        return $this->stock()->one()->ofMany()->withDefault(function (Stock $stock) {
+            $stock->stock = 0;
+        });
+    }
+
     public function toggleStarred(): self
     {
         $this->starred = !$this->starred;
@@ -58,4 +67,13 @@ class Product extends Model
             set: fn(array $value) => json_encode($value),
         );
     }
+
+    public function isDiscontinued(): bool
+    {
+        return $this->updated_at->format('Y-m-d') < 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');
+    }
 }

src/Twig/AppExtension.php

@@ -11,12 +11,16 @@ use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 
+use function Symfony\Component\Clock\now;
+
 class AppExtension extends AbstractExtension
 {
     public function getFunctions(): array
     {
         return [
             new TwigFunction('promosCount', [$this, 'promosCount']),
+            new TwigFunction('newCount', [$this, 'newCount']),
+            new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
         ];
     }
 
@@ -32,6 +36,16 @@ class AppExtension extends AbstractExtension
         return Product::whereHas('currentPrice', fn(Builder $query) => $query->whereColumn('price', '<', 'productStandardPrice'))->with(['currentPrice'])->count();
     }
 
+    public function newCount(): int
+    {
+        return Product::where('created_at', '>', now()->modify('-30 days')->format('Y-m-d'))->count();
+    }
+
+    public function discontinuedCount(): int
+    {
+        return Product::where('updated_at', '<', now()->format('Y-m-d'))->count();
+    }
+
     public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null
     {
         return $items->first(fn($item) => str_starts_with($item->created_at, $date));

templates/js/script.js

@@ -0,0 +1,4 @@
+(function() {
+    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+    const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+})();

templates/product.html.twig

@@ -1,31 +1,37 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
+    <div class="table-responsive">
         <table class='table table-hover'>
             <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 %}★{% else %} ☆ {% endif %}</a></td>
                 <td><img src='{{ product.image }}&width=150' class='border rounded p-1' alt='{{ product.name }}'/></td>
-            <td><a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a></td>
-            <td>{{ product.subTitle }}</td>
                 <td>
-                <ul class='nav'>
+                    <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
+                    <span class="badge text-bg-light">{{ product.subTitle }}</span>
+                </td>
+                <td>
+                    <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">
+                        <ol class="breadcrumb">
                             {% for category in product.categories %}
-                        <li class="nav-item"><a class="nav-link" href="{{ path('app_category', {'category': category}) }}"> {{ category }} </a></li>
+                                <li class="breadcrumb-item" aria-current="page"><a class="breadcrumb-item text-decoration-none"
+                                                                                   href="{{ path('app_category', {'category': category}) }}">{{ category }}</a></li>
                             {% endfor %}
-                </ul>
+                        </ol>
+                    </nav>
                 </td>
                 <td><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
             </tr>
             <tr>
-            <td colspan="4">
+                <td colspan="5">
                     <div style="width: 800px;">
                         <canvas id="price"></canvas>
                     </div>
                 </td>
             </tr>
             <tr>
-            <td colspan="4">
+                <td colspan="5">
                     <table class='table table-hover table-sm mb-0'>
                         <thead>
                         <tr>
@@ -48,29 +54,36 @@
                 </td>
             </tr>
         </table>
+    </div>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
     <script>
-        const ctx = document.getElementById('price');
+        const ctx = document.getElementById('price').getContext('2d');
 
         new Chart(ctx, {
             type: 'line',
             data: {
                 labels: ['{{ price_dates|raw }}'],
-                datasets: [{
+                datasets: [
+                    {
                         label: 'Price (PLN)',
-                    data: [{{ price_list }}],
+                        data: {{ price_list|raw }},
+                        yAxisID: 'yPrice',
+                        tension: 0.1,
                         borderWidth: 1
-                }]
+                    },
+                    {
+                        label: 'Stock (units)',
+                        data: {{ stock_list|raw }},
+                        yAxisID: 'yStock',
+                        tension: 0.1,
+                        borderWidth: 1
+                    }
+                ]
             },
             options: {
+                responsive: true,
                 animation: false,
-                plugins: {
-                    title: {
-                        display: true,
-                        text: 'Price in time'
-                    },
-                },
                 scales: {
                     x: {
                         title: {
@@ -78,13 +91,40 @@
                             text: 'Date'
                         }
                     },
-                    y: {
+                    yPrice: {
+                        type: 'linear',
+                        position: 'left',
                         beginAtZero: true,
                         title: {
                             display: true,
-                            text: 'Price'
+                            text: 'Price (PLN)'
+                        },
+                        grid: {
+                            drawOnChartArea: false
+                        }
+                    },
+                    yStock: {
+                        type: 'linear',
+                        position: 'right',
+                        beginAtZero: true,
+                        title: {
+                            display: true,
+                            text: 'Stock (units)'
+                        },
+                        grid: {
+                            drawOnChartArea: false
                         }
                     }
+                },
+                plugins: {
+                    legend: {
+                        display: true,
+                        position: 'top'
+                    },
+                    title: {
+                        display: true,
+                        text: 'Price and Stock in time'
+                    },
                 }
             }
         });

templates/productList.html.twig

@@ -1,36 +1,61 @@
 {% extends "template.html.twig" %}
 
 {% block content %}
+<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 class="d-none d-md-table-cell">Code</th>
             <th>Categories</th>
             <th></th>
-            <th>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>
         {% 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 font-weight-bold h3"><a class="text-warning text-decoration-none"
-                <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70' class='border rounded p-1' alt='{{ product.name }}'/></td>
+                                                                href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a></td>
-                <td class="align-middle"><a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</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 d-none d-md-table-cell">{{ product.subTitle }}</td>
                 <td class="align-middle">
-                    <ul class='nav'>
+                    <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
+                    {% if product.currentStock.stock > 0 %}
+                        <span class="badge text-bg-light">stock: {{ product.currentStock.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.updated_at }}">is discontinued</span>
+                    {% endif %}
+                    {% if product.isNew() %}
+                        <span class="badge text-bg-success">is new</span>
+                    {% endif %}
+                    <span class="badge text-bg-light">{{ product.subTitle }}</span>
+                </td>
+                <td class="align-middle">
+                    <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';" >
+                        <ol class="breadcrumb">
                             {% for category in product.categories %}
-                            <li class="nav-item"><a class="nav-link" href="{{ path('app_category', {'category': category}) }}"> {{ category }} </a></li>
+                                <li class="breadcrumb-item" aria-current="page"><a class="breadcrumb-item text-decoration-none"  href="{{ path('app_category', {'category': category}) }}">{{ category }}</a></li>
                             {%  endfor %}
-                    </ul>
+                        </ol>
+                    </nav>
                 </td>
                 <td class="align-middle"><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
                 <td class="align-middle">{{ product.price.last.price | format_currency('PLN', {}, 'pl') }}</td>
-                <td class="align-middle">{% if product.price.last.price != product.price.last.productStandardPrice %}<span class="text-decoration-line-through text-warning">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span class="text-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</td>
+                <td class="align-middle">
+                    <div class="d-flex flex-row">
+                        {% 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>
             </tr>
         {% endfor %}
     </table>
+</div>
 {% endblock %}

templates/template.html.twig

@@ -5,8 +5,8 @@
     <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="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
+    <link href="/templates/css/bootstrap.min.css" rel="stylesheet" />
-          crossorigin="anonymous"/>
+    <script src="/templates/js/script.js" defer></script>
 </head>
 <body>
 <nav class="navbar navbar-expand-lg sticky-top bg-body-tertiary border-bottom border-secondary border-1">
@@ -19,12 +19,20 @@
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                 <li class="nav-item">
-                    <a class="nav-link active" aria-current="page" href="{{ path('app_promos') }}">Promos ({{ promosCount() }})</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_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="d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
+
-                <input class="form-control me-2" type="search" name="search" placeholder="Search term eg. 36v or RCS18X" value="{{ search|default('') }}" aria-label="Search">
+            <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('') }}">
                 <button class="btn btn-outline-success" type="submit">Search</button>
+                <label for="floatingInputValue">Search term eg. 36v or RCS18X</label>
             </form>
         </div>
     </div>