Work-Related/events
Work-Related/events
1
0
mirror of https://github.com/werkraum-media/events.git synced 2024-11-22 09:16:20 +01:00
Code Issues Activity

Fix broken timezone and end time after import of recurring events

Browse source
This commit is contained in:
Daniel Siepmann 2022-07-07 12:10:49 +00:00
parent 325855929b
commit b0dae68550
10 changed files with 122 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Classes/Domain/Model/Date.php
View file

@ -164,22 +164,22 @@ class Date extends AbstractEntity
bool $canceled bool $canceled
): self { ): self {
return self::createFromDestinationData( return self::createFromDestinationData(
new \DateTime($date['start'], new \DateTimeZone($date['tz'])), new \DateTimeImmutable($date['start'], new \DateTimeZone($date['tz'])),
new \DateTime($date['end'], new \DateTimeZone($date['tz'])), new \DateTimeImmutable($date['end'], new \DateTimeZone($date['tz'])),
$canceled $canceled
); );
} }
public static function createFromDestinationData( public static function createFromDestinationData(
\DateTime $start, \DateTimeImmutable $start,
\DateTime $end, \DateTimeImmutable $end,
bool $canceled bool $canceled
): self { ): self {
$date = new Date(); $date = new Date();
$date->setLanguageUid(-1); $date->setLanguageUid(-1);
$date->setStart($start); $date->setStart(new \DateTime($start->format(\DateTime::W3C), $start->getTimezone()));
$date->setEnd($end); $date->setEnd(new \DateTime($end->format(\DateTime::W3C), $end->getTimezone()));
if ($canceled) { if ($canceled) {
$date->setCanceled('canceled'); $date->setCanceled('canceled');

44
Classes/Service/DestinationDataImportService/DatesFactory.php
View file

@ -121,8 +121,10 @@ class DatesFactory
bool $canceled bool $canceled
): \Generator { ): \Generator {
$today = $this->getToday(); $today = $this->getToday();
$start = new \DateTime($date['start'], new \DateTimeZone($date['tz'])); $timeZone = new \DateTimeZone($date['tz']);
$until = new \DateTime($date['repeatUntil'], new \DateTimeZone($date['tz'])); $start = new \DateTimeImmutable($date['start'], $timeZone);
$end = new \DateTimeImmutable($date['end'], $timeZone);
$until = new \DateTimeImmutable($date['repeatUntil'], $timeZone);
$i = (int) strtotime($start->format('l'), $start->getTimestamp()); $i = (int) strtotime($start->format('l'), $start->getTimestamp());
while ($i !== 0 && $i <= $until->getTimestamp()) { while ($i !== 0 && $i <= $until->getTimestamp()) {
@ -131,10 +133,10 @@ class DatesFactory
continue; continue;
} }
yield $this->createDateFromStartAndUntil( yield $this->createDateFromStartAndEnd(
(string) $i, $i,
$start, $start,
$until, $end,
$canceled $canceled
); );
} }
@ -148,38 +150,44 @@ class DatesFactory
bool $canceled bool $canceled
): \Generator { ): \Generator {
$today = $this->getToday(); $today = $this->getToday();
$start = new \DateTime($date['start'], new \DateTimeZone($date['tz'])); $timeZone = new \DateTimeZone($date['tz']);
$until = new \DateTime($date['repeatUntil'], new \DateTimeZone($date['tz'])); $start = new \DateTimeImmutable($date['start'], $timeZone);
$end = new \DateTimeImmutable($date['end'], $timeZone);
$until = new \DateTimeImmutable($date['repeatUntil'], $timeZone);
foreach ($date['weekdays'] as $day) { foreach ($date['weekdays'] as $day) {
$i = strtotime($day, $start->getTimestamp()); $i = strtotime($day, $start->getTimestamp());
while ($i !== 0 && $i <= $until->getTimestamp()) { while ($i !== 0 && $i <= $until->getTimestamp()) {
$timeStampToUse = (string) $i; $timeStampToUse = $i;
$i = strtotime('+1 week', $i); $i = strtotime('+1 week', $i);
if ($i < $today) { if ($i < $today) {
continue; continue;
} }
yield $this->createDateFromStartAndUntil( yield $this->createDateFromStartAndEnd(
$timeStampToUse, $timeStampToUse,
$start, $start,
$until, $end,
$canceled $canceled
); );
} }
} }
} }
private function createDateFromStartAndUntil( private function createDateFromStartAndEnd(
string $timestamp, int $timestamp,
\DateTime $start, \DateTimeImmutable $start,
\DateTime $until, \DateTimeImmutable $end,
bool $canceled bool $canceled
): Date { ): Date {
$eventStart = new \DateTime('@' . $timestamp); $eventStart = $start->setTimestamp($timestamp)->setTime(
$eventStart->setTime((int) $start->format('H'), (int) $start->format('i')); (int) $start->format('H'),
$eventEnd = new \DateTime('@' . $timestamp); (int) $start->format('i')
$eventEnd->setTime((int) $until->format('H'), (int) $until->format('i')); );
$eventEnd = $end->setTimestamp($timestamp)->setTime(
(int) $end->format('H'),
(int) $end->format('i')
);
return Date::createFromDestinationData( return Date::createFromDestinationData(
$eventStart, $eventStart,

30
Documentation/Changelog/2.4.3.rst Normal file
View file

@ -0,0 +1,30 @@
2.4.3
=====
Breaking
--------
Nothing
Features
--------
Nothing
Fixes
-----
* Fix broken date creation during import.
The import of recurring dates was broken.
We did not respect the time zone.
And we did not respect the end time, but used the until instead.
Tasks
-----
Nothing
Deprecation
-----------
Nothing

6
Tests/Functional/Import/DestinationDataTest/Assertions/ImportDoesntEndUpInEndlessDateCreationTest.csv
View file

@ -9,6 +9,6 @@ Um Voranmeldung unter 03672-486470 oder schillerhaus@rudolstadt.de wird gebeten.
Es gilt die 2G-PLUS-Regel.",,"Schillerhaus Rudolstadt","Schillerstraße 25",,"Rudolstadt","07407","Deutschland","http://www.schillerhaus.rudolstadt.de/","+ 49 3672 / 486470",,,,,"50.720971023259","11.335229873657","0","1",,"3","1",,"1", Es gilt die 2G-PLUS-Regel.",,"Schillerhaus Rudolstadt","Schillerstraße 25",,"Rudolstadt","07407","Deutschland","http://www.schillerhaus.rudolstadt.de/","+ 49 3672 / 486470",,,,,"50.720971023259","11.335229873657","0","1",,"3","1",,"1",
"tx_events_domain_model_date",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "tx_events_domain_model_date",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,,
,"1","2","0","0","0","0",-1,0,"0","0","0","1","1656151200","1656172800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"1","2","0","0","0","0",-1,0,"0","0","0","1","1656144000","1656165600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"2","2","0","0","0","0",-1,0,"0","0","0","1","1656756000","1656777600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"2","2","0","0","0","0",-1,0,"0","0","0","1","1656748800","1656770400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"3","2","0","0","0","0",-1,0,"0","0","0","1","1657360800","1657382400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"3","2","0","0","0","0",-1,0,"0","0","0","1","1657353600","1657375200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,

1 tx_events_domain_model_organizer
9 1 2 0 0 0 0 -1 0 0 0 0 1 1656151200 1656144000 1656172800 1656165600 no 0
10 2 2 0 0 0 0 -1 0 0 0 0 1 1656756000 1656748800 1656777600 1656770400 no 0
11 3 2 0 0 0 0 -1 0 0 0 0 1 1657360800 1657353600 1657382400 1657375200 no 0
12
13
14

32
Tests/Functional/Import/DestinationDataTest/Assertions/ImportsAllConfigurationTest.csv
View file

@ -34,29 +34,29 @@ Es gilt die 2G-PLUS-Regel.",,"Lutherkirche","Caspar-Schulte-Straße",,"Rudolstad
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,,
,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078810800","4078771200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078803600","4078810800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078897200","4078857600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078890000","4078897200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097732400","4097739600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097728800","4097736000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098337200","4098344400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098333600","4098340800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098942000","4098949200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098938400","4098945600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097818800","4097826000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097815200","4097822400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098423600","4098430800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098420000","4098427200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099028400","4099035600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099024800","4099032000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"14","3","0","0","0","0",-1,0,"0","0","0","4","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"14","3","0","0","0","0",-1,0,"0","0","0","4","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"15","3","0","0","0","0",-1,0,"0","0","0","5","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"15","3","0","0","0","0",-1,0,"0","0","0","5","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"16","3","0","0","0","0",-1,0,"0","0","0","5","4078810800","4078771200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"16","3","0","0","0","0",-1,0,"0","0","0","5","4078803600","4078810800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"17","3","0","0","0","0",-1,0,"0","0","0","5","4078897200","4078857600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"17","3","0","0","0","0",-1,0,"0","0","0","5","4078890000","4078897200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"18","3","0","0","0","0",-1,0,"0","0","0","5","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"18","3","0","0","0","0",-1,0,"0","0","0","5","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"19","3","0","0","0","0",-1,0,"0","0","0","6","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"19","3","0","0","0","0",-1,0,"0","0","0","6","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"20","3","0","0","0","0",-1,0,"0","0","0","6","4097732400","4097739600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"20","3","0","0","0","0",-1,0,"0","0","0","6","4097728800","4097736000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"21","3","0","0","0","0",-1,0,"0","0","0","6","4098337200","4098344400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"21","3","0","0","0","0",-1,0,"0","0","0","6","4098333600","4098340800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"22","3","0","0","0","0",-1,0,"0","0","0","6","4098942000","4098949200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"22","3","0","0","0","0",-1,0,"0","0","0","6","4098938400","4098945600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"23","3","0","0","0","0",-1,0,"0","0","0","6","4097818800","4097826000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"23","3","0","0","0","0",-1,0,"0","0","0","6","4097815200","4097822400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"24","3","0","0","0","0",-1,0,"0","0","0","6","4098423600","4098430800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"24","3","0","0","0","0",-1,0,"0","0","0","6","4098420000","4098427200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"25","3","0","0","0","0",-1,0,"0","0","0","6","4099028400","4099035600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"25","3","0","0","0","0",-1,0,"0","0","0","6","4099024800","4099032000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"26","3","0","0","0","0",-1,0,"0","0","0","6","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"26","3","0","0","0","0",-1,0,"0","0","0","6","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
"sys_category",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "sys_category",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","title","items","parent",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","title","items","parent",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

1 tx_events_domain_model_organizer
34 16 3 0 0 0 0 -1 0 0 0 0 5 4078810800 4078803600 4078771200 4078810800 no 0
35 17 3 0 0 0 0 -1 0 0 0 0 5 4078897200 4078890000 4078857600 4078897200 no 0
36 18 3 0 0 0 0 -1 0 0 0 0 5 4075020000 4075027200 no 0
37 19 3 0 0 0 0 -1 0 0 0 0 6 4099831200 4099834800 no 0
38 20 3 0 0 0 0 -1 0 0 0 0 6 4097732400 4097728800 4097739600 4097736000 no 0
39 21 3 0 0 0 0 -1 0 0 0 0 6 4098337200 4098333600 4098344400 4098340800 no 0
40 22 3 0 0 0 0 -1 0 0 0 0 6 4098942000 4098938400 4098949200 4098945600 no 0
41 23 3 0 0 0 0 -1 0 0 0 0 6 4097818800 4097815200 4097826000 4097822400 no 0
42 24 3 0 0 0 0 -1 0 0 0 0 6 4098423600 4098420000 4098430800 4098427200 no 0
43 25 3 0 0 0 0 -1 0 0 0 0 6 4099028400 4099024800 4099035600 4099032000 no 0
44 26 3 0 0 0 0 -1 0 0 0 0 6 4101645600 4101649200 no 0
45 sys_category
46 uid pid cruser_id hidden starttime endtime sys_language_uid l10n_parent title items parent
47 1 2 0 0 0 0 0 0 Top Category 0 0
48 2 2 0 0 0 0 0 0 Event Category Parent 0 1
49 3 2 0 0 0 0 0 0 Weihnachten 0 2
50 4 2 0 0 0 0 0 0 Kinder 0 2
51 5 2 0 0 0 0 0 0 Konzerte, Festivals, Show & Tanz 0 2
52 sys_category_record_mm
53 uid_local uid_foreign tablenames fieldname
54 3 1 tx_events_domain_model_event categories
55 4 2 tx_events_domain_model_event categories
56 5 3 tx_events_domain_model_event categories
57 3 3 tx_events_domain_model_event categories
58 3 4 tx_events_domain_model_event categories
59 4 5 tx_events_domain_model_event categories
60 5 6 tx_events_domain_model_event categories
61 3 6 tx_events_domain_model_event categories
62

16
Tests/Functional/Import/DestinationDataTest/Assertions/ImportsExampleAsExpected.csv
View file

@ -20,16 +20,16 @@ Es gilt die 2G-PLUS-Regel.",,"Lutherkirche","Caspar-Schulte-Straße",,"Rudolstad
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,,
,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078810800","4078771200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078803600","4078810800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078897200","4078857600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078890000","4078897200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097732400","4097739600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097728800","4097736000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098337200","4098344400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098333600","4098340800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098942000","4098949200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098938400","4098945600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097818800","4097826000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097815200","4097822400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098423600","4098430800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098420000","4098427200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099028400","4099035600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099024800","4099032000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
"sys_category",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "sys_category",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","title","items","parent",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","title","items","parent",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

1 tx_events_domain_model_organizer
20 8 2 0 0 0 0 -1 0 0 0 0 3 4098337200 4098333600 4098344400 4098340800 no 0
21 9 2 0 0 0 0 -1 0 0 0 0 3 4098942000 4098938400 4098949200 4098945600 no 0
22 10 2 0 0 0 0 -1 0 0 0 0 3 4097818800 4097815200 4097826000 4097822400 no 0
23 11 2 0 0 0 0 -1 0 0 0 0 3 4098423600 4098420000 4098430800 4098427200 no 0
24 12 2 0 0 0 0 -1 0 0 0 0 3 4099028400 4099024800 4099035600 4099032000 no 0
25 13 2 0 0 0 0 -1 0 0 0 0 3 4101645600 4101649200 no 0
26 sys_category
27 uid pid cruser_id hidden starttime endtime sys_language_uid l10n_parent title items parent
28 1 2 0 0 0 0 0 0 Top Category 0 0
29 2 2 0 0 0 0 0 0 Event Category Parent 0 1
30 3 2 0 0 0 0 0 0 Weihnachten 0 2
31 4 2 0 0 0 0 0 0 Kinder 0 2
32 5 2 0 0 0 0 0 0 Konzerte, Festivals, Show & Tanz 0 2
33 sys_category_record_mm
34 uid_local uid_foreign tablenames fieldname
35 3 1 tx_events_domain_model_event categories

16
Tests/Functional/Import/DestinationDataTest/Assertions/ImportsWithoutCategoryIfNotProvided.csv
View file

@ -20,14 +20,14 @@ Es gilt die 2G-PLUS-Regel.",,"Lutherkirche","Caspar-Schulte-Straße",,"Rudolstad
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,,
,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078810800","4078771200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078803600","4078810800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078897200","4078857600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078890000","4078897200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097732400","4097739600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097728800","4097736000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098337200","4098344400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098333600","4098340800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098942000","4098949200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098938400","4098945600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097818800","4097826000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097815200","4097822400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098423600","4098430800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098420000","4098427200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099028400","4099035600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099024800","4099032000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,

1 tx_events_domain_model_organizer
20 8 2 0 0 0 0 -1 0 0 0 0 3 4098337200 4098333600 4098344400 4098340800 no 0
21 9 2 0 0 0 0 -1 0 0 0 0 3 4098942000 4098938400 4098949200 4098945600 no 0
22 10 2 0 0 0 0 -1 0 0 0 0 3 4097818800 4097815200 4097826000 4097822400 no 0
23 11 2 0 0 0 0 -1 0 0 0 0 3 4098423600 4098420000 4098430800 4098427200 no 0
24 12 2 0 0 0 0 -1 0 0 0 0 3 4099028400 4099024800 4099035600 4099032000 no 0
25 13 2 0 0 0 0 -1 0 0 0 0 3 4101645600 4101649200 no 0
26
27
28
29
30
31
32
33

16
Tests/Functional/Import/DestinationDataTest/Assertions/ImportsWithoutRegionIfNotProvided.csv
View file

@ -20,16 +20,16 @@ Es gilt die 2G-PLUS-Regel.",,"Lutherkirche","Caspar-Schulte-Straße",,"Rudolstad
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link",,,,,,,,,,,,,,,,,,,,,,,,,,
,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"1","2","0","0","0","0",-1,0,"0","0","0","1","4101372000","4101377400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"2","2","0","0","0","0",-1,0,"0","0","0","2","4101112800","4101118200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078810800","4078771200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"3","2","0","0","0","0",-1,0,"0","0","0","2","4078803600","4078810800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078897200","4078857600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"4","2","0","0","0","0",-1,0,"0","0","0","2","4078890000","4078897200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"5","2","0","0","0","0",-1,0,"0","0","0","2","4075020000","4075027200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"6","2","0","0","0","0",-1,0,"0","0","0","3","4099831200","4099834800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097732400","4097739600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"7","2","0","0","0","0",-1,0,"0","0","0","3","4097728800","4097736000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098337200","4098344400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"8","2","0","0","0","0",-1,0,"0","0","0","3","4098333600","4098340800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098942000","4098949200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"9","2","0","0","0","0",-1,0,"0","0","0","3","4098938400","4098945600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097818800","4097826000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"10","2","0","0","0","0",-1,0,"0","0","0","3","4097815200","4097822400","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098423600","4098430800","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"11","2","0","0","0","0",-1,0,"0","0","0","3","4098420000","4098427200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099028400","4099035600","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"12","2","0","0","0","0",-1,0,"0","0","0","3","4099024800","4099032000","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,, ,"13","2","0","0","0","0",-1,0,"0","0","0","3","4101645600","4101649200","no","0",,,,,,,,,,,,,,,,,,,,,,,,,,,
"sys_category",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "sys_category",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","title","items","parent",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","title","items","parent",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

1 tx_events_domain_model_organizer
20 8 2 0 0 0 0 -1 0 0 0 0 3 4098337200 4098333600 4098344400 4098340800 no 0
21 9 2 0 0 0 0 -1 0 0 0 0 3 4098942000 4098938400 4098949200 4098945600 no 0
22 10 2 0 0 0 0 -1 0 0 0 0 3 4097818800 4097815200 4097826000 4097822400 no 0
23 11 2 0 0 0 0 -1 0 0 0 0 3 4098423600 4098420000 4098430800 4098427200 no 0
24 12 2 0 0 0 0 -1 0 0 0 0 3 4099028400 4099024800 4099035600 4099032000 no 0
25 13 2 0 0 0 0 -1 0 0 0 0 3 4101645600 4101649200 no 0
26 sys_category
27 uid pid cruser_id hidden starttime endtime sys_language_uid l10n_parent title items parent
28 1 2 0 0 0 0 0 0 Top Category 0 0
29 2 2 0 0 0 0 0 0 Event Category Parent 0 1
30 3 2 0 0 0 0 0 0 Weihnachten 0 2
31 4 2 0 0 0 0 0 0 Kinder 0 2
32 5 2 0 0 0 0 0 0 Konzerte, Festivals, Show & Tanz 0 2
33 sys_category_record_mm
34 uid_local uid_foreign tablenames fieldname
35 3 1 tx_events_domain_model_event categories

32
Tests/Unit/Service/DestinationDataImportService/DatesFactoryTest.php
View file

@ -152,12 +152,12 @@ class DatesFactoryTest extends TestCase
self::assertCount(3, $result); self::assertCount(3, $result);
self::assertInstanceOf(Date::class, $result[0]); self::assertInstanceOf(Date::class, $result[0]);
self::assertSame('4078828800', $result[0]->getStart()->format('U')); self::assertSame('4078821600', $result[0]->getStart()->format('U'));
self::assertSame('4078836000', $result[0]->getEnd()->format('U')); self::assertSame('4078825200', $result[0]->getEnd()->format('U'));
self::assertSame('canceled', $result[0]->getCanceled()); self::assertSame('canceled', $result[0]->getCanceled());
self::assertSame('4079001600', $result[2]->getStart()->format('U')); self::assertSame('4078994400', $result[2]->getStart()->format('U'));
self::assertSame('4079008800', $result[2]->getEnd()->format('U')); self::assertSame('4078998000', $result[2]->getEnd()->format('U'));
self::assertSame('canceled', $result[2]->getCanceled()); self::assertSame('canceled', $result[2]->getCanceled());
} }
@ -187,12 +187,12 @@ class DatesFactoryTest extends TestCase
self::assertCount(3, $result); self::assertCount(3, $result);
self::assertInstanceOf(Date::class, $result[0]); self::assertInstanceOf(Date::class, $result[0]);
self::assertSame('4078828800', $result[0]->getStart()->format('U')); self::assertSame('4078821600', $result[0]->getStart()->format('U'));
self::assertSame('4078836000', $result[0]->getEnd()->format('U')); self::assertSame('4078825200', $result[0]->getEnd()->format('U'));
self::assertSame('no', $result[0]->getCanceled()); self::assertSame('no', $result[0]->getCanceled());
self::assertSame('4079001600', $result[2]->getStart()->format('U')); self::assertSame('4078994400', $result[2]->getStart()->format('U'));
self::assertSame('4079008800', $result[2]->getEnd()->format('U')); self::assertSame('4078998000', $result[2]->getEnd()->format('U'));
self::assertSame('no', $result[2]->getCanceled()); self::assertSame('no', $result[2]->getCanceled());
} }
@ -226,12 +226,12 @@ class DatesFactoryTest extends TestCase
self::assertCount(4, $result); self::assertCount(4, $result);
self::assertInstanceOf(Date::class, $result[0]); self::assertInstanceOf(Date::class, $result[0]);
self::assertSame('4076564400', $result[0]->getStart()->format('U')); self::assertSame('4076560800', $result[0]->getStart()->format('U'));
self::assertSame('4076571600', $result[0]->getEnd()->format('U')); self::assertSame('4076568000', $result[0]->getEnd()->format('U'));
self::assertSame('canceled', $result[0]->getCanceled()); self::assertSame('canceled', $result[0]->getCanceled());
self::assertSame('4077255600', $result[3]->getStart()->format('U')); self::assertSame('4077252000', $result[3]->getStart()->format('U'));
self::assertSame('4077262800', $result[3]->getEnd()->format('U')); self::assertSame('4077259200', $result[3]->getEnd()->format('U'));
self::assertSame('canceled', $result[3]->getCanceled()); self::assertSame('canceled', $result[3]->getCanceled());
} }
@ -265,12 +265,12 @@ class DatesFactoryTest extends TestCase
self::assertCount(4, $result); self::assertCount(4, $result);
self::assertInstanceOf(Date::class, $result[0]); self::assertInstanceOf(Date::class, $result[0]);
self::assertSame('4076564400', $result[0]->getStart()->format('U')); self::assertSame('4076560800', $result[0]->getStart()->format('U'));
self::assertSame('4076571600', $result[0]->getEnd()->format('U')); self::assertSame('4076568000', $result[0]->getEnd()->format('U'));
self::assertSame('no', $result[0]->getCanceled()); self::assertSame('no', $result[0]->getCanceled());
self::assertSame('4077255600', $result[3]->getStart()->format('U')); self::assertSame('4077252000', $result[3]->getStart()->format('U'));
self::assertSame('4077262800', $result[3]->getEnd()->format('U')); self::assertSame('4077259200', $result[3]->getEnd()->format('U'));
self::assertSame('no', $result[3]->getCanceled()); self::assertSame('no', $result[3]->getCanceled());
} }

2
ext_emconf.php
View file

@ -9,7 +9,7 @@ $EM_CONF['events'] = [
'state' => 'alpha', 'state' => 'alpha',
'createDirs' => '', 'createDirs' => '',
'clearCacheOnLoad' => 0, 'clearCacheOnLoad' => 0,
'version' => '2.4.2', 'version' => '2.4.3',
'constraints' => [ 'constraints' => [
'depends' => [ 'depends' => [
'typo3' => '10.4.00-11.5.99', 'typo3' => '10.4.00-11.5.99',