Browse Source

Merge branch 'create-requirement' into dev

kely 1 year ago
parent
commit
4e61bf0a28

+ 2 - 5
app/Http/Controllers/API/RequirementController.php

@@ -25,12 +25,9 @@ class RequirementController extends Controller
         //
     }
 
-    public function byAsset(string $assetId)
+    public function byAsset(Request $request,string $assetId)
     {
-        $requirements = Requirement::query()
-            ->with(['createdBy', 'plan'])
-            ->where('asset_id', $assetId)
-            ->simplePaginate();
+        $requirements=Requirement::filter($request->all())->with(['createdBy', 'plan']) ->where('asset_id', $assetId)->simplePaginate();
 
         return AssetRequirementResource::collection($requirements);
     }

+ 14 - 0
app/ModelFilters/RequirementFilter.php

@@ -13,4 +13,18 @@ class RequirementFilter extends ModelFilter
     * @var array
     */
     public $relations = [];
+
+    public function apply($query)
+    {
+        return $query;
+    }
+
+    public function assetId($assetId){
+        return $this->where('asset_id',$assetId);
+    }
+
+    public function groupId($groupId){
+        return $this->where('requirement_group_id',$groupId);
+    }
+
 }

+ 3 - 2
app/Models/Requirement.php

@@ -3,14 +3,15 @@
 namespace App\Models;
 
 use App\Models\Scopes\CompanyScope;
+use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Requirement extends Model
 {
-    use HasFactory;
-    use SoftDeletes;
+    use HasFactory,SoftDeletes,Filterable;
+
 
     protected $fillable = [
         'title',