Develop

.github/workflows/ci.yml

@@ -1,9 +1,8 @@
 name: CI
 
 on:
-  push:
   pull_request:
-
+  workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

README.md

@@ -1,3 +1,4 @@
+[![Laravel Forge Site Deployment Status](https://img.shields.io/endpoint?url=https%3A%2F%2Fforge.laravel.com%2Fsite-badges%2F454ef724-eb70-4aaf-b396-ab7d9ca383cf&style=plastic)](https://forge.laravel.com/torben-evald-hansen/tall-hamlet-iuu/2642934)
 # Introduction
 This project provides an application with tools to
 - calculate electricity bill before it's received from your vendor

app/Console/Commands/ChargesManualLoad.php

@@ -19,7 +19,7 @@ class ChargesManualLoad extends Command
      *
      * @var string
      */
-    protected $description = 'Command description';
+    protected $description = 'Manually load hardcoded charges into cache';
 
     /**
      * Execute the console command.

app/Console/Commands/Database/DbExport.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Console\Commands\Database;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class DbExport extends Command
+{
+    /**
+     * @var string
+     */
+    protected $signature = 'db:export
+        {--tables= : Comma-separated list of tables to export (default: all data tables)}';
+
+    /**
+     * @var string
+     */
+    protected $description = 'Exports database tables to CSV files in database/fixtures for backup before data reload';
+
+    /** @var array<string> */
+    private array $defaultTables = [
+        'elspotprices',
+        'metering_points',
+        'charges',
+        'charge_prices',
+        'charge_groups',
+        'datahub_price_lists',
+        'users',
+    ];
+
+    public function handle(): int
+    {
+        $tables = $this->option('tables')
+            ? explode(',', $this->option('tables'))
+            : $this->defaultTables;
+
+        $fixturesPath = database_path('fixtures');
+
+        foreach ($tables as $table) {
+            $table = trim($table);
+
+            try {
+                $count = DB::table($table)->count();
+            } catch (\Illuminate\Database\QueryException $e) {
+                $this->error("Table {$table} does not exist");
+
+                return Command::FAILURE;
+            }
+
+            if ($count === 0) {
+                $this->warn("Skipping {$table} — table is empty");
+                continue;
+            }
+
+            $outputFile = $fixturesPath . '/poweruse-' . $table . '.csv';
+            $this->info("Exporting {$table} ({$count} rows) to {$outputFile}");
+
+            $handle = fopen($outputFile, 'w');
+            if ($handle === false) {
+                $this->error("Could not open {$outputFile} for writing");
+                continue;
+            }
+
+            foreach (DB::table($table)->get() as $row) {
+                /** @var array<string, mixed> $fields */
+                $fields = array_map(function ($value) {
+                    return $value === null ? 'NULL' : (string) $value;
+                }, (array) $row);
+                fputcsv($handle, $fields);
+            }
+
+            fclose($handle);
+            $this->info("Exported {$table} successfully");
+        }
+
+        $this->newLine();
+        $this->info('Export complete. Files saved to ' . $fixturesPath);
+
+        return Command::SUCCESS;
+    }
+}

app/Console/Commands/EnergiDataServiceLoadDatahubPriceLists.php

@@ -44,7 +44,7 @@ public function handle() : int
 
         $more = 1;
         $i = 0;
-        $bar = $this->output->createProgressBar(266516);
+        $bar = $this->output->createProgressBar(423500);
         $bar->start();
         while ($more) {
             $records = $datahubPriceListsService->requestAllDatahubPriceListsFromEnergiDataService(100, $i);

app/Models/ChargeTariffMapping.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ChargeTariffMapping extends Model
+{
+    protected $fillable = [
+        'charge_name',
+        'charge_owner_gln',
+        'datahub_note',
+        'datahub_gln',
+        'datahub_charge_type',
+        'datahub_description',
+        'verified',
+    ];
+
+    protected function casts(): array
+    {
+        return [
+            'verified' => 'boolean',
+        ];
+    }
+}

app/Services/GetPreliminaryInvoice.php

@@ -5,6 +5,7 @@
 use App\Enums\SourceEnum;
 use App\Exceptions\DataUnavailableException;
 use App\Exceptions\MissingDataException;
+use App\Models\ChargeTariffMapping;
 use App\Models\DatahubPriceList;
 use App\Models\User;
 use App\Services\Interfaces\GetSpotPricesInterface;
@@ -508,14 +509,73 @@ private function findDatahubPriceList(array|\ArrayAccess $tariff, string $toDate
         if (cache()->has($key)) {
             $datahubPriceLists = cache($key);
         } else {
-            $datahubPriceLists = $this->datahubPriceListService->getFromQuery(
-                $this->datahubPriceListService->getQueryForFetchingSpecificTariffFromDB($tariff['name'], $tariff['owner'], $tariff['description'] ?? '', $toDate, $fromDate)
-            );
+            $datahubPriceLists = collect();
+
+            $mapping = ChargeTariffMapping::where('charge_name', $tariff['name'])
+                ->where('charge_owner_gln', $tariff['owner'])
+                ->first();
+
+            if ($mapping) {
+                $datahubPriceLists = $this->datahubPriceListService->getFromQuery(
+                    $this->datahubPriceListService->getQueryForFetchingSpecificTariffFromDB(
+                        $mapping->datahub_note,
+                        $mapping->datahub_gln,
+                        $mapping->datahub_description ?? '',
+                        $toDate,
+                        $fromDate
+                    )
+                );
+            }
+
+            if ($datahubPriceLists->isEmpty()) {
+                $datahubPriceLists = $this->datahubPriceListService->getFromQuery(
+                    $this->datahubPriceListService->getQueryForFetchingSpecificTariffFromDB($tariff['name'], $tariff['owner'], $tariff['description'] ?? '', $toDate, $fromDate)
+                );
+
+                if ($datahubPriceLists->isNotEmpty() && !$mapping) {
+                    $first = $datahubPriceLists->first();
+                    ChargeTariffMapping::updateOrCreate(
+                        ['charge_name' => $tariff['name'], 'charge_owner_gln' => $tariff['owner']],
+                        [
+                            'datahub_note' => $first->Note,
+                            'datahub_gln' => $first->GLN_Number,
+                            'datahub_charge_type' => $first->ChargeType,
+                            'datahub_description' => $first->Description,
+                            'verified' => true,
+                        ]
+                    );
+                }
+            }
+
             if ($datahubPriceLists->isEmpty()) {
                 $datahubPriceLists = $this->datahubPriceListService->getFromQuery(
                     $this->datahubPriceListService->getQueryForFetchingTariffByGlnAndNameLike($tariff['name'], $tariff['owner'], $toDate, $fromDate)
                 );
+
+                if ($datahubPriceLists->isNotEmpty() && !$mapping) {
+                    $first = $datahubPriceLists->first();
+                    ChargeTariffMapping::updateOrCreate(
+                        ['charge_name' => $tariff['name'], 'charge_owner_gln' => $tariff['owner']],
+                        [
+                            'datahub_note' => $first->Note,
+                            'datahub_gln' => $first->GLN_Number,
+                            'datahub_charge_type' => $first->ChargeType,
+                            'datahub_description' => $first->Description,
+                            'verified' => false,
+                        ]
+                    );
+                }
             }
+
+            if ($datahubPriceLists->isEmpty()) {
+                logger()->warning('No DatahubPriceList match found for tariff', [
+                    'name' => $tariff['name'],
+                    'owner' => $tariff['owner'],
+                    'fromDate' => $fromDate,
+                    'toDate' => $toDate,
+                ]);
+            }
+
             if ($datahubPriceLists->isNotEmpty()) {
                 cache([$key => $datahubPriceLists], 2592000);
             }

composer.json

@@ -7,27 +7,27 @@
     "require": {
         "php": ">=8.5.0",
         "ext-curl": "*",
-        "laravel/framework": "^11.0",
-        "laravel/passport": "^12.0",
-        "laravel/tinker": "^2.8",
-        "laravel/ui": "^4.5",
-        "spatie/laravel-html": "^3.6",
-        "tvup/eloverblikapi": "^v2.1.1"
+        "laravel/framework": "^12.56",
+        "laravel/passport": "^12.4",
+        "laravel/tinker": "^3.0",
+        "laravel/ui": "^4.6",
+        "spatie/laravel-html": "^3.13",
+        "tvup/eloverblikapi": "^2.1"
     },
     "require-dev": {
-        "brianium/paratest": "^7.19.2",
-        "fakerphp/faker": "^1.23",
-        "friendsofphp/php-cs-fixer": "^3.64",
-        "larastan/larastan": "^3.0",
+        "brianium/paratest": "^7.19",
+        "fakerphp/faker": "^1.24",
+        "friendsofphp/php-cs-fixer": "^3.94",
+        "larastan/larastan": "^3.9",
         "laravel/boost": "^2.4",
-        "laravel/breeze": "^2.2",
-        "laravel/sail": "^1.35",
+        "laravel/breeze": "^2.4",
+        "laravel/sail": "^1.55",
         "mockery/mockery": "^1.6",
-        "nunomaduro/collision": "^8.3",
+        "nunomaduro/collision": "^8.9",
         "phpstan/phpstan-mockery": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
-        "phpunit/phpunit": "^13.0.0",
-        "spatie/laravel-ignition": "^2.6"
+        "phpunit/phpunit": "^13.0",
+        "spatie/laravel-ignition": "^2.12"
     },
     "autoload": {
         "psr-4": {