Merge pull request 'update test optimalisasi API project search' (#129) from dev-ibnu into staging

Reviewed-on: ordo/adw-backend#129

app/Http/Controllers/Controller.php

@@ -97,6 +97,79 @@ class Controller extends BaseController
         return $data;
     }
 
+    // new version for custom select in selfTable
+    protected function setUpPayloadSelect($condition, $tableSelf)
+    {
+        $alias = "selfTable";
+        $builder = DB::table($tableSelf." AS ".$alias);
+        // $builder = $builder->select($alias.".*");
+        if($condition){
+            if(isset($condition['select'])){
+                foreach($condition['select'] as $select){
+                    $builder = $builder->select($alias.".".$select);
+                }
+            }
+            if(isset($condition['joins'])){ 
+                $no = 0;
+                foreach($condition['joins'] as $join){
+                    $tableJoin = isset($join['name1']) ? $join['name1'] : $alias;
+                    $tableName  = $join['name'];
+                    $columnJoin = $join['column_join']; // foreign key table sini
+                    $columnSelf = isset($join['column_self']) ? $join['column_self'] : "id"; // primary key table lawan
+                    $columnResult = $join['column_results'];
+
+                    foreach($columnResult as $sColumn){
+                        $builder = $builder->addSelect($tableName.".".$sColumn." as join_".$this->listJoinAll[$no]."_".$sColumn);
+                    }
+                    $builder = $builder->leftJoin($tableName, $tableJoin.".".$columnJoin, '=', $tableName.'.'.$columnSelf);
+                    $no++;
+                }
+            } 
+
+            if(isset($condition['columns'])){
+                $listWhere = $condition['columns'];
+
+                $builder = $builder->where(function ($query)  use($listWhere, $alias){
+                    foreach($listWhere as $where){
+                        $value = $where['value'];
+                        if($value && $value!="" && $value!=" "){
+                            $column = $where['name'];
+                            $operator = strtolower($where['logic_operator']); // like, =, <>, range
+                            $value2 = isset($where['value1']) ? $where['value1'] : "";
+                            $tableColumn = isset($where['table_name']) ? $where['table_name'] : $alias;
+                            $query = $this->whereCondition($query, $operator, $tableColumn, $column, $value, $value2);
+                        }
+                    }
+                });
+            }
+
+            if(isset($condition['group_column'])){
+                $builder = $this->groupWhere($builder, $condition['group_column'], $alias);
+            }
+
+            $data['count'] = clone $builder;
+
+            if(isset($condition['paging'])){
+                $builder = $builder->offset($condition['paging']['start'])->limit($condition['paging']['length']);
+            }
+
+            if(isset($condition['orders'])){
+                $orders = $condition['orders'];
+                $sortBy = $orders['ascending'] ? "ASC" : "DESC";
+                $columnOrder = $orders['columns'];
+                foreach($columnOrder as $column){
+                    $builder = $builder->orderBy($alias.".".$column, $sortBy);
+                }
+            }
+        }else{
+            $builder = $builder->select($alias.".*");
+        }
+        $data['builder'] = $builder;
+        return $data;
+    }
+
+
+
     private function groupWhere($oldBuilder, $groupWhere, $alias)
     {
         $builder = $oldBuilder;

app/Http/Controllers/ProjectController.php

@@ -216,6 +216,19 @@ class ProjectController extends Controller
 		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
 	}
 
+	public function searchCustom(Request $request)
+	{
+		$payload = $request->all();
+
+		$dataBuilder = $this->setUpPayloadSelect($payload, 'm_proyek');
+		$builder = $dataBuilder['builder'];
+		$countBuilder = $dataBuilder['count'];
+		$dataGet = $builder->get();
+		$totalRecord = $countBuilder->count();
+
+		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
+	}
+
 	public function list()
 	{
 		$data = Project::orderBy('id', 'desc')->get();

rest-client.http

@@ -1,10 +1,12 @@
-@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODQ0NFwvYXBpXC9sb2dpbiIsImlhdCI6MTY3NzQ3NzIzMSwiZXhwIjoxNjc4MDgyMDMxLCJuYmYiOjE2Nzc0NzcyMzEsImp0aSI6ImR5WWhRY3ZIbUJEcmFKMG0iLCJzdWIiOjEsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.9zT6CBbQholzIdQ9ZBDoxMvrR-PKvIYkGzdNB6bim0Y
+@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODQ0NFwvYXBpXC9sb2dpbiIsImlhdCI6MTY5MTc2MDYyNCwiZXhwIjoxNjkyMzY1NDI0LCJuYmYiOjE2OTE3NjA2MjQsImp0aSI6Ikd2bEFPTE4yZ2FuRFdVbjEiLCJzdWIiOjEsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.XNGbsmcgQ-CkV8vLlvnItGKM0R1am5X5b6qUFOR1DRo
+@tokenS = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9hZHctYXBpLm9zcHJvLmlkXC9hcGlcL2xvZ2luIiwiaWF0IjoxNjkxNTcyMTIwLCJleHAiOjE2OTIxNzY5MjAsIm5iZiI6MTY5MTU3MjEyMCwianRpIjoiVUdqbnhLRVdlZzYyTTBnayIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.5QqK0dLW5jzbVOkSCSW0mFo0K7ycGOBW9NCG_2Zldm4
 
-@hostname = https://adw-api.ospro.id/api
+
+# @hostname = https://adw-api.ospro.id/api
 # @hostname = https://ospro-api.ospro.id/api
 # @hostname = https://api-iu.ospro.id/api
 # @hostname = https://api-staging-adw.ospro.id/api
-# @hostname = http://localhost:8444/api
+@hostname = http://localhost:8444/api
 # @hostname = http://103.73.125.81:8444/api
 # @hostname = http://localhost:8444/adw-backend/api
 
@@ -402,6 +404,59 @@ GET {{hostname}}/project/list
 Authorization: Bearer  {{token}}
 content-type: application/json
 
+###
+POST {{hostname}}/project/search
+Authorization: Bearer  {{token}}
+content-type: application/json
+
+{
+  "columns": [
+    {
+      "name": "nama",
+      "logic_operator": "ilike",
+      "value": "",
+      "operator": "AND"
+    }
+  ],
+  "select": ["kode_sortname", "nama", "mulai_proyek"],
+  "joins": [
+    {
+      "name": "m_users",
+      "column_join": "pm_id",
+      "column_results": [
+        "name",
+        "username"
+      ]
+    },
+    {
+      "name": "m_type_proyek",
+      "column_join": "type_proyek_id",
+      "column_results": [
+        "name",
+        "description"
+      ]
+    }
+  ],
+  "orders": {
+    "columns": [
+      "id"
+    ],
+    "ascending": false
+  },
+  "paging": {
+    "start": 0,
+    "length": 10
+  }
+}
+
+###
+POST https://adw-api.ospro.id/api/project/search
+Authorization: Bearer  {{tokenS}}
+content-type: application/json
+
+{
+    "columns":[{"name":"nama","logic_operator":"ilike","value":"","operator":"AND"}],"joins":[{"name":"m_users","column_join":"pm_id","column_results":["name","username"]},{"name":"m_type_proyek","column_join":"type_proyek_id","column_results":["name","description"]}],"orders":{"columns":["id"],"ascending":false},"paging":{"start":0,"length":10}
+}
 
 ### add
 POST {{hostname}}/project/add
@@ -1103,3 +1158,14 @@ content-type: application/json
 
     }
 }
+
+#######
+POST {{hostname}}/project/get-s-curve
+Authorization: Bearer {{token}}
+content-type: application/json
+
+{
+    "period":"week",
+    "project_id":"118",
+    "gantt_id":"287"
+}

routes/web.php

@@ -53,7 +53,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->post('/document-activity/search', 'ActivityDokumenController@searchDocProject');
 		$router->get('/document-activity/download/{id}', 'ActivityDokumenController@downloadDokumen');
 
-		$router->post('/project/search', 'ProjectController@search');
+		$router->post('/project/search', 'ProjectController@searchCustom');
 		$router->post('/project/add', 'ProjectController@add');
 		$router->put('/project/update/{id}', 'ProjectController@update');
 		$router->get('/project/edit/{id}', 'ProjectController@edit');