#81 order of fetching

inikoo · Aug 14, 2024 · f3399a2 · f3399a2
1 parent 9b2fcfe
commit f3399a2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/app/Actions/Transfers/Aurora/FetchAuroraCustomers.php b/app/Actions/Transfers/Aurora/FetchAuroraCustomers.php
@@ -175,7 +175,7 @@ public function getModelsQuery(): Builder
         $query = DB::connection('aurora')
             ->table('Customer Dimension')
             ->select('Customer Key as source_id')
-            ->orderBy('source_id');
+            ->orderBy('Customer First Contacted Date');
 
         if ($this->onlyNew) {
             $query->whereNull('aiku_id');

diff --git a/app/Actions/Transfers/Aurora/FetchAuroraInvoices.php b/app/Actions/Transfers/Aurora/FetchAuroraInvoices.php
@@ -127,7 +127,7 @@ public function getModelsQuery(): Builder
             $query->whereNull('aiku_id');
         }
 
-        $query->orderBy('Invoice Date', 'desc');
+        $query->orderBy('Invoice Date');
 
         return $query;
     }

diff --git a/app/Actions/Transfers/Aurora/FetchAuroraProducts.php b/app/Actions/Transfers/Aurora/FetchAuroraProducts.php
@@ -119,9 +119,8 @@ public function getModelsQuery(): Builder
             ->table('Product Dimension')
             ->where('Product Type', 'Product')
             ->whereNull('Product Customer Key')
-         //   ->where('is_variant', 'No')
             ->select('Product ID as source_id')
-            ->orderBy('Product ID');
+            ->orderBy('Product Valid From');
 
         if ($this->onlyNew) {
             $query->whereNull('aiku_id');

diff --git a/app/Actions/Transfers/Aurora/FetchAuroraStocks.php b/app/Actions/Transfers/Aurora/FetchAuroraStocks.php
@@ -152,7 +152,7 @@ public function getModelsQuery(): Builder
         if ($this->onlyNew) {
             $query->whereNull('aiku_id');
         }
-        $query->orderBy('source_id');
+        $query->orderBy('Part Valid From');
 
         return $query;
     }

diff --git a/app/Actions/Transfers/Aurora/FetchAuroraSupplierProducts.php b/app/Actions/Transfers/Aurora/FetchAuroraSupplierProducts.php
@@ -169,7 +169,7 @@ public function getModelsQuery(): Builder
             ->where('Part Status', '!=', 'Not In Use')
             ->where('spp.aiku_ignore', 'No')
             ->where('sd.aiku_ignore', 'No')
-            ->orderBy('source_id');
+            ->orderBy('Supplier Part From');
     }
 
     public function count(): ?int

diff --git a/app/Actions/Transfers/Aurora/FetchAuroraSuppliers.php b/app/Actions/Transfers/Aurora/FetchAuroraSuppliers.php
@@ -32,7 +32,7 @@ public function getModelsQuery(): Builder
             ->leftJoin('Agent Supplier Bridge', 'Agent Supplier Supplier Key', 'Supplier Key')
             ->select('Supplier Key as source_id')
             ->where('aiku_ignore', 'No')
-            ->orderBy('source_id');
+            ->orderBy('Supplier Valid From');
 
         if ($this->onlyNew) {
             $query->whereNull('aiku_id');

diff --git a/app/Transfers/Aurora/FetchAuroraProduct.php b/app/Transfers/Aurora/FetchAuroraProduct.php
@@ -88,11 +88,8 @@ protected function parseModel(): void
         $code = $this->cleanTradeUnitReference($this->auroraModelData->{'Product Code'});
 
 
-        $isMain=true;
-
-
         $this->parsedData['product'] = [
-            'is_main'                => $isMain,
+            'is_main'                => true,
             'type'                   => AssetTypeEnum::PRODUCT,
             'owner_type'             => $owner_type,
             'owner_id'               => $owner_id,