adding more statistics to the onboarding page.

digital-services-act · Jun 4, 2024 · c467f63 · c467f63
1 parent 1548845
commit c467f63
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/app/Http/Controllers/OnboardingController.php b/app/Http/Controllers/OnboardingController.php
@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\PersonalAccessToken;
 use App\Models\Platform;
 use App\Services\StatementSearchService;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 
 class OnboardingController extends Controller
 {
@@ -17,12 +19,16 @@ public function index(Request $request)
  {
  $vlop_count = Platform::Vlops()->count();
  $platforms = Platform::nonVlops()->with('users')->orderBy('name')->get();
+ $total_vlop_platforms_sending = $this->statement_search_service->totalVlopPlatformsSending();
  $total_non_vlop_platforms_sending = $this->statement_search_service->totalNonVlopPlatformsSending();
+ $total_valid_tokens = PersonalAccessToken::query()->orWhereNull('expires_at')->orwhere('expires_at', '>=', Carbon::now())->count();
 
  return view('onboarding.index', [
  'platforms' => $platforms,
  'vlop_count' => $vlop_count,
- 'total_non_vlop_platforms_sending' => $total_non_vlop_platforms_sending
+ 'total_vlop_platforms_sending' => $total_vlop_platforms_sending,
+ 'total_non_vlop_platforms_sending' => $total_non_vlop_platforms_sending,
+ 'total_valid_tokens' => $total_valid_tokens
  ]);
 
  }

diff --git a/app/Services/StatementSearchService.php b/app/Services/StatementSearchService.php
@@ -393,14 +393,24 @@ public function bulkIndexStatements(Collection $statements): void
 
  public function totalNonVlopPlatformsSending()
  {
- return Cache::remember('total_sending_platforms', self::FIVE_MINUTES, function(){
+ return Cache::remember('total_sending_non_vlop_platforms', self::FIVE_MINUTES, function(){
  $vlop_platform_ids = implode(',', Platform::Vlops()->pluck('id')->toArray());
  $query = "SELECT COUNT(DISTINCT(platform_id)) FROM " . $this->index_name . " WHERE platform_id NOT IN (" . $vlop_platform_ids . ")";
  $result = $this->runSql($query);
  return $this->extractCountQueryResult($result);
  });
  }
 
+ public function totalVlopPlatformsSending()
+ {
+ return Cache::remember('total_sending_vlop_platforms', self::FIVE_MINUTES, function(){
+ $vlop_platform_ids = implode(',', Platform::Vlops()->pluck('id')->toArray());
+ $query = "SELECT COUNT(DISTINCT(platform_id)) FROM " . $this->index_name . " WHERE platform_id IN (" . $vlop_platform_ids . ")";
+ $result = $this->runSql($query);
+ return $this->extractCountQueryResult($result);
+ });
+ }
+
 
  public function startCountQuery(): string
  {

diff --git a/resources/views/onboarding/index.blade.php b/resources/views/onboarding/index.blade.php
@@ -31,6 +31,15 @@
  {{ $vlop_count }}
  </td>
  </tr>
+ <tr class="ecl-table__row">
+ <td class="ecl-table__cell" data-ecl-table-header="Statistic">
+ VLOP Platforms that have sent data via API or webform
+ </td>
+ <td class="ecl-table__cell" data-ecl-table-header="Total">
+ {{ $total_vlop_platforms_sending }}
+ </td>
+ </tr>
+
  <tr class="ecl-table__row">
  <td class="ecl-table__cell" data-ecl-table-header="Statistic">
  Non-VLOP platforms
@@ -47,6 +56,15 @@
  {{ $total_non_vlop_platforms_sending }}
  </td>
  </tr>
+
+ <tr class="ecl-table__row">
+ <td class="ecl-table__cell" data-ecl-table-header="Statistic">
+ Valid Tokens
+ </td>
+ <td class="ecl-table__cell" data-ecl-table-header="Total">
+ {{ $total_valid_tokens }}
+ </td>
+ </tr>
  </tbody>
  </table>
  </div>