wip

commitglobal · Jun 6, 2024 · fb51c7f · fb51c7f
1 parent aa90d20
commit fb51c7f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/app/Enums/StatKey.php b/app/Enums/StatKey.php
@@ -15,11 +15,15 @@ enum StatKey: string
     use HasLabel;
 
     case VOTES = 'votes';
+
     case OBSERVERS = 'observers';
     case POLLING_STATIONS = 'polling_stations';
+    case VISITED_POLLING_STATIONS = 'visited_polling_stations';
     case STARTED_FORMS = 'started_forms';
     case QUESTIONS_ANSWERED = 'questions_answered';
     case FLAGGED_ANSWERS = 'flagged_answers';
+    case MINUTES_MONITORING = 'minutes_monitoring';
+    case NGOS = 'ngos';
 
     protected function labelKeyPrefix(): ?string
     {

diff --git a/app/Jobs/FetchVoteMonitorLiveDataJob.php b/app/Jobs/FetchVoteMonitorLiveDataJob.php
@@ -4,6 +4,7 @@
 
 namespace App\Jobs;
 
+use App\Enums\StatKey;
 use App\Models\Stat;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
@@ -34,18 +35,19 @@ public function handle(): void
     {
         $data = Http::acceptJson()
             ->withUserAgent(config('app.name'))
-            ->withToken(config('services.votemonitor.apikey'))
+            ->withHeader('x-vote-monitor-api-key', config('services.votemonitor.apikey'))
             ->get(config('services.votemonitor.url'))
             ->throw()
             ->json();
 
         Stat::upsert(
-            collect($data)
-                ->map(fn ($value, $key) => [
+            collect(StatKey::values())
+                ->map(fn (string $key) => [
                     'key' => $key,
-                    'value' => $value,
+                    'value' => data_get($data, $key),
                     'updated_at' => now(),
                 ])
+                ->reject(fn (array $item) => blank($item['value']))
                 ->values()
                 ->all(),
             uniqueBy: ['key'],

diff --git a/config/services.php b/config/services.php
@@ -43,7 +43,6 @@
         'enabled' => env('VOTEMONITOR_ENABLED', false),
         'url' => env('VOTEMONITOR_URL'),
         'apikey' => env('VOTEMONITOR_APIKEY'),
-        'election_round_id' => env('VOTEMONITOR_ELECTION_ROUND_ID'),
     ],
 
 ];
diff --git a/lang/en/app.php b/lang/en/app.php
@@ -28,9 +28,12 @@
         'votes' => 'Votes',
         'observers' => 'Observers on field',
         'polling_stations' => 'Polling stations',
+        'visited_polling_stations' => 'Visited polling stations',
         'started_forms' => 'Started forms',
         'questions_answered' => 'Questions answered',
         'flagged_answers' => 'Flagged answers',
+        'minutes_monitoring' => 'Minutes monitoring',
+        'ngos' => 'NGOs',
     ],
 
     'votemonitor' => [