Skip to content

refactor(archimate): remove private methods nothing calls #1374

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 2 commits into from
Nov 2, 2026
Merged

refactor(archimate): remove private methods nothing calls #1374

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
8c0bf85
refactor(archimate): remove private methods nothing calls
rubenvdlinde Nov 2, 2026
61f16a6
Merge remote-tracking branch 'origin/development' into refactor/sig-a…
rubenvdlinde Nov 2, 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
141 changes: 3 additions & 138 deletions lib/Service/AangebodenGebruikService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,28 +1165,13 @@ private function getGebruiksConfiguration(): array {
);
}//end getGebruiksConfiguration()

/**
* Get configuration for koppelingen objects (register ID and schema IDs)
*
* @return array Configuration with register_id and schemas array
* @throws Exception When configuration is not available
*/
private function getKoppelingenConfiguration(): array {
return $this->resolveVoorzieningenSchemaConfig(
schemaKey: 'koppeling_schema',
labelForLogs: 'koppelingen'
);
}//end getKoppelingenConfiguration()

/**
* Resolves a `{register_id, schemas: [schemaId]}` tuple for the supplied
* voorzieningen-config schema key.
*
* Extracted from {@see getGebruiksConfiguration()} +
* {@see getKoppelingenConfiguration()} as part of task 7.3 — the two
* methods were 95% identical (differing only on the schema key and the
* log label). Throws when either the register id or the requested schema
* id is missing on the voorzieningen config.
* Used by {@see getGebruiksConfiguration()}. Throws when either the
* register id or the requested schema id is missing on the voorzieningen
* config.
*
* @param string $schemaKey The voorzieningen-config schema key
* (e.g. "gebruik_schema").
Expand Down Expand Up @@ -1238,64 +1223,6 @@ private function resolveVoorzieningenSchemaConfig(string $schemaKey, string $lab
throw new Exception(ucfirst($labelForLogs) . ' configuration not found. Please configure the schemas in the admin panel.');
}//end resolveVoorzieningenSchemaConfig()

/**
* Get all objects for a specific schema using paginated search, optionally filtered by organization
*
* Uses ObjectService's buildSearchQuery() for proper query construction
*
* @param ObjectServiceInterface $objectService The OpenRegister object service
* @param string $registerId The register ID
* @param string $schemaId The schema ID
* @param array $options Query options (includes request parameters for buildSearchQuery)
* @param string|null $organisationFilter Optional organization UUID to filter by
*
* @return array Paginated result from searchObjectsPaginated
*
* @throws Exception When query fails
*/
private function getAllObjectsForSchema(
ObjectServiceInterface $objectService,
string $registerId,
string $schemaId,
array $options = [],
?string $organisationFilter = null,
): array {
// Use ObjectService's buildSearchQuery to properly handle request parameters.
$searchQuery = $objectService->buildSearchQuery($options);

// Add schema and register filters.
$searchQuery['@self']['schema'] = $schemaId;
$searchQuery['@self']['register'] = $registerId;

// Add organization filter if provided.
if ($organisationFilter !== null) {
$searchQuery['@self']['organisation'] = $organisationFilter;
}

// Force database source for real-time data.
$searchQuery['_source'] = 'database';

$this->logger->debug(
'Getting all objects for schema (paginated)',
[
'register' => $registerId,
'schema' => $schemaId,
'organisation_filter' => $organisationFilter,
'query' => $searchQuery,
]
);

// Execute search with RBAC and multitenancy disabled using paginated search.
$searchResult = $objectService->searchObjectsPaginated(
query: $searchQuery,
_rbac: false,
_multitenancy: false,
deleted: false
);

return $searchResult;
}//end getAllObjectsForSchema()

/**
* Get all applications/modules owned by an organization
*
Expand Down Expand Up @@ -1400,68 +1327,6 @@ private function getApplicationsOwnedByOrganisation(
}//end try
}//end getApplicationsOwnedByOrganisation()

/**
* Get objects related to a specific UUID via the uses relationship using paginated search
*
* Uses ObjectService's buildSearchQuery() for proper query construction
*
* @param ObjectServiceInterface $objectService The OpenRegister object service
* @param string $registerId The register ID
* @param string $schemaId The schema ID
* @param string $relatedUuid The UUID to find relationships for
* @param array $options Query options (includes request parameters for buildSearchQuery)
* @param string|null $organisationFilter Optional organization UUID to filter by
*
* @return array Paginated result from searchObjectsPaginated
*
* @throws Exception When query fails
*/
private function getObjectsRelatedToUuid(
ObjectServiceInterface $objectService,
string $registerId,
string $schemaId,
string $relatedUuid,
array $options = [],
?string $organisationFilter = null,
): array {
// Use ObjectService's buildSearchQuery to properly handle request parameters.
$searchQuery = $objectService->buildSearchQuery($options);

// Add schema and register filters.
$searchQuery['@self']['schema'] = $schemaId;
$searchQuery['@self']['register'] = $registerId;

// Add organization filter if provided.
if ($organisationFilter !== null) {
$searchQuery['@self']['organisation'] = $organisationFilter;
}

// Force database source for real-time data.
$searchQuery['_source'] = 'database';

$this->logger->debug(
'Getting objects related to UUID (paginated)',
[
'register' => $registerId,
'schema' => $schemaId,
'related_uuid' => $relatedUuid,
'organisation_filter' => $organisationFilter,
'query' => $searchQuery,
]
);

// Execute search using the uses parameter to find relationships with pagination.
$searchResult = $objectService->searchObjectsPaginated(
query: $searchQuery,
_rbac: false,
_multitenancy: false,
deleted: false,
uses: $relatedUuid
);

return $searchResult;
}//end getObjectsRelatedToUuid()

/**
* Check if an organization owns a specific application/module
*
Expand Down
51 changes: 0 additions & 51 deletions lib/Service/ArchiMateExportService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1919,57 +1919,6 @@ private function addModelMetadataToXml(\SimpleXMLElement $xml, array $modelMetad
}
}//end addModelMetadataToXml()

/**
* Optimized method to add data to XML node.
*
* @param \SimpleXMLElement $node The XML node.
* @param array $data The data array.
*
* @return void
*/
private function addDataToXmlNode(\SimpleXMLElement $node, array $data): void {
// Add attributes first.
if (isset($data['_attributes']) === true && is_array($data['_attributes']) === true) {
foreach ($data['_attributes'] as $attrName => $attrValue) {
$node->addAttribute($attrName, (string)$attrValue);
}
}

// Add text content.
if (isset($data['_value']) === true) {
$node[0] = (string)$data['_value'];
}

// Add child elements.
foreach ($data as $key => $value) {
if ($key === '_attributes' || $key === '_value' || is_int($key) === true) {
continue;
}

if (is_array($value) === true) {
if (isset($value[0]) === true) {
// Array of items.
foreach ($value as $item) {
$child = $node->addChild($key);
if (is_array($item) === true) {
$this->addDataToXmlNode(node: $child, data: $item);
} else {
$child[0] = (string)$item;
}
}
} else {
// Single object.
$child = $node->addChild($key);
$this->addDataToXmlNode(node: $child, data: $value);
}
} else {
// Scalar value.
$child = $node->addChild($key);
$child[0] = (string)$value;
}//end if
}//end foreach
}//end addDataToXmlNode()

/**
* Convert OpenRegister objects back to ArchiMate format
*
Expand Down
Loading
Loading