Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Internal/Http/Controllers/Api/AuthController.php

@@ -11,19 +11,25 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
 use Modules\Internal\Emails\SendVerifyEmail;
 use Modules\Internal\Events\ForgetPassword;
+use App\Helpers\Helper;
+use Validator;
 
 class AuthController extends Controller
 {
     public function login(Request $request)
     {
         $request->validate([
-            'email' => 'required|email',
+            'email' => 'required',
             'password' => 'required'
         ]);
 
         $user = User::query()
-            ->where('email', $request->email)
-            ->first();
+                ->where(function ($query) use ($request) {
+                    $query->where('email', $request->email)
+                        ->orWhere('username', $request->email);
+                })
+                ->first();
+
 
         if (!$user) {
             return response(['message' => 'User Tidak Ditemukan'], 404);
@@ -124,4 +130,36 @@ class AuthController extends Controller
         ]);
         return response()->json($user);
     }
+
+    public function register(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'email' => 'required|email|unique:users,email',
+            'username' => 'required|unique:users,username',
+            'password' => [
+                'required',
+                'min:5',
+                // 'regex:/.*[0-9].*/',
+                // 'regex:/.*[a-z].*/',
+                // 'regex:/.*[A-Z].*/',
+            ]
+        ], [
+            // 'password.regex' => "Password harus minimal 8 karakter, kombinasi huruf besar kecil dan angka"
+        ])->validate();
+        
+        try {
+            $user = User::create([
+                'email' => $request->email,
+                'username' => $request->username,
+                'password' => Hash::make($request->password),
+            ]);
+
+            return response()->json($user);
+        } catch (\Exception $e) {
+            return response()->json([
+                'message' => 'Terjadi masalah ketika mendaftar'
+            ]);
+        }
+    }
+
 }

Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php

@@ -260,6 +260,7 @@ class DailyMonitoringController extends Controller
                 'lab_date'          => $request->lab_date,
                 'provider'          => $request->provider,
                 'examination'       => $request->examination,
+                'created_by'        => auth()->user()->id,
             ]);
 
 
@@ -387,7 +388,11 @@ class DailyMonitoringController extends Controller
         // get claim request
         $request_log = DB::table('request_logs')
                 ->where('code', $request_code)
-                ->update(['discharge_date' => now()]); 
+                ->update([
+                    'discharge_date' => now(), 
+                    'updated_by' => auth()->user()->id,
+                    'updated_at' => now()
+                ]); 
         if ($request_log) {
             return response()->json([
                 'error'   => false,

Modules/Internal/Http/Controllers/Api/RequestLogBenefitController.php

@@ -8,6 +8,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\DB;
+use Carbon\Carbon;
 
 
 class RequestLogBenefitController extends Controller
@@ -72,6 +73,7 @@ class RequestLogBenefitController extends Controller
                         'amount_not_approved' => $value['amount_not_approved'],
                         'excess_paid' => $value['excess_paid'],
                         'keterangan' => $value['keterangan'],
+                        'created_by' => auth()->user()->id,
 
                     ];
                     // Insert Data
@@ -117,6 +119,8 @@ class RequestLogBenefitController extends Controller
         $requestLogBenefit->amount_not_approved = $request->amount_not_approved;
         $requestLogBenefit->excess_paid = $request->excess_paid;
         $requestLogBenefit->keterangan = $request->keterangan;
+        $requestLogBenefit->updated_by = auth()->user()->id;
+        $requestLogBenefit->updated_at = Carbon::now();
 
         $requestLogBenefit->save();
       

Modules/Internal/Http/Controllers/Api/RequestLogController.php

@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Storage;
 use App\Services\RequestLogService;
 use App\Exceptions\ImportRowException;
 use App\Events\RequestLoged;
+use Carbon\Carbon;
 
 use Maatwebsite\Excel\Facades\Excel;
 use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
@@ -198,6 +199,8 @@ class RequestLogController extends Controller
     {
         $requestLog = RequestLog::findOrFail($id);
         $requestLog->status = $request->status;
+        $requestLog->approved_by = auth()->user()->id;
+        $requestLog->approved_at = Carbon::now();
         $requestLog->save();
       
         return response()->json([
@@ -312,6 +315,8 @@ class RequestLogController extends Controller
         // Update Request LOG untuk lanjut ke Final LOG
         $requestLog->final_log = 1;
         $requestLog->status_final_log = $status;
+        $requestLog->approved_final_log_by = auth()->user()->id;
+        $requestLog->approved_final_log_at = Carbon::now();
         $requestLog->save();
 
 

Modules/Internal/Http/Controllers/Api/UserManagementController.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Modules\Internal\Http\Controllers\Api;
+
+use App\Helpers\Helper;
+use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+use App\Models\User;
+
+class UserManagemet extends Controller
+{
+    public function index(Request $request){
+        $user = User::all();
+        return Helper::responseJson(data: $user);
+    }
+}