Skip to content

Factorization #152

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
btry merged 1 commit into from
Dec 24, 2025
Merged

Factorization #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 11 additions & 46 deletions src/DataSource/Lca/Boaviztapi/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,11 @@ public function get(string $endpoint, array $options = []): array
*/
public function createSource(): bool
{
$source_name = $this->getSourceName();
// create a source in Source
$source = new Source();
$source->getFromDBByCrit([
'name' => $source_name,
]);
if ($source->isNewItem()) {
$id = $source->add([
'name' => $source_name,
]);
return !$source->isNewID($id);
}
$source->getOrCreate([], ['name' => $this->getSourceName()]);

return true;
return (!$source->isNewItem());
}

/**
Expand Down Expand Up @@ -157,49 +148,23 @@ public function queryZones(): array
public function saveZones(array $zones): void
{
$source = new Source();
$source->getFromDBByCrit([
'name' => $this->getSourceName(),
]);
$source->getOrCreate([], ['name' => $this->getSourceName()]);
if ($source->isNewItem()) {
return;
}

$source_id = $source->getID();
$zone = new Zone();
foreach ($zones as $code => $name) {
$zone_id = $zone->getFromDBByCrit([
'name' => $name,
]);
if ($zone_id === false) {
$zone_id = $zone->add([
'name' => $name,
]);
if ($zone_id === false) {
// Failed to add the zone
continue;
}
} else {
$zone_id = $zone->getID();
$zone = new Zone();
$zone->getOrCreate([], ['name' => $name]);
if ($zone->isNewItem()) {
continue;
}
$source_zone = new Source_Zone();
$source_zone_id = $source_zone->getFromDBByCrit([
'plugin_carbon_sources_id' => $source_id,
'plugin_carbon_zones_id' => $zone_id,
]);
if ($source_zone_id === false) {
$source_zone_id = $source_zone->add([
'plugin_carbon_sources_id' => $source_id,
'plugin_carbon_zones_id' => $zone_id,
]);
if ($source_zone_id === false) {
continue;
}
} else {
$source_zone_id = $source_zone->getID();
}
$source_zone->update([
'id' => $source_zone_id,
$source_zone->getOrCreate([
'code' => $code,
], [
'plugin_carbon_sources_id' => $source->getID(),
'plugin_carbon_zones_id' => $zone->getID(),
]);
}
}
Expand Down