Country stats and searching by exact model name.

src/Command/Migrate.php

@@ -246,16 +246,6 @@ class Migrate extends Command
                 $table->json('promotions')->nullable();
             });
         }
-        if (!Capsule::schema()->hasColumn('prices', 'conversionRate')) {
-            Capsule::schema()->table('prices', function (Blueprint $table) {
-                $table->float('conversionRate')->nullable();
-            });
-        }
-        if (!Capsule::schema()->hasColumn('products', 'conversionRate')) {
-            Capsule::schema()->table('products', function (Blueprint $table) {
-                $table->float('conversionRate')->nullable();
-            });
-        }
     }
 
     public function index(): void

src/Command/ScrapeWebsite.php

@@ -23,17 +23,15 @@ class ScrapeWebsite extends Command
 {
     const COUNTRY_ID = 'country';
     private Client $client;
-    private array $rates;
 
     public function __construct(protected Capsule $database)
     {
         parent::__construct();
-        $this->client = new Client();
-        $this->rates = $this->getCurrencyExchange();
     }
 
     protected function configure(): void
     {
+        $this->client = new Client();
         $this->addOption(self::COUNTRY_ID, 'c', InputOption::VALUE_OPTIONAL, 'Country id');
     }
 
@@ -70,7 +68,6 @@ class ScrapeWebsite extends Command
             $product->priceLowest = $product->lowestPrice->price;
             $product->lastSeen = $newestPrice->created_at->format('Y-m-d');
             $product->stock = $currentStock->stock;
-            $product->conversionRate = $newestPrice->conversionRate;
             $product->save(['timestamps' => false]);
             $progress->advance();
         }
@@ -101,7 +98,7 @@ class ScrapeWebsite extends Command
                 $products = array_merge($products, $responseObject->products);
                 $page++;
                 $canLoadMore = $responseObject->canLoadMore;
-            } catch (GuzzleException) {
+            } catch (GuzzleException $e) {
                 return $products;
             }
         } while ($canLoadMore);
@@ -135,7 +132,6 @@ class ScrapeWebsite extends Command
             $price->price = $product->productPrice;
             $price->productStandardPrice = $product->productStandardPrice;
             $price->lowestProductPrice30Days = $product->lowestProductPrice30Days;
-            $price->conversionRate = $this->getConversionRate($country->currency);
             $productModel->price()->save($price);
         }
         $stockExist = $productModel->stock()->whereRaw("strftime('%Y-%m-%d', created_at) = ?", [date('Y-m-d')])->exists();
@@ -151,22 +147,4 @@ class ScrapeWebsite extends Command
             $productModel->stock()->save($stock);
         }
     }
-
-    public function getCurrencyExchange(): array
-    {
-        $result = $this->client->request('GET', 'https://api.nbp.pl/api/exchangerates/tables/A/?format=json');
-        $rates = ['PLN' => 1.0];
-        foreach(json_decode($result->getBody()->getContents(),true)[0]['rates'] as $rate){
-            $rates[$rate['code']] = $rate['mid'];
-        }
-
-        return $rates;
-    }
-
-    private function getConversionRate(string $currency): float
-    {
-        $currency = strtoupper($currency);
-
-        return $this->rates[$currency];
-    }
 }

src/Controller/CountryController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Krzysiej\RyobiCrawler\Controller;
+
+use Illuminate\Database\Eloquent\Builder;
+use Krzysiej\RyobiCrawler\Models\Country;
+use Krzysiej\RyobiCrawler\Models\Product;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+final class CountryController extends BaseController
+{
+    #[Route('/country/{countryName?}', name: 'app_country')]
+    public function __invoke(?string $countryName): Response
+    {
+        /** @var Product[] $products */
+        $products = Product::with(['price', 'lowestPrice', 'country'])
+            ->join('countries', 'countries.id', '=', 'products.country_id')
+            ->where('countryName', $countryName)
+            ->orderByDesc('starred')
+            ->orderByDesc('created_by')
+            ->get();
+
+        $country = Country::where('countryName', $countryName)->first();
+
+        return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'country', 'country' => $country, 'countryStats' => $this->countryStats($countryName)]);
+    }
+
+    private function countryStats(string $country): array
+    {
+        $countryProducts = Product::join('countries', 'countries.id', '=', 'products.country_id')
+            ->where('countryName', $country);
+
+        $stats = [];
+        $stats['items'] = $countryProducts->get()->count();
+//        $stats['items2'] = $countryProducts->dd();
+
+        return $stats;
+    }
+}

src/Controller/ProductController.php

@@ -32,6 +32,32 @@ final class ProductController extends BaseController
         ksort($stockList);
         ksort($priceList);
 
+        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))),
+        ]);
+    }
+    #[Route('/product/model/{productModel}', name: 'app_product_model')]
+    public function productModel(string $productModel): Response
+    {
+
+        $product = Product::with([
+            'price' => fn($query) => $query->orderBy('created_at', 'desc'),
+            'stock' => fn($query) => $query->orderBy('created_at', 'desc'),
+        ])->where('subTitle', $productModel)->first();
+
+        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();
+
+        ksort($stockList);
+        ksort($priceList);
+
+
         return $this->render('product.html.twig', [
             'product' => $product,
             'price_list' => $this->prepareChartData($priceList),

src/Models/Price.php

@@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property float $price
  * @property float $productStandardPrice
  * @property float $lowestProductPrice30Days
- * @property float $conversionRate
  */
 class Price extends Model
 {

src/Models/Product.php

@@ -27,7 +27,6 @@ use function Symfony\Component\Clock\now;
  * @property float $priceLowest
  * @property float $productStandardPrice
  * @property float $lowestProductPrice30Days
- * @property float $conversionRate
  * @property Date $lastSeen
  * @property integer $stock
  * @property Object $promotions
@@ -104,11 +103,6 @@ class Product extends Model
         );
     }
 
-    public function conversionRate(): ?float
-    {
-        return $this->conversionRate;
-    }
-
     public function isDiscontinued(): bool
     {
         return $this->lastSeen < now()->format('Y-m-d');

src/Twig/AppExtension.php

@@ -3,6 +3,7 @@
 namespace Krzysiej\RyobiCrawler\Twig;
 
 use Illuminate\Database\Eloquent\Collection;
+use Krzysiej\RyobiCrawler\Models\Country;
 use Krzysiej\RyobiCrawler\Models\Price;
 use Krzysiej\RyobiCrawler\Models\Product;
 use Krzysiej\RyobiCrawler\Models\Stock;
@@ -28,6 +29,7 @@ class AppExtension extends AbstractExtension
             new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
             new TwigFunction('lowestPriceCount', [$this, 'lowestPriceCount']),
             new TwigFunction('renderCategoryTree', [$this, 'renderCategoryTree']),
+            new TwigFunction('getCountries', [$this, 'getCountries']),
         ];
     }
 
@@ -66,6 +68,11 @@ class AppExtension extends AbstractExtension
             ->count();
     }
 
+    public function getCountries(): array
+    {
+        return Country::get()->toArray();
+    }
+
     public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null
     {
         return $items->first(fn($item) => str_starts_with($item->created_at, $date));

templates/product.html.twig

@@ -11,7 +11,7 @@
                 <td>
                     <a href='{{ path('app_product', {'productId': product.id}) }}'
                        class="text-decoration-none">{{ product.name }}</a>
-                    <span class="badge text-bg-light"><a href="{{ path('app_search', {'search': product.subTitle}) }}"
+                    <span class="badge text-bg-light"><a href="{{ path('app_product_model', {'productModel': 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>

templates/productList.html.twig

@@ -19,6 +19,12 @@
             </ul>
         {% endif %}
 
+    {% if listType == 'country' and country is not null%}
+        <h2 class="text-muted mt-4 mx-4">{{ country.countryName }}</h2>
+        <h5 class="mx-4 my-0">Currency: {{ country.currency }}</h5>
+        {{  dump(countryStats) }}
+    {% 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">
@@ -60,10 +66,10 @@
                                     <a href="{{ path('app_new') }}"><span class="badge text-bg-success">is new</span></a>
                                 {% endif %}
                                 <span class="badge text-bg-light"><a
-                                            href="{{ path('app_search', {'search': product.subTitle}) }}"
+                                            href="{{ path('app_product_model', {'productModel': 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 %}
-                                <span class="badge text-bg-light">{{ product.country.countryName }}</span>
+                                <span class="badge text-bg-light"><a href="{{ path('app_country', {'countryName': product.country.countryName}) }}" class="link-underline link-underline-opacity-0 link-dark">{{ product.country.countryName }}</a></span>
                             </td>
                             <td class="align-middle">
                                 <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">
@@ -80,30 +86,19 @@
                             <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) }}<br>
-                                    {%  if product.conversionRate is not empty and product.conversionRate != 1 %}
-                                        {{ (product.priceLowest * product.conversionRate) | format_currency('PLN', {}, 'pl') }}
-                                    {% endif %}
+                                {{ 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>
+                                    <a href="{{ path('app_lowest_price') }}"><span class="badge bg-info">now lowest</span></a>{% endif %}</td>
                             {% endif %}
 
-                            <td class="align-middle text-end">
-                                {{ product.priceCurrent | format_currency(product.country.currency, {}, product.country.locale) }}<br>
-                                {%  if product.conversionRate is not empty and product.conversionRate != 1 %}
-                                    {{ (product.priceCurrent * product.conversionRate) | format_currency('PLN', {}, 'pl') }}
-                                {% endif %}
-                            </td>
+                            <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>
-                                        {%  if product.conversionRate is not empty and product.conversionRate != 1 %}
-                                            <span class="badge text-bg-warning text-decoration-line-through flex-fill">{{ (product.productStandardPrice * product.conversionRate) | format_currency('PLN', {}, 'pl') }}</span>
-                                        {% endif %}
-                                        <span class="badge text-bg-success flex-fill">{{ ((1 - product.priceCurrent / product.productStandardPrice)*100)|number_format(0) }}%</span>
+                                    {% 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>

templates/template.html.twig

@@ -33,6 +33,16 @@
                     <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>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            Countries
+                        </a>
+                        <ul class="dropdown-menu">
+                            {% for country in getCountries() %}
+                                <li><a class="dropdown-item" href="{{ path('app_country', {'countryName': country.countryName}) }}">{{ country.countryName }}</a></li>
+                            {%  endfor %}
+                        </ul>
+                    </li>
             </ul>
 
             <form class="form-floating d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">