From 492e7c0a582660d209d76067e7b0dcf69f9fdd06 Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Mon, 27 Nov 2023 09:49:52 +0800
Subject: [PATCH] Fix helper implementation

Use class with static files instead of load it directly in composer json
---
 .../Controllers/ReportGadaiController.php     |  8 ++----
 app/Services/Reports/GadaianService.php       |  5 ++--
 app/helpers.php                               | 28 ++++++++-----------
 composer.json                                 |  3 --
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/ReportGadaiController.php b/app/Http/Controllers/ReportGadaiController.php
index 55bd66c..3855601 100644
--- a/app/Http/Controllers/ReportGadaiController.php
+++ b/app/Http/Controllers/ReportGadaiController.php
@@ -3,14 +3,12 @@
 namespace App\Http\Controllers;
 
 use App\Cawangan;
-use App\CawanganDetail;
-use App\Customer;
 use App\Gadai;
-use App\Marhun;
-use DateTime;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use App\Services\Reports\GadaianService as ReportGadaianService;
+use App\Helper;
+
 
 class ReportGadaiController extends Controller
 {
@@ -27,7 +25,7 @@ class ReportGadaiController extends Controller
         $startDate = $request->startDate;
         $endDate = $request->endDate;
 
-        $active_cawangan_db_connection = getActiveCawanganDbConnection();
+        $active_cawangan_db_connection = Helper::getActiveCawanganDbConnection();
 
         $active_cawangan_db_name = array_map(function ($db_connection) {
             return config('database.connections' . '.' . $db_connection . '.' . 'database');
diff --git a/app/Services/Reports/GadaianService.php b/app/Services/Reports/GadaianService.php
index 7eb65af..5aad15f 100644
--- a/app/Services/Reports/GadaianService.php
+++ b/app/Services/Reports/GadaianService.php
@@ -9,6 +9,7 @@ use App\Gadai;
 use App\Marhun;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
+use App\Helper;
 
 class GadaianService
 {
@@ -82,8 +83,8 @@ class GadaianService
 
         $data = [
             'query' => [
-                'startDate' => formatDate($this->startDate),
-                'endDate' => formatDate($this->endDate),
+                'startDate' => Helper::formatDate($this->startDate),
+                'endDate' => Helper::formatDate($this->endDate),
             ],
             'cawangan_detail' => $cawangan_detail,
             'gadaian' => $total_gadaian,
diff --git a/app/helpers.php b/app/helpers.php
index c610506..2e165c1 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,28 +1,25 @@
 <?php
 namespace App;
 
-
-use Illuminate\Support\Facades\DB;
 use DateTime;
+use Illuminate\Support\Facades\DB;
 
-if (!function_exists('formatNumber')) {
-    function formatNumber ($amount) {
+class Helper
+{
+
+    public static function formatNumber($amount)
+    {
         $formattedAmount = number_format($amount, 2, '.', ',');
 
         return $formattedAmount;
-    };
-}
+    }
 
+    public static function formatDate($date_string)
+    {
+        return (new DateTime($date_string))->format("d-m-Y");
+    }
 
-if (!function_exists('formatDate')) {
-    function formatDate ($date_string) {
-       return  (new DateTime($date_string))->format("d-m-Y");
-    };
-}
-
-if (!function_exists('getActiveCawanganDbConnection')) {
-
-    function getActiveCawanganDbConnection()
+    public static function getActiveCawanganDbConnection()
     {
 
         $all_active_db_keys = array_filter(array_keys(config('database.connections')), function ($connection) {
@@ -49,5 +46,4 @@ if (!function_exists('getActiveCawanganDbConnection')) {
         return $all_cawangan_db;
 
     }
-
 }
diff --git a/composer.json b/composer.json
index deaf479..2c8071f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,9 +17,6 @@
         "phpunit/phpunit": "^8.5"
     },
     "autoload": {
-        "files":[
-            "app/helpers.php"
-        ],
         "classmap": [
             "database/seeds",
             "database/factories"