fix and add ud transportation

app/Http/Controllers/Api/V1/PointLogController.php

@@ -22,7 +22,7 @@ class PointLogController extends Controller
 
     public function getAll()
     {
-        $query = User::select('users.name', 'users.id as user_id', DB::raw('SUM(point_logs.point) as total_point'))->rightJoin('point_logs', 'point_logs.user_id', 'users.id')->groupBy('point_logs.user_id')->orderBy('total_point', 'desc')->get();
+        $query = User::select('users.name', 'users.id as user_id', DB::raw('SUM(point_logs.point) as total_point'))->rightJoin('point_logs', 'point_logs.user_id', 'users.id')->groupBy('point_logs.user_id')->orderBy('total_point', 'desc')->limit(5)->get();
 
         if($query){
             $result = $query;
@@ -45,7 +45,7 @@ class PointLogController extends Controller
     
     public function getNonEvent()
     {
-        $query = User::select('users.name', 'users.id as user_id', DB::raw('SUM(point_logs.point) as total_point'))->rightJoin('point_logs', 'point_logs.user_id', 'users.id')->where('event_id', '=', 0)->groupBy('point_logs.user_id')->orderBy('total_point', 'desc')->get();
+        $query = User::select('users.name', 'users.id as user_id', DB::raw('SUM(point_logs.point) as total_point'))->rightJoin('point_logs', 'point_logs.user_id', 'users.id')->where('event_id', '=', 0)->groupBy('point_logs.user_id')->orderBy('total_point', 'desc')->limit(5)->get();
 
         if($query){
             $result = $query;
@@ -68,7 +68,7 @@ class PointLogController extends Controller
 
     public function getWithEvent()
     {
-        $query = User::select('users.name', 'users.id as user_id', DB::raw('SUM(point_logs.point) as total_point'))->rightJoin('point_logs', 'point_logs.user_id', 'users.id')->where('event_id', '=', 1)->groupBy('point_logs.user_id')->orderBy('total_point', 'desc')->get();
+        $query = User::select('users.name', 'users.id as user_id', DB::raw('SUM(point_logs.point) as total_point'))->rightJoin('point_logs', 'point_logs.user_id', 'users.id')->where('event_id', '=', 1)->groupBy('point_logs.user_id')->orderBy('total_point', 'desc')->limit(5)->get();
 
         if($query){
             $result = $query;

app/Http/Controllers/Api/V1/TransportationController.php

@@ -87,7 +87,7 @@ class TransportationController extends Controller
             return $this->resSuccess(null, $res_status, $msg, $status_msg, null);
         }
     }
-
+    
     public function postStore(Request $request)
     {
         $post = $request->all();
@@ -96,6 +96,7 @@ class TransportationController extends Controller
         /**digunakan untuk set rule validator */
         $rules = [
             'gambar' => 'required',
+            'user_id' => 'required',
             // 'gambar' => 'required|file|max:1000',
         ];
         /**digunakan untuk set message dari validatornya yang akan keluar gimna, :attribue itu udah langsung mendeteksi inputtan dari name="attribue" */
@@ -121,8 +122,13 @@ class TransportationController extends Controller
             $query->transportation_identity     = $request->transportation_identity;
             $query->transportation_type         = $request->transportation_type;
             $query->transportation_photo        = Helper::base64_to_image($request->gambar, 'transportation');
-            $query->user_id                     = 123456;
+            $query->user_id                     = Helper::hash(Request::all()['user_id'], 'decode');
             $query->save();
+
+            $query->hash_id = Helper::hash($query->id, 'encode');
+            $query->user_id = Helper::hash($query->user_id, 'encode');
+
+
             if($query){
                 $result = $query;
     
@@ -143,6 +149,99 @@ class TransportationController extends Controller
         }
     }
 
+    public function postUpdate(Request $request)
+    {        
+        $post = $request->all();
+
+        $rules = [
+            'id' => 'required',
+            'gambar' => 'required',
+            'user_id' => 'required',
+        ];
+
+        $validator = Validator::make($post, $rules);
+
+        if(!$validator->fails()){
+            $transportation = Transportation::where('id', Helper::hash(Request::all()['id'], 'decode'))->firstOrFail();
+            
+            $transportation->name                        = $request->name;
+            $transportation->transportation_identity     = $request->transportation_identity;
+            $transportation->transportation_type         = $request->transportation_type;
+            $transportation->transportation_photo        = Helper::base64_to_image($request->gambar, 'transportation');
+            $transportation->user_id                     = Helper::hash(Request::all()['user_id'], 'decode');
+            $transportation->save();
+
+            $transportation->hash_id = Helper::hash($transportation->id, 'encode');
+            $transportation->user_id = Helper::hash($transportation->user_id, 'encode');
+
+            $result = $transportation;
+            $res_status = true;
+            $msg = 'Berhasil membuat user';
+            $status_msg = $msg;
+
+            return $this->resSuccess(null, $res_status, $msg, $status_msg, $result);
+
+        }else {
+
+            $res_status = false;
+            $msg = 'Gagal Membuat user';
+            $status_msg = $validator->errors();
+
+            return $this->resSuccess(null, $res_status, $msg, $status_msg, null);
+        }
+    }
+
+    public function delete()
+    {
+        $validator = Validator::make(Request::all(), [
+            'id' => ['required'],
+        ]);
+        if(!$validator->fails()){
+            $query = Transportation::find(Helper::hash(Request::all()['id'], 'decode'))->detroy();
+
+            if($query){
+                $result = $query;
+                $res_status = true;
+                $msg = 'Data berhasil dihapus';
+                $status_msg = $msg;
+
+                return $this->resSuccess(null, $res_status, $msg, $status_msg, $result);
+            }else{
+                $result = $query;
+                $res_status = false;
+                $msg = 'Data gagal dihapus';
+                $status_msg = $msg;
+
+                return $this->resSuccess(null, $res_status, $msg, $status_msg, $result);
+            }
+        }else{
+            $res_status = false;
+            $msg = 'Data tidak ditemukan';
+            $status_msg = $validator->errors();
+
+            return $this->resSuccess(null, $res_status, $msg, $status_msg, null);
+        }
+        
+
+        if($query){
+            $result = $query;
+
+            $res_status = true;
+            $msg = 'Mendapatkan Data';
+            $status_msg = $msg;
+
+            return $this->resSuccess(null, $res_status, $msg, $status_msg, $result);
+
+        }else {
+
+            $res_status = false;
+            $msg = 'Data tidak ditemukan';
+            $status_msg = $msg;
+
+            return $this->resSuccess(null, $res_status, $msg, $status_msg, null);
+        }
+    }
+
     public function resSuccess($param = null, $status = null, $msg = null, $status_msg = null, $result = null)
     {
         $response['response'] = array(

app/Http/Controllers/Api/V1/UserController.php

@@ -82,7 +82,7 @@ class UserController extends Controller
         }else {
 
             $res_status = false;
-            $msg = 'Data tidak ditemukan';
+            $msg = 'Email atau Password yang anda masukkan salah';
             $status_msg = $msg;
 
             return $this->resSuccess(null, $res_status, $msg, $status_msg, null);
@@ -147,7 +147,6 @@ class UserController extends Controller
             'gender' => ['required'],
             'is_have_organization' => ['required'],
             'organization_id' => [],
-            'id_member' => [],
         ]);
 
         if(!$validator->fails()){
@@ -158,7 +157,6 @@ class UserController extends Controller
                 'gender' => $request->gender,
                 'is_have_organization' => $request->is_have_organization,
                 'organization_id' => !empty($request->organization_id)?$request->organization_id:NULL,
-                'id_member' => !empty($request->id_member)?$request->id_member:'',
             ]);
 
             $res_status = true;
@@ -186,7 +184,6 @@ class UserController extends Controller
             'gender' => ['required'],
             'is_have_organization' => ['required'],
             'organization_id' => [],
-            'id_member' => [],
         ]);
 
         if(!$validator->fails()){
@@ -198,7 +195,6 @@ class UserController extends Controller
             $profile->gender = $request->gender;
             $profile->is_have_organization = $request->is_have_organization;
             $profile->organization_id = !empty($request->organization_id)?$request->organization_id:'';
-            $profile->id_member = !empty($request->id_member)?$request->id_member:'';
 
             $res_status = true;
             $msg = 'Berhasil membuat user';

database/migrations/2022_04_11_130837_add_is_approved_to_timelines_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsApprovedToTimelinesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('timelines', function (Blueprint $table) {
+            $table->enum('is_approved', ['yes', 'no']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('timelines', function (Blueprint $table) {
+            $table->dropColumn('is_approved');
+        });
+    }
+}