#985 Fetch Aurora Webpages, small fixes

inikoo · Oct 23, 2024 · 17a08c9 · 17a08c9
1 parent 7ea3875
commit 17a08c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/app/Actions/Transfers/Aurora/FetchAuroraWebpages.php b/app/Actions/Transfers/Aurora/FetchAuroraWebpages.php
@@ -88,8 +88,8 @@ public function handle(SourceOrganisationService $organisationSource, int $organ
                             );
                         }
                     }
+                    $this->recordChange($organisationSource, $webpage->wasChanged());
                 } catch (Exception $e) {
-
                     $this->recordError($organisationSource, $e, $webpageData['webpage'], 'Webpage', 'update');
 
                     return null;
@@ -124,19 +124,17 @@ public function handle(SourceOrganisationService $organisationSource, int $organ
                         Arr::except($webpageData['webpage'], ['migration_data', 'parent_id', 'fetched_at', 'last_fetched_at'])
                     );
                     $this->recordNew($organisationSource);
+                    $sourceData = explode(':', $webpage->source_id);
+                    DB::connection('aurora')->table('Page Store Dimension')
+                        ->where('Page Key', $sourceData[1])
+                        ->update(['aiku_id' => $webpage->id]);
                 } catch (Exception|Throwable $e) {
                     $this->recordError($organisationSource, $e, $webpageData['webpage'], 'Webpage', 'store');
 
                     return null;
                 }
             }
 
-
-            $sourceData = explode(':', $webpage->source_id);
-            DB::connection('aurora')->table('Page Store Dimension')
-                ->where('Page Key', $sourceData[1])
-                ->update(['aiku_id' => $webpage->id]);
-
             return $webpage;
         }
 

diff --git a/app/Actions/Web/Webpage/StoreWebpage.php b/app/Actions/Web/Webpage/StoreWebpage.php
@@ -11,6 +11,7 @@
 use App\Actions\OrgAction;
 use App\Actions\SysAdmin\Group\Hydrators\GroupHydrateWebpages;
 use App\Actions\SysAdmin\Organisation\Hydrators\OrganisationHydrateWebpages;
+use App\Actions\Traits\Rules\WithNoStrictRules;
 use App\Actions\Web\Webpage\Hydrators\WebpageHydrateUniversalSearch;
 use App\Actions\Web\Webpage\Hydrators\WebpageHydrateWebpages;
 use App\Actions\Web\Website\Hydrators\WebsiteHydrateWebpages;
@@ -29,7 +30,7 @@
 class StoreWebpage extends OrgAction
 {
     use AsAction;
-
+    use WithNoStrictRules;
 
     private Website $website;
 
@@ -166,8 +167,7 @@ public function rules(): array
         }
 
         if (!$this->strict) {
-            $rules['source_id']  = ['sometimes', 'string'];
-            $rules['fetched_at'] = ['sometimes', 'date'];
+            $rules = $this->noStrictStoreRules($rules);
             $rules['migration_data'] = ['sometimes', 'array'];
         }
 

diff --git a/app/Actions/Web/Webpage/UpdateWebpage.php b/app/Actions/Web/Webpage/UpdateWebpage.php
@@ -10,6 +10,7 @@
 use App\Actions\OrgAction;
 use App\Actions\SysAdmin\Group\Hydrators\GroupHydrateWebpages;
 use App\Actions\SysAdmin\Organisation\Hydrators\OrganisationHydrateWebpages;
+use App\Actions\Traits\Rules\WithNoStrictRules;
 use App\Actions\Traits\WithActionUpdate;
 use App\Actions\Web\Webpage\Hydrators\WebpageHydrateUniversalSearch;
 use App\Actions\Web\Webpage\Hydrators\WebpageHydrateWebpages;
@@ -28,6 +29,7 @@
 class UpdateWebpage extends OrgAction
 {
     use WithActionUpdate;
+    use WithNoStrictRules;
 
     private Webpage $webpage;
 
@@ -123,7 +125,7 @@ public function rules(): array
         ];
 
         if (!$this->strict) {
-            $rules['last_fetched_at'] = ['sometimes', 'date'];
+            $rules = $this->noStrictUpdateRules($rules);
             $rules['migration_data'] = ['sometimes', 'array'];
 
         }