#928 Fetch Aurora History (updated) test on locations

inikoo · Oct 4, 2024 · 0060b9f · 0060b9f
1 parent bfdc3e2
commit 0060b9f
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 17 deletions.
diff --git a/app/Actions/CRM/Customer/DeleteCustomerDeliveryAddress.php b/app/Actions/CRM/Customer/DeleteCustomerDeliveryAddress.php
@@ -31,7 +31,7 @@ public function handle(Customer $customer, Address $address): Customer
         AddressHydrateUsage::dispatch($address);
 
         $address->delete();
-        
+
         $customer->refresh();
         return $customer;
     }

diff --git a/app/Actions/Inventory/Location/StoreLocation.php b/app/Actions/Inventory/Location/StoreLocation.php
@@ -111,8 +111,12 @@ public function inWarehouseArea(WarehouseArea $warehouseArea, ActionRequest $req
         return $this->handle($warehouseArea, $this->validatedData);
     }
 
-    public function action(WarehouseArea|Warehouse $parent, array $modelData, int $hydratorsDelay = 0, bool $strict = true): Location
+    public function action(WarehouseArea|Warehouse $parent, array $modelData, int $hydratorsDelay = 0, bool $strict = true, $audit = true): Location
     {
+        if (!$audit) {
+            Location::disableAuditing();
+        }
+
         $this->asAction       = true;
         $this->strict         = $strict;
         $this->hydratorsDelay = $hydratorsDelay;

diff --git a/app/Actions/Inventory/Location/UpdateLocation.php b/app/Actions/Inventory/Location/UpdateLocation.php
@@ -75,7 +75,8 @@ public function rules(): array
             'allow_stocks'           => ['sometimes', 'required', 'boolean'],
             'allow_fulfilment'       => ['sometimes', 'required', 'boolean'],
             'allow_dropshipping'     => ['sometimes', 'required', 'boolean'],
-            'last_fetched_at'        => ['sometimes', 'date'],
+            'max_weight' => ['sometimes', 'nullable', 'numeric', 'min:0.1', 'max:1000000'],
+            'max_volume' => ['sometimes', 'nullable', 'numeric', 'min:0.1', 'max:1000000'],
         ];
 
         if (!$this->strict) {

diff --git a/app/Actions/Transfers/Aurora/FetchAuroraHistories.php b/app/Actions/Transfers/Aurora/FetchAuroraHistories.php
@@ -70,9 +70,11 @@ public function getModelsQuery(): Builder
         //enum('sold_since','last_sold','first_sold','placed','wrote','deleted','edited','cancelled','charged','merged','created','associated','disassociate','register','login','logout','fail_login','password_request','password_reset','search')
         $query = DB::connection('aurora')
             ->table('History Dimension')
-            ->where('Direct Object', 'Customer')
-            //    ->whereIn('Action', ['edited', 'created']);
-            ->whereIn('Action', ['created'])
+           // ->whereIn('Direct Object', ['Customer','Location'])
+           // ->whereIn('Action', ['edited', 'created']);
+
+            ->where('Direct Object', 'Location')
+            ->whereIn('Action', ['edited', 'created'])
             ->select('History Key as source_id')
             ->orderBy('History Date', 'asc');
 

diff --git a/app/Actions/Transfers/Aurora/FetchAuroraLocations.php b/app/Actions/Transfers/Aurora/FetchAuroraLocations.php
@@ -13,6 +13,7 @@
 use App\Transfers\SourceOrganisationService;
 use Exception;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 
 class FetchAuroraLocations extends FetchAuroraAction
@@ -44,9 +45,17 @@ public function handle(SourceOrganisationService $organisationSource, int $organ
                         parent: $locationData['parent'],
                         modelData: $locationData['location'],
                         hydratorsDelay: 60,
-                        strict: false
+                        strict: false,
+                        audit: false
                     );
 
+                    Location::enableAuditing();
+                    $this->saveMigrationHistory(
+                        $location,
+                        Arr::except($locationData['customer'], ['fetched_at','last_fetched_at'])
+                    );
+
+
                     $this->recordNew($organisationSource);
                     $sourceData = explode(':', $location->source_id);
                     DB::connection('aurora')->table('Location Dimension')

diff --git a/app/Transfers/Aurora/FetchAuroraEmployee.php b/app/Transfers/Aurora/FetchAuroraEmployee.php
@@ -114,7 +114,7 @@ public function fetch(int $id): ?array
             }
 
 
-            $userData = $this->parseUser();
+            $userData = $this->parseUserFromEmployee();
             //            if ($userData) {
             //                $this->parsedData['employee']['username']          = $userData['username'];
             //                $this->parsedData['employee']['legacy_password']   = $userData['legacy_password'];
@@ -146,7 +146,7 @@ public function fetch(int $id): ?array
     }
 
 
-    private function parseUser(): ?array
+    private function parseUserFromEmployee(): ?array
     {
         $auroraUserData = DB::connection('aurora')
             ->table('User Dimension as users')

diff --git a/app/Transfers/Aurora/FetchAuroraHistory.php b/app/Transfers/Aurora/FetchAuroraHistory.php
@@ -7,6 +7,8 @@
 
 namespace App\Transfers\Aurora;
 
+use App\Models\CRM\Customer;
+use App\Models\Inventory\Location;
 use Illuminate\Support\Facades\DB;
 
 class FetchAuroraHistory extends FetchAurora
@@ -73,6 +75,8 @@ protected function parseModel(): void
             $this->parsedData['history']['user_type'] = class_basename($user);
             $this->parsedData['history']['user_id']   = $user->id;
         }
+
+
     }
 
 
@@ -84,7 +88,7 @@ protected function fetchData($id): object|null
     }
 
 
-    protected function parseAuditableFromHistory()
+    protected function parseAuditableFromHistory(): Customer|Location|null
     {
         $auditable = null;
 
@@ -93,6 +97,12 @@ protected function parseAuditableFromHistory()
                 $auditable = $this->parseCustomer(
                     $this->organisation->id.':'.$this->auroraModelData->{'Direct Object Key'}
                 );
+                break;
+            case 'Location':
+                $auditable = $this->parseLocation(
+                    $this->organisation->id.':'.$this->auroraModelData->{'Direct Object Key'},
+                    $this->organisationSource
+                );
         }
 
 
@@ -132,11 +142,11 @@ protected function parseHistoryOldValues($auditable, string $event): array
         if ($event == 'created') {
             return [];
         }
+        return $this->parseHistoryUpdatedOldValues($auditable);
 
-        return [];
     }
 
-    protected function parseHistoryNewValues($auditable, string $event)
+    protected function parseHistoryNewValues($auditable, string $event): array
     {
         if ($event == 'created') {
             return $this->parseHistoryCreatedNewValues($auditable);
@@ -222,10 +232,10 @@ protected function parseCustomerHistoryCreatedNewValues($auditable): array
             $abstract = $this->auroraModelData->{'History Details'};
         }
 
-        if ($abstract == 'Customer  registered' ||
-            $abstract == 'New customer  added' ||
-            $abstract == 'Nouveau Client  ajoute' ||
-            $abstract == 'New customer'
+        if ($abstract == 'Customer  registered'
+            || $abstract == 'New customer  added'
+            || $abstract == 'Nouveau Client  ajoute'
+            || $abstract == 'New customer'
         ) {
             $newValues['name'] = '';
         }

diff --git a/app/Transfers/Aurora/FetchAuroraLocation.php b/app/Transfers/Aurora/FetchAuroraLocation.php
@@ -43,7 +43,9 @@ protected function parseModel(): void
             'code'            => $code,
             'source_id'       => $this->organisation->id.':'.$this->auroraModelData->{'Location Key'},
             'fetched_at'      => now(),
-            'last_fetched_at' => now()
+            'last_fetched_at' => now(),
+            'max_weight'      => $this->auroraModelData->{'Location Max Weight'} == 0 ? null : $this->auroraModelData->{'Location Max Weight'},
+            'max_volume'      => $this->auroraModelData->{'Location Max Volume'} == 0 ? null : $this->auroraModelData->{'Location Max Volume'},
         ];
     }
 

diff --git a/app/Transfers/Aurora/WithAuroraSysAdminParsers.php b/app/Transfers/Aurora/WithAuroraSysAdminParsers.php
@@ -7,6 +7,8 @@
 
 namespace App\Transfers\Aurora;
 
+use App\Actions\Transfers\Aurora\FetchAuroraDeletedUsers;
+use App\Actions\Transfers\Aurora\FetchAuroraUsers;
 use App\Models\CRM\WebUser;
 use App\Models\SysAdmin\Guest;
 use App\Models\SysAdmin\User;
@@ -110,6 +112,10 @@ protected function parseUserFromHistory(): User|WebUser|null
         }
 
 
+        return $this->parseUser($this->organisation->id.':'.$this->auroraModelData->{'User Key'});
+    }
+
+
     protected function parseUserPhoto(): array
     {
         $profileImages = $this->getModelImagesCollection(