poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Updated to post api from get api and its responses' (#704) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
Details

Browse Source 
Reviewed-on: #704
This commit was merged in pull request #704.
This commit is contained in:
jothi
2026-06-04 19:51:04 +00:00
parent 2dea2ddf9b cdcbcc62b1
commit 935c3ab120
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Http/Controllers/TestingPanelController.php
View File

@@ -498,39 +498,47 @@ class TestingPanelController extends Controller
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Invalid authorization token!',
'status_response' => (object) [],
], 403);
}
$plantCode = $request->header('plant-code') ?? null;
$serialNumbers = $request->header('serial-numbers') ?? null;
// $description = $item ? $item->description : '';
$plantCode = trim($request->header('plant-code')) ?? null;
// $serialNumbers = $request->header('serial-numbers') ?? null;
$data = $request->all();
$serialNumbers = $data['serial_numbers'] ?? '';
// $serialNumbers = $request->input('serial_numbers', []);
if ($plantCode == null || $plantCode == '' || ! $plantCode) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Plant code can't be empty!",
'status_response' => (object) [],
], 404);
} elseif (! is_numeric($plantCode)) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Plant code '{$plantCode}' should contain only numeric values!",
'status_response' => (object) [],
], 404);
} elseif (Str::length($plantCode) < 4 || Str::length($plantCode) > 7) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Plant code '{$plantCode}' must be between 4 and 7 digits only!",
'status_response' => (object) [],
], 404);
} elseif (! preg_match('/^[1-9]\d{3,6}$/', $plantCode)) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Invalid plant code '{$plantCode}' found!",
'status_response' => (object) [],
], 404);
}
if ($serialNumbers == null || $serialNumbers == '' || ! $serialNumbers) {
if (empty($serialNumbers) || ! is_array($serialNumbers) || count($serialNumbers) == 0) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Serial numbers can't be empty!",
'status_description' => 'Serial numbers is required and must be a non-empty array.',
'status_response' => (object) [],
], 404);
}
@@ -540,18 +548,25 @@ class TestingPanelController extends Controller
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Plant code '{$plantCode}' not found!",
], 400);
'status_response' => (object) [],
], 404);
}
$plantId = $plant->id;
$serialArray = array_map('trim', explode(',', $serialNumbers));
// $serialNumber = 'SNO-'.Str::random(5).'-'.time(); // Default random serial number if not provided
// $serialArray = array_map('trim', explode(',', $serialNumbers));
// // $serialNumber = 'SNO-'.Str::random(5).'-'.time(); // Default random serial number if not provided
$serialArray = $serialNumbers;
// Remove null, empty string, or falsy values from $serialArray
$serialArray = array_filter($serialArray, function ($serial) {
return $serial != null && $serial != '' && $serial;
});
// $serialArray = array_filter($serialArray, function ($serial) {
// return $serial != null && $serial != '' && $serial;
// });
// Remove null/empty/falsy and reindex the array
$serialArray = array_values(array_filter($serialNumbers, function ($serial) {
return $serial != null && $serial != '' && is_string($serial) && trim($serial) != '';
}));
$serialStatus = [];
$validSerials = [];
@@ -586,7 +601,8 @@ class TestingPanelController extends Controller
if ($validSerials == null || empty($validSerials)) {
return response()->json([
'status_code' => 'ERROR',
'status_descriptions' => $serialStatus,
'status_description' => 'Has pending leak test!',
'status_response' => [$serialStatus],
], 404);
} else {
$serialArray = $validSerials; // nonExistingSerials
@@ -604,7 +620,8 @@ class TestingPanelController extends Controller
return response()->json([
'status_code' => 'ERROR',
'status_descriptions' => $mergedResult,
'status_description' => 'Has pending leak test!',
'status_response' => [$mergedResult],
], 404);
}
@@ -629,14 +646,16 @@ class TestingPanelController extends Controller
return response()->json([
'status_code' => $hasFail ? 'ERROR' : 'SUCCESS',
'status_descriptions' => $mergedResult,
'status_description' => $hasFail ? 'Has pending leak test!' : 'Each serial number has passed the leak test!',
'status_response' => [$mergedResult],
], $hasFail ? 404 : 200);
} else {
$mergedResult = $serialStatus + $nonExistingSerials + $existingSerials; // nonExistingSerials
return response()->json([
'status_code' => 'ERROR',
'status_descriptions' => $mergedResult,
'status_description' => 'Has pending leak test!',
'status_response' => [$mergedResult],
], 404);
}
}

2
routes/api.php
View File

@@ -161,7 +161,7 @@ Route::post('testing/reading/store-data', [TestingPanelController::class, 'store
Route::post('testing/leak-test/store-data', [TestingPanelController::class, 'storeLeakTestStatus']);
Route::get('testing/leak-test/get-data', [TestingPanelController::class, 'getLeakTestStatus']);
Route::post('testing/leak-test/get-data', [TestingPanelController::class, 'getLeakTestStatus']);
Route::get('get-pdf', [PdfController::class, 'getPdf']); // processorder/get-pdf