Merge branch 'master' of ssh://git.meshkee.com:2222/cssd/cssd-back

Dockerfile.nginx

@@ -1,4 +1,4 @@
-FROM node:14-alpine AS builder
+FROM docker.meshkee.com/repository/docker-hosted/node:14-alpine AS builder
 
 WORKDIR /var/www/html
 

app/Http/Controllers/TestResultController.php

@@ -48,6 +48,11 @@ class TestResultController extends Controller
             ->when($request->has('testType_id') && $request->testType_id, function ($query) use ($request) {
                 $query->where('test_type_id', $request->testType_id);
             })
+            ->when($request->has('test_type_name') && $request->test_type_name, function ($q) use ($request) {
+                $q->whereHas('test_type', function ($query) use ($request) {
+                    $query->where('name', 'like', "%{$request->test_type_name}%");
+                });
+            })
             ->when(($request->has('device_id') && $request->device_id) && ($request->has('device_label') && $request->device_label && $request->device_label != "undefined"), function ($query) use ($request) {
                 if ($request->device_label != 'undefined') {
                     $query->whereHas('input_values', function ($query) use ($request) {

app/Http/Controllers/TestTypeController.php

@@ -7,6 +7,7 @@ use App\Models\Input;
 use App\Models\Option;
 use App\Models\TestResult;
 use App\Models\TestType;
+use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Milon\Barcode\Facades\DNS1DFacade;
@@ -380,20 +381,13 @@ class TestTypeController extends Controller
 
     /////////////////////////////////////////////////////////////////////////////////////
 
-    public function getInputs(Request $request)
+    public function getInputs(int $testTypeId)
     {
         if (auth('api')->user()->can('getInputs')) {
             return MessageResponse::error(trans('messages.failed'));
         }
-        if ($request->test_result_id !== '') {
+        try {
-            $testTypeId = TestResult::find($request->test_result_id);
+            $testType = TestType::select('id', 'name', 'unique_code', 'device_label')->findOrFail($testTypeId);
-        }
-        if (isset($testTypeId) && $testTypeId) {
-            $testType = TestType::select('id', 'name', 'unique_code', 'device_label')->find($testTypeId->test_type_id);
-        } else {
-            $testType = TestType::where('name', $request->name)->orWhere('unique_code', $request->unique_code)->select('id', 'name', 'unique_code', 'device_label')->first();
-        }
-        if (isset($testType) && $testType) {
 
             $inputs = Input::select('id', 'name', 'type', 'size', 'parent_id', 'require_scanner')->with(
                 ['options' => function ($query) {
@@ -408,9 +402,10 @@ class TestTypeController extends Controller
             )->whereNull('parent_id')->where('test_type_id', $testType->id)->get();
 
             return MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
-        }
+        } catch(Exception $e) {
             return MessageResponse::error();
         }
+    }
 
     public function list()
     {

app/Repositories/LabelRepository.php

@@ -11,6 +11,9 @@ class LabelRepository implements LabelRepositoryInterface
     {
         return Label::when($request->has('sterilizer_id') && $request->sterilizer_id != '', function ($query) use ($request) {
             $query->where('sterilizer_id', $request->sterilizer_id);
+        })
+            ->when($request->has('package_name') && $request->package_name != '', function ($query) use ($request) {
+                $this->applyPackageNameFilter($query,$request);
             })
             ->when($request->has('cycle_number') && $request->cycle_number != '', function ($query) use ($request) {
                 $query->where('cycle_number', $request->cycle_number);
@@ -48,6 +51,9 @@ class LabelRepository implements LabelRepositoryInterface
     {
         return Label::when($request->has('sterilizer_id') && $request->sterilizer_id != '', function ($query) use ($request) {
             $query->where('sterilizer_id', $request->sterilizer_id);
+        })
+            ->when($request->has('package_name') && $request->package_name != '', function ($query) use ($request) {
+                $this->applyPackageNameFilter($query,$request);
             })
             ->when($request->has('cycle_number') && $request->cycle_number != '', function ($query) use ($request) {
                 $query->where('cycle_number', $request->cycle_number);
@@ -85,6 +91,9 @@ class LabelRepository implements LabelRepositoryInterface
     {
         return Label::when($request->has('sterilizer_id') && $request->sterilizer_id != '', function ($query) use ($request) {
             $query->where('sterilizer_id', $request->sterilizer_id);
+        })
+            ->when($request->has('package_name') && $request->package_name != '', function ($query) use ($request) {
+                $this->applyPackageNameFilter($query,$request);
             })
             ->when($request->has('cycle_number') && $request->cycle_number != '', function ($query) use ($request) {
                 $query->where('cycle_number', $request->cycle_number);
@@ -114,4 +123,11 @@ class LabelRepository implements LabelRepositoryInterface
             ->orderByDesc('id')
             ->paginate(10);
     }
+
+    public function applyPackageNameFilter($q,$request)
+    {
+        return $q->whereHas('package', function ($query) use ($request) {
+            $query->where('packages.name', 'like', "%{$request->package_name}%");
+        });
+    }
 }

packages/Auth/SendsPasswordResetEmails.php

@@ -7,6 +7,7 @@ use App\Models\User;
 use App\Services\Notification\SmsNotification;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Packages\Messaging\src\Facades\MessageResponse;
 // use Packages\SMSSender\SMSSender;
 
@@ -38,15 +39,14 @@ trait SendsPasswordResetEmails
      */
      public function checkDisposablePassword(Request $request)
      {
-         if ( \Cache::has($request->code) ) {
         $userid = \Cache::pull($request->code);
+         if ( !is_null($userid) ) {
              $user = User::findOrFail($userid);
              if($user) {
-
                 $user->password = \Hash::make($request->code);
                 $user->save();
 
-                 $request->merge([ 'cell_number' => $user->cell_number ]);
+                $request->merge([ 'cell_number' => $user->cell_number, 'password' => $request->code ]);
                 return (new LoginController())->login($request);
              }
              return MessageResponse::error('User Not Found');

routes/api.php

@@ -35,7 +35,7 @@ Route::middleware('auth:api')->group(function () {
     Route::post('/TestTypes/Barcode/{TestType}', [TestTypeController::class, 'generateBarcode']);
     Route::resource('TestTypes', TestTypeController::class);
     Route::resource('MedicalCenters', MedicalCenterController::class);
-    Route::post('/GetInputs', [TestTypeController::class, 'getInputs']);
+    Route::get('/GetInputs/{id}', [TestTypeController::class, 'getInputs']); // Route::post('/GetInputs', [TestTypeController::class, 'getInputs']) این بود قبلا
 
     Route::get('/GetInfo', [UserController::class, 'getInfo']);
     Route::get('Users/MedicalCenter/{MedicalCenter}', [UserController::class, 'getByMedicalCenter']);