|
@@ -60,20 +60,24 @@ class ProjectController extends Controller
|
|
|
*/
|
|
|
public function index(Request $request)
|
|
|
{
|
|
|
- $pageSize=$request->get('page_size') ?? 10;
|
|
|
- $sort=$request->input('sort','desc');
|
|
|
- $projectAsset = Project::filter($request->all())->allowed()->orderBy('created_at',$sort)->with('assets')->paginate($pageSize);
|
|
|
+ $projectAsset=$this->getProject($request);
|
|
|
|
|
|
return ProjectResource::collection($projectAsset);
|
|
|
}
|
|
|
|
|
|
public function publicSearch(Request $request)
|
|
|
{
|
|
|
- $projectAsset = Project::filter($request->all())->allowed()->orderByDesc('created_at')->with('assets')->get();
|
|
|
+ $projectAsset=$this->getProject($request);
|
|
|
|
|
|
return ProjectSimpleResource::collection($projectAsset);
|
|
|
}
|
|
|
|
|
|
+ protected function getProject(Request $request){
|
|
|
+ $pageSize=$request->get('page_size') ?? 10;
|
|
|
+ $sort=$request->input('sort','desc');
|
|
|
+ return Project::filter($request->all())->allowed()->orderBy('created_at',$sort)->with('assets')->paginate($pageSize);
|
|
|
+ }
|
|
|
+
|
|
|
public function byAsset(Request $request)
|
|
|
{
|
|
|
$asset=$request->asset;
|