Skip to content

Import time_zone, lang_enum, email_contact in aggregator #1485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjaudiomv merged 2 commits into from
Apr 7, 2026
Merged

Import time_zone, lang_enum, email_contact in aggregator #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f4cd59
import time_zone field in aggregator
pjaudiomv Apr 7, 2026
1d0e584
add rest of missing fields lang_enum, email_contact
pjaudiomv Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/app/Repositories/External/ExternalMeeting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ class ExternalMeeting extends ExternalObject
public ?int $venueType;
public string $startTime;
public string $durationTime;
public ?string $timeZone;
public ?string $langEnum;
public ?string $emailContact;
public ?float $latitude;
public ?float $longitude;
public string $name;
Expand Down Expand Up @@ -44,6 +47,9 @@ public function __construct(array $values)
$this->venueType = $this->validateNullableInt($values, 'venue_type');
$this->startTime = $this->validateTime($values, 'start_time');
$this->durationTime = $this->validateTime($values, 'duration_time');
$this->timeZone = $this->validateNullableString($values, 'time_zone');
$this->langEnum = $this->validateNullableString($values, 'lang_enum');
$this->emailContact = $this->validateNullableString($values, 'email_contact');
$this->latitude = $this->validateNullableFloat($values, 'latitude');
$this->longitude = $this->validateNullableFloat($values, 'longitude');
$this->name = $this->validateString($values, 'meeting_name');
Expand Down Expand Up @@ -91,6 +97,15 @@ public function isEqual(Meeting $meeting, Collection $serviceBodyIdToSourceIdMap
if ($this->durationTime != $meeting->duration_time) {
return false;
}
if ($this->timeZone != $meeting->time_zone) {
return false;
}
if ($this->langEnum != $meeting->lang_enum) {
return false;
}
if ($this->emailContact != $meeting->email_contact) {
return false;
}
if ($this->latitude != $meeting->latitude) {
if (is_null($this->latitude) || is_null($meeting->latitude)) {
return false;
Expand Down
3 changes: 3 additions & 0 deletions src/app/Repositories/MeetingRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,9 @@ private function externalMeetingToValuesArray(int $rootServerId, int $serviceBod
'weekday_tinyint' => $externalMeeting->weekdayId - 1,
'start_time' => $externalMeeting->startTime,
'duration_time' => $externalMeeting->durationTime,
'time_zone' => $externalMeeting->timeZone,
'lang_enum' => $externalMeeting->langEnum,
'email_contact' => $externalMeeting->emailContact,
'latitude' => $externalMeeting->latitude,
'longitude' => $externalMeeting->longitude,
'published' => $externalMeeting->published ? 1 : 0,
Expand Down
6 changes: 6 additions & 0 deletions src/tests/Feature/Aggregator/ImportMeetingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ private function externalMeeting(ExternalServiceBody $serviceBody, array $format
'venue_type' => 1,
'start_time' => '08:00',
'duration_time' => '01:00',
'time_zone' => 'America/New_York',
'lang_enum' => 'en',
'email_contact' => 'meeting@example.com',
'latitude' => '-123',
'longitude' => '123',
'meeting_name' => 'Test Name',
Expand Down Expand Up @@ -93,6 +96,9 @@ private function create(int $rootServerId, int $sourceId, $serviceBodyId, array
'venue_type' => 2,
'start_time' => '09:00',
'duration_time' => '02:00',
'time_zone' => 'America/Los_Angeles',
'lang_enum' => 'es',
'email_contact' => 'old@example.com',
'latitude' => '-323',
'longitude' => '4',
'worldid_mixed' => 'World ID changed',
Expand Down
27 changes: 27 additions & 0 deletions src/tests/Unit/ExternalMeetingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ private function validValues(): array
'venue_type' => '1',
'start_time' => '20:00:00',
'duration_time' => '01:00:00',
'time_zone' => 'America/New_York',
'lang_enum' => 'en',
'email_contact' => 'test@example.com',
'longitude' => '-84.4661174',
'latitude' => '33.8658047',
'comments' => 'comments',
Expand Down Expand Up @@ -56,6 +59,9 @@ private function getModel(array $validValues, int $serviceBodyId, array $formatS
'venue_type' => $validValues['venue_type'],
'start_time' => $validValues['start_time'],
'duration_time' => $validValues['duration_time'],
'time_zone' => $validValues['time_zone'],
'lang_enum' => $validValues['lang_enum'],
'email_contact' => $validValues['email_contact'],
'longitude' => $validValues['longitude'],
'latitude' => $validValues['latitude'],
'worldid_mixed' => $validValues['worldid_mixed'],
Expand Down Expand Up @@ -112,6 +118,9 @@ public function testValidWithoutNulls()
$this->assertEquals($values['venue_type'], $meeting->venueType);
$this->assertEquals($values['start_time'], $meeting->startTime);
$this->assertEquals($values['duration_time'], $meeting->durationTime);
$this->assertEquals($values['time_zone'], $meeting->timeZone);
$this->assertEquals($values['lang_enum'], $meeting->langEnum);
$this->assertEquals($values['email_contact'], $meeting->emailContact);
$this->assertEquals($values['latitude'], $meeting->latitude);
$this->assertEquals($values['longitude'], $meeting->longitude);
$this->assertEquals($values['meeting_name'], $meeting->name);
Expand Down Expand Up @@ -161,6 +170,9 @@ public function testValidWithEmpty()
$values['bus_lines'] = '';
$values['train_lines'] = '';
$values['venue_type'] = '';
$values['time_zone'] = '';
$values['lang_enum'] = '';
$values['email_contact'] = '';
$values['latitude'] = '';
$values['longitude'] = '';
$values['format_shared_id_list'] = '';
Expand All @@ -175,6 +187,9 @@ public function testValidWithEmpty()
$this->assertNull($meeting->latitude);
$this->assertNull($meeting->longitude);
$this->assertNull($meeting->venueType);
$this->assertNull($meeting->timeZone);
$this->assertNull($meeting->langEnum);
$this->assertNull($meeting->emailContact);
$this->assertNull($meeting->worldId);
$this->assertNull($meeting->comments);
$this->assertNull($meeting->virtualMeetingAdditionalInfo);
Expand Down Expand Up @@ -217,6 +232,9 @@ public function testValidWithNulls()
$values['bus_lines'] = null;
$values['train_lines'] = null;
$values['venue_type'] = null;
$values['time_zone'] = null;
$values['lang_enum'] = null;
$values['email_contact'] = null;
$values['latitude'] = null;
$values['longitude'] = null;
$values['format_shared_id_list'] = null;
Expand All @@ -231,6 +249,9 @@ public function testValidWithNulls()
$this->assertNull($meeting->latitude);
$this->assertNull($meeting->longitude);
$this->assertNull($meeting->venueType);
$this->assertNull($meeting->timeZone);
$this->assertNull($meeting->langEnum);
$this->assertNull($meeting->emailContact);
$this->assertNull($meeting->worldId);
$this->assertNull($meeting->comments);
$this->assertNull($meeting->virtualMeetingAdditionalInfo);
Expand Down Expand Up @@ -273,6 +294,9 @@ public function testValidWithMissing()
unset($values['bus_lines']);
unset($values['train_lines']);
unset($values['venue_type']);
unset($values['time_zone']);
unset($values['lang_enum']);
unset($values['email_contact']);
unset($values['latitude']);
unset($values['longitude']);
unset($values['format_shared_id_list']);
Expand All @@ -287,6 +311,9 @@ public function testValidWithMissing()
$this->assertNull($meeting->latitude);
$this->assertNull($meeting->longitude);
$this->assertNull($meeting->venueType);
$this->assertNull($meeting->timeZone);
$this->assertNull($meeting->langEnum);
$this->assertNull($meeting->emailContact);
$this->assertNull($meeting->worldId);
$this->assertNull($meeting->comments);
$this->assertNull($meeting->virtualMeetingAdditionalInfo);
Expand Down