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

Improve our parent/children identification with points, fix our testing that was failing with NULLs and asserted out. Added zone:check so that's its easier to identify parent for FTNs

Browse Source
This commit is contained in:
Deon George
2023-12-11 18:31:38 +11:00
parent 247cf614f3
commit 541f612446
4 changed files with 229 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Models/Address.php
View File

@@ -150,7 +150,6 @@ class Address extends Model
/**
* Find children dependent on this record
* @todo If bosses are defined here, and points, then mail to a point goes to it's boss
*/
public function children()
{
@@ -194,9 +193,18 @@ class Address extends Model
case self::NODE_PVT:
case self::NODE_HOLD:
case self::NODE_DOWN:
case self::NODE_POINT:
case self::NODE_UNKNOWN:
// Nodes dont have children, but must return a relationship instance
// Identify our children.
$children = self::select('addresses.*')
->where('zone_id',$this->zone_id)
->where('region_id',$this->region_id)
->where('host_id',$this->host_id)
->where('node_id',$this->node_id)
->where('point_id','<>',0);
break;
case self::NODE_POINT:
// Points dont have children, but must return a relationship instance
return $this->hasOne(self::class,NULL,'void');
default:
@@ -298,14 +306,17 @@ class Address extends Model
*
* @return Address|null
* @throws \Exception
* @todo Dont include points in this
*/
public function parent(): ?Address
{
// If we are have session password, then we dont have a parent
// If we have session password, then we are the parent
if ($this->session('sespass'))
return $this;
// If it is our address
if (our_address()->contains($this))
return NULL;
switch ($this->role) {
// ZCs dont have parents, but we may have a default
case self::NODE_ZC:
@@ -326,15 +337,15 @@ class Address extends Model
// Hosts
case self::NODE_NC:
// See if we have a RC
// See if we have an RC
$parent = self::where('zone_id',$this->zone_id)
->where('region_id',$this->region_id)
->where('host_id',0)
->where('host_id',$this->region_id)
->where('node_id',0)
->single();
if (! $parent) {
// See if we have a RC
// See if we have an ZC
$parent = self::where('zone_id',$this->zone_id)
->where('region_id',0)
->where('host_id',0)
@@ -351,22 +362,27 @@ class Address extends Model
case self::NODE_PVT:
case self::NODE_HOLD:
case self::NODE_DOWN:
case self::NODE_UNKNOWN:
// If we are a child of a hub, then check our hub
$parent = ($this->hub_id
? self::where('id',$this->hub_id)
: self::where('zone_id',$this->zone_id)
->where('region_id',$this->region_id)
->where('host_id',$this->host_id)
->where('node_id',0)
->where('role','<',$this->role))
->where('role','<',self::NODE_HC))
->active()
->single();
break;
case self::NODE_UNKNOWN:
case self::NODE_POINT:
// @todo Points - if the boss is defined, we should return it.
return NULL;
$parent = self::where('zone_id',$this->zone_id)
->where('region_id',$this->region_id)
->where('host_id',$this->host_id)
->where('node_id',$this->node_id)
->where('point_id',0)
->active()
->single();
break;
default:
throw new \Exception(sprintf('Unknown role: %s (%d)',serialize($this->role),$this->id));