Skip to content

refactor(organization-sync): split the related contact and organisation entity sync, drop unused organisation service parameters #1405

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
rubenvdlinde merged 7 commits into from
Nov 3, 2026
Merged

refactor(organization-sync): split the related contact and organisation entity sync, drop unused organisation service parameters #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69018ae
test(organization-sync): golden for the related contact person sync
rubenvdlinde Nov 3, 2026
0d62d74
refactor(organization-sync): split the related contact person sync in…
rubenvdlinde Nov 3, 2026
b3a48c0
test(organization-sync): golden for ensuring the organisation entity …
rubenvdlinde Nov 3, 2026
80859ef
refactor(organization-sync): split ensuring the organisation entity i…
rubenvdlinde Nov 3, 2026
01b0c42
test(stackiq): golden for the organisation sync with OpenRegister, as…
rubenvdlinde Nov 3, 2026
e5ec6e3
refactor(stackiq): drop the unused organisation service parameter fro…
rubenvdlinde Nov 3, 2026
a36a20f
Merge remote-tracking branch 'origin/development' into refactor/sig-o…
rubenvdlinde Nov 3, 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
956 changes: 533 additions & 423 deletions lib/Service/OrganizationSyncService.php
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 3 additions & 13 deletions lib/Service/StackiqService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,6 @@ public function syncOrganizationWithOpenRegister(object $organizationObject): bo

// Update the organization using OrganisationService.
$updatedOrganisation = $this->updateOrganisationInOpenRegister(
organisationService: $organisationService,
existingOrganisation: $existingOrganisation,
mappedData: $mappedData
);
Expand Down Expand Up @@ -1395,7 +1394,6 @@ public function syncOrganizationWithOpenRegister(object $organizationObject): bo
// Create the organization using OrganisationService.
$this->_logger->info('StackiqService: SYNC_STEP_10 - Calling createOrganisationInOpenRegister');
$createdOrganisation = $this->createOrganisationInOpenRegisterInternal(
organisationService: $organisationService,
mappedData: $mappedData,
organizationUuid: $organizationUuid
);
Expand Down Expand Up @@ -1452,11 +1450,10 @@ public function createOrganisationInOpenRegister(array $objectData): ?object {
'participants' => $objectData['participants'] ?? [],
];

// Get organisation service.
$organisationService = $this->_container->get('OCA\OpenRegister\Service\OrganisationService');
// Fails early when OpenRegister's organisation service is not available.
$this->_container->get('OCA\OpenRegister\Service\OrganisationService');

return $this->createOrganisationInOpenRegisterInternal(
organisationService: $organisationService,
mappedData: $mappedData,
organizationUuid: $organizationUuid
);
Expand Down Expand Up @@ -1494,17 +1491,12 @@ private function mapStatus(string $status): bool {
/**
* Creates an organization in OpenRegister using OrganisationService
*
* @param \OCA\OpenRegister\Service\OrganisationService $organisationService The OpenRegister organisation service
* @param array $mappedData The mapped organization data
* @param string $organizationUuid The organization UUID to use
*
* @return \OCA\OpenRegister\Db\Organisation The created organization
*/
private function createOrganisationInOpenRegisterInternal(
\OCA\OpenRegister\Service\OrganisationService $organisationService,
array $mappedData,
string $organizationUuid,
): \OCA\OpenRegister\Db\Organisation {
private function createOrganisationInOpenRegisterInternal(array $mappedData, string $organizationUuid): \OCA\OpenRegister\Db\Organisation {
$this->_logger->info(
'StackiqService: STEP 1 - Starting createOrganisationInOpenRegister',
[
Expand Down Expand Up @@ -1778,14 +1770,12 @@ private function createOrganisationInOpenRegisterInternal(
/**
* Updates an organization in OpenRegister using OrganisationService
*
* @param \OCA\OpenRegister\Service\OrganisationService $organisationService The OpenRegister organisation service
* @param \OCA\OpenRegister\Db\Organisation $existingOrganisation The existing organization
* @param array $mappedData The mapped organization data
*
* @return \OCA\OpenRegister\Db\Organisation The updated organization
*/
private function updateOrganisationInOpenRegister(
\OCA\OpenRegister\Service\OrganisationService $organisationService,
\OCA\OpenRegister\Db\Organisation $existingOrganisation,
array $mappedData,
): \OCA\OpenRegister\Db\Organisation {
Expand Down
9 changes: 9 additions & 0 deletions tests/Stubs/Db/OrganisationMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ abstract class OrganisationMapper {
*/
abstract public function findByUuid(string $uuid): Organisation;

/**
* Find an organisation by slug.
*
* @param string $slug The organisation slug.
*
* @return Organisation
*/
abstract public function findBySlug(string $slug): Organisation;

/**
* Persist an organisation entity.
*
Expand Down
Loading
Loading