feat: make webcams manually editable to be ignored from import

This commit is contained in:
fromme committed 2026-11-03 14:35:45 +01:00
1 parent 48f22a7787
commit 05fa99c15c
5 files changed
+53 -9

No files matched your search

@@ -386,7 +386,10 @@ class RecordSerializer
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_webcam'); $queryBuilder = $this->connectionPool->getQueryBuilderForTable('tx_epproducts_domain_model_webcam');
$url = $queryBuilder $url = $queryBuilder
->select('url') ->select('url')
->from('tx_epproducts_domain_model_webcam')->where($queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($webcamUid, Connection::PARAM_INT)))->executeQuery() ->from('tx_epproducts_domain_model_webcam')->where(
$queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($webcamUid, Connection::PARAM_INT)),
$queryBuilder->expr()->eq('available', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)),
)->executeQuery()
->fetchOne() ->fetchOne()
; ;
@@ -277,7 +277,7 @@ class ApiMiddleware implements MiddlewareInterface
'webcam.url as webcamUrl', 'webcam.url as webcamUrl',
) )
->from('tx_epproducts_domain_model_region', 'region') ->from('tx_epproducts_domain_model_region', 'region')
->leftJoin('region', 'tx_epproducts_domain_model_webcam', 'webcam', 'region.webcam = webcam.uid') ->leftJoin('region', 'tx_epproducts_domain_model_webcam', 'webcam', 'region.webcam = webcam.uid AND webcam.available = 1')
->where($queryBuilder->expr()->eq('region.uid', $queryBuilder->createNamedParameter($regionUid, Connection::PARAM_INT)))->setMaxResults(1)->executeQuery() ->where($queryBuilder->expr()->eq('region.uid', $queryBuilder->createNamedParameter($regionUid, Connection::PARAM_INT)))->setMaxResults(1)->executeQuery()
->fetchAssociative() ->fetchAssociative()
; ;
@@ -17,7 +17,8 @@ use TYPO3\CMS\Core\Http\RequestFactory;
* *
* Port of the TYPO3 10 import with plain DBAL instead of Extbase persistence. Records are matched by * Port of the TYPO3 10 import with plain DBAL instead of Extbase persistence. Records are matched by
* vendor_uid and updated in place, so the regions keep pointing at their snow report; records no * vendor_uid and updated in place, so the regions keep pointing at their snow report; records no
* longer in the feed are flagged deleted. The feed only answers the production server. * longer in the feed are flagged deleted. Webcams flagged manual are maintained by editors and left
* alone entirely. The feed only answers the production server.
*/ */
class SnowreportImportService implements LoggerAwareInterface class SnowreportImportService implements LoggerAwareInterface
{ {
@@ -143,6 +144,7 @@ class SnowreportImportService implements LoggerAwareInterface
$now = time(); $now = time();
$snowreports = $this->loadIndex(self::SNOWREPORT_TABLE); $snowreports = $this->loadIndex(self::SNOWREPORT_TABLE);
$webcams = $this->loadIndex(self::WEBCAM_TABLE); $webcams = $this->loadIndex(self::WEBCAM_TABLE);
$manualWebcamUids = $this->loadManualWebcamUids();
$validSnowreports = []; $validSnowreports = [];
$validWebcams = []; $validWebcams = [];
$snowreportConnection = $this->connectionPool->getConnectionForTable(self::SNOWREPORT_TABLE); $snowreportConnection = $this->connectionPool->getConnectionForTable(self::SNOWREPORT_TABLE);
@@ -178,6 +180,10 @@ class SnowreportImportService implements LoggerAwareInterface
$available = $this->convertValue((string)$item->verf, self::TYPE_BOOL, 'verf'); $available = $this->convertValue((string)$item->verf, self::TYPE_BOOL, 'verf');
$webcamVendorUid = (string)(int)$item->uid; $webcamVendorUid = (string)(int)$item->uid;
if (isset($webcams[$webcamVendorUid]) && in_array($webcams[$webcamVendorUid], $manualWebcamUids, true)) {
$validWebcams[] = $webcamVendorUid;
continue;
}
// Cams that are neither current nor already known are skipped // Cams that are neither current nor already known are skipped
if (!isset($webcams[$webcamVendorUid]) && !$include) { if (!isset($webcams[$webcamVendorUid]) && !$include) {
continue; continue;
@@ -206,7 +212,7 @@ class SnowreportImportService implements LoggerAwareInterface
$count++; $count++;
} }
$this->flagObsolete(self::WEBCAM_TABLE, array_keys($webcams), $validWebcams, $now); $this->flagObsolete(self::WEBCAM_TABLE, array_keys($webcams), $validWebcams, $now, $manualWebcamUids);
$this->flagObsolete(self::SNOWREPORT_TABLE, array_keys($snowreports), $validSnowreports, $now); $this->flagObsolete(self::SNOWREPORT_TABLE, array_keys($snowreports), $validSnowreports, $now);
// Inline child counter, which the plain SQL above does not maintain // Inline child counter, which the plain SQL above does not maintain
$snowreportConnection->executeStatement( $snowreportConnection->executeStatement(
@@ -268,7 +274,28 @@ class SnowreportImportService implements LoggerAwareInterface
return $index; return $index;
} }
private function flagObsolete(string $table, array $currentVendorUids, array $validVendorUids, int $now): void /**
* Uids of the webcams editors maintain themselves, whatever their vendor_uid
*
* @return int[]
*/
private function loadManualWebcamUids(): array
{
$queryBuilder = $this->connectionPool->getQueryBuilderForTable(self::WEBCAM_TABLE);
$queryBuilder->getRestrictions()->removeAll()->add(new DeletedRestriction());
return array_map(intval(...), $queryBuilder
->select('uid')
->from(self::WEBCAM_TABLE)
->where($queryBuilder->expr()->eq('manual', $queryBuilder->createNamedParameter(1, Connection::PARAM_INT)))
->executeQuery()
->fetchFirstColumn());
}
/**
* @param int[] $keepUids records never flagged, even if they share a vendor_uid with an obsolete one
*/
private function flagObsolete(string $table, array $currentVendorUids, array $validVendorUids, int $now, array $keepUids = []): void
{ {
$obsolete = array_values(array_diff(array_map(strval(...), $currentVendorUids), array_map(strval(...), $validVendorUids))); $obsolete = array_values(array_diff(array_map(strval(...), $currentVendorUids), array_map(strval(...), $validVendorUids)));
if ([] === $obsolete) { if ([] === $obsolete) {
@@ -280,8 +307,11 @@ class SnowreportImportService implements LoggerAwareInterface
->update($table) ->update($table)
->set('deleted', 1) ->set('deleted', 1)
->set('tstamp', $now) ->set('tstamp', $now)
->where($queryBuilder->expr()->in('vendor_uid', $queryBuilder->createNamedParameter($obsolete, Connection::PARAM_STR_ARRAY))) ->where($queryBuilder->expr()->in('vendor_uid', $queryBuilder->createNamedParameter($obsolete, Connection::PARAM_STR_ARRAY)));
->executeStatement(); if ([] !== $keepUids) {
$queryBuilder->andWhere($queryBuilder->expr()->notIn('uid', $queryBuilder->createNamedParameter($keepUids, Connection::PARAM_INT_ARRAY)));
}
$queryBuilder->executeStatement();
} }
private function convertValue(string $raw, string $type, string $key): int|string|bool private function convertValue(string $raw, string $type, string $key): int|string|bool
@@ -26,7 +26,7 @@ return [
], ],
'types' => [ 'types' => [
'1' => [ '1' => [
'showitem' => 'hidden, name, url, vendor_uid, available, snowreport, --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language, sys_language_uid, l10n_parent', 'showitem' => 'hidden, manual, name, url, vendor_uid, available, snowreport, --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language, sys_language_uid, l10n_parent',
], ],
], ],
'columns' => [ 'columns' => [
@@ -128,11 +128,11 @@ return [
'vendor_uid' => [ 'vendor_uid' => [
'exclude' => 0, 'exclude' => 0,
'label' => 'ID', 'label' => 'ID',
'description' => 'Webcam-ID im Feed von skiresort-service.com, leer bei eigenen Webcams',
'config' => [ 'config' => [
'type' => 'input', 'type' => 'input',
'size' => 30, 'size' => 30,
'eval' => 'trim', 'eval' => 'trim',
'required' => true
], ],
], ],
'available' => [ 'available' => [
@@ -140,6 +140,16 @@ return [
'label' => 'verfügbar', 'label' => 'verfügbar',
'config' => [ 'config' => [
'type' => 'check', 'type' => 'check',
'default' => 1,
],
],
'manual' => [
'exclude' => 0,
'label' => 'Manuell gepflegt',
'description' => 'Der Schneehöhen-Import ändert und löscht diese Webcam nicht',
'config' => [
'type' => 'check',
'default' => 1,
], ],
], ],
'snowreport' => [ 'snowreport' => [
+1
View File
@@ -1076,6 +1076,7 @@ CREATE TABLE tx_epproducts_domain_model_webcam
vendor_uid varchar(32) DEFAULT '' NOT NULL, vendor_uid varchar(32) DEFAULT '' NOT NULL,
available tinyint(4) unsigned DEFAULT '0' NOT NULL, available tinyint(4) unsigned DEFAULT '0' NOT NULL,
manual tinyint(4) unsigned DEFAULT '0' NOT NULL,
snowreport int(11) unsigned DEFAULT '0', snowreport int(11) unsigned DEFAULT '0',
name varchar(255) DEFAULT '' NOT NULL, name varchar(255) DEFAULT '' NOT NULL,
url varchar(255) DEFAULT '' NOT NULL, url varchar(255) DEFAULT '' NOT NULL,