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

Move DomainController::NODE* to Address::NODE*, make role mandatory in the database, change logic so that mail generated by the host comes from a node address.

Browse Source
This commit is contained in:
Deon George
2022-01-24 22:56:13 +11:00
parent efa7195633
commit d660d5a6df
15 changed files with 143 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Jobs/NodelistImport.php
View File

@@ -12,7 +12,6 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
use App\Http\Controllers\DomainController;
use App\Models\{Address,Domain,Nodelist,Setup,System,Zone};
use App\Traits\Import as ImportTrait;
@@ -134,13 +133,13 @@ class NodelistImport implements ShouldQueue
$region = 0;
$host = 0;
$hub_id = NULL;
$role = DomainController::NODE_ZC;
$role = Address::NODE_ZC;
break;
case 'Region':
$region = $fields[1];
$role = DomainController::NODE_RC;
$role = Address::NODE_RC;
$host = 0;
$hub_id = NULL;
@@ -149,36 +148,37 @@ class NodelistImport implements ShouldQueue
case 'Host':
$host = $fields[1];
$hub_id = NULL;
$role = DomainController::NODE_NC;
$role = Address::NODE_NC;
break;
case 'Hub':
$node = $fields[1];
$role = DomainController::NODE_HC;
$role = Address::NODE_HC;
break;
case 'Pvt':
$node = $fields[1];
$role = DomainController::NODE_PVT;
$role = Address::NODE_PVT;
break;
case 'Hold':
$node = $fields[1];
$role = DomainController::NODE_HOLD;
$role = Address::NODE_HOLD;
break;
case 'Down':
$node = $fields[1];
$role = DomainController::NODE_DOWN;
$role = Address::NODE_DOWN;
break;
case '':
$node = $fields[1];
$role = Address::NODE_ACTIVE;
break;
default:
@@ -205,8 +205,6 @@ class NodelistImport implements ShouldQueue
$ao->role = $role;
$ao->hub_id = $hub_id;
$role = NULL;
if ($ao->exists)
Log::debug(sprintf('%s:Processing existing address [%s]',self::LOGKEY,$ao->ftn));
@@ -330,7 +328,7 @@ class NodelistImport implements ShouldQueue
$so->baud = $fields[6];
*/
if ($method && ($ao->role != DomainController::NODE_PVT)) {
if ($method && ($ao->role != Address::NODE_PVT)) {
$so->mailer_type = $method;
$so->mailer_address = $address;
$so->mailer_port = $port;
@@ -352,7 +350,7 @@ class NodelistImport implements ShouldQueue
try {
$so->addresses()->save($ao);
if ($ao->role == DomainController::NODE_HC)
if ($ao->role == Address::NODE_HC)
$hub_id = $ao->id;
$no->addresses()->attach($ao,['role'=>$ao->role]);
@@ -382,4 +380,4 @@ class NodelistImport implements ShouldQueue
Log::info(sprintf('%s:Updated %d records from %d systems',self::LOGKEY,$p,$c));
}
}
}