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

Fix point address assignment

Browse Source
This commit is contained in:
Deon George 2023-04-15 20:24:53 +10:00
parent 0473808e67
commit ae46dee24e
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Http/Controllers/SystemController.php
View File

@ -173,24 +173,42 @@ class SystemController extends Controller
'required', 'required',
new TwoByteInteger, new TwoByteInteger,
function ($attribute,$value,$fail) use ($request) { function ($attribute,$value,$fail) use ($request) {
// Check that the region doesnt already exist if ($request->point_id === 0) {
// Check that the host doesnt already exist
$o = Address::where(function($query) use ($request,$value) {
return $query
->where('zone_id',$request->post('zone_id'))
->where('host_id',$request->post('host_id'))
->where('node_id',$value)
->where('point_id',0);
});
if ($o->count()) {
$fail(sprintf('Host already exists: %s',$o->get()->pluck('ftn')->join(',')));
}
}
},
],
'point_id' => [
'required',
function($attribute,$value,$fail) use ($request) {
if (! is_numeric($value) || $value > DomainController::NUMBER_MAX)
$fail(sprintf('Point numbers must be between 0 and %d',DomainController::NUMBER_MAX));
// Check that the host doesnt already exist
$o = Address::where(function($query) use ($request,$value) { $o = Address::where(function($query) use ($request,$value) {
return $query return $query
->where('zone_id',$request->post('zone_id')) ->where('zone_id',$request->post('zone_id'))
->where('host_id',$request->post('host_id')) ->where('host_id',$request->post('host_id'))
->where('node_id',$value) ->where('node_id',$request->post('node_id'))
->where('point_id',0); ->where('point_id',$value);
}); });
if ($o->count()) { if ($o->count()) {
$fail(sprintf('Host already exists: %s',$o->get()->pluck('ftn')->join(','))); $fail(sprintf('Point already exists: %s',$o->get()->pluck('ftn')->join(',')));
} }
}, }
], ],
'point_id' => ['required',function($attribute,$value,$fail) {
if (! is_numeric($value) || $value > DomainController::NUMBER_MAX)
$fail(sprintf('Point numbers must be between 0 and %d',DomainController::NUMBER_MAX));
}],
'hub' => 'required|boolean', 'hub' => 'required|boolean',
'hub_id' => 'nullable|exists:addresses,id', 'hub_id' => 'nullable|exists:addresses,id',
]); ]);
@ -202,7 +220,7 @@ class SystemController extends Controller
$oo->node_id = $request->post('node_id'); $oo->node_id = $request->post('node_id');
$oo->point_id = $request->post('point_id'); $oo->point_id = $request->post('point_id');
$oo->hub_id = $request->post('hub_id') > 0 ? $request->post('hub_id') : NULL; $oo->hub_id = $request->post('hub_id') > 0 ? $request->post('hub_id') : NULL;
$oo->role = ((! $oo->point_id) && $request->post('hub')) ? Address::NODE_HC : Address::NODE_ACTIVE; $oo->role = ((! $oo->point_id) && $request->post('hub')) ? Address::NODE_HC : ($request->post('point_id') ? Address::NODE_POINT : Address::NODE_ACTIVE);
$oo->active = TRUE; $oo->active = TRUE;
$o->addresses()->save($oo); $o->addresses()->save($oo);