Merge branch '1185-dashboard-visualization-api' into develop

app/Http/Controllers/Admin/Dashboard/DashboardController.php

@@ -184,7 +184,7 @@ public function publisherStats(): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing publisher registration count.
      *
      * @param Request $request
      *
@@ -202,8 +202,9 @@ public function publisherRegistrationCount(Request $request): JsonResponse
                 'success' => true,
                 'message' => 'Publisher registration count fetched successfully',
                 'data' => [
-                    'count'=>array_sum($publisherStat),
-                    'graph'=>$publisherStat, ],
+                    'count' => array_sum($publisherStat),
+                    'graph' => $publisherStat,
+                ],
             ]);
         } catch (Exception $e) {
             logger()->error($e);
@@ -213,7 +214,7 @@ public function publisherRegistrationCount(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing registration type.
      *
      * @param Request $request
      *
@@ -240,7 +241,7 @@ public function publisherRegistrationType(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing publisher grouped by country.
      *
      * @param Request $request
      *
@@ -258,7 +259,7 @@ public function publisherGroupedByCountry(Request $request): JsonResponse
             return response()->json([
                 'success' => true,
                 'message' => 'Publisher grouped by country fetched successfully',
-                'data' => ['paginatedData'=>$paginatedData, 'codeList'=>$codeList],
+                'data' => ['paginatedData' => $paginatedData, 'codeList' => $codeList],
             ]);
         } catch (Exception $e) {
             logger()->error($e->getMessage());
@@ -268,7 +269,7 @@ public function publisherGroupedByCountry(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing grouped by type.
      *
      * @param Request $request
      *
@@ -286,7 +287,7 @@ public function publisherGroupedByType(Request $request): JsonResponse
             return response()->json([
                 'success' => true,
                 'message' => 'Publisher grouped by type fetched successfully',
-                'data' => ['paginatedData'=>$paginatedData, 'codeList'=>$codeList],
+                'data' => ['paginatedData' => $paginatedData, 'codeList' => $codeList],
             ]);
         } catch (Exception $e) {
             logger()->error($e->getMessage());
@@ -296,7 +297,7 @@ public function publisherGroupedByType(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing publisher grouped by data license.
      *
      * @param Request $request
      *
@@ -314,7 +315,7 @@ public function publisherGroupedByDataLicense(Request $request): JsonResponse
             return response()->json([
                 'success' => true,
                 'message' => 'Publisher grouped by type fetched successfully',
-                'data' => ['paginatedData'=>$paginatedData, 'codeList'=>$codeList],
+                'data' => ['paginatedData' => $paginatedData, 'codeList' => $codeList],
             ]);
         } catch (Exception $e) {
             logger()->error($e->getMessage());
@@ -324,7 +325,7 @@ public function publisherGroupedByDataLicense(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing publisher grouped by setup completeness.
      *
      * @param Request $request
      *
@@ -351,7 +352,7 @@ public function publisherGroupedBySetupCompleteness(Request $request): JsonRespo
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing activity stats.
      *
      * @param Request $request
      *
@@ -376,7 +377,7 @@ public function activityStats(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing activity count.
      *
      * @param Request $request
      *
@@ -392,8 +393,9 @@ public function activityCount(Request $request): JsonResponse
                 'success' => true,
                 'message' => 'Activity time range data fetched successfully',
                 'data' => [
-                    'count'=>array_sum($activityData),
-                    'graph'=>$activityData, ],
+                    'count' => array_sum($activityData),
+                    'graph' => $activityData,
+                ],
             ]);
         } catch (Exception $e) {
             logger()->error($e->getMessage());
@@ -403,7 +405,7 @@ public function activityCount(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing activity status(draft, published, need to republish).
      *
      * @param Request $request
      *
@@ -428,7 +430,7 @@ public function activityStatus(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing activity count group by method of creation.
      *
      * @param Request $request
      *
@@ -453,7 +455,7 @@ public function activityMethod(Request $request): JsonResponse
     }
 
     /**
-     * Returns json data containing publisher stats.
+     * Returns json data containing activity completeness.
      *
      * @param Request $request
      *
@@ -500,7 +502,7 @@ public function getDataInDateRange(Request $request): JsonResponse
             return response()->json([
                 'success' => true,
                 'message' => 'User count in date range fetched successfully',
-                'data' => ['graph'=>$results, 'count'=>array_sum($results)],
+                'data' => ['graph' => $results, 'count' => array_sum($results)],
             ]);
         } catch (InvalidFormatException $e) {
             logger()->error($e->getMessage());

app/Http/Controllers/SuperAdmin/SuperAdminController.php

@@ -114,13 +114,15 @@ public function sanitizeRequest($request): array
 
         if (in_array($request->get('orderBy'), $tableConfig['orderBy'], true)) {
             $queryParams['orderBy'] = $request->get('orderBy');
+
             if (in_array($request->get('direction'), $tableConfig['direction'], true)) {
                 $queryParams['direction'] = $request->get('direction');
             }
         }
 
         list($startDateString, $endDateString, $column) = $this->resolveDateRangeFromRequest($request);
         $queryParams['date_column'] = $column;
+
         if ($startDateString && $endDateString) {
             list($queryParams['start_date'], $queryParams['end_date']) = $this->resolveCustomRangeParams($startDateString, $endDateString);
         }

app/IATI/Models/Organization/Organization.php

@@ -236,14 +236,4 @@ public function usersIncludingDeleted(): HasMany
     {
         return $this->hasMany(User::class, 'organization_id', 'id')->withTrashed();
     }
-
-    /**
-     * Returns recently changed activity.
-     *
-     * @return HasOne
-     */
-    public function recentlyChangeActivity(): HasOne
-    {
-        return $this->hasOne(Activity::class)->latest('updated_at');
-    }
 }

app/IATI/Models/User/User.php

@@ -16,6 +16,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notifiable;
@@ -237,9 +238,9 @@ public function transformAudit(array $data): array
      *
      * @param $query
      *
-     * @return mixed
+     * @return Builder
      */
-    public function scopeRegisteredToday($query): mixed
+    public function scopeRegisteredToday($query): Builder
     {
         return $query->whereDate('created_at', Carbon::today());
     }

app/IATI/Repositories/Activity/ActivityRepository.php

@@ -603,9 +603,9 @@ public function getAllActivitiesQueryToDownload($organizationId, $queryParams):
      * @param $organizationId
      * @param $activitiesId
      *
-     * @return object
+     * @return Collection
      */
-    public function getCodesToDownload($organizationId, $activitiesId): object
+    public function getCodesToDownload($organizationId, $activitiesId): Collection
     {
         $query = $this->model->with(['results'])->select('id', 'iati_identifier')->where('org_id', $organizationId);
 
@@ -630,18 +630,23 @@ public function getActivitityWithRelationsById($activityId): ?Model
 
     /*
      * Updates specific key inside reporting_org (json field).
+     *
+     * @return Model|null
      */
-    public function getLastUpdatedActivity()
+    public function getLastUpdatedActivity(): ?Model
     {
         return $this->model->select('id', 'org_id')->latest('updated_at')->first();
     }
 
     /**
      * Applies filter to the activity query.
      *
+     * @param $query
      * @param $queryParams
+     *
+     * @return Builder
      */
-    protected function filterActivity($query, $queryParams)
+    protected function filterActivity($query, $queryParams): Builder
     {
         $filteredQuery = $query;
 
@@ -662,6 +667,8 @@ protected function filterActivity($query, $queryParams)
      * @param $queryParams
      *
      * @return array
+     *
+     * @throws \Exception
      */
     public function getActivityCount($queryParams): array
     {

app/IATI/Repositories/Organization/OrganizationRepository.php

@@ -509,9 +509,6 @@ public function publisherWithoutActivity(): int
      */
     public function getOrganizationDashboardDownload($queryParams): array
     {
-    //    case when publishing_info::text=json_strip_nulls(publishing_info)::text and (publishing_info->'publisher_verification')::text='true'::text and (publishing_info->'token_verification')::text='true'::text then 'complete' else 'incomplete' end as publisher_info,
-    //    case when default_values::text=json_strip_nulls(default_values)::text and activity_default_values::text=json_strip_nulls(activity_default_values)::text then 'complete' else 'incomplete' end as default_values,
-
         $completenessMap = $this->getCompletenessMap();
         $statementForPublisher_info = 'case when ' . $completenessMap['Publishers_settings_not_completed'] . " then 'incomplete' else 'complete' end as publisher_info";
         $statementForDefault_values = 'case when ' . $completenessMap['Default_values_not_completed'] . " then 'incomplete' else 'complete' end as default_values";

app/IATI/Services/Download/DownloadCodeService.php

@@ -67,7 +67,7 @@ public function __construct(
      *
      * @param $activityIds
      *
-     * @return object
+     * @return array
      */
     public function getActivitiesToDownload($activityIds): array
     {

packages/development/config.yaml

@@ -46,7 +46,7 @@ data:
   MAIL_HOST: "email-smtp.us-east-1.amazonaws.com"
   MAIL_PORT: "587"
   MAIL_ENCRYPTION: "tls"
-  MAIL_FROM_ADDRESS: "[email protected]"
+  MAIL_FROM_ADDRESS: "[email protected]"
   MAIL_FROM_NAME: "IATI Publisher Dev"
 
   IATI_VALIDATOR_ENDPOINT: "https://api.iatistandard.org/validator/validate"

packages/production/config.yaml

@@ -46,7 +46,7 @@ data:
   MAIL_HOST: "email-smtp.us-east-1.amazonaws.com"
   MAIL_PORT: "587"
   MAIL_ENCRYPTION: "tls"
-  MAIL_FROM_ADDRESS: "[email protected]"
+  MAIL_FROM_ADDRESS: "[email protected]"
   MAIL_FROM_NAME: "IATI Publisher"
 
   IATI_VALIDATOR_ENDPOINT: "https://api.iatistandard.org/validator/validate"