Merge pull request #138 from Riyad-Murad/staging

Staging

Author: Riyad-Murad

amp-laravel/app/Http/Controllers/Common/AuthController.php

@@ -3,9 +3,11 @@
 namespace App\Http\Controllers\Common;
 
 use Throwable;
+use App\Services\ContactMessageService;
 use App\Services\UserLoginService;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AuthRequestLogin;
+use App\Http\Requests\ContactMessageRequest;
 use Illuminate\Auth\AuthenticationException;
 
 class AuthController extends Controller
@@ -30,6 +32,26 @@ public function login(AuthRequestLogin $request)
         }
     }
 
+    public function insertMessage(ContactMessageRequest $request)
+    {
+        try {
+            $validatedData = $request->validated();
+            $response = ContactMessageService::insertMessage($validatedData);
+
+            $messageData = [
+                'id' => $response->id,
+                'name' => $response->name,
+                'email' => $response->email,
+                'phone_number' => $response->phone_number,
+                'message' => $response->message ?? null,
+            ];
+
+            return $this->loginMessageResponse(true, "Message Submitted Successfully", $messageData, 200);
+        } catch (Throwable $e) {
+            return $this->errorMessageResponse(false, "Something went wrong during Contact Message insertion", $e->getMessage(), 500);
+        }
+    }
+
     public function logout()
     {
         $response = UserLoginService::logout();

amp-laravel/app/Http/Controllers/Provider/ProviderFunctionsController.php

@@ -57,9 +57,9 @@ public function getUsers($id)
         try {
             $users = GetAllClientUsersService::getAll($id);
 
-            return $this->messageResponse(true, "Messages retrieved successfully", 200, $users);
+            return $this->messageResponse(true, "Users retrieved successfully", 200, $users);
         } catch (\Exception $e) {
-            return $this->errorMessageResponse(false, $e->getMessage(), "Failed to retrieve messages", 500);
+            return $this->errorMessageResponse(false, $e->getMessage(), "Failed to retrieve users", 500);
         }
     }
 
@@ -68,9 +68,9 @@ public function getMetrics($id)
         try {
             $metrics = GetAllClientMetricsService::getAll($id);
 
-            return $this->messageResponse(true, "Messages retrieved successfully", 200, $metrics);
+            return $this->messageResponse(true, "Metrics retrieved successfully", 200, $metrics);
         } catch (\Exception $e) {
-            return $this->errorMessageResponse(false, $e->getMessage(), "Failed to retrieve messages", 500);
+            return $this->errorMessageResponse(false, $e->getMessage(), "Failed to retrieve metrics", 500);
         }
     }
 
@@ -79,9 +79,9 @@ public function getLines($id)
         try {
             $lines = GetAllLinesService::getAll($id);
 
-            return $this->messageResponse(true, "Messages retrieved successfully", 200, $lines);
+            return $this->messageResponse(true, "Lines retrieved successfully", 200, $lines);
         } catch (\Exception $e) {
-            return $this->errorMessageResponse(false, $e->getMessage(), "Failed to retrieve messages", 500);
+            return $this->errorMessageResponse(false, $e->getMessage(), "Failed to retrieve lines", 500);
         }
     }
 

amp-laravel/app/Http/Requests/ContactMessageRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ContactMessageRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|string|max:255',
+            'email' => 'required|email|max:255',
+            'phone_number' => 'required|string|max:20',
+            'message' => 'sometimes|required|string|max:1000',
+        ];
+    }
+}

amp-laravel/app/Models/ContactForm.php

@@ -12,7 +12,7 @@ class ContactForm extends Model
     protected $fillable = [
         'name',
         'email',
-        'phone',
+        'phone_number',
         'message',
     ];
 

amp-laravel/app/Services/ContactMessageService.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\ContactForm;
+
+class ContactMessageService
+{
+    public static function insertMessage(array $data): ContactForm
+    {
+        return ContactForm::create([
+            'name' => $data['name'],
+            'email' => $data['email'],
+            'phone_number' => $data['phone_number'],
+            'message' => $data['message'] ?? null,
+        ]);
+    }
+}

amp-laravel/app/Services/Provider/GetOverviewDataService.php

@@ -14,9 +14,9 @@ public static function getOverviewData(int $providerId): array
         $clientSlaveIds = Metric::whereIn('master_id', $masterIds)->distinct()->pluck('slave_id');
         $totalClients = User::whereIn('slave_id', $clientSlaveIds)->where('user_type', 'Client')->count();
         $totalPowerThisMonth = Metric::whereIn('master_id', $masterIds)
-            ->whereYear('date_month', now()->year)
-            ->whereMonth('date_month', now()->month)
+            ->whereRaw('SUBSTRING(date_month, 1, 2) = ?', [now()->format('m')])
             ->sum('power');
+
         $averageVoltage = Metric::whereIn('master_id', $masterIds)->avg('voltage');
 
         return [

amp-laravel/app/Services/Provider/GetPowerUsageByClientService.php

@@ -10,23 +10,29 @@ class GetPowerUsageByClientService
 {
     public static function getPowerUsageByClient(int $providerId): array
     {
-        $masters = Master::where('user_id', $providerId)->with(['metrics' => function ($query) {
-            $query->whereYear('date_month', now()->year)
-                ->whereMonth('date_month', now()->month);
-        }])->get();
+        $masters = Master::where('user_id', $providerId)
+            ->with(['metrics' => function ($query) {
+                $query->whereRaw('SUBSTRING(date_month, 1, 2) = ?', [now()->format('m')]);
+            }])
+            ->get();
 
         $clientPowerUsage = [];
 
+        // Collect unique slave_ids from the loaded metrics
         $clientSlaveIds = $masters->flatMap(function ($master) {
-            return $master->metrics->pluck('slave_id')->unique();
-        })->toArray();
+            return $master->metrics->pluck('slave_id');
+        })->unique()->toArray();
 
-        $clients = User::whereIn('slave_id', $clientSlaveIds)->where('user_type', 'Client')->get(['id', 'name', 'slave_id']);
+        // Get clients matching those slave_ids
+        $clients = User::whereIn('slave_id', $clientSlaveIds)
+            ->where('user_type', 'Client')
+            ->get(['id', 'name', 'slave_id']);
 
         foreach ($clients as $client) {
-            $totalPower = $masters->flatMap(function ($master) use ($client) {
+            // Sum power for each client's slave_id across all master's metrics (already filtered by month)
+            $totalPower = $masters->sum(function ($master) use ($client) {
                 return $master->metrics->where('slave_id', $client->slave_id)->sum('power');
-            })->sum();
+            });
 
             $clientPowerUsage[] = [
                 'client_name' => $client->name,
@@ -35,9 +41,7 @@ public static function getPowerUsageByClient(int $providerId): array
         }
 
         // Sort clients by total power usage in descending order
-        usort($clientPowerUsage, function ($a, $b) {
-            return $b['total_power'] <=> $a['total_power'];
-        });
+        usort($clientPowerUsage, fn($a, $b) => $b['total_power'] <=> $a['total_power']);
 
         return $clientPowerUsage;
     }

amp-laravel/app/Services/Provider/GetTotalPowerUsageService.php

@@ -10,9 +10,9 @@ class GetTotalPowerUsageService
     public static function getTotalPowerUsage(int $providerId): float
     {
         $masterIds = Master::where('user_id', $providerId)->pluck('id');
+
         return round(Metric::whereIn('master_id', $masterIds)
-            ->whereYear('date_month', now()->year)
-            ->whereMonth('date_month', now()->month)
+            ->whereRaw('SUBSTRING(date_month, 1, 2) = ?', [now()->format('m')])
             ->sum('power'), 2);
     }
 }

amp-laravel/app/Traits/ResponseTrait.php

@@ -2,7 +2,9 @@
 
 namespace App\Traits;
 
+use App\Models\User;
 use Illuminate\Contracts\Validation\Validator;
+use PHPOpenSourceSaver\JWTAuth\Facades\JWTAuth;
 use Illuminate\Http\Exceptions\HttpResponseException;
 
 trait ResponseTrait
@@ -42,4 +44,28 @@ public function failedValidation(Validator $validator)
             'message' => 'Invalid Credentials'
         ], 422));
     }
+
+    public function actingAsClient()
+    {
+        $client = User::factory()->create(['user_type' => 'Client']);
+        $token = JWTAuth::fromUser($client);
+        $request = $this->withHeader('Authorization', "Bearer $token");
+
+        return [$request, $client];
+    }
+
+
+    public function actingAsProvider()
+    {
+        $provider = User::factory()->create(['user_type' => 'provider']);
+        $token = JWTAuth::fromUser($provider);
+        return $this->withHeader('Authorization', "Bearer $token");
+    }
+
+    public function actingAsAdmin()
+    {
+        $admin = User::factory()->create(['user_type' => 'admin']);
+        $token = JWTAuth::fromUser($admin);
+        return $this->withHeader('Authorization', "Bearer $token");
+    }
 }

amp-laravel/database/factories/MetricFactory.php

@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\Slave;
-use App\Models\Master;
+use DateTime;
+use DateInterval;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -25,7 +25,19 @@ public function definition(): array
             'current' => $this->faker->randomFloat(2, 0, 100),
             'power' => $this->faker->randomFloat(2, 0, 500),
             'energy' => $this->faker->randomFloat(2, 0, 10000),
-            'date_month' => $this->faker->date('m-d'),
+            'date_month' => function () {
+                $today = new DateTime();
+                $startOfMonth = (new DateTime())->modify('first day of this month');
+                $daysRange = (int)$today->format('d') - 1; // from day 1 to today
+
+                if ($daysRange === 0) {
+                    $randomDate = $startOfMonth;
+                } else {
+                    $randomDate = (clone $startOfMonth)->add(new DateInterval('P' . rand(0, $daysRange) . 'D'));
+                }
+
+                return $randomDate->format('m-d');
+            }
         ];
     }
 }