michele/netgescon-day0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align supplier archive paths with local disk root

Browse Source
This commit is contained in:
michele 2026-04-14 22:03:02 +00:00
parent 1e132db408
commit f065149831
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/ProvisionFornitoriArchives.php
View File

@ -53,9 +53,9 @@ public function handle(): int
continue; continue;
} }
$before = Storage::disk('local')->exists($canonicalBase); $before = Storage::disk('local')->directoryExists($canonicalBase);
$fornitore->ensureArchiveStructure(); $fornitore->ensureArchiveStructure();
$after = Storage::disk('local')->exists($canonicalBase); $after = Storage::disk('local')->directoryExists($canonicalBase);
if (! $before && $after) { if (! $before && $after) {
$created++; $created++;
@ -63,13 +63,13 @@ public function handle(): int
$message = '#'. (int) $fornitore->id $message = '#'. (int) $fornitore->id
. ' ' . trim((string) ($fornitore->ragione_sociale ?: ('Fornitore ' . $fornitore->id))) . ' ' . trim((string) ($fornitore->ragione_sociale ?: ('Fornitore ' . $fornitore->id)))
. ' -> ' . storage_path('app/' . $canonicalBase) . ' -> ' . Storage::disk('local')->path($canonicalBase)
. ' [' . ($after ? ($before ? 'gia_esistente' : 'creata') : 'non_creata') . ']'; . ' [' . ($after ? ($before ? 'gia_esistente' : 'creata') : 'non_creata') . ']';
$this->line($message); $this->line($message);
if ($this->option('legacy-too') && is_string($legacyBase) && $legacyBase !== '') { if ($this->option('legacy-too') && is_string($legacyBase) && $legacyBase !== '') {
$this->line(' legacy: ' . storage_path('app/' . $legacyBase) . ' [' . (Storage::disk('local')->exists($legacyBase) ? 'presente' : 'assente') . ']'); $this->line(' legacy: ' . Storage::disk('local')->path($legacyBase) . ' [' . (Storage::disk('local')->directoryExists($legacyBase) ? 'presente' : 'assente') . ']');
} }
} }
}); });

36
app/Filament/Pages/Fornitore/ImpostazioniArchivio.php
View File

@ -119,7 +119,7 @@ public function saveUploadedTecnoRepairMdb(): void
$filename = 'TecnoRepairDB-' . now()->format('Ymd-His') . '.mdb'; $filename = 'TecnoRepairDB-' . now()->format('Ymd-His') . '.mdb';
$stored = $upload->storeAs($relativeBase . '/tecnorepair/imports', $filename, 'local'); $stored = $upload->storeAs($relativeBase . '/tecnorepair/imports', $filename, 'local');
$this->tecnorepairMdbPath = storage_path('app/' . $stored); $this->tecnorepairMdbPath = Storage::disk('local')->path($stored);
$this->tecnorepairMdbUpload = null; $this->tecnorepairMdbUpload = null;
$this->refreshArchiveSummary(); $this->refreshArchiveSummary();
@ -353,9 +353,9 @@ public function saveOperationalWorkflow(): void
private function refreshArchiveSummary(): void private function refreshArchiveSummary(): void
{ {
$relativeBase = $this->getArchiveRelativeBase(); $relativeBase = $this->getArchiveRelativeBase();
$absoluteBase = $relativeBase ? storage_path('app/' . $relativeBase) : null; $absoluteBase = $relativeBase ? Storage::disk('local')->path($relativeBase) : null;
$legacyRelativeBase = $this->getLegacyArchiveRelativeBase(); $legacyRelativeBase = $this->getLegacyArchiveRelativeBase();
$legacyAbsoluteBase = $legacyRelativeBase ? storage_path('app/' . $legacyRelativeBase) : null; $legacyAbsoluteBase = $legacyRelativeBase ? Storage::disk('local')->path($legacyRelativeBase) : null;
$this->operationalConfigAvailable = Schema::hasColumn('fornitori', 'operational_config'); $this->operationalConfigAvailable = Schema::hasColumn('fornitori', 'operational_config');
if ($this->fornitore instanceof Fornitore) { if ($this->fornitore instanceof Fornitore) {
@ -364,17 +364,17 @@ private function refreshArchiveSummary(): void
$this->archiveFolders = $relativeBase === null ? [] : [ $this->archiveFolders = $relativeBase === null ? [] : [
['label' => 'Base archivio', 'path' => (string) $absoluteBase], ['label' => 'Base archivio', 'path' => (string) $absoluteBase],
['label' => 'Rubrica fornitore', 'path' => storage_path('app/' . $relativeBase . '/rubrica')], ['label' => 'Rubrica fornitore', 'path' => Storage::disk('local')->path($relativeBase . '/rubrica')],
['label' => 'FE fornitore', 'path' => storage_path('app/' . $relativeBase . '/fe')], ['label' => 'FE fornitore', 'path' => Storage::disk('local')->path($relativeBase . '/fe')],
['label' => 'Prodotti e catalogo', 'path' => storage_path('app/' . $relativeBase . '/prodotti')], ['label' => 'Prodotti e catalogo', 'path' => Storage::disk('local')->path($relativeBase . '/prodotti')],
['label' => 'Comunicazioni / Post-it', 'path' => storage_path('app/' . $relativeBase . '/comunicazioni')], ['label' => 'Comunicazioni / Post-it', 'path' => Storage::disk('local')->path($relativeBase . '/comunicazioni')],
['label' => 'TecnoRepair import', 'path' => storage_path('app/' . $relativeBase . '/tecnorepair/imports')], ['label' => 'TecnoRepair import', 'path' => Storage::disk('local')->path($relativeBase . '/tecnorepair/imports')],
['label' => 'Archivio per anno', 'path' => storage_path('app/' . $relativeBase . '/documenti/archivio_per_anno')], ['label' => 'Archivio per anno', 'path' => Storage::disk('local')->path($relativeBase . '/documenti/archivio_per_anno')],
]; ];
if (is_string($legacyAbsoluteBase) && $legacyAbsoluteBase !== '' && $legacyAbsoluteBase !== $absoluteBase && is_dir($legacyAbsoluteBase)) { if (is_string($legacyAbsoluteBase) && $legacyAbsoluteBase !== '' && $legacyAbsoluteBase !== $absoluteBase && is_dir($legacyAbsoluteBase)) {
$this->archiveFolders[] = ['label' => 'Base archivio legacy', 'path' => $legacyAbsoluteBase]; $this->archiveFolders[] = ['label' => 'Base archivio legacy', 'path' => $legacyAbsoluteBase];
$this->archiveFolders[] = ['label' => 'TecnoRepair import legacy', 'path' => storage_path('app/' . $legacyRelativeBase . '/tecnorepair/imports')]; $this->archiveFolders[] = ['label' => 'TecnoRepair import legacy', 'path' => Storage::disk('local')->path($legacyRelativeBase . '/tecnorepair/imports')];
} }
$currentMdbPath = $this->resolveTecnoRepairMdbPath($this->tecnorepairMdbPath); $currentMdbPath = $this->resolveTecnoRepairMdbPath($this->tecnorepairMdbPath);
@ -575,6 +575,7 @@ private function resolveTecnoRepairMdbPath(?string $rawPath): ?string
return null; return null;
} }
$diskRoot = str_replace('\\', '/', Storage::disk('local')->path(''));
$storageBase = str_replace('\\', '/', storage_path('app')); $storageBase = str_replace('\\', '/', storage_path('app'));
$normalizedInput = str_replace('\\', '/', $path); $normalizedInput = str_replace('\\', '/', $path);
$candidatePaths = []; $candidatePaths = [];
@ -583,23 +584,30 @@ private function resolveTecnoRepairMdbPath(?string $rawPath): ?string
$candidatePaths[] = $path; $candidatePaths[] = $path;
} }
if (str_starts_with($normalizedInput, rtrim($diskRoot, '/') . '/')) {
$relative = ltrim(substr($normalizedInput, strlen(rtrim($diskRoot, '/'))), '/');
if ($relative !== '' && Storage::disk('local')->exists($relative)) {
$candidatePaths[] = Storage::disk('local')->path($relative);
}
}
if (str_starts_with($normalizedInput, $storageBase . '/')) { if (str_starts_with($normalizedInput, $storageBase . '/')) {
$relative = ltrim(substr($normalizedInput, strlen($storageBase)), '/'); $relative = ltrim(substr($normalizedInput, strlen($storageBase)), '/');
if ($relative !== '' && Storage::disk('local')->exists($relative)) { if ($relative !== '' && Storage::disk('local')->exists($relative)) {
$candidatePaths[] = storage_path('app/' . $relative); $candidatePaths[] = Storage::disk('local')->path($relative);
} }
} }
if (! str_starts_with($normalizedInput, '/')) { if (! str_starts_with($normalizedInput, '/')) {
$relative = ltrim($normalizedInput, '/'); $relative = ltrim($normalizedInput, '/');
if (Storage::disk('local')->exists($relative)) { if (Storage::disk('local')->exists($relative)) {
$candidatePaths[] = storage_path('app/' . $relative); $candidatePaths[] = Storage::disk('local')->path($relative);
} }
foreach ($this->getTecnoRepairImportBases() as $importBase) { foreach ($this->getTecnoRepairImportBases() as $importBase) {
$joined = trim($importBase . '/' . $relative, '/'); $joined = trim($importBase . '/' . $relative, '/');
if (Storage::disk('local')->exists($joined)) { if (Storage::disk('local')->exists($joined)) {
$candidatePaths[] = storage_path('app/' . $joined); $candidatePaths[] = Storage::disk('local')->path($joined);
} }
} }
} }
@ -627,7 +635,7 @@ private function discoverLatestTecnoRepairMdbPath(): ?string
->first(); ->first();
if (is_string($latest) && $latest !== '') { if (is_string($latest) && $latest !== '') {
return storage_path('app/' . $latest); return Storage::disk('local')->path($latest);
} }
} }

9
app/Services/TenantArchivePathService.php
View File

@ -5,6 +5,7 @@
use App\Models\Fornitore; use App\Models\Fornitore;
use App\Models\Stabile; use App\Models\Stabile;
use InvalidArgumentException; use InvalidArgumentException;
use Illuminate\Support\Facades\Storage;
class TenantArchivePathService class TenantArchivePathService
{ {
@ -59,7 +60,7 @@ public function amministratoreRelativePath(Amministratore | string $amministrato
public function amministratoreAbsolutePath(Amministratore | string $amministratore, ?string $suffix = null): string public function amministratoreAbsolutePath(Amministratore | string $amministratore, ?string $suffix = null): string
{ {
return storage_path('app/' . $this->amministratoreRelativePath($amministratore, $suffix)); return Storage::disk('local')->path($this->amministratoreRelativePath($amministratore, $suffix));
} }
public function stabileRelativePath(Stabile $stabile, ?string $suffix = null): string public function stabileRelativePath(Stabile $stabile, ?string $suffix = null): string
@ -71,7 +72,7 @@ public function stabileRelativePath(Stabile $stabile, ?string $suffix = null): s
public function stabileAbsolutePath(Stabile $stabile, ?string $suffix = null): string public function stabileAbsolutePath(Stabile $stabile, ?string $suffix = null): string
{ {
return storage_path('app/' . $this->stabileRelativePath($stabile, $suffix)); return Storage::disk('local')->path($this->stabileRelativePath($stabile, $suffix));
} }
public function fornitoreCode(Fornitore | string $fornitore): string public function fornitoreCode(Fornitore | string $fornitore): string
@ -104,7 +105,7 @@ public function fornitoreRelativePath(Fornitore | string $fornitore, ?string $su
public function fornitoreAbsolutePath(Fornitore | string $fornitore, ?string $suffix = null): string public function fornitoreAbsolutePath(Fornitore | string $fornitore, ?string $suffix = null): string
{ {
return storage_path('app/' . $this->fornitoreRelativePath($fornitore, $suffix)); return Storage::disk('local')->path($this->fornitoreRelativePath($fornitore, $suffix));
} }
public function fornitoreLegacyRelativePath(Fornitore $fornitore, ?string $suffix = null): string public function fornitoreLegacyRelativePath(Fornitore $fornitore, ?string $suffix = null): string
@ -116,7 +117,7 @@ public function fornitoreLegacyRelativePath(Fornitore $fornitore, ?string $suffi
public function fornitoreLegacyAbsolutePath(Fornitore $fornitore, ?string $suffix = null): string public function fornitoreLegacyAbsolutePath(Fornitore $fornitore, ?string $suffix = null): string
{ {
return storage_path('app/' . $this->fornitoreLegacyRelativePath($fornitore, $suffix)); return Storage::disk('local')->path($this->fornitoreLegacyRelativePath($fornitore, $suffix));
} }
private function appendSuffix(string $basePath, ?string $suffix): string private function appendSuffix(string $basePath, ?string $suffix): string