feature/filter-by-country #73
40
src/Controller/CountryController.php
Normal file
40
src/Controller/CountryController.php
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,6 +32,32 @@ final class ProductController extends BaseController
|
|||||||
ksort($stockList);
|
ksort($stockList);
|
||||||
ksort($priceList);
|
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', [
|
return $this->render('product.html.twig', [
|
||||||
'product' => $product,
|
'product' => $product,
|
||||||
'price_list' => $this->prepareChartData($priceList),
|
'price_list' => $this->prepareChartData($priceList),
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace Krzysiej\RyobiCrawler\Twig;
|
namespace Krzysiej\RyobiCrawler\Twig;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
|
use Krzysiej\RyobiCrawler\Models\Country;
|
||||||
use Krzysiej\RyobiCrawler\Models\Price;
|
use Krzysiej\RyobiCrawler\Models\Price;
|
||||||
use Krzysiej\RyobiCrawler\Models\Product;
|
use Krzysiej\RyobiCrawler\Models\Product;
|
||||||
use Krzysiej\RyobiCrawler\Models\Stock;
|
use Krzysiej\RyobiCrawler\Models\Stock;
|
||||||
@@ -28,6 +29,7 @@ class AppExtension extends AbstractExtension
|
|||||||
new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
|
new TwigFunction('discontinuedCount', [$this, 'discontinuedCount']),
|
||||||
new TwigFunction('lowestPriceCount', [$this, 'lowestPriceCount']),
|
new TwigFunction('lowestPriceCount', [$this, 'lowestPriceCount']),
|
||||||
new TwigFunction('renderCategoryTree', [$this, 'renderCategoryTree']),
|
new TwigFunction('renderCategoryTree', [$this, 'renderCategoryTree']),
|
||||||
|
new TwigFunction('getCountries', [$this, 'getCountries']),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,6 +68,11 @@ class AppExtension extends AbstractExtension
|
|||||||
->count();
|
->count();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getCountries(): array
|
||||||
|
{
|
||||||
|
return Country::get()->toArray();
|
||||||
|
}
|
||||||
|
|
||||||
public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null
|
public function findByCreatedAtDate(Collection $items, string $date): Stock|Price|null
|
||||||
{
|
{
|
||||||
return $items->first(fn($item) => str_starts_with($item->created_at, $date));
|
return $items->first(fn($item) => str_starts_with($item->created_at, $date));
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<td>
|
<td>
|
||||||
<a href='{{ path('app_product', {'productId': product.id}) }}'
|
<a href='{{ path('app_product', {'productId': product.id}) }}'
|
||||||
class="text-decoration-none">{{ product.name }}</a>
|
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>
|
class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
|
||||||
{% if product.promotions is not null and product.promotions.hasPromotion %}<a
|
{% 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>
|
href="{{ path('app_promos', {'promo': product.promotions.slug}) }}"><span class="badge bg-info">PROMO: {{ product.promotions.tag }}</span>
|
||||||
|
|||||||
@@ -19,6 +19,12 @@
|
|||||||
</ul>
|
</ul>
|
||||||
{% endif %}
|
{% 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) %}
|
{% 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">
|
<div class="table-responsive">
|
||||||
@@ -60,10 +66,10 @@
|
|||||||
<a href="{{ path('app_new') }}"><span class="badge text-bg-success">is new</span></a>
|
<a href="{{ path('app_new') }}"><span class="badge text-bg-success">is new</span></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<span class="badge text-bg-light"><a
|
<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>
|
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 %}
|
{% 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>
|
||||||
<td class="align-middle">
|
<td class="align-middle">
|
||||||
<nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">
|
<nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';">
|
||||||
@@ -83,7 +89,7 @@
|
|||||||
{{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}
|
{{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if product.priceLowest != product.priceCurrent %}{{ 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 %}
|
{% endif %}
|
||||||
|
|
||||||
<td class="align-middle text-end">{{ product.priceCurrent | format_currency(product.country.currency, {}, product.country.locale) }}</td>
|
<td class="align-middle text-end">{{ product.priceCurrent | format_currency(product.country.currency, {}, product.country.locale) }}</td>
|
||||||
|
|||||||
@@ -33,6 +33,16 @@
|
|||||||
<li class="nav-item">
|
<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>
|
<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>
|
||||||
|
<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>
|
</ul>
|
||||||
|
|
||||||
<form class="form-floating d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
|
<form class="form-floating d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
|
||||||
|
|||||||
Reference in New Issue
Block a user