bbs/clrghouz
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Improvements to handle rogue 2D adresses

Browse Source
This commit is contained in:
Deon George 2024-10-23 12:06:53 +11:00
parent 967153c70a
commit 670450387c
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Models/Address.php
View File

@ -254,19 +254,26 @@ class Address extends Model
$ftn = self::parseFTN($address); $ftn = self::parseFTN($address);
$do = $ftn['d'] ? Domain::where('name',$ftn['d'])->single() : NULL; $do = $ftn['d'] ? Domain::where('name',$ftn['d'])->single() : NULL;
if ($ftn['z'] === 0) $o = new self;
Log::alert(sprintf('%s:! newFTN was parsed an FTN [%s] with a zero zone',self::LOGKEY,$address)); $o->region_id = $ftn['r'];
$o->host_id = $ftn['n'];
$o->node_id = $ftn['f'];
$o->point_id = $ftn['p'];
$zo = Zone::where('zone_id',$ftn['z']) $zo = Zone::where('zone_id',$ftn['z'])
->when($do,fn($query)=>$query->where('domain_id',$do->id)) ->when($do,fn($query)=>$query->where('domain_id',$do->id))
->single(); ->single();
$o = new self;
$o->zone_id = $zo?->id; $o->zone_id = $zo?->id;
$o->region_id = $ftn['r'];
$o->host_id = $ftn['n']; if (($ftn['z'] === 0) || (! $zo)) {
$o->node_id = $ftn['f']; Log::alert(sprintf('%s:! newFTN was parsed an FTN [%s] with a zero zone, adding empty zone in domain',self::LOGKEY,$address));
$o->point_id = $ftn['p'];
$zo = new Zone;
$zo->domain_id = $do?->id;
}
$o->zone()->associate($zo);
return $o; return $o;
} }
@ -761,6 +768,9 @@ class Address extends Model
if (! $this->relationLoaded('zone')) if (! $this->relationLoaded('zone'))
$this->load(['zone:id,domain_id,zone_id']); $this->load(['zone:id,domain_id,zone_id']);
if (! $this->zone)
throw new InvalidFTNException(sprintf('Invalid Zone for FTN address [%d/%d.%d@%s]',$this->host_id ?: $this->region_id,$this->node_id,$this->point_id,$this->domain?->name));
return sprintf('%d:%s',$this->zone->zone_id,$this->getFTN2DAttribute()); return sprintf('%d:%s',$this->zone->zone_id,$this->getFTN2DAttribute());
} }