#WN-114# changes to filter applications by filtered logs

Author: Jose Ganora

app/Classes/Repositories/ApplicationRepository.php

@@ -42,6 +42,11 @@ public function allDesc($columns = ['*'])
         return $this->applicationModel->orderBy('id', 'desc')->get($columns);
     }
 
+    public function findIn($ids = [], $columns = ['*'])
+    {
+        return $this->applicationModel->whereIn('id', $ids)->get($columns);
+    }
+
     /**
      * @param array $attributes
      * @return Application

app/Classes/Repositories/ApplicationRepositoryInterface.php

@@ -14,4 +14,6 @@ interface ApplicationRepositoryInterface extends RepositoryInterface
     public function findForUserId($tenantId, $userId);
 
     public function allDesc($columns);
+
+    public function findIn($ids = [], $columns = ['*']);
 }

app/Http/Controllers/UsageLogController.php

@@ -235,21 +235,22 @@ public function getTotals(Request $request)
             }
             $usageLogs = $query->get();
 
-            $applications = $this->applicationRepo->all();
+            $uniqueApplicationIds = $usageLogs->pluck('application_id')->unique();
+
+            $applications = $this->applicationRepo->findIn($uniqueApplicationIds->toArray());
 
             // Calculate total estimated users
             $totalEstimatedUsers = $applications->map(function ($application) {
                 return $application->estimated_users_count;
             })->sum();
 
             $totals = [
-                'applications' => count($applications),
+                'applications' => count($uniqueApplicationIds),
                 'estimatedUsers' => $totalEstimatedUsers,
                 'hits' => count($usageLogs),
             ];
         } catch (\Exception $e) {
             Log::error('Could not get Usage Log totals', ['message' => $e->getMessage()]);
-
             return response()->json([
                 'status' => 500,
                 'error_message' => 'Could not get Usage Log totals',