[change]: code review

app/Console/Commands/FixDocumentLink.php

@@ -6,6 +6,8 @@
 
 use App\IATI\Models\Activity\Activity;
 use App\IATI\Models\Organization\Organization;
+use App\IATI\Services\Activity\ActivityService;
+use App\IATI\Services\Organization\OrganizationService;
 use App\IATI\Traits\MigrateActivityTrait;
 use App\IATI\Traits\MigrateOrganizationTrait;
 use Exception;
@@ -78,8 +80,14 @@ class FixDocumentLink extends Command
      *
      * @param DB $db
      * @param DatabaseManager $databaseManager
+     * @param OrganizationService $organizationService
+     * @param ActivityService $activityService
      */
-    public function __construct(protected DB $db, protected DatabaseManager $databaseManager)
+    public function __construct(protected DB $db,
+        protected DatabaseManager $databaseManager,
+        protected OrganizationService $organizationService,
+        protected ActivityService $activityService
+    )
     {
         parent::__construct();
     }
@@ -111,11 +119,11 @@ public function handle(): int
             $aidstreamOrganizationIdentifierArray = $this->getAidstreamOrganizationIdentifier($aidstreamOrganizationIds);
             $aidstreamOrganizationIdentifierArray = array_map('strtolower', $aidstreamOrganizationIdentifierArray);
 
-            $iatiOrganizations = Organization::whereIn('publisher_id', $aidstreamOrganizationIdentifierArray)->get();
+            $iatiOrganizations = $this->organizationService->getOrganizationByPublisherIds($aidstreamOrganizationIdentifierArray);
             $iatiOrganizationIdArray = $iatiOrganizations->pluck('id', 'publisher_id');
 
             $idMap = $this->mapOrganizationIds($aidstreamOrganizationIdentifierArray, $iatiOrganizationIdArray);
-            $activities = Activity::whereIn('org_id', $idMap)->get();
+            $activities = $this->activityService->getActivitiesByOrgIds($idMap);
 
             foreach ($activities as $activity) {
                 $this->fixActivityResultDocumentLink($activity);

app/Console/Commands/FixRegionIssues.php

@@ -5,6 +5,7 @@
 namespace App\Console\Commands;
 
 use App\IATI\Models\Organization\Organization;
+use App\IATI\Services\Organization\OrganizationService;
 use App\IATI\Traits\MigrateActivityTrait;
 use App\IATI\Traits\MigrateOrganizationTrait;
 use Exception;
@@ -38,7 +39,8 @@ class FixRegionIssues extends Command
 
     public function __construct(
         protected DB $db,
-        protected DatabaseManager $databaseManager
+        protected DatabaseManager $databaseManager,
+        protected OrganizationService $organizationService
     ) {
         parent::__construct();
     }
@@ -77,7 +79,7 @@ public function handle(): void
             $recipientRegionBudgetArray = $aidstreamOrganizationDataCollectionArray->pluck('recipient_region_budget', 'organization_id');
             $aidstreamOrganizationIdentifierArray = array_map('strtolower', $aidstreamOrganizationIdentifierArray);
 
-            $iatiOrganizations = Organization::whereIn('publisher_id', $aidstreamOrganizationIdentifierArray)->get();
+            $iatiOrganizations = $this->organizationService->getOrganizationByPublisherIds($aidstreamOrganizationIdentifierArray);
             $iatiOrganizationIdArray = $iatiOrganizations->pluck('id', 'publisher_id');
 
             $idMap = $this->mapOrganizationIds($aidstreamOrganizationIdentifierArray, $iatiOrganizationIdArray);

app/Console/Commands/FixTransaction.php

@@ -6,6 +6,8 @@
 
 use App\IATI\Models\Activity\Activity;
 use App\IATI\Models\Organization\Organization;
+use App\IATI\Services\Activity\ActivityService;
+use App\IATI\Services\Organization\OrganizationService;
 use App\IATI\Traits\MigrateOrganizationTrait;
 use Illuminate\Console\Command;
 use Illuminate\Database\DatabaseManager;
@@ -39,8 +41,14 @@ class FixTransaction extends Command
      *
      * @param DB $db
      * @param DatabaseManager $databaseManager
+     * @param ActivityService $activityService
+     * @param OrganizationService $organizationService
      */
-    public function __construct(protected DB $db, protected DatabaseManager $databaseManager)
+    public function __construct(protected DB $db,
+        protected DatabaseManager $databaseManager,
+        protected ActivityService $activityService,
+        protected OrganizationService $organizationService
+    )
     {
         parent::__construct();
     }
@@ -72,11 +80,11 @@ public function handle()
             $aidstreamOrganizationIdentifierArray = $this->getAidstreamOrganizationIdentifier($aidstreamOrganizationIds);
             $aidstreamOrganizationIdentifierArray = array_map('strtolower', $aidstreamOrganizationIdentifierArray);
 
-            $iatiOrganizations = Organization::whereIn('publisher_id', $aidstreamOrganizationIdentifierArray)->get();
+            $iatiOrganizations = $this->organizationService->getOrganizationByPublisherIds($aidstreamOrganizationIdentifierArray);
             $iatiOrganizationIdArray = $iatiOrganizations->pluck('id', 'publisher_id');
 
             $idMap = $this->mapOrganizationIds($aidstreamOrganizationIdentifierArray, $iatiOrganizationIdArray);
-            $activities = Activity::whereIn('org_id', $idMap)->get();
+            $activities = $this->activityService->getActivitiesByOrgIds($idMap);
 
             foreach ($activities as $activity) {
                 $this->fixAllTransaction($activity);

app/IATI/Repositories/Activity/ActivityRepository.php

@@ -472,4 +472,15 @@ public function updateReportingOrg($id, $key, $data): int
     {
         return $this->model->where('id', $id)->update(["reporting_org->0->{$key}"=>$data]);
     }
+
+    /**
+     * Returns activities by org ids
+     * @param array $orgIds
+     *
+     * @return Collection|array
+     */
+    public function getActivitiesByOrgIds(array $orgIds): Collection | array
+    {
+        return $this->model->whereIn('org_id', $orgIds)->get();
+    }
 }

app/IATI/Repositories/Organization/OrganizationRepository.php

@@ -10,6 +10,7 @@
 use App\IATI\Repositories\Repository;
 use App\IATI\Traits\FillDefaultValuesTrait;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 
@@ -176,4 +177,15 @@ public function getOrganizationByPublisherId($publisherId): ?object
     {
         return $this->model->where('publisher_id', $publisherId)->with(['settings', 'users', 'activities'])->first();
     }
+    /**
+     * Returns Organizations by publisher ids
+     *
+     * @param array $publisherIds
+     *
+     * @return array|Collection
+     */
+    public function getOrganizationByPublisherIds(array $publisherIds): Collection | array
+    {
+        return $this->model->whereIn('publisher_id', $publisherIds)->get();
+    }
 }

app/IATI/Services/Activity/ActivityService.php

@@ -674,4 +674,15 @@ public function getReportingOrg(): mixed
     {
         return app(OrganizationRepository::class)->getSpecifiedColumn(auth()->user()->organization->id, 'reporting_org');
     }
+    /**
+     * Returns activities by organization ids
+     *
+     * @param array $idMap
+     *
+     * @return array|Collection
+     */
+    public function getActivitiesByOrgIds(array $idMap): Collection | array
+    {
+        return $this->activityRepository->getActivitiesByOrgIds($idMap);
+    }
 }

app/IATI/Services/Organization/OrganizationService.php

@@ -11,6 +11,7 @@
 use GuzzleHttp\Client;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -236,4 +237,15 @@ public function getOrganizationByPublisherId($publisher_id): ?object
     {
         return $this->organizationRepo->getOrganizationByPublisherId($publisher_id);
     }
+    /**
+     * Returns organizations by publisher ids
+     *
+     * @param array $publisherIds
+     *
+     * @return Builder|Model|mixed|object|null
+     */
+    public function getOrganizationByPublisherIds(array $publisherIds): mixed
+    {
+        return $this->organizationRepo->getOrganizationByPublisherIds($publisherIds);
+    }
 }