Compare commits
22
Commits
41d188a8cc
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
11f46d0acf | ||
|
|
4279669aa3 | ||
|
|
aa3d81102e | ||
|
|
739a4c49f7 | ||
|
|
88e0488b49 | ||
|
|
f57671b4d4 | ||
|
|
313fb151bc | ||
|
|
6350742084 | ||
|
|
ef7d81fe99 | ||
|
|
0477589a7a | ||
|
|
38962845d3 | ||
|
|
c7f43ad02c | ||
|
|
1111c180f8 | ||
|
|
69f9b42757 | ||
|
|
5bb4b6254a | ||
|
|
32b70f9b70 | ||
|
|
7839b97e63 | ||
|
|
416ac5c13d | ||
|
|
992ec19c33 | ||
|
|
57b09624f4 | ||
|
|
81724c818b | ||
|
|
b4a9156df6 |
No files matched your search
@@ -20,3 +20,4 @@ public/typo3conf/l10n
|
||||
public/typo3temp
|
||||
public/uploads
|
||||
var
|
||||
http-client.private.env.json
|
||||
@@ -1,12 +1,42 @@
|
||||
# Backchannel endpoints MyE&P reads hotel and product data from. Same environment files and key
|
||||
# as content-feed.http: pick "local" and put cmsApiKey in http-client.private.env.json.
|
||||
|
||||
### GET product data for myep
|
||||
GET https://ep-reisen.ddev.site/api/product
|
||||
?product=SSTMR
|
||||
&hotel=SSTGR
|
||||
&key=abcabc123
|
||||
GET {{host}}/api/product?product=3VIIN&hotel=VLTS
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("200 with key", function () {
|
||||
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
### GET hotel data for myep
|
||||
GET https://ep-reisen.ddev.site/api/hotel
|
||||
?hotel=DPWGRP
|
||||
&key=abcabc123
|
||||
GET {{host}}/api/hotel?hotel=DPWGRP
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("200 with key", function () {
|
||||
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
### Transition form: key as query parameter, as MyE&P sends it today (still accepted)
|
||||
GET {{host}}/api/hotel?hotel=DPWGRP&key={{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("200 with query key", function () {
|
||||
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
### Any other value is refused now - this used to pass
|
||||
GET {{host}}/api/hotel?hotel=DPWGRP&key=AbcAbc123
|
||||
|
||||
> {%
|
||||
client.test("403 with the old dummy key", function () {
|
||||
client.assert(response.status === 403, "expected 403, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
###
|
||||
@@ -0,0 +1,141 @@
|
||||
# Chatbot content feed (see .ddev/plans/CHATBOT-MCP-01-TYPO3-CONTENT-FEED.md)
|
||||
#
|
||||
# Pick the "local" environment in PhpStorm and run the whole file top to bottom: the manifest
|
||||
# request stores uids and a content URL that the later requests use.
|
||||
#
|
||||
# Needs, locally:
|
||||
# - http-client.private.env.json with {"local": {"cmsApiKey": "<your key>"}} (gitignored)
|
||||
# - the same key in TYPO3, e.g.
|
||||
# ddev exec vendor/bin/typo3cms configuration:set EXTENSIONS/ep_products/cmsApiKey <your key>
|
||||
# plus contentFeedSites etc. - or open and save the ep_products extension configuration once
|
||||
# in the backend, which writes all the defaults.
|
||||
#
|
||||
# The kill switch (contentFeedEnabled = 0) cannot be toggled from here; with it off, every keyed
|
||||
# request below answers 503.
|
||||
|
||||
### Manifest without a key is refused
|
||||
GET {{host}}/api/content/manifest
|
||||
|
||||
> {%
|
||||
client.test("403 without key", function () {
|
||||
client.assert(response.status === 403, "expected 403, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
### Manifest
|
||||
GET {{host}}/api/content/manifest
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("manifest is complete and well-formed", function () {
|
||||
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||
client.assert(response.body.items.length > 0, "manifest is empty");
|
||||
client.assert(response.body.sites.length > 0, "no sites");
|
||||
client.assert(
|
||||
response.body.items.every(function (item) { return item.type && item.uid && item.modified; }),
|
||||
"an item lacks type, uid or modified"
|
||||
);
|
||||
});
|
||||
|
||||
var uidsOf = function (type, limit) {
|
||||
return response.body.items
|
||||
.filter(function (item) { return item.type === type; })
|
||||
.slice(0, limit)
|
||||
.map(function (item) { return item.uid; })
|
||||
.join(",");
|
||||
};
|
||||
|
||||
client.global.set("productUids", uidsOf("product", 5));
|
||||
client.global.set("hotelUids", uidsOf("hotel", 5));
|
||||
client.global.set("regionUids", uidsOf("region", 5));
|
||||
client.global.set("newsUids", uidsOf("news", 3));
|
||||
|
||||
var page = response.body.items.filter(function (item) { return item.type === "page" && item.contentUrl; })[0];
|
||||
client.global.set("contentUrl", page.contentUrl);
|
||||
|
||||
var tooMany = [];
|
||||
for (var i = 1; i <= 101; i++) { tooMany.push(i); }
|
||||
client.global.set("tooManyUids", tooMany.join(","));
|
||||
%}
|
||||
|
||||
### Products (with FAQs)
|
||||
GET {{host}}/api/content/records?type=product&uids={{productUids}}
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("every requested product comes back, links resolved", function () {
|
||||
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||
client.assert(response.body.items.length === client.global.get("productUids").split(",").length, "products missing");
|
||||
client.assert(JSON.stringify(response.body).indexOf("t3://") === -1, "unresolved t3:// link");
|
||||
});
|
||||
%}
|
||||
|
||||
### Hotels (codes include matchcode aliases)
|
||||
GET {{host}}/api/content/records?type=hotel&uids={{hotelUids}}
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("hotels carry their codes", function () {
|
||||
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||
client.assert(response.body.items.every(function (hotel) { return Array.isArray(hotel.codes); }), "hotel without codes");
|
||||
});
|
||||
%}
|
||||
|
||||
### Regions
|
||||
GET {{host}}/api/content/records?type=region&uids={{regionUids}}
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
### Blog articles
|
||||
GET {{host}}/api/content/records?type=news&uids={{newsUids}}
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
### Unknown type is a 400
|
||||
GET {{host}}/api/content/records?type=page&uids=1
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("400 for unknown type", function () {
|
||||
client.assert(response.status === 400, "expected 400, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
### More than 100 uids is a 400
|
||||
GET {{host}}/api/content/records?type=product&uids={{tooManyUids}}
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("400 above 100 uids", function () {
|
||||
client.assert(response.status === 400, "expected 400, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
### Content-only render of the first page in the manifest
|
||||
GET {{contentUrl}}
|
||||
X-Api-Key: {{cmsApiKey}}
|
||||
|
||||
> {%
|
||||
client.test("bare article, never cached by proxies", function () {
|
||||
client.assert(response.status === 200, "expected 200, got " + response.status);
|
||||
client.assert(response.body.indexOf("<article>") === 0, "not a bare <article> fragment");
|
||||
client.assert(response.headers.valueOf("Cache-Control") === "private, no-store", "unexpected Cache-Control");
|
||||
});
|
||||
%}
|
||||
|
||||
### Content-only render without a key is a 404 (the type must not be discoverable)
|
||||
GET {{contentUrl}}
|
||||
|
||||
> {%
|
||||
client.test("404 without key", function () {
|
||||
client.assert(response.status === 404, "expected 404, got " + response.status);
|
||||
});
|
||||
%}
|
||||
|
||||
### Content-only render with a wrong key is a 404
|
||||
GET {{contentUrl}}
|
||||
X-Api-Key: definitely-wrong
|
||||
|
||||
> {%
|
||||
client.test("404 with wrong key", function () {
|
||||
client.assert(response.status === 404, "expected 404, got " + response.status);
|
||||
});
|
||||
%}
|
||||
+4
-1
@@ -70,7 +70,10 @@ host('prod')
|
||||
->set('writable_mode', 'chmod')
|
||||
->set('rsync_src', __DIR__)
|
||||
->set('rsync', $rsyncOptions)
|
||||
->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{current_path}}/{{typo3_webroot}}/ --web-url=https://www.ep-reisen.de')
|
||||
// The temp script goes into the shared typo3temp, which resolves to the same directory from every
|
||||
// release: PHP workers with a stale realpath cache still map "current" to the previous release and
|
||||
// would 404 on a script placed inside the new one.
|
||||
->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{deploy_path}}/shared/{{typo3_webroot}}/typo3temp/ --web-url=https://www.ep-reisen.de/typo3temp')
|
||||
;
|
||||
|
||||
task('deploy', [
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"local": {
|
||||
"host": "https://ep-reisen.ddev.site"
|
||||
},
|
||||
"prod": {
|
||||
"host": "https://www.ep-reisen.de"
|
||||
}
|
||||
}
|
||||
@@ -285,9 +285,6 @@ AddDefaultCharset utf-8
|
||||
<FilesMatch "\.(eot|otf|tt[cf]|woff2?)$">
|
||||
Header set Access-Control-Allow-Origin "*"
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.(png|gif|jpe?g)$">
|
||||
Header append Vary Accept
|
||||
</FilesMatch>
|
||||
</IfModule>
|
||||
|
||||
### End: Cross Origin ###
|
||||
@@ -395,12 +392,6 @@ AddDefaultCharset utf-8
|
||||
# NOTE: Add your additional local storages here
|
||||
RewriteRule ^(?:typo3/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
|
||||
|
||||
RewriteCond %{HTTP_ACCEPT} image/webp
|
||||
RewriteCond %{REQUEST_FILENAME} (.*)\.(png|gif|jpe?g)$
|
||||
RewriteCond %{REQUEST_FILENAME}\.webp -f
|
||||
RewriteRule ^ %{REQUEST_FILENAME}\.webp [L,T=image/webp]
|
||||
|
||||
|
||||
### Begin: StaticFileCache (preparation) ####
|
||||
|
||||
# Document root configuration
|
||||
|
||||
@@ -90,6 +90,14 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['rootline']
|
||||
// by the CDN, so stop generating them. mod_deflate still compresses direct origin hits.
|
||||
$GLOBALS['TYPO3_CONF_VARS']['FE']['compressionLevel'] = 0;
|
||||
|
||||
// utf8 in MySQL/MariaDB is utf8mb3 (max. 3 bytes) and rejects 4-byte characters like emoji.
|
||||
// Set here because LocalConfiguration.php is a Deployer shared file and not deployed from the repo.
|
||||
$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['charset'] = 'utf8mb4';
|
||||
$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['tableoptions'] = [
|
||||
'charset' => 'utf8mb4',
|
||||
'collate' => 'utf8mb4_unicode_ci',
|
||||
];
|
||||
|
||||
// suppress php deprecation warnings flooding typo3 logs
|
||||
$GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] =
|
||||
$GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] & ~E_DEPRECATED & ~E_USER_DEPRECATED;
|
||||
|
||||
@@ -59,6 +59,7 @@ call_user_func(function() {
|
||||
'label' => 'Reiseart',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'default' => 0,
|
||||
'renderType' => 'selectSingle',
|
||||
'items' => [
|
||||
['Keine Zuordnung', 0],
|
||||
@@ -74,6 +75,7 @@ call_user_func(function() {
|
||||
'label' => 'Angebot/Beispielangebot',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'default' => 0,
|
||||
'renderType' => 'selectSingle',
|
||||
'items' => [
|
||||
['Keine Zuordnung', 0],
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use EP\EpProducts\Http\ApiKeyAuthenticator;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use TYPO3\CMS\Core\Cache\CacheManager;
|
||||
use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
|
||||
use TYPO3\CMS\Core\Http\JsonResponse;
|
||||
use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
|
||||
/**
|
||||
* The chatbot content feed's backchannel endpoints under /api/content/.
|
||||
*
|
||||
* See .ddev/plans/CHATBOT-MCP-01-TYPO3-CONTENT-FEED.md.
|
||||
*/
|
||||
class ContentFeedApi
|
||||
{
|
||||
public const PATH_PREFIX = '/api/content/';
|
||||
|
||||
private const MANIFEST_CACHE_IDENTIFIER = 'content_feed_manifest';
|
||||
// The consumer polls every 15 minutes, so this caps the build at once per poll however
|
||||
// often it retries. Edits reach the chatbot within about 25 minutes.
|
||||
private const MANIFEST_CACHE_LIFETIME = 600;
|
||||
|
||||
private const MAX_RECORDS_PER_REQUEST = 100;
|
||||
|
||||
private const DISABLED_RETRY_AFTER = 3600;
|
||||
|
||||
private const JSON_FLAGS = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
|
||||
|
||||
/**
|
||||
* @var ApiKeyAuthenticator
|
||||
*/
|
||||
private $authenticator;
|
||||
|
||||
/**
|
||||
* @var ContentFeedConfiguration
|
||||
*/
|
||||
private $configuration;
|
||||
|
||||
/**
|
||||
* @var ManifestBuilder
|
||||
*/
|
||||
private $manifestBuilder;
|
||||
|
||||
/**
|
||||
* @var RecordSerializer
|
||||
*/
|
||||
private $recordSerializer;
|
||||
|
||||
/**
|
||||
* @var FrontendInterface
|
||||
*/
|
||||
private $cache;
|
||||
|
||||
public function __construct(
|
||||
ApiKeyAuthenticator $authenticator,
|
||||
ContentFeedConfiguration $configuration,
|
||||
ManifestBuilder $manifestBuilder,
|
||||
RecordSerializer $recordSerializer,
|
||||
CacheManager $cacheManager
|
||||
) {
|
||||
$this->authenticator = $authenticator;
|
||||
$this->configuration = $configuration;
|
||||
$this->manifestBuilder = $manifestBuilder;
|
||||
$this->recordSerializer = $recordSerializer;
|
||||
$this->cache = $cacheManager->getCache('ep_products_cache');
|
||||
}
|
||||
|
||||
public function handle(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
if (!$this->authenticator->isAuthorized($request)) {
|
||||
return $this->error('Invalid or missing api key', 403);
|
||||
}
|
||||
|
||||
if (!$this->configuration->isEnabled()) {
|
||||
return self::disabledResponse();
|
||||
}
|
||||
|
||||
if ([] === $this->configuration->getSites()) {
|
||||
// An empty feed would read as "everything was deleted". Refuse instead.
|
||||
return $this->error('Content feed has no sites configured', 503);
|
||||
}
|
||||
|
||||
$path = substr($request->getUri()->getPath(), strlen(self::PATH_PREFIX));
|
||||
|
||||
if ('manifest' === $path) {
|
||||
return new JsonResponse($this->getManifest(), 200, [], self::JSON_FLAGS);
|
||||
}
|
||||
|
||||
if ('records' === $path) {
|
||||
return $this->handleRecordsRequest($request);
|
||||
}
|
||||
|
||||
return $this->error('Not found', 404);
|
||||
}
|
||||
|
||||
/**
|
||||
* Uids that are not (or no longer) eligible are left out rather than answered with an error:
|
||||
* the manifest may have changed between the consumer's two calls, and it reads a requested
|
||||
* but absent uid as deleted.
|
||||
*/
|
||||
private function handleRecordsRequest(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
$type = (string) ($request->getQueryParams()['type'] ?? '');
|
||||
|
||||
if (!isset(RecordFinder::TYPES[$type])) {
|
||||
return $this->error('Unknown type, expected one of: ' . implode(', ', array_keys(RecordFinder::TYPES)), 400);
|
||||
}
|
||||
|
||||
$uids = array_values(array_unique(array_filter(
|
||||
GeneralUtility::intExplode(',', (string) ($request->getQueryParams()['uids'] ?? ''), true),
|
||||
function (int $uid): bool {
|
||||
return $uid > 0;
|
||||
}
|
||||
)));
|
||||
|
||||
if ([] === $uids) {
|
||||
return $this->error('No uids given', 400);
|
||||
}
|
||||
|
||||
if (count($uids) > self::MAX_RECORDS_PER_REQUEST) {
|
||||
return $this->error(sprintf('At most %d uids per request', self::MAX_RECORDS_PER_REQUEST), 400);
|
||||
}
|
||||
|
||||
return new JsonResponse([
|
||||
'type' => $type,
|
||||
'items' => $this->recordSerializer->serialize($type, $uids),
|
||||
], 200, [], self::JSON_FLAGS);
|
||||
}
|
||||
|
||||
private function getManifest(): array
|
||||
{
|
||||
$manifest = $this->cache->get(self::MANIFEST_CACHE_IDENTIFIER);
|
||||
|
||||
if (!is_array($manifest)) {
|
||||
$manifest = $this->manifestBuilder->build();
|
||||
$this->cache->set(self::MANIFEST_CACHE_IDENTIFIER, $manifest, [], self::MANIFEST_CACHE_LIFETIME);
|
||||
}
|
||||
|
||||
return $manifest;
|
||||
}
|
||||
|
||||
/**
|
||||
* The kill switch: contentFeedEnabled = 0 in the extension configuration, for when the host
|
||||
* is struggling. The consumer stops its run, keeps everything it has and tries again later -
|
||||
* nothing is deleted on the chatbot side.
|
||||
*/
|
||||
public static function disabledResponse(): ResponseInterface
|
||||
{
|
||||
return new JsonResponse(
|
||||
['message' => 'Content feed is switched off'],
|
||||
503,
|
||||
['Retry-After' => (string) self::DISABLED_RETRY_AFTER],
|
||||
self::JSON_FLAGS
|
||||
);
|
||||
}
|
||||
|
||||
private function error(string $message, int $status): ResponseInterface
|
||||
{
|
||||
return new JsonResponse(['message' => $message], $status, [], self::JSON_FLAGS);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
|
||||
use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
|
||||
/**
|
||||
* The chatbot content feed's extension configuration.
|
||||
*
|
||||
* Missing keys fall back to "feed is on, but covers nothing": a key added to ext_conf_template.txt
|
||||
* is absent until the extension configuration is saved in the backend, and an empty feed is
|
||||
* refused by the consumer rather than read as "everything was deleted".
|
||||
*/
|
||||
class ContentFeedConfiguration
|
||||
{
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private $configuration;
|
||||
|
||||
public function __construct(ExtensionConfiguration $extensionConfiguration)
|
||||
{
|
||||
$this->configuration = (array) $extensionConfiguration->get('ep_products');
|
||||
}
|
||||
|
||||
public function isEnabled(): bool
|
||||
{
|
||||
return (bool) ($this->configuration['contentFeedEnabled'] ?? true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string[] site identifiers
|
||||
*/
|
||||
public function getSites(): array
|
||||
{
|
||||
return GeneralUtility::trimExplode(',', (string) ($this->configuration['contentFeedSites'] ?? ''), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int[] language ids; the default language when unset
|
||||
*/
|
||||
public function getLanguages(): array
|
||||
{
|
||||
$languages = GeneralUtility::intExplode(',', (string) ($this->configuration['contentFeedLanguages'] ?? '0'), true);
|
||||
|
||||
return [] === $languages ? [0] : $languages;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int[] page uids whose whole subtree stays out of the feed
|
||||
*/
|
||||
public function getExcludedPages(): array
|
||||
{
|
||||
return GeneralUtility::intExplode(',', (string) ($this->configuration['contentFeedExcludedPages'] ?? ''), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, int> site identifier => news detail page uid
|
||||
*/
|
||||
public function getNewsDetailPages(): array
|
||||
{
|
||||
$pages = [];
|
||||
|
||||
foreach (GeneralUtility::trimExplode(',', (string) ($this->configuration['contentFeedNewsDetailPages'] ?? ''), true) as $entry) {
|
||||
$parts = GeneralUtility::trimExplode(':', $entry, true);
|
||||
|
||||
if (2 === count($parts) && (int) $parts[1] > 0) {
|
||||
$pages[$parts[0]] = (int) $parts[1];
|
||||
}
|
||||
}
|
||||
|
||||
return $pages;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,379 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use TYPO3\CMS\Core\Database\ConnectionPool;
|
||||
use TYPO3\CMS\Core\Site\Entity\Site;
|
||||
|
||||
/**
|
||||
* Builds GET /api/content/manifest: everything the content feed publishes, with a modification
|
||||
* marker per item and no bodies. The list is complete - an item missing from it is gone - so the
|
||||
* consumer never has to infer deletions from timestamps.
|
||||
*
|
||||
* See .ddev/plans/CHATBOT-MCP-01-TYPO3-CONTENT-FEED.md §4.
|
||||
*/
|
||||
class ManifestBuilder
|
||||
{
|
||||
public const CONTENT_PAGE_TYPE = 1730;
|
||||
|
||||
private const DOKTYPE_DEFAULT = 1;
|
||||
// Recycler and backend user section: nothing below them is public.
|
||||
private const DOKTYPES_NOT_TRAVERSED = [6, 255];
|
||||
// l18n_cfg bit 1: "hide default translation of page".
|
||||
private const L18N_HIDE_DEFAULT_LANGUAGE = 1;
|
||||
|
||||
private const RECORD_FIELDS = [
|
||||
'product' => ['uid', 'tstamp', 'detail_page'],
|
||||
'hotel' => ['uid', 'tstamp', 'detail_page'],
|
||||
'region' => ['uid', 'tstamp', 'detail_page'],
|
||||
'country' => ['uid', 'tstamp', 'detail_page'],
|
||||
'city' => ['uid', 'tstamp', 'detail_page'],
|
||||
'concept' => ['uid', 'tstamp', 'detail_page'],
|
||||
'news' => ['uid', 'tstamp', 'pid'],
|
||||
];
|
||||
|
||||
/**
|
||||
* @var PageTree
|
||||
*/
|
||||
private $pageTree;
|
||||
|
||||
/**
|
||||
* @var UrlResolver
|
||||
*/
|
||||
private $urlResolver;
|
||||
|
||||
/**
|
||||
* @var RecordFinder
|
||||
*/
|
||||
private $recordFinder;
|
||||
|
||||
/**
|
||||
* @var ContentFeedConfiguration
|
||||
*/
|
||||
private $configuration;
|
||||
|
||||
/**
|
||||
* @var ConnectionPool
|
||||
*/
|
||||
private $connectionPool;
|
||||
|
||||
public function __construct(
|
||||
PageTree $pageTree,
|
||||
UrlResolver $urlResolver,
|
||||
RecordFinder $recordFinder,
|
||||
ContentFeedConfiguration $configuration,
|
||||
ConnectionPool $connectionPool
|
||||
) {
|
||||
$this->pageTree = $pageTree;
|
||||
$this->urlResolver = $urlResolver;
|
||||
$this->recordFinder = $recordFinder;
|
||||
$this->configuration = $configuration;
|
||||
$this->connectionPool = $connectionPool;
|
||||
}
|
||||
|
||||
public function build(): array
|
||||
{
|
||||
$sites = $this->urlResolver->getIncludedSites();
|
||||
$records = $this->buildRecordItems();
|
||||
|
||||
return [
|
||||
'generatedAt' => date('c'),
|
||||
'sites' => array_map([$this, 'describeSite'], $sites),
|
||||
'items' => array_merge($this->buildPageItems($sites, $this->collectDetailPages()), $records),
|
||||
];
|
||||
}
|
||||
|
||||
private function describeSite(Site $site): array
|
||||
{
|
||||
$languages = [];
|
||||
|
||||
foreach ($site->getLanguages() as $language) {
|
||||
$languages[] = $language->getTwoLetterIsoCode();
|
||||
}
|
||||
|
||||
$title = trim((string) ($site->getConfiguration()['websiteTitle'] ?? ''));
|
||||
|
||||
if ('' === $title) {
|
||||
$title = trim($site->getDefaultLanguage()->getWebsiteTitle());
|
||||
}
|
||||
|
||||
return [
|
||||
'identifier' => $site->getIdentifier(),
|
||||
'title' => '' !== $title ? $title : $site->getIdentifier(),
|
||||
'base' => (string) $site->getBase(),
|
||||
'languages' => $languages,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Site[] $sites
|
||||
* @param array<int, array> $detailPages detailOf entries by page uid
|
||||
*/
|
||||
private function buildPageItems(array $sites, array $detailPages): array
|
||||
{
|
||||
$content = $this->findContentStatistics();
|
||||
$excluded = array_flip($this->configuration->getExcludedPages());
|
||||
$feedLanguages = $this->configuration->getLanguages();
|
||||
$items = [];
|
||||
|
||||
foreach ($sites as $site) {
|
||||
$languageIds = [];
|
||||
|
||||
foreach ($site->getLanguages() as $language) {
|
||||
if (in_array($language->getLanguageId(), $feedLanguages, true)) {
|
||||
$languageIds[$language->getLanguageId()] = $language->getTwoLetterIsoCode();
|
||||
}
|
||||
}
|
||||
|
||||
$context = [
|
||||
'site' => $site,
|
||||
'languages' => $languageIds,
|
||||
'excluded' => $excluded,
|
||||
'content' => $content,
|
||||
'detailPages' => $detailPages,
|
||||
];
|
||||
$breadcrumbs = array_fill_keys(array_keys($languageIds), []);
|
||||
|
||||
$this->walk($site->getRootPageId(), $context, $breadcrumbs, true, $items);
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<int, string[]> $breadcrumbs titles above this page, by language id
|
||||
*/
|
||||
private function walk(int $uid, array $context, array $breadcrumbs, bool $isRoot, array &$items): void
|
||||
{
|
||||
$page = $this->pageTree->getPage($uid);
|
||||
|
||||
if (null === $page || isset($context['excluded'][$uid])) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (in_array((int) $page['doktype'], self::DOKTYPES_NOT_TRAVERSED, true)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$visible = $this->pageTree->isVisible($page);
|
||||
|
||||
if (!$visible && (int) $page['extendToSubpages'] === 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
$childBreadcrumbs = $breadcrumbs;
|
||||
|
||||
foreach ($context['languages'] as $languageId => $isoCode) {
|
||||
$row = $this->getLanguageRow($page, $languageId);
|
||||
|
||||
if ($visible && null !== $row && $this->isPublishable($page, $row, $languageId)) {
|
||||
$item = $this->buildPageItem($page, $row, $languageId, $isoCode, $breadcrumbs[$languageId], $context);
|
||||
|
||||
if (null !== $item) {
|
||||
$items[] = $item;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$isRoot) {
|
||||
$source = $row ?? $page;
|
||||
$childBreadcrumbs[$languageId][] = '' !== trim((string) $source['nav_title'])
|
||||
? trim((string) $source['nav_title'])
|
||||
: trim((string) $source['title']);
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($this->pageTree->getChildren($uid) as $childUid) {
|
||||
$this->walk($childUid, $context, $childBreadcrumbs, false, $items);
|
||||
}
|
||||
}
|
||||
|
||||
private function getLanguageRow(array $page, int $languageId): ?array
|
||||
{
|
||||
if (0 === $languageId) {
|
||||
return $page;
|
||||
}
|
||||
|
||||
$overlay = $this->pageTree->getOverlay((int) $page['uid'], $languageId);
|
||||
|
||||
return null !== $overlay && $this->pageTree->isVisible($overlay) ? $overlay : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Mirrors the XML sitemap: standard pages only, nothing marked no_index. If Google is not
|
||||
* meant to see a page, the chatbot is not either.
|
||||
*/
|
||||
private function isPublishable(array $page, array $row, int $languageId): bool
|
||||
{
|
||||
if ((int) $page['doktype'] !== self::DOKTYPE_DEFAULT || (int) $row['no_index'] === 1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return 0 !== $languageId || 0 === ((int) $page['l18n_cfg'] & self::L18N_HIDE_DEFAULT_LANGUAGE);
|
||||
}
|
||||
|
||||
private function buildPageItem(array $page, array $row, int $languageId, string $isoCode, array $breadcrumb, array $context): ?array
|
||||
{
|
||||
$uid = (int) $page['uid'];
|
||||
// "Show content from page": the elements live on another page, and so do their changes.
|
||||
// The site answers 404 when that page is hidden.
|
||||
$contentPid = (int) $page['content_from_pid'] ?: $uid;
|
||||
$contentPage = $this->pageTree->getPage($contentPid);
|
||||
|
||||
if (null === $contentPage || !$this->pageTree->isVisible($contentPage)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Without a visible element other than plugins, the content-only render is empty (it
|
||||
// leaves plugins out), so there is nothing to fetch. That is most product and hotel
|
||||
// detail pages: their text comes through the records endpoint.
|
||||
$content = $context['content'][$contentPid] ?? [];
|
||||
$textElements = ($content[$languageId]['text'] ?? 0) + ($content[-1]['text'] ?? 0);
|
||||
|
||||
if (0 === $textElements) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$url = $this->urlResolver->getPageUrl($uid, $languageId);
|
||||
|
||||
if (null === $url) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$modified = max(
|
||||
(int) $row['tstamp'],
|
||||
$content[$languageId]['tstamp'] ?? 0,
|
||||
$content[-1]['tstamp'] ?? 0
|
||||
);
|
||||
|
||||
return [
|
||||
'type' => 'page',
|
||||
'uid' => $uid,
|
||||
'language' => $isoCode,
|
||||
'site' => $context['site']->getIdentifier(),
|
||||
'url' => $url,
|
||||
'contentUrl' => $this->urlResolver->getPageUrl($uid, $languageId, ['type' => self::CONTENT_PAGE_TYPE]),
|
||||
'title' => trim((string) $row['title']),
|
||||
'description' => $this->nullIfEmpty((string) $row['description']),
|
||||
'breadcrumb' => $breadcrumb,
|
||||
'detailOf' => $context['detailPages'][$uid] ?? [],
|
||||
'modified' => date('c', $modified),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Per page and language: the latest change to any content element, and how many visible
|
||||
* elements are not plugins.
|
||||
* Deleted and hidden elements count towards the change - removing or hiding one changes the
|
||||
* page - which is also why SYS_LASTCHANGED is no use here: it only moves on render.
|
||||
*
|
||||
* @return array<int, array<int, array{tstamp: int, text: int}>>
|
||||
*/
|
||||
private function findContentStatistics(): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tt_content');
|
||||
$queryBuilder->getRestrictions()->removeAll();
|
||||
|
||||
$rows = $queryBuilder
|
||||
->selectLiteral(
|
||||
'pid',
|
||||
'sys_language_uid',
|
||||
'MAX(tstamp) AS tstamp',
|
||||
"SUM(CASE WHEN deleted = 0 AND hidden = 0 AND CType <> 'list' THEN 1 ELSE 0 END) AS text_elements"
|
||||
)
|
||||
->from('tt_content')
|
||||
->groupBy('pid', 'sys_language_uid')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$statistics = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$statistics[(int) $row['pid']][(int) $row['sys_language_uid']] = [
|
||||
'tstamp' => (int) $row['tstamp'],
|
||||
'text' => (int) $row['text_elements'],
|
||||
];
|
||||
}
|
||||
|
||||
return $statistics;
|
||||
}
|
||||
|
||||
/**
|
||||
* Which records name a page as their detail page. Keyed by the page the record points at,
|
||||
* not by where a shortcut leads: a shortcut is not in the manifest, and the page it leads to
|
||||
* usually describes something broader (product detail shortcuts point at region pages).
|
||||
*
|
||||
* @return array<int, array>
|
||||
*/
|
||||
private function collectDetailPages(): array
|
||||
{
|
||||
$detailPages = [];
|
||||
|
||||
foreach (self::RECORD_FIELDS as $type => $fields) {
|
||||
if (!in_array('detail_page', $fields, true)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($this->recordFinder->find($type, ['uid', 'detail_page']) as $uid => $row) {
|
||||
$pageUid = $this->urlResolver->parsePageReference((string) $row['detail_page']);
|
||||
|
||||
if (null !== $pageUid) {
|
||||
$detailPages[$pageUid][] = ['type' => $type, 'uid' => $uid];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $detailPages;
|
||||
}
|
||||
|
||||
private function buildRecordItems(): array
|
||||
{
|
||||
$faqTimestamps = $this->recordFinder->findFaqTimestamps();
|
||||
$matchcodeTimestamps = $this->recordFinder->findMatchcodeTimestamps();
|
||||
$items = [];
|
||||
|
||||
foreach (self::RECORD_FIELDS as $type => $fields) {
|
||||
foreach ($this->recordFinder->find($type, $fields) as $uid => $row) {
|
||||
if ('news' === $type) {
|
||||
$link = $this->urlResolver->getNewsLink((int) $row['uid'], (int) $row['pid']);
|
||||
|
||||
// News has no detail_page of its own: an article stored outside the feed's
|
||||
// sites (the retired ep-events) is not part of the feed at all.
|
||||
if (null === $link) {
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
$link = $this->urlResolver->getRecordLink((string) $row['detail_page']);
|
||||
}
|
||||
|
||||
$modified = (int) $row['tstamp'];
|
||||
|
||||
if ('product' === $type) {
|
||||
$modified = max($modified, $faqTimestamps[$uid] ?? 0);
|
||||
}
|
||||
|
||||
if ('hotel' === $type) {
|
||||
$modified = max($modified, $matchcodeTimestamps[$uid] ?? 0);
|
||||
}
|
||||
|
||||
$items[] = [
|
||||
'type' => $type,
|
||||
'uid' => $uid,
|
||||
'language' => 'de',
|
||||
'site' => $link['site'],
|
||||
'url' => $link['url'],
|
||||
'modified' => date('c', $modified),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
|
||||
private function nullIfEmpty(string $value): ?string
|
||||
{
|
||||
$value = trim($value);
|
||||
|
||||
return '' === $value ? null : $value;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,131 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use TYPO3\CMS\Core\Context\Context;
|
||||
use TYPO3\CMS\Core\Database\ConnectionPool;
|
||||
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
|
||||
|
||||
/**
|
||||
* The whole page table in memory, for the content feed's tree walk and shortcut resolution.
|
||||
*
|
||||
* About 2 900 rows: one query and a PHP walk is far cheaper than a query per tree level.
|
||||
* Visibility is evaluated here, not in SQL, because a hidden page still has to be traversed
|
||||
* (its subpages stay reachable unless extendToSubpages is set).
|
||||
*/
|
||||
class PageTree
|
||||
{
|
||||
private const FIELDS = [
|
||||
'uid', 'pid', 'sorting', 'doktype', 'hidden', 'starttime', 'endtime', 'fe_group',
|
||||
'extendToSubpages', 'no_index', 'title', 'nav_title', 'description', 'shortcut',
|
||||
'shortcut_mode', 'content_from_pid', 'tstamp', 'sys_language_uid', 'l10n_parent', 'l18n_cfg',
|
||||
];
|
||||
|
||||
/**
|
||||
* @var ConnectionPool
|
||||
*/
|
||||
private $connectionPool;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
private $now;
|
||||
|
||||
/**
|
||||
* @var array<int, array>|null default-language rows by uid
|
||||
*/
|
||||
private $pages;
|
||||
|
||||
/**
|
||||
* @var array<int, int[]> child uids by parent uid, in sorting order
|
||||
*/
|
||||
private $children = [];
|
||||
|
||||
/**
|
||||
* @var array<int, array<int, array>> overlay rows by default-language uid and language id
|
||||
*/
|
||||
private $overlays = [];
|
||||
|
||||
public function __construct(ConnectionPool $connectionPool, Context $context)
|
||||
{
|
||||
$this->connectionPool = $connectionPool;
|
||||
$this->now = (int) $context->getPropertyFromAspect('date', 'timestamp');
|
||||
}
|
||||
|
||||
public function getPage(int $uid): ?array
|
||||
{
|
||||
$this->load();
|
||||
|
||||
return $this->pages[$uid] ?? null;
|
||||
}
|
||||
|
||||
public function getOverlay(int $uid, int $languageId): ?array
|
||||
{
|
||||
$this->load();
|
||||
|
||||
return $this->overlays[$uid][$languageId] ?? null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int[]
|
||||
*/
|
||||
public function getChildren(int $uid): array
|
||||
{
|
||||
$this->load();
|
||||
|
||||
return $this->children[$uid] ?? [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Visible to an anonymous frontend visitor: not hidden, inside its start/end window, and not
|
||||
* restricted to a frontend user group.
|
||||
*/
|
||||
public function isVisible(array $row): bool
|
||||
{
|
||||
if ((int) $row['hidden'] === 1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((int) $row['starttime'] > $this->now) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((int) $row['endtime'] !== 0 && (int) $row['endtime'] <= $this->now) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return in_array((string) $row['fe_group'], ['', '0'], true);
|
||||
}
|
||||
|
||||
private function load(): void
|
||||
{
|
||||
if (null !== $this->pages) {
|
||||
return;
|
||||
}
|
||||
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('pages');
|
||||
$queryBuilder->getRestrictions()->removeAll()->add(new DeletedRestriction());
|
||||
|
||||
$rows = $queryBuilder
|
||||
->select(...self::FIELDS)
|
||||
->from('pages')
|
||||
->orderBy('sorting')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$this->pages = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$uid = (int) $row['uid'];
|
||||
|
||||
if ((int) $row['sys_language_uid'] > 0) {
|
||||
$this->overlays[(int) $row['l10n_parent']][(int) $row['sys_language_uid']] = $row;
|
||||
continue;
|
||||
}
|
||||
|
||||
$this->pages[$uid] = $row;
|
||||
$this->children[(int) $row['pid']][] = $uid;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,152 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use TYPO3\CMS\Core\Database\Connection;
|
||||
use TYPO3\CMS\Core\Database\ConnectionPool;
|
||||
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
|
||||
|
||||
/**
|
||||
* Which records the content feed publishes. The manifest and the records endpoint both go
|
||||
* through here, so a uid the manifest lists is exactly a uid the records endpoint returns.
|
||||
*
|
||||
* The default restrictions apply: deleted, hidden, starttime and endtime.
|
||||
*/
|
||||
class RecordFinder
|
||||
{
|
||||
public const TYPES = [
|
||||
'product' => 'tx_epproducts_domain_model_product',
|
||||
'hotel' => 'tx_epproducts_domain_model_hotel',
|
||||
'region' => 'tx_epproducts_domain_model_region',
|
||||
'country' => 'tx_epproducts_domain_model_country',
|
||||
'city' => 'tx_epproducts_domain_model_city',
|
||||
'concept' => 'tx_epproducts_domain_model_concept',
|
||||
'news' => 'tx_news_domain_model_news',
|
||||
];
|
||||
|
||||
/**
|
||||
* @var ConnectionPool
|
||||
*/
|
||||
private $connectionPool;
|
||||
|
||||
public function __construct(ConnectionPool $connectionPool)
|
||||
{
|
||||
$this->connectionPool = $connectionPool;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string[] $fields
|
||||
* @param int[]|null $uids null for all eligible records
|
||||
* @return array<int, array> rows by uid, in uid order
|
||||
*/
|
||||
public function find(string $type, array $fields, ?array $uids = null): array
|
||||
{
|
||||
$table = self::TYPES[$type];
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable($table);
|
||||
$queryBuilder
|
||||
->select(...$fields)
|
||||
->from($table)
|
||||
->where($queryBuilder->expr()->in('sys_language_uid', [0, -1]))
|
||||
->orderBy('uid')
|
||||
;
|
||||
|
||||
if (null !== $uids) {
|
||||
if ([] === $uids) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$queryBuilder->andWhere($queryBuilder->expr()->in(
|
||||
'uid',
|
||||
$queryBuilder->createNamedParameter($uids, Connection::PARAM_INT_ARRAY)
|
||||
));
|
||||
}
|
||||
|
||||
$this->addTypeConstraints($type, $queryBuilder);
|
||||
|
||||
$rows = [];
|
||||
|
||||
foreach ($queryBuilder->execute()->fetchAllAssociative() as $row) {
|
||||
$rows[(int) $row['uid']] = $row;
|
||||
}
|
||||
|
||||
return $rows;
|
||||
}
|
||||
|
||||
/**
|
||||
* Latest change to a product's FAQs, by product uid. Deleted and hidden FAQs count: removing
|
||||
* one is a change to the product's text.
|
||||
*
|
||||
* @return array<int, int>
|
||||
*/
|
||||
public function findFaqTimestamps(): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_faq');
|
||||
$queryBuilder->getRestrictions()->removeAll();
|
||||
|
||||
$rows = $queryBuilder
|
||||
->selectLiteral('mm.uid_local AS product', 'MAX(faq.tstamp) AS tstamp')
|
||||
->from('tx_epproducts_product_faq_mm', 'mm')
|
||||
->join('mm', 'tx_epproducts_domain_model_faq', 'faq', 'faq.uid = mm.uid_foreign')
|
||||
->groupBy('mm.uid_local')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
return $this->indexTimestamps($rows, 'product');
|
||||
}
|
||||
|
||||
/**
|
||||
* Latest change to a hotel's matchcode aliases, by hotel uid. They are part of the hotel's
|
||||
* `codes`, which the consumer joins its trip data on.
|
||||
*
|
||||
* @return array<int, int>
|
||||
*/
|
||||
public function findMatchcodeTimestamps(): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_matchcode');
|
||||
$queryBuilder->getRestrictions()->removeAll();
|
||||
|
||||
$rows = $queryBuilder
|
||||
->selectLiteral('entity AS hotel', 'MAX(tstamp) AS tstamp')
|
||||
->from('tx_epproducts_domain_model_matchcode')
|
||||
->where($queryBuilder->expr()->eq('entity_type', $queryBuilder->createNamedParameter('hotel')))
|
||||
->groupBy('entity')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
return $this->indexTimestamps($rows, 'hotel');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<int, int>
|
||||
*/
|
||||
private function indexTimestamps(array $rows, string $key): array
|
||||
{
|
||||
$timestamps = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$timestamps[(int) $row[$key]] = (int) $row['tstamp'];
|
||||
}
|
||||
|
||||
return $timestamps;
|
||||
}
|
||||
|
||||
private function addTypeConstraints(string $type, QueryBuilder $queryBuilder): void
|
||||
{
|
||||
$expr = $queryBuilder->expr();
|
||||
|
||||
if ('product' === $type) {
|
||||
// A product that is neither searchable nor bookable is an internal record.
|
||||
$queryBuilder->andWhere($expr->orX($expr->eq('searchable', 1), $expr->eq('bookable', 1)));
|
||||
}
|
||||
|
||||
if ('news' === $type) {
|
||||
// Type 0 is a regular article; 1 and 2 are just links to a page or an external URL.
|
||||
$queryBuilder->andWhere(
|
||||
$expr->eq('type', $queryBuilder->createNamedParameter('0')),
|
||||
$expr->in('fe_group', $queryBuilder->createNamedParameter(['', '0'], Connection::PARAM_STR_ARRAY))
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,513 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use EP\EpProducts\Utility\HotelIconUtility;
|
||||
use TYPO3\CMS\Core\Database\Connection;
|
||||
use TYPO3\CMS\Core\Database\ConnectionPool;
|
||||
|
||||
/**
|
||||
* Builds GET /api/content/records: the editorial content of products, hotels, destinations,
|
||||
* concepts and blog articles. Filter attributes and text only - no dates, prices or images.
|
||||
* Dates and prices are the consumer's own data; images play no part in a text chatbot.
|
||||
*
|
||||
* Rich-text fields go out as stored HTML with `t3://` links resolved; the consumer converts
|
||||
* them to Markdown together with the rendered pages, so there is one HTML-to-text step.
|
||||
*
|
||||
* See .ddev/plans/CHATBOT-MCP-01-TYPO3-CONTENT-FEED.md §5.
|
||||
*/
|
||||
class RecordSerializer
|
||||
{
|
||||
/**
|
||||
* @var RecordFinder
|
||||
*/
|
||||
private $recordFinder;
|
||||
|
||||
/**
|
||||
* @var UrlResolver
|
||||
*/
|
||||
private $urlResolver;
|
||||
|
||||
/**
|
||||
* @var RteLinkResolver
|
||||
*/
|
||||
private $rteLinkResolver;
|
||||
|
||||
/**
|
||||
* @var ConnectionPool
|
||||
*/
|
||||
private $connectionPool;
|
||||
|
||||
public function __construct(
|
||||
RecordFinder $recordFinder,
|
||||
UrlResolver $urlResolver,
|
||||
RteLinkResolver $rteLinkResolver,
|
||||
ConnectionPool $connectionPool
|
||||
) {
|
||||
$this->recordFinder = $recordFinder;
|
||||
$this->urlResolver = $urlResolver;
|
||||
$this->rteLinkResolver = $rteLinkResolver;
|
||||
$this->connectionPool = $connectionPool;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int[] $uids
|
||||
* @return array[] one item per eligible uid; ineligible uids are left out
|
||||
*/
|
||||
public function serialize(string $type, array $uids): array
|
||||
{
|
||||
$rows = $this->recordFinder->find($type, ['*'], $uids);
|
||||
|
||||
if ([] === $rows) {
|
||||
return [];
|
||||
}
|
||||
|
||||
switch ($type) {
|
||||
case 'product':
|
||||
return $this->serializeProducts($rows);
|
||||
case 'hotel':
|
||||
return $this->serializeHotels($rows);
|
||||
case 'news':
|
||||
return $this->serializeNews($rows);
|
||||
default:
|
||||
return array_values(array_map(function (array $row) use ($type): array {
|
||||
return $this->serializeDestination($type, $row);
|
||||
}, $rows));
|
||||
}
|
||||
}
|
||||
|
||||
private function serializeProducts(array $rows): array
|
||||
{
|
||||
$uids = array_keys($rows);
|
||||
$hotels = $this->findMmUids('tx_epproducts_product_hotel_mm', 'uid_local', 'uid_foreign', $uids);
|
||||
$regions = $this->findMmUids('tx_epproducts_product_region_mm', 'uid_local', 'uid_foreign', $uids);
|
||||
$faqs = $this->findFaqs($uids);
|
||||
$faqTimestamps = $this->recordFinder->findFaqTimestamps();
|
||||
$infoboxes = $this->findInfoboxTexts(array_column($rows, 'non_bookable_info'));
|
||||
$items = [];
|
||||
|
||||
foreach ($rows as $uid => $row) {
|
||||
$season = trim((string) $row['season']);
|
||||
|
||||
$items[] = $this->withLink($row, max((int) $row['tstamp'], $faqTimestamps[$uid] ?? 0)) + [
|
||||
'code' => $this->text($row['code']),
|
||||
'busProId' => (int) $row['bus_pro_id'] ?: null,
|
||||
'name' => $this->text($row['name']),
|
||||
'subline' => $this->text($row['subline']),
|
||||
'headline' => $this->text($row['headline']),
|
||||
'season' => '' === $season ? 'w' : $season,
|
||||
'daytrip' => (bool) $row['daytrip'],
|
||||
'bookable' => (bool) $row['bookable'],
|
||||
'searchable' => (bool) $row['searchable'],
|
||||
'skipassIncluded' => (bool) $row['skipass_included'],
|
||||
'conceptUid' => (int) $row['concept'] ?: null,
|
||||
'countryUid' => (int) $row['country'] ?: null,
|
||||
'regionUid' => (int) $row['region'] ?: null,
|
||||
'cityUid' => (int) $row['city'] ?: null,
|
||||
'additionalRegionUids' => $regions[$uid] ?? [],
|
||||
'hotelUids' => $hotels[$uid] ?? [],
|
||||
'keywords' => $this->text($row['keywords']),
|
||||
'text' => [
|
||||
'teaser' => $this->html($row['teaser']),
|
||||
'teaserLong' => $this->html($row['teaser_long']),
|
||||
'feature' => $this->text($row['feature']),
|
||||
'conceptDescription' => $this->html($row['concept_description']),
|
||||
'boardDescription' => $this->html($row['board_description']),
|
||||
'includedServices' => $this->html($row['included_services']),
|
||||
'additionalServices' => $this->html($row['additional_services']),
|
||||
'programmeDescription' => $this->html($row['programme_description']),
|
||||
'skiPassDescription' => $this->html($row['ski_pass_description']),
|
||||
'nonBookableInfo' => $infoboxes[(int) $row['non_bookable_info']] ?? null,
|
||||
],
|
||||
'faqs' => $faqs[$uid] ?? [],
|
||||
];
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
|
||||
private function serializeHotels(array $rows): array
|
||||
{
|
||||
$uids = array_keys($rows);
|
||||
$aliases = $this->findMatchcodes($uids);
|
||||
$matchcodeTimestamps = $this->recordFinder->findMatchcodeTimestamps();
|
||||
$products = $this->findMmUids('tx_epproducts_product_hotel_mm', 'uid_foreign', 'uid_local', $uids, 'sorting_foreign');
|
||||
$eligibleProducts = $this->recordFinder->find('product', ['uid'], array_values(array_unique(array_merge([], ...array_values($products)))));
|
||||
$items = [];
|
||||
|
||||
foreach ($rows as $uid => $row) {
|
||||
$code = trim((string) $row['code']);
|
||||
$codes = array_values(array_unique(array_filter(array_merge([$code], $aliases[$uid] ?? []), 'strlen')));
|
||||
|
||||
$items[] = $this->withLink($row, max((int) $row['tstamp'], $matchcodeTimestamps[$uid] ?? 0)) + [
|
||||
'code' => '' === $code ? null : $code,
|
||||
'codes' => $codes,
|
||||
'name' => $this->text($row['name']),
|
||||
'shortName' => $this->text($row['short_name']),
|
||||
'headline' => $this->text($row['headline']),
|
||||
'type' => (int) $row['type'],
|
||||
'category' => (int) $row['category'],
|
||||
'new' => (bool) $row['new'],
|
||||
'earlybird' => (bool) $row['earlybird'],
|
||||
'countryUid' => (int) $row['country'] ?: null,
|
||||
'regionUid' => (int) $row['region'] ?: null,
|
||||
'cityUid' => (int) $row['city'] ?: null,
|
||||
'productUids' => array_values(array_filter($products[$uid] ?? [], function (int $productUid) use ($eligibleProducts): bool {
|
||||
return isset($eligibleProducts[$productUid]);
|
||||
})),
|
||||
'address' => $this->text($row['address']),
|
||||
'latitude' => $this->text($row['latitude']),
|
||||
'longitude' => $this->text($row['longitude']),
|
||||
'facts' => [
|
||||
'bedsCount' => (int) $row['beds_count'] ?: null,
|
||||
'parkingCount' => (int) $row['parking_count'] ?: null,
|
||||
'altitude' => $this->text($row['altitude']),
|
||||
'distanceBus' => $this->text($row['distance_bus']),
|
||||
'distanceLift' => $this->text($row['distance_lift']),
|
||||
'shower' => $this->text($row['shower']),
|
||||
'partyroom' => (bool) $row['partyroom'],
|
||||
'gamesroom' => (bool) $row['gamesroom'],
|
||||
'sauna' => (bool) $row['sauna'],
|
||||
'wifi' => (bool) $row['wifi'],
|
||||
],
|
||||
'icons' => HotelIconUtility::getIcons($row),
|
||||
'keywords' => $this->text($row['keywords']),
|
||||
'text' => [
|
||||
'teaser' => $this->html($row['teaser']),
|
||||
'description' => $this->html($row['description']),
|
||||
'features' => $this->html($row['features']),
|
||||
'roomTypes' => $this->html($row['room_types']),
|
||||
'additionalInformation' => $this->html($row['additional_information']),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
|
||||
private function serializeDestination(string $type, array $row): array
|
||||
{
|
||||
$item = $this->withLink($row, (int) $row['tstamp']) + [
|
||||
'name' => $this->text($row['name']),
|
||||
'headline' => $this->text($row['headline']),
|
||||
];
|
||||
|
||||
switch ($type) {
|
||||
case 'region':
|
||||
return $item + [
|
||||
'season' => $this->text($row['season']),
|
||||
'keywords' => $this->text($row['keywords']),
|
||||
'countryUid' => (int) $row['country'] ?: null,
|
||||
'facts' => [
|
||||
'length' => $this->text($row['length']),
|
||||
'height' => $this->text($row['height']),
|
||||
'lifts' => $this->text($row['lifts']),
|
||||
],
|
||||
'webcam' => $this->findWebcamUrl((int) $row['webcam']),
|
||||
'text' => [
|
||||
'teaser' => $this->html($row['teaser']),
|
||||
'description' => $this->html($row['description']),
|
||||
'feature' => $this->text($row['feature']),
|
||||
'skiArea' => $this->html($row['ski_area']),
|
||||
'skiAreaExtended' => $this->html($row['ski_area_extended']),
|
||||
'skiPass' => $this->html($row['ski_pass']),
|
||||
'news' => $this->html($row['news']),
|
||||
],
|
||||
];
|
||||
case 'country':
|
||||
return $item + [
|
||||
'code' => $this->text($row['code']),
|
||||
'season' => $this->text($row['season']),
|
||||
'keywords' => $this->text($row['keywords']),
|
||||
'text' => [
|
||||
'teaser' => $this->html($row['teaser']),
|
||||
'description' => $this->html($row['description']),
|
||||
'descriptionExtended' => $this->html($row['description_extended']),
|
||||
],
|
||||
];
|
||||
case 'city':
|
||||
return $item + [
|
||||
'season' => $this->text($row['season']),
|
||||
'keywords' => $this->text($row['keywords']),
|
||||
'countryUid' => (int) $row['country'] ?: null,
|
||||
'regionUid' => (int) $row['region'] ?: null,
|
||||
'text' => [
|
||||
'teaser' => $this->html($row['teaser']),
|
||||
'description' => $this->html($row['description']),
|
||||
'descriptionExtended' => $this->html($row['description_extended']),
|
||||
'party' => $this->html($row['party']),
|
||||
'leisure' => $this->html($row['leisure']),
|
||||
],
|
||||
];
|
||||
default: // concept
|
||||
return $item + [
|
||||
'code' => $this->text($row['code']),
|
||||
'text' => [
|
||||
'teaser' => $this->html($row['teaser']),
|
||||
'description' => $this->html($row['description']),
|
||||
'descriptionExtended' => $this->html($row['description_extended']),
|
||||
'popupText' => $this->html($row['popup_text']),
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
private function serializeNews(array $rows): array
|
||||
{
|
||||
$uids = array_keys($rows);
|
||||
$tags = $this->findNewsTags($uids);
|
||||
$categories = $this->findNewsCategories($uids);
|
||||
$items = [];
|
||||
|
||||
foreach ($rows as $uid => $row) {
|
||||
$link = $this->urlResolver->getNewsLink($uid, (int) $row['pid']);
|
||||
|
||||
if (null === $link) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$items[] = [
|
||||
'uid' => $uid,
|
||||
'url' => $link['url'],
|
||||
'site' => $link['site'],
|
||||
'modified' => date('c', (int) $row['tstamp']),
|
||||
'title' => $this->text($row['title']),
|
||||
'teaser' => $this->html($row['teaser']),
|
||||
'bodytext' => $this->html($row['bodytext']),
|
||||
'datetime' => (int) $row['datetime'] > 0 ? date('c', (int) $row['datetime']) : null,
|
||||
'tags' => $tags[$uid] ?? [],
|
||||
'categories' => $categories[$uid] ?? [],
|
||||
];
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
|
||||
/**
|
||||
* The identity and link fields every record carries, with the same values as the manifest.
|
||||
*/
|
||||
private function withLink(array $row, int $modified): array
|
||||
{
|
||||
$link = $this->urlResolver->getRecordLink((string) $row['detail_page']);
|
||||
|
||||
return [
|
||||
'uid' => (int) $row['uid'],
|
||||
'url' => $link['url'],
|
||||
'site' => $link['site'],
|
||||
'modified' => date('c', $modified),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int[] $uids
|
||||
* @return array<int, int[]> related uids by $keyField, in $sortField order
|
||||
*/
|
||||
private function findMmUids(string $table, string $keyField, string $valueField, array $uids, string $sortField = 'sorting'): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable($table);
|
||||
$rows = $queryBuilder
|
||||
->select($keyField, $valueField)
|
||||
->from($table)
|
||||
->where($queryBuilder->expr()->in($keyField, $queryBuilder->createNamedParameter($uids, Connection::PARAM_INT_ARRAY)))
|
||||
->orderBy($keyField)
|
||||
->addOrderBy($sortField)
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$related = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$related[(int) $row[$keyField]][] = (int) $row[$valueField];
|
||||
}
|
||||
|
||||
return $related;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int[] $productUids
|
||||
* @return array<int, array[]> FAQs by product uid, in the order the editor arranged them
|
||||
*/
|
||||
private function findFaqs(array $productUids): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_faq');
|
||||
$rows = $queryBuilder
|
||||
->select('mm.uid_local AS product', 'faq.question', 'faq.answer', 'faq.category')
|
||||
->from('tx_epproducts_domain_model_faq', 'faq')
|
||||
->join('faq', 'tx_epproducts_product_faq_mm', 'mm', 'mm.uid_foreign = faq.uid')
|
||||
->where($queryBuilder->expr()->in('mm.uid_local', $queryBuilder->createNamedParameter($productUids, Connection::PARAM_INT_ARRAY)))
|
||||
->orderBy('mm.uid_local')
|
||||
->addOrderBy('mm.sorting')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$faqs = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$faqs[(int) $row['product']][] = [
|
||||
'question' => $this->text($row['question']),
|
||||
'answer' => $this->html($row['answer']),
|
||||
'category' => $this->text($row['category']),
|
||||
];
|
||||
}
|
||||
|
||||
return $faqs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Matchcode aliases by hotel uid. With the hotel's own code they are every code BusPro may use
|
||||
* for it - the same set DateImportService::getHotelMappings() resolves.
|
||||
*
|
||||
* @param int[] $hotelUids
|
||||
* @return array<int, string[]>
|
||||
*/
|
||||
private function findMatchcodes(array $hotelUids): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_matchcode');
|
||||
$rows = $queryBuilder
|
||||
->select('entity', 'code')
|
||||
->from('tx_epproducts_domain_model_matchcode')
|
||||
->where(
|
||||
$queryBuilder->expr()->eq('entity_type', $queryBuilder->createNamedParameter('hotel')),
|
||||
$queryBuilder->expr()->in('entity', $queryBuilder->createNamedParameter($hotelUids, Connection::PARAM_INT_ARRAY))
|
||||
)
|
||||
->orderBy('code')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$codes = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$codes[(int) $row['entity']][] = trim((string) $row['code']);
|
||||
}
|
||||
|
||||
return $codes;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $infoboxUids
|
||||
* @return array<int, string|null>
|
||||
*/
|
||||
private function findInfoboxTexts(array $infoboxUids): array
|
||||
{
|
||||
$infoboxUids = array_values(array_filter(array_map('intval', $infoboxUids)));
|
||||
|
||||
if ([] === $infoboxUids) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_infobox');
|
||||
$rows = $queryBuilder
|
||||
->select('uid', 'text')
|
||||
->from('tx_epproducts_domain_model_infobox')
|
||||
->where($queryBuilder->expr()->in('uid', $queryBuilder->createNamedParameter(array_unique($infoboxUids), Connection::PARAM_INT_ARRAY)))
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$texts = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$texts[(int) $row['uid']] = $this->html($row['text']);
|
||||
}
|
||||
|
||||
return $texts;
|
||||
}
|
||||
|
||||
private function findWebcamUrl(int $webcamUid): ?string
|
||||
{
|
||||
if (0 === $webcamUid) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_webcam');
|
||||
$url = $queryBuilder
|
||||
->select('url')
|
||||
->from('tx_epproducts_domain_model_webcam')
|
||||
->where($queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($webcamUid, \PDO::PARAM_INT)))
|
||||
->execute()
|
||||
->fetchOne()
|
||||
;
|
||||
|
||||
return false === $url ? null : $this->text($url);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int[] $newsUids
|
||||
* @return array<int, string[]>
|
||||
*/
|
||||
private function findNewsTags(array $newsUids): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_news_domain_model_tag');
|
||||
$rows = $queryBuilder
|
||||
->select('mm.uid_local AS news', 'tag.title')
|
||||
->from('tx_news_domain_model_tag', 'tag')
|
||||
->join('tag', 'tx_news_domain_model_news_tag_mm', 'mm', 'mm.uid_foreign = tag.uid')
|
||||
->where($queryBuilder->expr()->in('mm.uid_local', $queryBuilder->createNamedParameter($newsUids, Connection::PARAM_INT_ARRAY)))
|
||||
->orderBy('mm.sorting')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$tags = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$tags[(int) $row['news']][] = trim((string) $row['title']);
|
||||
}
|
||||
|
||||
return $tags;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int[] $newsUids
|
||||
* @return array<int, string[]>
|
||||
*/
|
||||
private function findNewsCategories(array $newsUids): array
|
||||
{
|
||||
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_category');
|
||||
$rows = $queryBuilder
|
||||
->select('mm.uid_foreign AS news', 'category.title')
|
||||
->from('sys_category', 'category')
|
||||
->join('category', 'sys_category_record_mm', 'mm', 'mm.uid_local = category.uid')
|
||||
->where(
|
||||
$queryBuilder->expr()->eq('mm.tablenames', $queryBuilder->createNamedParameter('tx_news_domain_model_news')),
|
||||
$queryBuilder->expr()->eq('mm.fieldname', $queryBuilder->createNamedParameter('categories')),
|
||||
$queryBuilder->expr()->in('mm.uid_foreign', $queryBuilder->createNamedParameter($newsUids, Connection::PARAM_INT_ARRAY))
|
||||
)
|
||||
->orderBy('mm.sorting_foreign')
|
||||
->execute()
|
||||
->fetchAllAssociative()
|
||||
;
|
||||
|
||||
$categories = [];
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$categories[(int) $row['news']][] = trim((string) $row['title']);
|
||||
}
|
||||
|
||||
return $categories;
|
||||
}
|
||||
|
||||
/**
|
||||
* Rich text as stored, with internal links made absolute.
|
||||
*/
|
||||
private function html($value): ?string
|
||||
{
|
||||
$value = trim((string) $value);
|
||||
|
||||
return '' === $value ? null : $this->rteLinkResolver->resolve($value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Plain text with whitespace collapsed. Product names carry literal line breaks the website
|
||||
* splits on for layout ("Apartments \nVal Thorens"); the chatbot needs them as one line.
|
||||
*/
|
||||
private function text($value): ?string
|
||||
{
|
||||
$value = trim((string) preg_replace('/\s+/u', ' ', (string) $value));
|
||||
|
||||
return '' === $value ? null : $value;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use TYPO3\CMS\Core\LinkHandling\LinkService;
|
||||
use TYPO3\CMS\Core\Resource\File;
|
||||
|
||||
/**
|
||||
* Rewrites `t3://` links in stored RTE HTML to absolute URLs.
|
||||
*
|
||||
* parseFunc_RTE would do this, but it needs a TSFE and the API middleware runs before one exists.
|
||||
* Only links are touched; the rest of the HTML is passed on as stored. A link that cannot be
|
||||
* resolved to something public (a page outside the feed's sites, a deleted page) loses its href
|
||||
* and keeps its text.
|
||||
*/
|
||||
class RteLinkResolver
|
||||
{
|
||||
/**
|
||||
* @var LinkService
|
||||
*/
|
||||
private $linkService;
|
||||
|
||||
/**
|
||||
* @var UrlResolver
|
||||
*/
|
||||
private $urlResolver;
|
||||
|
||||
public function __construct(LinkService $linkService, UrlResolver $urlResolver)
|
||||
{
|
||||
$this->linkService = $linkService;
|
||||
$this->urlResolver = $urlResolver;
|
||||
}
|
||||
|
||||
public function resolve(string $html): string
|
||||
{
|
||||
if (false === strpos($html, 't3://')) {
|
||||
return $html;
|
||||
}
|
||||
|
||||
return (string) preg_replace_callback(
|
||||
'/\shref=(["\'])(t3:\/\/[^"\']*)\1/i',
|
||||
function (array $matches): string {
|
||||
$url = $this->resolveLink(html_entity_decode($matches[2], ENT_QUOTES | ENT_HTML5));
|
||||
|
||||
return null === $url ? '' : ' href="' . htmlspecialchars($url) . '"';
|
||||
},
|
||||
$html
|
||||
);
|
||||
}
|
||||
|
||||
private function resolveLink(string $link): ?string
|
||||
{
|
||||
try {
|
||||
$data = $this->linkService->resolve($link);
|
||||
} catch (\Throwable $e) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (LinkService::TYPE_PAGE === ($data['type'] ?? null)) {
|
||||
$pageUid = $this->urlResolver->parsePageReference('t3://page?uid=' . ($data['pageuid'] ?? ''));
|
||||
$target = null === $pageUid ? null : $this->urlResolver->resolveLinkTarget($pageUid);
|
||||
$url = null === $target ? null : $this->urlResolver->getPageUrl($target);
|
||||
|
||||
if (null !== $url && '' !== (string) ($data['fragment'] ?? '')) {
|
||||
$url .= '#' . $data['fragment'];
|
||||
}
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
if (LinkService::TYPE_FILE === ($data['type'] ?? null) && ($data['file'] ?? null) instanceof File) {
|
||||
return $this->absolute((string) $data['file']->getPublicUrl());
|
||||
}
|
||||
|
||||
if (LinkService::TYPE_URL === ($data['type'] ?? null)) {
|
||||
return (string) $data['url'];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* File URLs come back relative to the document root; the consumer has no page to resolve
|
||||
* them against for record text, so make them absolute against the main site.
|
||||
*/
|
||||
private function absolute(string $url): ?string
|
||||
{
|
||||
if ('' === $url) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (1 === preg_match('/^https?:\/\//', $url)) {
|
||||
return $url;
|
||||
}
|
||||
|
||||
$sites = $this->urlResolver->getIncludedSites();
|
||||
|
||||
if ([] === $sites) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return rtrim((string) $sites[0]->getBase(), '/') . '/' . ltrim($url, '/');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,214 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\ContentFeed;
|
||||
|
||||
use TYPO3\CMS\Core\Exception\SiteNotFoundException;
|
||||
use TYPO3\CMS\Core\Site\Entity\Site;
|
||||
use TYPO3\CMS\Core\Site\SiteFinder;
|
||||
use TYPO3\CMS\Core\Utility\MathUtility;
|
||||
|
||||
/**
|
||||
* Absolute public URLs for the content feed, generated through each site's router so that
|
||||
* baseVariants apply (staging and DDEV get their own hosts) and route enhancers shape the path.
|
||||
*/
|
||||
class UrlResolver
|
||||
{
|
||||
private const DOKTYPE_DEFAULT = 1;
|
||||
private const DOKTYPE_SHORTCUT = 4;
|
||||
private const SHORTCUT_MODE_NONE = 0;
|
||||
private const SHORTCUT_MODE_FIRST_SUBPAGE = 1;
|
||||
private const SHORTCUT_MODE_PARENT_PAGE = 3;
|
||||
private const MAX_SHORTCUT_DEPTH = 5;
|
||||
|
||||
/**
|
||||
* @var SiteFinder
|
||||
*/
|
||||
private $siteFinder;
|
||||
|
||||
/**
|
||||
* @var PageTree
|
||||
*/
|
||||
private $pageTree;
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
private $includedSites;
|
||||
|
||||
/**
|
||||
* @var array<string, int> news detail page uid by site identifier
|
||||
*/
|
||||
private $newsDetailPages;
|
||||
|
||||
/**
|
||||
* @var array<int, Site|null>
|
||||
*/
|
||||
private $sitesByPage = [];
|
||||
|
||||
public function __construct(SiteFinder $siteFinder, PageTree $pageTree, ContentFeedConfiguration $configuration)
|
||||
{
|
||||
$this->siteFinder = $siteFinder;
|
||||
$this->pageTree = $pageTree;
|
||||
$this->includedSites = $configuration->getSites();
|
||||
$this->newsDetailPages = $configuration->getNewsDetailPages();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Site[] included sites, in configuration order
|
||||
*/
|
||||
public function getIncludedSites(): array
|
||||
{
|
||||
$sites = [];
|
||||
|
||||
foreach ($this->includedSites as $identifier) {
|
||||
try {
|
||||
$sites[] = $this->siteFinder->getSiteByIdentifier($identifier);
|
||||
} catch (SiteNotFoundException $e) {
|
||||
// A misspelt identifier must not take the whole feed down; it just contributes nothing.
|
||||
}
|
||||
}
|
||||
|
||||
return $sites;
|
||||
}
|
||||
|
||||
/**
|
||||
* The page's site, or null when it belongs to no site or to one outside the feed.
|
||||
*/
|
||||
public function getIncludedSite(int $pageUid): ?Site
|
||||
{
|
||||
if (!array_key_exists($pageUid, $this->sitesByPage)) {
|
||||
try {
|
||||
$site = $this->siteFinder->getSiteByPageId($pageUid);
|
||||
$this->sitesByPage[$pageUid] = in_array($site->getIdentifier(), $this->includedSites, true) ? $site : null;
|
||||
} catch (SiteNotFoundException $e) {
|
||||
$this->sitesByPage[$pageUid] = null;
|
||||
}
|
||||
}
|
||||
|
||||
return $this->sitesByPage[$pageUid];
|
||||
}
|
||||
|
||||
public function getPageUrl(int $pageUid, int $languageId = 0, array $parameters = []): ?string
|
||||
{
|
||||
$site = $this->getIncludedSite($pageUid);
|
||||
|
||||
if (null === $site) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
$language = $site->getLanguageById($languageId);
|
||||
|
||||
return (string) $site->getRouter()->generateUri($pageUid, ['_language' => $language] + $parameters);
|
||||
} catch (\Throwable $e) {
|
||||
// Unroutable pages (missing slug, disabled language) are left out rather than failing the feed.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses a typolink page reference as stored in `detail_page`: a plain uid or `t3://page?uid=N`.
|
||||
*/
|
||||
public function parsePageReference(string $reference): ?int
|
||||
{
|
||||
$reference = trim($reference);
|
||||
|
||||
if (MathUtility::canBeInterpretedAsInteger($reference)) {
|
||||
return (int) $reference > 0 ? (int) $reference : null;
|
||||
}
|
||||
|
||||
if (1 === preg_match('/^t3:\/\/page\?(?:.*&)?uid=(\d+)/', html_entity_decode($reference), $matches)) {
|
||||
return (int) $matches[1];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Follows shortcut pages the way a typolink does, and returns the uid of the visible standard
|
||||
* page a link to $pageUid ends up on - or null when the chain breaks or loops.
|
||||
*/
|
||||
public function resolveLinkTarget(int $pageUid): ?int
|
||||
{
|
||||
for ($depth = 0; $depth < self::MAX_SHORTCUT_DEPTH; $depth++) {
|
||||
$page = $this->pageTree->getPage($pageUid);
|
||||
|
||||
if (null === $page || !$this->pageTree->isVisible($page)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if ((int) $page['doktype'] !== self::DOKTYPE_SHORTCUT) {
|
||||
return (int) $page['doktype'] === self::DOKTYPE_DEFAULT ? $pageUid : null;
|
||||
}
|
||||
|
||||
$next = $this->getShortcutTarget($page);
|
||||
|
||||
if (null === $next) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$pageUid = $next;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array{url: ?string, site: ?string}
|
||||
*/
|
||||
public function getRecordLink(string $detailPage): array
|
||||
{
|
||||
$pageUid = $this->parsePageReference($detailPage);
|
||||
$target = null === $pageUid ? null : $this->resolveLinkTarget($pageUid);
|
||||
$site = null === $target ? null : $this->getIncludedSite($target);
|
||||
$url = null === $site ? null : $this->getPageUrl($target);
|
||||
|
||||
return [
|
||||
'url' => $url,
|
||||
'site' => null === $url ? null : $site->getIdentifier(),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* News has no detail_page of its own: the storage folder decides the site, and the site's
|
||||
* configured detail page carries the article through the NewsDetailPlugin route enhancer.
|
||||
*
|
||||
* @return array{url: ?string, site: string}|null null when the article is stored outside the feed's sites
|
||||
*/
|
||||
public function getNewsLink(int $newsUid, int $storagePid): ?array
|
||||
{
|
||||
$site = $this->getIncludedSite($storagePid);
|
||||
|
||||
if (null === $site) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$detailPage = $this->newsDetailPages[$site->getIdentifier()] ?? null;
|
||||
$url = null === $detailPage ? null : $this->getPageUrl($detailPage, 0, [
|
||||
'tx_news_pi1' => ['action' => 'detail', 'controller' => 'News', 'news' => $newsUid],
|
||||
]);
|
||||
|
||||
return ['url' => $url, 'site' => $site->getIdentifier()];
|
||||
}
|
||||
|
||||
private function getShortcutTarget(array $page): ?int
|
||||
{
|
||||
switch ((int) $page['shortcut_mode']) {
|
||||
case self::SHORTCUT_MODE_NONE:
|
||||
return (int) $page['shortcut'] > 0 ? (int) $page['shortcut'] : null;
|
||||
case self::SHORTCUT_MODE_FIRST_SUBPAGE:
|
||||
foreach ($this->pageTree->getChildren((int) $page['uid']) as $childUid) {
|
||||
if ($this->pageTree->isVisible($this->pageTree->getPage($childUid))) {
|
||||
return $childUid;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
case self::SHORTCUT_MODE_PARENT_PAGE:
|
||||
return (int) $page['pid'] > 0 ? (int) $page['pid'] : null;
|
||||
default:
|
||||
// Random subpage: there is no stable URL to give.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -114,6 +114,11 @@ class Date extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
|
||||
*/
|
||||
protected $skipassIncluded = false;
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
protected $groupTravel = false;
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
@@ -421,6 +426,22 @@ class Date extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
|
||||
$this->skipassIncluded = $skipassIncluded;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function getGroupTravel()
|
||||
{
|
||||
return $this->groupTravel;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param bool $groupTravel
|
||||
*/
|
||||
public function setGroupTravel($groupTravel)
|
||||
{
|
||||
$this->groupTravel = $groupTravel;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
|
||||
@@ -33,6 +33,7 @@ class DateRepository extends AbstractRepository
|
||||
->where(
|
||||
$qb->expr()->eq('date.product', $qb->createNamedParameter($productUid, Connection::PARAM_INT)),
|
||||
$qb->expr()->eq('date.hotel', $qb->createNamedParameter($hotelUid, Connection::PARAM_INT)),
|
||||
$qb->expr()->eq('date.group_travel', $qb->createNamedParameter(0, Connection::PARAM_INT)),
|
||||
'date.date_start >= NOW()'
|
||||
)
|
||||
->orderBy('date.date_start', 'DESC')
|
||||
|
||||
@@ -210,6 +210,7 @@ class ProductRepository extends AbstractRepository
|
||||
'date.uid as dateUid', 'date.date_start as dateStart', 'date.date_end as dateEnd',
|
||||
'date.bus_pro_id as dateBusProId', 'date.hotel as hotelUid', 'date.hotel_bus_pro_id as hotelBusProId',
|
||||
'date.bus_included as dateBusIncluded', 'date.skipass_included as dateSkiPassIncluded',
|
||||
'date.group_travel as dateGroupTravel',
|
||||
'date.season as season', 'date.product_detail_page as productDetailPage',
|
||||
'room.uid as roomUid', 'room.bus_pro_id as roomBusProId', 'room.name as roomName',
|
||||
'room.price as roomPrice', 'date.discount as roomDiscount', 'date.bus_price as busPrice',
|
||||
@@ -273,6 +274,7 @@ class ProductRepository extends AbstractRepository
|
||||
'date.discount as dateDiscount', 'date.bus_price as busPrice', 'date.nights as dateNights',
|
||||
'date.bus_included as dateBusIncluded', 'date.services_included as dateServicesIncluded',
|
||||
'date.services_general as dateServicesGeneral', 'date.skipass_included as dateSkiPassIncluded',
|
||||
'date.group_travel as dateGroupTravel',
|
||||
'date.bus_pro_id as dateBusProId', 'date.hotel_bus_pro_id as hotelBusProId',
|
||||
'date.available as available', 'date.product_detail_page as productDetailPage',
|
||||
)
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\Http;
|
||||
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
|
||||
|
||||
/**
|
||||
* Checks the shared key of the CMS backchannel endpoints (content feed, CMS index).
|
||||
*
|
||||
* An empty or missing `cmsApiKey` denies every request. ExtensionConfiguration::get() returns the
|
||||
* stored configuration verbatim, so a newly added key is absent until someone saves the extension
|
||||
* configuration in the backend - defaulting to "allow" there would publish the whole catalogue.
|
||||
*/
|
||||
class ApiKeyAuthenticator
|
||||
{
|
||||
/**
|
||||
* @var ExtensionConfiguration
|
||||
*/
|
||||
private $extensionConfiguration;
|
||||
|
||||
public function __construct(ExtensionConfiguration $extensionConfiguration)
|
||||
{
|
||||
$this->extensionConfiguration = $extensionConfiguration;
|
||||
}
|
||||
|
||||
public function isAuthorized(ServerRequestInterface $request): bool
|
||||
{
|
||||
$configured = (string) ($this->extensionConfiguration->get('ep_products')['cmsApiKey'] ?? '');
|
||||
|
||||
if ('' === $configured) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Header first: query-string keys end up in access logs. `key` stays accepted for parity
|
||||
// with the existing /api/hotel and /api/product calls.
|
||||
$provided = $request->getHeaderLine('X-Api-Key');
|
||||
|
||||
if ('' === $provided) {
|
||||
$provided = (string) ($request->getQueryParams()['key'] ?? '');
|
||||
}
|
||||
|
||||
return hash_equals($configured, $provided);
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
namespace EP\EpProducts\Middleware;
|
||||
|
||||
use EP\EpProducts\ContentFeed\ContentFeedApi;
|
||||
use EP\EpProducts\Http\ApiKeyAuthenticator;
|
||||
use EP\EpProducts\Service\MyEpImageService;
|
||||
use EP\EpProducts\Utility\HotelIconUtility;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
@@ -41,18 +43,32 @@ class ApiMiddleware implements MiddlewareInterface
|
||||
*/
|
||||
private $imageService;
|
||||
|
||||
/**
|
||||
* @var ContentFeedApi
|
||||
*/
|
||||
private $contentFeedApi;
|
||||
|
||||
/**
|
||||
* @var ApiKeyAuthenticator
|
||||
*/
|
||||
private $authenticator;
|
||||
|
||||
public function __construct(
|
||||
MyEpImageService $hotelImageService,
|
||||
MyEpImageService $productImageService,
|
||||
MyEpImageService $regionImageService,
|
||||
FileRepository $fileRepository,
|
||||
ImageService $imageService
|
||||
ImageService $imageService,
|
||||
ContentFeedApi $contentFeedApi,
|
||||
ApiKeyAuthenticator $authenticator
|
||||
) {
|
||||
$this->hotelImageService = $hotelImageService;
|
||||
$this->productImageService = $productImageService;
|
||||
$this->regionImageService = $regionImageService;
|
||||
$this->fileRepository = $fileRepository;
|
||||
$this->imageService = $imageService;
|
||||
$this->contentFeedApi = $contentFeedApi;
|
||||
$this->authenticator = $authenticator;
|
||||
}
|
||||
|
||||
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
|
||||
@@ -67,17 +83,17 @@ class ApiMiddleware implements MiddlewareInterface
|
||||
return $this->handleProductRequest($request);
|
||||
}
|
||||
|
||||
if (0 === strpos($path, ContentFeedApi::PATH_PREFIX)) {
|
||||
return $this->contentFeedApi->handle($request);
|
||||
}
|
||||
|
||||
return $handler->handle($request);
|
||||
}
|
||||
|
||||
private function handleHotelRequest(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
// This is currently fake, we only check for existence. Since we are communicating
|
||||
// on the backchannel only it's not much of a problem.
|
||||
$apiKey = $request->getQueryParams()['key'] ?? null;
|
||||
|
||||
if (null === $apiKey) {
|
||||
return new JsonResponse(['message' => 'No api key provided'], 403);
|
||||
if (!$this->authenticator->isAuthorized($request)) {
|
||||
return new JsonResponse(['message' => 'Invalid or missing api key'], 403);
|
||||
}
|
||||
|
||||
$hotelCode = $request->getQueryParams()['hotel'] ?? null;
|
||||
@@ -97,12 +113,8 @@ class ApiMiddleware implements MiddlewareInterface
|
||||
|
||||
private function handleProductRequest(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
// This is currently fake, we only check for existence. Since we are communicating
|
||||
// on the backchannel only it's not much of a problem.
|
||||
$apiKey = $request->getQueryParams()['key'] ?? null;
|
||||
|
||||
if (null === $apiKey) {
|
||||
return new JsonResponse(['message' => 'No api key provided'], 403);
|
||||
if (!$this->authenticator->isAuthorized($request)) {
|
||||
return new JsonResponse(['message' => 'Invalid or missing api key'], 403);
|
||||
}
|
||||
|
||||
$productCode = $request->getQueryParams()['product'] ?? null;
|
||||
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
<?php
|
||||
|
||||
namespace EP\EpProducts\Middleware;
|
||||
|
||||
use EP\EpProducts\ContentFeed\ContentFeedApi;
|
||||
use EP\EpProducts\ContentFeed\ContentFeedConfiguration;
|
||||
use EP\EpProducts\ContentFeed\ManifestBuilder;
|
||||
use EP\EpProducts\Http\ApiKeyAuthenticator;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Psr\Http\Server\MiddlewareInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use TYPO3\CMS\Core\Routing\PageArguments;
|
||||
use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
use TYPO3\CMS\Frontend\Controller\ErrorController;
|
||||
|
||||
/**
|
||||
* Keeps the chatbot content-only page type (an unstyled copy of every page) off the public web:
|
||||
* only requests carrying the CMS API key get it.
|
||||
*
|
||||
* Runs once the page type is known and before TSFE, so a page-cache hit cannot bypass it.
|
||||
* staticfilecache never stores the type (`tx_staticfilecache.disableCache`); if it did, .htaccess
|
||||
* would serve the file without this check ever running.
|
||||
*/
|
||||
class ContentPageTypeGuardMiddleware implements MiddlewareInterface
|
||||
{
|
||||
/**
|
||||
* @var ApiKeyAuthenticator
|
||||
*/
|
||||
private $authenticator;
|
||||
|
||||
/**
|
||||
* @var ContentFeedConfiguration
|
||||
*/
|
||||
private $configuration;
|
||||
|
||||
public function __construct(ApiKeyAuthenticator $authenticator, ContentFeedConfiguration $configuration)
|
||||
{
|
||||
$this->authenticator = $authenticator;
|
||||
$this->configuration = $configuration;
|
||||
}
|
||||
|
||||
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
|
||||
{
|
||||
$routing = $request->getAttribute('routing');
|
||||
|
||||
if (!$routing instanceof PageArguments
|
||||
|| (string) ManifestBuilder::CONTENT_PAGE_TYPE !== $routing->getPageType()
|
||||
) {
|
||||
return $handler->handle($request);
|
||||
}
|
||||
|
||||
if (!$this->authenticator->isAuthorized($request)) {
|
||||
// 404, not 403: an unauthenticated caller should not learn the type exists.
|
||||
return GeneralUtility::makeInstance(ErrorController::class)
|
||||
->pageNotFoundAction($request, 'The requested page does not exist');
|
||||
}
|
||||
|
||||
if (!$this->configuration->isEnabled()) {
|
||||
return ContentFeedApi::disabledResponse();
|
||||
}
|
||||
|
||||
return $handler->handle($request);
|
||||
}
|
||||
}
|
||||
@@ -64,6 +64,22 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
||||
const SELECTION_GROUP_EVENTS = 89;
|
||||
const SELECTION_GROUP_TRANSPORTATION = 90;
|
||||
|
||||
/**
|
||||
* Group 'Kunde' also carries trip types (Wochenreise, Midweekreise, ...), so
|
||||
* group travel keys on the selection, not on the group's presence. Every
|
||||
* date should carry either 'Gruppenkunde' or 'Endkunde'.
|
||||
*/
|
||||
const SELECTION_GROUP_CUSTOMER = 96;
|
||||
const SELECTION_CUSTOMER_GROUP = 1418;
|
||||
const SELECTION_CUSTOMER_END = 1419;
|
||||
|
||||
/**
|
||||
* Fallback for dates the office has not tagged with either selection: these
|
||||
* trip type markers in front of the travel code's trailing date mean
|
||||
* end-customer travel.
|
||||
*/
|
||||
const END_CUSTOMER_CODE_PATTERN = '/(?:MP|WE|KT|PM|MW|FA)\d{6}$/';
|
||||
|
||||
/**
|
||||
* 'Leistungen Personal' occurs in no export so far, so its id is unknown and
|
||||
* it is still matched by label. Register its id once the warning fires.
|
||||
@@ -286,6 +302,9 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
||||
{
|
||||
$dateCount = 0;
|
||||
|
||||
// Selection groups are date-level, so any hotel row tells.
|
||||
$this->checkCustomerSelection(reset($rows));
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$date = $this->createDateRecord($product, $row);
|
||||
|
||||
@@ -410,6 +429,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
||||
$skiPassIncluded = (int) (count($includedSkiPass) > 0);
|
||||
$date['skipass_included'] = $skiPassIncluded;
|
||||
|
||||
$date['group_travel'] = (int) $this->isGroupTravel($row);
|
||||
|
||||
$servicesTransportation = $this->parseService($row['transportServices']);
|
||||
$discount = $this->determineDiscount($servicesTransportation);
|
||||
$date['discount'] = $discount;
|
||||
@@ -771,6 +792,49 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* 'Gruppenkunde' and 'Endkunde' decide. A date carrying neither is judged by
|
||||
* its travel code.
|
||||
*
|
||||
* @param array $row
|
||||
* @return bool
|
||||
*/
|
||||
protected function isGroupTravel(array $row): bool
|
||||
{
|
||||
$customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
|
||||
$isGroup = isset($customer[static::SELECTION_CUSTOMER_GROUP]);
|
||||
$isEnd = isset($customer[static::SELECTION_CUSTOMER_END]);
|
||||
if ($isGroup || $isEnd) {
|
||||
return $isGroup;
|
||||
}
|
||||
|
||||
return !preg_match(static::END_CUSTOMER_CODE_PATTERN, (string) $row['date']['code']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reports dates whose customer selection is missing or contradictory, along
|
||||
* with what they import as.
|
||||
*
|
||||
* @param array $row
|
||||
*/
|
||||
protected function checkCustomerSelection(array $row): void
|
||||
{
|
||||
$customer = $this->parseSelectionGroup($row['selectionGroups'], static::SELECTION_GROUP_CUSTOMER);
|
||||
$isGroup = isset($customer[static::SELECTION_CUSTOMER_GROUP]);
|
||||
$isEnd = isset($customer[static::SELECTION_CUSTOMER_END]);
|
||||
if ($isGroup !== $isEnd) {
|
||||
return;
|
||||
}
|
||||
|
||||
$this->logger->warning(
|
||||
$isGroup
|
||||
? 'date has both Gruppenkunde and Endkunde selected, importing as group travel'
|
||||
: 'date has neither Gruppenkunde nor Endkunde selected, falling back to travel code, importing as '
|
||||
. ($this->isGroupTravel($row) ? 'group travel' : 'end-customer travel'),
|
||||
['product' => $row['product']['code'], 'date' => $row['date']['code']]
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array[] $selections
|
||||
* @param array $data
|
||||
|
||||
@@ -230,6 +230,7 @@ class DateService implements SingletonInterface
|
||||
'summer' => $row['season'] === 's',
|
||||
'busIncluded' => (bool) $row['dateBusIncluded'],
|
||||
'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'],
|
||||
'groupTravel' => (bool) $row['dateGroupTravel'],
|
||||
'roomUid' => $row['roomUid'],
|
||||
'roomName' => $row['roomName'],
|
||||
'available' => $row['roomAvailable'] && $row['roomPrice'],
|
||||
@@ -320,6 +321,7 @@ class DateService implements SingletonInterface
|
||||
'nights' => $row['dateNights'],
|
||||
'busIncluded' => (bool) $row['dateBusIncluded'],
|
||||
'skiPassIncluded' => (bool) $row['dateSkiPassIncluded'],
|
||||
'groupTravel' => (bool) $row['dateGroupTravel'],
|
||||
'servicesIncluded' => unserialize($row['dateServicesIncluded'], ['allowed_classes' => false]),
|
||||
'servicesGeneral' => unserialize($row['dateServicesGeneral'], ['allowed_classes' => false]),
|
||||
'season' => $row['season'],
|
||||
|
||||
@@ -7,10 +7,12 @@ use EP\EpProducts\Domain\Model\Product;
|
||||
use EP\EpProducts\Domain\Repository\DateRepository;
|
||||
|
||||
/**
|
||||
* Lists the pickup points of a product's latest upcoming date that has any,
|
||||
* with that date's time and round-trip surcharge per pickup point. Pickups,
|
||||
* times and prices may differ on other dates; taking the latest one keeps the
|
||||
* values unique and shows them for as long as the product is offered.
|
||||
* Lists the pickup points of a product's latest upcoming end-customer date that
|
||||
* has any, with that date's time and round-trip surcharge per pickup point.
|
||||
* Group travel dates are left out: their pickups are arranged per group and
|
||||
* are not offered publicly. Pickups, times and prices may differ on other
|
||||
* dates; taking the latest one keeps the values unique and shows them for as
|
||||
* long as the product is offered.
|
||||
*
|
||||
* The returned shape is meant to be served by MyE&P later on, so that only the
|
||||
* data source has to change once the local date table goes away.
|
||||
|
||||
@@ -20,6 +20,15 @@ return [
|
||||
'typo3/cms-frontend/site',
|
||||
],
|
||||
],
|
||||
'ep/content-page-type-guard' => [
|
||||
'target' => \EP\EpProducts\Middleware\ContentPageTypeGuardMiddleware::class,
|
||||
'after' => [
|
||||
'typo3/cms-frontend/page-resolver',
|
||||
],
|
||||
'before' => [
|
||||
'typo3/cms-frontend/page-argument-validator',
|
||||
],
|
||||
],
|
||||
'ep/staging-environment' => [
|
||||
'target' => \EP\EpProducts\Middleware\StagingEnvironmentMiddleware::class,
|
||||
'after' => [
|
||||
|
||||
+1
@@ -403,6 +403,7 @@ return [
|
||||
'label' => 'Produkte',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'default' => 0,
|
||||
'renderType' => 'selectMultipleSideBySide',
|
||||
'foreign_table' => 'tx_epproducts_domain_model_product',
|
||||
'size' => 10,
|
||||
|
||||
+10
-2
@@ -24,8 +24,8 @@ return [
|
||||
],
|
||||
'types' => [
|
||||
'1' => ['showitem' => 'hidden, bus_pro_id, hotel_bus_pro_id, code, daytrip, date_start, date_end, nights, board,
|
||||
board_code, board_bus_pro_id, bus_included, bus_available, skipass_included, services_included,
|
||||
services_general, courses_included, guide, pickups, discount, min_price, pseudo_price, available, min_pax,
|
||||
board_code, board_bus_pro_id, bus_included, bus_available, skipass_included, group_travel,
|
||||
services_included, services_general, courses_included, guide, pickups, discount, min_price, pseudo_price, available, min_pax,
|
||||
new'
|
||||
],
|
||||
],
|
||||
@@ -322,6 +322,14 @@ return [
|
||||
'default' => 0
|
||||
]
|
||||
],
|
||||
'group_travel' => [
|
||||
'exclude' => false,
|
||||
'label' => 'Gruppenreise',
|
||||
'config' => [
|
||||
'type' => 'check',
|
||||
'default' => 0
|
||||
]
|
||||
],
|
||||
'bus_price' => [
|
||||
'exclude' => false,
|
||||
'label' => 'Bus Preis',
|
||||
|
||||
@@ -75,3 +75,21 @@ productImportSftpHostKey =
|
||||
|
||||
# cat=SftpImport; type=int+; label=SFTP connection timeout in seconds
|
||||
productImportSftpTimeout = 15
|
||||
|
||||
# cat=ContentFeed; type=string; label=API key for the CMS backchannel endpoints used by MyE&P (/api/hotel, /api/product, /api/content/*); sent as X-Api-Key or ?key=. Empty denies every request.
|
||||
cmsApiKey =
|
||||
|
||||
# cat=ContentFeed; type=boolean; label=Serve the chatbot content feed (off: all feed endpoints answer 503)
|
||||
contentFeedEnabled = 1
|
||||
|
||||
# cat=ContentFeed; type=string; label=Site identifiers included in the chatbot content feed (comma-separated)
|
||||
contentFeedSites = ep-reisen,ser,ski-boarderweek,ski-wochenenden,snowzone
|
||||
|
||||
# cat=ContentFeed; type=string; label=Language ids included in the chatbot content feed (comma-separated; the English pages are untranslated placeholders today)
|
||||
contentFeedLanguages = 0
|
||||
|
||||
# cat=ContentFeed; type=string; label=Page uids whose subtrees stay out of the chatbot content feed (comma-separated; 634 = group booking links)
|
||||
contentFeedExcludedPages = 634
|
||||
|
||||
# cat=ContentFeed; type=string; label=News detail page per site for the chatbot content feed (identifier:pageUid, comma-separated)
|
||||
contentFeedNewsDetailPages = ep-reisen:1392
|
||||
@@ -117,6 +117,7 @@ CREATE TABLE tx_epproducts_domain_model_date
|
||||
bus_included tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||
bus_available tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||
skipass_included tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||
group_travel tinyint(1) unsigned DEFAULT '0' NOT NULL,
|
||||
bus_price decimal(10,2) DEFAULT '0.00' NOT NULL,
|
||||
services_included text NOT NULL,
|
||||
services_general text NOT NULL,
|
||||
|
||||
@@ -24,6 +24,7 @@ call_user_func(function() {
|
||||
'label' => 'Land',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'default' => 0,
|
||||
'renderType' => 'selectSingle',
|
||||
'foreign_table' => 'tx_epproducts_domain_model_country',
|
||||
'foreign_table_where' => 'ORDER BY name',
|
||||
@@ -39,6 +40,7 @@ call_user_func(function() {
|
||||
'label' => 'Gebiet',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'default' => 0,
|
||||
'renderType' => 'selectSingle',
|
||||
'foreign_table' => 'tx_epproducts_domain_model_region',
|
||||
'foreign_table_where' => 'ORDER BY name',
|
||||
@@ -106,6 +108,7 @@ call_user_func(function() {
|
||||
'label' => 'Badge',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'default' => 0,
|
||||
'renderType' => 'selectSingle',
|
||||
'foreign_table' => 'tx_epproducts_domain_model_badge',
|
||||
'foreign_table_where' => 'ORDER BY title',
|
||||
|
||||
+1
@@ -22,6 +22,7 @@ call_user_func(function() {
|
||||
'label' => 'Mitarbeiter',
|
||||
'config' => [
|
||||
'type' => 'select',
|
||||
'default' => 0,
|
||||
'renderType' => 'selectSingle',
|
||||
'foreign_table' => 'tx_epproducts_domain_model_teammember',
|
||||
'foreign_table_where' => 'ORDER BY name',
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
# Chatbot content feed: the main content of a page, without header, navigation, footer or
|
||||
# assets. Fetched by MyE&P for pages the content manifest reports as changed; protected by
|
||||
# EP\EpProducts\Middleware\ContentPageTypeGuardMiddleware. See
|
||||
# .ddev/plans/CHATBOT-MCP-01-TYPO3-CONTENT-FEED.md §6.
|
||||
|
||||
# Plugins (the booking widget on product detail pages), forms, sub-page menus and teaser cards
|
||||
# are left out: MyE&P has trip data first-hand, and the pages and records the cards link to are
|
||||
# in the feed in their own right. The filter applies to top-level elements only; a plugin nested
|
||||
# in a grid or container element is still rendered by its parent.
|
||||
lib.contentOnly < lib.dynamicContent
|
||||
lib.contentOnly.20.select.where = colPos={register:colPos} AND CType NOT IN ({$plugin.tx_eptheme.settings.contentOnlyExcludedCTypes})
|
||||
|
||||
tx_eptheme_content_only = PAGE
|
||||
tx_eptheme_content_only {
|
||||
typeNum = 1730
|
||||
config {
|
||||
disableAllHeaderCode = 1
|
||||
disablePrefixComment = 1
|
||||
additionalHeaders.10.header = Content-Type: text/html; charset=utf-8
|
||||
additionalHeaders.20.header = X-Robots-Tag: noindex, nofollow, noarchive
|
||||
admPanel = 0
|
||||
debug = 0
|
||||
# Never written to disk: the type is key-protected, and a static file would be served
|
||||
# by .htaccess without that check ever running.
|
||||
tx_staticfilecache.disableCache = 1
|
||||
# Same reason for shared caches between us and the consumer: the TYPO3 page cache is
|
||||
# fine (the guard runs before it), a proxy storing a keyed response is not.
|
||||
sendCacheHeaders = 0
|
||||
additionalHeaders.30.header = Cache-Control: private, no-store
|
||||
}
|
||||
|
||||
10 = COA
|
||||
10 {
|
||||
wrap = <article>|</article>
|
||||
|
||||
10 = TEXT
|
||||
10.field = title
|
||||
10.htmlSpecialChars = 1
|
||||
10.wrap = <h1>|</h1>
|
||||
|
||||
# Page templates without a sidebar render colPos 0; the sidebar layouts render 3 (header),
|
||||
# 4 (content) and 2 (sidebar). colPos 1 holds teaser groups and is left out. The page
|
||||
# templates pass colPos in as data; here there is no template, so each copy sets it.
|
||||
# These must be copies (<), not references (=<): removing colPos.cObject on a reference
|
||||
# leaves the referenced cObject in place, and every column silently renders colPos 0.
|
||||
20 < lib.contentOnly
|
||||
20.5.colPos.cObject >
|
||||
20.5.colPos = 3
|
||||
|
||||
30 < lib.contentOnly
|
||||
30.5.colPos.cObject >
|
||||
30.5.colPos = 0
|
||||
|
||||
40 < lib.contentOnly
|
||||
40.5.colPos.cObject >
|
||||
40.5.colPos = 4
|
||||
|
||||
50 < lib.contentOnly
|
||||
50.5.colPos.cObject >
|
||||
50.5.colPos = 2
|
||||
}
|
||||
}
|
||||
@@ -153,6 +153,8 @@ plugin.tx_eptheme {
|
||||
xmlSitemapRootPageUid =
|
||||
# cat=eptheme/600/110; type=string; label=XML sitemap page UIDs to exclude
|
||||
xmlSitemapExcludeUids =
|
||||
# cat=eptheme/600/120; type=string; label=CTypes left out of the chatbot content-only page type (quoted, comma-separated)
|
||||
contentOnlyExcludedCTypes = 'list','form_formframework','menu_subpages','teaser_product','teaser_hotel','teaser_concept','teaser_country','teaser_region','ep_container_teasergroup'
|
||||
|
||||
# cat=eptheme/300/100; type=string; label=Cookiefirst Script
|
||||
cookieFirstScriptUrl = https://consent.cookiefirst.com/sites/ep-reisen.de-fabb1554-8932-4075-85dc-97fa68892918/consent.js
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: '-translate-y-2 text-white'}"/>
|
||||
</f:if>
|
||||
<div class="py-4 relative">
|
||||
<div class="container grid grid-cols-2 lg:grid-cols-4 gap-8 pb-4">
|
||||
<div class="container grid md:grid-cols-2 lg:grid-cols-4 gap-8 pb-4 text-center md:text-left">
|
||||
<f:if condition="{settings.footerNavPid}">
|
||||
<f:for each="{footernav}" as="menuheader">
|
||||
<div>
|
||||
@@ -32,7 +32,7 @@
|
||||
</f:if>
|
||||
</div>
|
||||
|
||||
<div class="container py-4 text-white text-xl border-t border-white">
|
||||
<div class="container py-4 text-white text-xl border-t border-white text-center md:text-left">
|
||||
{totalRatings.totalAverage -> f:format.number(decimalSeparator: ',')} Sterne bei {totalRatings.totalCount} Bewertungen
|
||||
</div>
|
||||
|
||||
@@ -184,10 +184,8 @@
|
||||
<f:format.raw>{totalRatings.jsonData->f:format.json()}</f:format.raw>
|
||||
</script>
|
||||
|
||||
<f:comment><!--
|
||||
<f:if condition="{site.identifier} == 'ep-reisen'">
|
||||
<f:render partial="Chatbot" arguments="{_all}"/>
|
||||
</f:if>
|
||||
--></f:comment>
|
||||
<f:if condition="{site.identifier} == 'ep-reisen'">
|
||||
<f:render partial="Chatbot" arguments="{_all}"/>
|
||||
</f:if>
|
||||
|
||||
</html>
|
||||
@@ -2,7 +2,7 @@
|
||||
xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
|
||||
|
||||
<div class="odd:bg-zinc-50 p-4" data-rte-content>
|
||||
<div class="group odd:bg-zinc-50 p-4" data-rte-content>
|
||||
<f:if condition="{journey.byBus}">
|
||||
<h3>
|
||||
Busanreise
|
||||
@@ -11,6 +11,9 @@
|
||||
{journey.byBus -> f:format.html()}
|
||||
</div>
|
||||
</f:if>
|
||||
<f:if condition="{pickupsOverview.pickups}">
|
||||
<f:render partial="Product/Pickups" arguments="{pickupsOverview: pickupsOverview}"/>
|
||||
</f:if>
|
||||
<f:if condition="{journey.byCar}">
|
||||
<h3>
|
||||
Eigenanreise
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
|
||||
|
||||
<div class="group odd:bg-zinc-50 p-4" data-rte-content>
|
||||
<div class="pb-8">
|
||||
<h3>
|
||||
Bus-Zustiege
|
||||
</h3>
|
||||
|
||||
@@ -162,12 +162,7 @@
|
||||
<div class="mb-4 hidden"
|
||||
data-tabs-target="tab"
|
||||
data-tab="journey">
|
||||
<f:if condition="{product.journey}">
|
||||
<f:render partial="Journey/Details" arguments="{journey: product.journey, bars: 1}"/>
|
||||
</f:if>
|
||||
<f:if condition="{pickupsOverview.pickups}">
|
||||
<f:render partial="Product/Pickups" arguments="{pickupsOverview: pickupsOverview}"/>
|
||||
</f:if>
|
||||
<f:render partial="Journey/Details" arguments="{journey: product.journey, pickupsOverview: pickupsOverview, bars: 1}"/>
|
||||
</div>
|
||||
</f:if>
|
||||
</f:section>
|
||||
|
||||
Reference in new issue
Block a user