$paginator
*/
-$this->params['breadcrumbs'] = 'Suggested links';
+$this->params['breadcrumbs'] = 'Suggestions';
-$this->setTitle('Suggested links');
+$this->setTitle('Suggestions');
?>
Suggested links: getTotalItems() ?>
@@ -43,9 +43,10 @@
id ?> |
created_at->format('d-m-Y') ?> |
+ url->__toString()) ?>
url),
- (null !== parse_url(https://github.com/$link-%3Eurl,%20PHP_URL_SCHEME) ? '' : 'https://') . $link->url,
+ '',
+ $link->url->__toString(),
['rel' => 'nofollow noreferrer', 'target' => '_blank']
) ?>
description) ?>
@@ -63,4 +64,5 @@
paginator($paginator)
- ->urlGenerator(static fn ($page) => $url->generate(LinkController::PAGE_SUGGESTION_TABLE, ['page' => $page]));
+ ->urlGenerator(static fn($page) => $url->generate(LinkController::PAGE_SUGGESTION_TABLE, ['page' => $page]))
+ ->__toString();
diff --git a/resources/views/admin/link/urls.php b/resources/views/admin/link/urls.php
new file mode 100644
index 0000000..def6671
--- /dev/null
+++ b/resources/views/admin/link/urls.php
@@ -0,0 +1,59 @@
+ $paginator
+ */
+
+$this->params['breadcrumbs'] = 'Url list';
+
+$this->setTitle('Url list');
+
+?>
+Total URLs: getTotalItems() ?>
+
+
+
+ | ID |
+ URL |
+ Created at |
+
+
+
+ read() as $link) {
+ ?>
+
+ | id ?> |
+
+ __toString()) ?>
+ ',
+ $link->__toString(),
+ ['rel' => 'nofollow noreferrer', 'target' => '_blank']
+ ) ?>
+ |
+ created_at->format('d-m-Y') ?> |
+
+
+
+
+paginator($paginator)
+ ->urlGenerator(static fn($page) => $url->generate(LinkController::PAGE_SUGGESTION_TABLE, ['page' => $page]))
+ ->__toString();
diff --git a/src/Api/External/Controller/LinkController.php b/src/Api/External/Controller/LinkController.php
index a94892d..6f112b9 100644
--- a/src/Api/External/Controller/LinkController.php
+++ b/src/Api/External/Controller/LinkController.php
@@ -5,7 +5,7 @@
namespace App\Api\External\Controller;
use App\Api\External\Exception\HttpException;
-use App\Module\Link\Api\UserLinkService;
+use App\Module\Link\Api\LinkSuggestionService;
use App\Api\Common\Form\CreateLinkForm;
use App\Api\Common\Form\FindLinkForm;
use Psr\Http\Message\ServerRequestInterface;
@@ -15,24 +15,24 @@
final class LinkController extends ApiController
{
- public function get(UserLinkService $service, ServerRequestInterface $request, FindLinkForm $form): array
+ public function get(LinkSuggestionService $service, ServerRequestInterface $request, FindLinkForm $form): array
{
$this->validateLinkForm($form, $request->getQueryParams());
- $link = $service->getLink($form->getUrl(), $this->getIdentityFromRequest($request));
+ $link = $service->findSuggestion($form->getUrl(), $this->getIdentityFromRequest($request));
- return ['url' => $link->url];
+ return ['url' => $link->url->__toString()];
}
- public function post(UserLinkService $service, ServerRequestInterface $request, CreateLinkForm $form): void
+ public function post(LinkSuggestionService $service, ServerRequestInterface $request, CreateLinkForm $form): void
{
$this->validateLinkForm($form, (array)$request->getParsedBody());
$service->createSuggestion($form->withSource('api'), $this->getIdentityFromRequest($request));
}
- public function delete(UserLinkService $service, ServerRequestInterface $request, FindLinkForm $form): void
+ public function delete(LinkSuggestionService $service, ServerRequestInterface $request, FindLinkForm $form): void
{
$this->validateLinkForm($form, $request->getQueryParams());
- $service->deleteLink($form->getUrl(), $this->getIdentityFromRequest($request));
+ $service->deleteSuggestion($form->getUrl(), $this->getIdentityFromRequest($request));
}
private function validateLinkForm(FormModel $form, array $data): void
diff --git a/src/Api/Telegram/Telegram/Conversation/SuggestLinkConversation.php b/src/Api/Telegram/Telegram/Conversation/SuggestLinkConversation.php
index 4952a43..cfba31e 100644
--- a/src/Api/Telegram/Telegram/Conversation/SuggestLinkConversation.php
+++ b/src/Api/Telegram/Telegram/Conversation/SuggestLinkConversation.php
@@ -11,7 +11,7 @@
use App\Api\Telegram\Telegram\Command\FallbackCommand;
use App\Api\Telegram\Telegram\Command\StartCommand;
use App\Api\Telegram\Telegram\Command\SuggestLinkCommand;
-use App\Module\Link\Api\UserLinkService;
+use App\Module\Link\Api\LinkSuggestionService;
use BotMan\BotMan\Messages\Conversations\Conversation;
use BotMan\BotMan\Messages\Incoming\Answer;
use BotMan\Drivers\Telegram\Extensions\Keyboard;
@@ -36,14 +36,14 @@ final class SuggestLinkConversation extends Conversation
protected bool $finishing = false;
private FormMaker $formMaker;
- private UserLinkService $userLinkService;
+ private LinkSuggestionService $userLinkService;
private TgIdentityService $identityService;
private ChatConfig $chatConfig;
private ValidatorInterface $validator;
public function __construct(
FormMaker $formMaker,
- UserLinkService $userLinkService,
+ LinkSuggestionService $userLinkService,
TgIdentityService $identityService,
ChatConfig $chatConfig,
ValidatorInterface $validator
diff --git a/src/Api/UI/Controller/Admin/CommonController.php b/src/Api/UI/Controller/Admin/CommonController.php
index 11f9572..4818859 100644
--- a/src/Api/UI/Controller/Admin/CommonController.php
+++ b/src/Api/UI/Controller/Admin/CommonController.php
@@ -13,7 +13,7 @@ class CommonController extends AbstractController
public const PAGE_INDEX = self::ROUTE_PREFIX . 'index';
/**
- * Action for {@see P_INDEX}
+ * Action for {@see PAGE_INDEX}
*/
public function pageIndex(): ResponseInterface
{
diff --git a/src/Api/UI/Controller/Admin/LinkController.php b/src/Api/UI/Controller/Admin/LinkController.php
index bdcf845..eadb0af 100644
--- a/src/Api/UI/Controller/Admin/LinkController.php
+++ b/src/Api/UI/Controller/Admin/LinkController.php
@@ -6,6 +6,7 @@
use App\Api\UI\Controller\AbstractController;
use App\Module\Link\Domain\Repository\SuggestionRepository;
+use App\Module\Link\Domain\Repository\UrlRepository;
use App\Module\User\Domain\Repository\AccountRepository;
use App\Module\User\Domain\Repository\IdentityRepository;
use Psr\Http\Message\ResponseInterface;
@@ -17,10 +18,11 @@
class LinkController extends AbstractController
{
public const ROUTE_PREFIX = 'admin_panel_link__';
- public const PAGE_SUGGESTION_TABLE = self::ROUTE_PREFIX . 'table';
+ public const PAGE_SUGGESTION_TABLE = self::ROUTE_PREFIX . 'suggestion_table';
+ public const PAGE_URL_TABLE = self::ROUTE_PREFIX . 'url_table';
/**
- * Action for {@see P_SUGGESTION_TABLE}
+ * Action for {@see PAGE_SUGGESTION_TABLE}
*/
public function pageSuggestionTable(
ServerRequestInterface $request,
@@ -28,7 +30,7 @@ public function pageSuggestionTable(
): ResponseInterface {
$pageNum = (int)$request->getAttribute('page', 1);
- $dataReader = $suggestionRepository->findAllWithUserAccount()->withSort((new Sort(['id']))->withOrderString('-id'));
+ $dataReader = $suggestionRepository->findAllWithUserAccount()->withSort(Sort::any()->withOrderString('-id'));
$paginator = (new OffsetPaginator($dataReader))
->withPageSize(20)
->withCurrentPage($pageNum);
@@ -40,4 +42,26 @@ public function pageSuggestionTable(
]
);
}
+
+ /**
+ * Action for {@see PAGE_URL_TABLE}
+ */
+ public function pageUrlTable(
+ ServerRequestInterface $request,
+ UrlRepository $urlRepository
+ ): ResponseInterface {
+ $pageNum = (int)$request->getAttribute('page', 1);
+
+ $dataReader = $urlRepository->findAll()->withSort(Sort::any()->withOrderString('-id'));
+ $paginator = (new OffsetPaginator($dataReader))
+ ->withPageSize(20)
+ ->withCurrentPage($pageNum);
+
+ return $this->render(
+ 'admin/link/urls',
+ [
+ 'paginator' => $paginator,
+ ]
+ );
+ }
}
diff --git a/src/Api/UI/Controller/LinkController.php b/src/Api/UI/Controller/LinkController.php
index 16a86d1..149c872 100644
--- a/src/Api/UI/Controller/LinkController.php
+++ b/src/Api/UI/Controller/LinkController.php
@@ -6,7 +6,7 @@
use App\Api\UI\Form\SuggestLinkForm;
use App\Api\UI\Widget\FlashMessage;
-use App\Module\Link\Api\UserLinkService;
+use App\Module\Link\Api\LinkSuggestionService;
use App\Module\User\Api\IdentityFactory;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
@@ -25,14 +25,14 @@ final class LinkController extends AbstractController
public const ACTION_SUGGEST_LINK = self::ROUTE_PREFIX . 'suggest_link_action';
/**
- * Action for {@see P_SUGGEST_LINK}
+ * Action for {@see PAGE_SUGGEST_LINK}
*/
public function pageSuggestLink(SuggestLinkForm $form): ResponseInterface {
return $this->render('link/form', ['form' => $form]);
}
/**
- * Action for {@see A_SUGGEST_LINK}
+ * Action for {@see ACTION_SUGGEST_LINK}
*/
public function actionSuggestLink(
ServerRequestInterface $request,
@@ -41,7 +41,7 @@ public function actionSuggestLink(
SuggestLinkForm $form,
IdentityFactory $identityFactory,
User $user,
- UserLinkService $service,
+ LinkSuggestionService $service,
ValidatorInterface $validator
): ResponseInterface {
if (!$form->load($request->getParsedBody()) || !$form->validate($validator)) {
diff --git a/src/Api/UI/Controller/SiteController.php b/src/Api/UI/Controller/SiteController.php
index 3b8c6b7..c9b3805 100644
--- a/src/Api/UI/Controller/SiteController.php
+++ b/src/Api/UI/Controller/SiteController.php
@@ -11,7 +11,7 @@ class SiteController extends AbstractController
public const PAGE_INDEX = 'site__index';
/**
- * Action for {@see P_INDEX}
+ * Action for {@see PAGE_INDEX}
*/
public function pageIndex(): ResponseInterface
{
diff --git a/src/Api/UI/Controller/UserController.php b/src/Api/UI/Controller/UserController.php
index 4fad3aa..19b1c72 100644
--- a/src/Api/UI/Controller/UserController.php
+++ b/src/Api/UI/Controller/UserController.php
@@ -30,7 +30,7 @@ class UserController extends AbstractController
public const ACTION_LOGIN = self::ROUTE_PREFIX . 'login_action';
/**
- * Action for {@see P_REGISTER}
+ * Action for {@see PAGE_REGISTER}
*/
public function pageRegister(RegisterForm $form): ResponseInterface
{
@@ -38,7 +38,7 @@ public function pageRegister(RegisterForm $form): ResponseInterface
}
/**
- * Action for {@see A_REGISTER}
+ * Action for {@see ACTION_REGISTER}
*/
public function actionRegister(
ServerRequestInterface $request,
@@ -77,7 +77,7 @@ public function actionRegister(
}
/**
- * Action for {@see P_LOGIN}
+ * Action for {@see PAGE_LOGIN}
*/
public function pageLogin(LoginForm $form): ResponseInterface
{
@@ -85,7 +85,7 @@ public function pageLogin(LoginForm $form): ResponseInterface
}
/**
- * Action for {@see A_LOGIN}
+ * Action for {@see ACTION_LOGIN}
*/
public function actionLogin(
ServerRequestInterface $request,
@@ -124,7 +124,7 @@ public function actionLogin(
}
/**
- * Action for {@see A_LOGOUT}
+ * Action for {@see ACTION_LOGOUT}
*/
public function actionLogout(
UrlGeneratorInterface $url,
diff --git a/src/Api/UI/Widget/OffsetPagination.php b/src/Api/UI/Widget/OffsetPagination.php
index 2e73754..f9038b2 100644
--- a/src/Api/UI/Widget/OffsetPagination.php
+++ b/src/Api/UI/Widget/OffsetPagination.php
@@ -97,6 +97,8 @@ protected function prepareButtons(): void
$this->pagesCount,
];
}
+ } elseif ($this->pagesCount === 0) {
+ $this->pages = [];
} else {
$this->pages = range(1, $this->pagesCount);
}
@@ -106,6 +108,9 @@ protected function prepareButtons(): void
protected function renderButtons(): string
{
$result = '';
+ if (count($this->pages) === 0) {
+ return $result;
+ }
// `Previous` page
$prevUrl = $this->paginator->isOnFirstPage() ? null : $this->getPageLink($this->currentPage - 1);
diff --git a/src/Module/Link/Api/UserLinkService.php b/src/Module/Link/Api/LinkSuggestionService.php
similarity index 58%
rename from src/Module/Link/Api/UserLinkService.php
rename to src/Module/Link/Api/LinkSuggestionService.php
index 8eaefab..5d7eea1 100644
--- a/src/Module/Link/Api/UserLinkService.php
+++ b/src/Module/Link/Api/LinkSuggestionService.php
@@ -8,10 +8,9 @@
use App\Api\Common\Form\CreateLinkForm;
use Yiisoft\Auth\IdentityInterface;
-interface UserLinkService
+interface LinkSuggestionService
{
public function createSuggestion(CreateLinkForm $form, IdentityInterface $identity): Suggestion;
-
- public function getLink(string $url, IdentityInterface $identity): Suggestion;
- public function deleteLink(string $url, IdentityInterface $identity): void;
+ public function findSuggestion(string $url, IdentityInterface $identity): Suggestion;
+ public function deleteSuggestion(string $url, IdentityInterface $identity): void;
}
diff --git a/src/Module/Link/Config/common.php b/src/Module/Link/Config/common.php
index ab763e8..b56e726 100644
--- a/src/Module/Link/Config/common.php
+++ b/src/Module/Link/Config/common.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-use App\Module\Link\Api\UserLinkService;
+use App\Module\Link\Api\LinkSuggestionService;
use App\Module\Link\Domain\Entity\Suggestion;
use App\Module\Link\Domain\Repository\SuggestionRepository;
-use App\Module\Link\Service\UserLink;
+use App\Module\Link\Service\SuggestionService;
use Cycle\ORM\ORMInterface;
use Psr\Container\ContainerInterface;
use Yiisoft\Factory\Definitions\Reference;
@@ -13,7 +13,7 @@
/** @var array $params */
return [
- UserLinkService::class => Reference::to(UserLink::class),
+ LinkSuggestionService::class => Reference::to(SuggestionService::class),
# Repositories
SuggestionRepository::class => static function (ContainerInterface $container) {
diff --git a/src/Module/Link/Domain/Entity/Suggestion.php b/src/Module/Link/Domain/Entity/Suggestion.php
index cd5f39e..02ed530 100644
--- a/src/Module/Link/Domain/Entity/Suggestion.php
+++ b/src/Module/Link/Domain/Entity/Suggestion.php
@@ -30,9 +30,11 @@ class Suggestion
public ?int $id = null;
/**
- * @Column(type="string(255)")
+ * @var null|Url|Reference
+ * @psalm-var null|Url
+ * @BelongsTo(target="App\Module\Link\Domain\Entity\Url", nullable=false, load="eager")
*/
- public string $url;
+ public $url;
/**
* @Column(type="text", nullable=true)
diff --git a/src/Module/Link/Domain/Entity/Url.php b/src/Module/Link/Domain/Entity/Url.php
new file mode 100644
index 0000000..24c4992
--- /dev/null
+++ b/src/Module/Link/Domain/Entity/Url.php
@@ -0,0 +1,88 @@
+host = $host;
+ $this->created_at = new DateTimeImmutable();
+ $this->updated_at = new DateTimeImmutable();
+ }
+
+ public function __toString(): string
+ {
+ $result = "{$this->scheme}://{$this->host}";
+ $result .= strlen($this->path) > 1 ? $this->path : '/';
+ if ($this->query !== '') {
+ $result .= "?{$this->query}";
+ }
+ return $result;
+ }
+}
diff --git a/src/Module/Link/Domain/Mapper/SuggestionMapper.php b/src/Module/Link/Domain/Mapper/SuggestionMapper.php
index 1253262..f4a3640 100644
--- a/src/Module/Link/Domain/Mapper/SuggestionMapper.php
+++ b/src/Module/Link/Domain/Mapper/SuggestionMapper.php
@@ -12,9 +12,6 @@
class SuggestionMapper extends Mapper
{
- /**
- * @suppress PhanUndeclaredMethod
- */
public function queueUpdate($entity, Node $node, State $state): ContextCarrierInterface
{
/** @var Update $command */
diff --git a/src/Module/Link/Domain/Mapper/UrlMapper.php b/src/Module/Link/Domain/Mapper/UrlMapper.php
new file mode 100644
index 0000000..c838658
--- /dev/null
+++ b/src/Module/Link/Domain/Mapper/UrlMapper.php
@@ -0,0 +1,25 @@
+register('updated_at', new \DateTimeImmutable(), true);
+ $command->registerAppendix('updated_at', new \DateTimeImmutable());
+
+ return $command;
+ }
+}
diff --git a/src/Module/Link/Domain/Repository/SuggestionRepository.php b/src/Module/Link/Domain/Repository/SuggestionRepository.php
index 82f63fe..4ce289d 100644
--- a/src/Module/Link/Domain/Repository/SuggestionRepository.php
+++ b/src/Module/Link/Domain/Repository/SuggestionRepository.php
@@ -26,9 +26,9 @@ public function __construct(Select $select, ORMInterface $orm)
parent::__construct($select);
}
- public function findOneByUrlAndIdentity(string $url, IdentityInterface $identity): ?Suggestion
+ public function findOneByUrlAndIdentity(int $urlId, IdentityInterface $identity): ?Suggestion
{
- return $this->findOne(['url' => $url, 'identity_id' => $identity->getId()]);
+ return $this->findOne(['url_id' => $urlId, 'identity_id' => $identity->getId()]);
}
/**
@@ -40,6 +40,7 @@ public function findAllWithUserAccount(array $scope = [], array $orderBy = []):
$this->select()
->where($scope)
->orderBy($orderBy)
+ ->load('url', ['method' => Select::SINGLE_QUERY])
->load('identity', ['method' => Select::SINGLE_QUERY])
->load('identity.account', ['method' => Select::SINGLE_QUERY])
);
diff --git a/src/Module/Link/Domain/Repository/UrlRepository.php b/src/Module/Link/Domain/Repository/UrlRepository.php
new file mode 100644
index 0000000..91a2c31
--- /dev/null
+++ b/src/Module/Link/Domain/Repository/UrlRepository.php
@@ -0,0 +1,21 @@
+repository = $repository;
+ $this->repository = $suggestionRepository;
$this->entityWriter = $entityWriter;
+ $this->urlService = $urlService;
}
public function createSuggestion(CreateLinkForm $form, IdentityInterface $identity): Suggestion
{
$link = new Suggestion();
- $link->url = $form->getUrl();
+
+ # Find existing url or prepare new
+ $url = $this->urlService->findUrl($form->getUrl()) ?? $this->urlService->prepareUrl($form->getUrl());
+
+ $link->url = $url;
$link->source = $form->getSource();
$link->description = $form->getDescription();
@@ -38,20 +45,25 @@ public function createSuggestion(CreateLinkForm $form, IdentityInterface $identi
return $link;
}
- public function deleteLink(string $url, IdentityInterface $identity): void
+ public function deleteSuggestion(string $url, IdentityInterface $identity): void
{
$this->repository->delete(
- $this->getLink($url, $identity)
+ $this->findSuggestion($url, $identity)
);
}
- public function getLink(string $url, IdentityInterface $identity): Suggestion
+ public function findSuggestion(string $url, IdentityInterface $identity): Suggestion
{
- $link = $this->repository->findOneByUrlAndIdentity($url, $identity);
- if ($link === null) {
+ $urlEntity = $this->urlService->findUrl($url);
+ if ($urlEntity === null) {
throw new EntityNotFound('Url not found.');
}
+ $link = $this->repository->findOneByUrlAndIdentity($urlEntity->id, $identity);
+ if ($link === null) {
+ throw new EntityNotFound('Suggestion not found.');
+ }
+
return $link;
}
}
diff --git a/src/Module/Link/Service/UrlService.php b/src/Module/Link/Service/UrlService.php
new file mode 100644
index 0000000..3c8c870
--- /dev/null
+++ b/src/Module/Link/Service/UrlService.php
@@ -0,0 +1,81 @@
+repository = $repository;
+ }
+
+ public function findUrl(string $url): ?Url
+ {
+ $chunks = $this->normalizeUrl($url);
+ // https://www.php.net/manual/ru/function.http-build-query.php?utm_id=123&utm_term=asd&xren=aro&foo=bar
+ return $this->repository->findOne(
+ [
+ 'scheme' => in_array($chunks['scheme'], ['http', 'https'], true)
+ ? ['in' => new Parameter(['http', 'https'])]
+ : ['=' => $chunks['scheme']],
+ 'host' => ['=' => $chunks['host']],
+ 'path' => ['=' => $chunks['path']],
+ 'query' => ['=' => $chunks['query']],
+ ]
+ );
+ }
+
+ public function prepareUrl(string $url): Url
+ {
+ $chunks = $this->normalizeUrl($url);
+
+ $url = new Url($chunks['host']);
+ $url->query = $chunks['query'];
+ $url->path = $chunks['path'];
+ $url->scheme = $chunks['scheme'];
+
+ return $url;
+ }
+
+ #[ArrayShape(["scheme" => "string", "host" => "string", "query" => "string", "path" => "string"])]
+ #[Pure]
+ private function normalizeUrl(string $url): array
+ {
+ $chunks = parse_url(https://github.com/$url);
+ if (!is_array($chunks) || !array_key_exists('host', $chunks)) {
+ throw new \InvalidArgumentException(sprintf('$url should be valid url. "%s" is an invalid url.', $url));
+ }
+
+ return [
+ 'scheme' => strtolower($chunks['scheme'] ?? 'https'),
+ 'host' => strtolower($chunks['host']),
+ 'path' => $chunks['path'] ?? '',
+ 'query' => $this->normalizeUrlQuery($chunks['query'] ?? ''),
+ ];
+ }
+
+ private function normalizeUrlQuery(string $queryStr): string
+ {
+ if ($queryStr === '') {
+ return '';
+ }
+ $result = [];
+ parse_str($queryStr, $output);
+ foreach ($output as $key => $value) {
+ // Clear UTM tags
+ if (strcasecmp(substr($key, 0, 4), 'utm_') === 0) {
+ continue;
+ }
+ $result[$key] = $value;
+ }
+ ksort($result);
+ return http_build_query($result, '', '&', PHP_QUERY_RFC1738);
+ }
+}
|