Merge pull request #19 from ryanaidilp/4.0.7

update to version 4.0.7
ryanaidilp · Apr 9, 2021 · e2e4455 · e2e4455
2 parents 85144cf + 0282295
commit e2e4455
Show file tree

Hide file tree

Showing 16 changed files with 479 additions and 234 deletions.
diff --git a/app/Helpers/AppHelper.php b/app/Helpers/AppHelper.php
@@ -25,3 +25,12 @@ function sendNotification($body, $header)
         'Authorization' => 'Basic ' . env('ONESIGNAL_API_KEY')
     ])->retry(3, 1000)->post(env('ONESIGNAL_API_URL'), $fields);
 }
+
+function setResponse($data, $errors, $isSuccess)
+{
+    return [
+        'success' => $isSuccess,
+        'errors' => $errors,
+        'data' => $data
+    ];
+}
diff --git a/app/Http/Controllers/Api/StatisticController.php b/app/Http/Controllers/Api/StatisticController.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Statistic;
+use App\Transformers\AppSerializer;
+use App\Transformers\StatisticTransformer;
+use Illuminate\Http\Request;
+
+class StatisticController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $statistics = Statistic::with(['histories'])->get();
+        $statistics = \fractal($statistics, new StatisticTransformer, new AppSerializer)->toArray();
+        $statistics = \setResponse($statistics, [], true);
+        return \response($statistics, 200);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Models\Statistic  $statistic
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Statistic $statistic)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Models\Statistic  $statistic
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Statistic $statistic)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Models\Statistic  $statistic
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Statistic $statistic)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\Statistic  $statistic
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Statistic $statistic)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php
@@ -93,7 +93,6 @@ public function data()
         $districts = District::all();
         $provinces = Province::all();
         $tests = fractal(Test::all(), new TestTransformer)->toArray();
-        $data = fractal(Statistic::with('histories')->get(), new StatisticTransformer)->toArray();
         $nationals = fractal(NationalCaseHistory::all(), new NationalStatisticTransformer)->toArray();
         $genders = fractal(Gender::latest()->first(), new GenderTransformer)->toArray();
         return Inertia::render("Data/Index", [
@@ -113,9 +112,6 @@ public function data()
                     'map_id' => $province->map_id
                 ];
             })->toArray(),
-            'recapLocal' => function () use ($data) {
-                return  $data['data'];
-            },
             'recapNational' => function () use ($nationals) {
                 return $nationals['data'];
             },