From 632c0db6b03653169a7bfdd10b6375f5fdfbed9a Mon Sep 17 00:00:00 2001
From: simmac <simmac@users.noreply.github.com>
Date: Sun, 4 Jun 2023 23:41:16 +0200
Subject: [PATCH] Fixed DM-DE queries.

Fixes #45
---
 stores/dm-de.js | 29 +++++++++++++++++------------
 stores/dm.js    |  6 ++++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/stores/dm-de.js b/stores/dm-de.js
index d1a4c86..7445d7e 100644
--- a/stores/dm-de.js
+++ b/stores/dm-de.js
@@ -34,10 +34,11 @@ exports.fetchData = async function () {
         "allCategories.id=010000&price.value.to=2", //~500 items
         "allCategories.id=010000&price.value.from=2&price.value.to=3", //~600 items
         "allCategories.id=010000&price.value.from=3&price.value.to=4", //~500 items
-        "allCategories.id=010000&price.value.from=4&price.value.to=7", //~800 items
-        "allCategories.id=010000&price.value.from=7&price.value.to=10", //~900 items
-        "allCategories.id=010000&price.value.from=10&price.value.to=15", //~900 items
-        "allCategories.id=010000&price.value.from=15", //~300 items
+        "allCategories.id=010000&price.value.from=4&price.value.to=6", //~800 items
+        "allCategories.id=010000&price.value.from=6&price.value.to=8", //~800 items
+        "allCategories.id=010000&price.value.from=8&price.value.to=10", //~900 items
+        "allCategories.id=010000&price.value.from=10&price.value.to=14", //~900 items
+        "allCategories.id=010000&price.value.from=14", //~300 items
         "allCategories.id=020000&price.value.to=2", //~600 items
         "allCategories.id=020000&price.value.from=2&price.value.to=3", //~550 items
         "allCategories.id=020000&price.value.from=3&price.value.to=4", //~600 items
@@ -45,15 +46,17 @@ exports.fetchData = async function () {
         "allCategories.id=020000&price.value.from=6&price.value.to=10", //~850 items
         "allCategories.id=020000&price.value.from=10&price.value.to=18", //~900 items
         "allCategories.id=020000&price.value.from=18", //~960 items (!)
-        "allCategories.id=030000&price.value.to=8", //~900 items
-        "allCategories.id=030000&price.value.from=8", //~500 items
+        "allCategories.id=030000&price.value.to=7", //~980 items (!)
+        "allCategories.id=030000&price.value.from=7", //~500 items
         "allCategories.id=040000&price.value.to=2", //~600 items
         "allCategories.id=040000&price.value.from=2&price.value.to=4", //~900 items
         "allCategories.id=040000&price.value.from=4", //~400 items
-        "allCategories.id=050000&price.value.to=4", //~600 items
-        "allCategories.id=050000&price.value.from=4", //~800 items
-        "allCategories.id=060000&price.value.to=4", //~900 items
-        "allCategories.id=060000&price.value.from=4", //~500 items
+        "allCategories.id=050000&price.value.to=2", //~850 items
+        "allCategories.id=050000&price.value.from=2&price.value.to=6", //~900 items
+        "allCategories.id=050000&price.value.from=6&price.value.to=10", //~850 items
+        "allCategories.id=050000&price.value.from=10", //~850 items
+        "allCategories.id=060000&price.value.to=3", //~940 items
+        "allCategories.id=060000&price.value.from=3", //~850 items
         "allCategories.id=070000", //~300 items
     ];
 
@@ -78,8 +81,10 @@ exports.fetchData = async function () {
             });
         }
         let items = res.data;
-        if (items.count > 1000) {
-            console.warn(`DM-DE Query returned more than 1000 items! Items may be missing. Adjust queries. Query: ${query}`);
+        if (items.count > items.products.length) {
+            console.warn(
+                `DM-DE Query matches ${items.count} items, but API only returns first ${items.products.length}. Adjust queries. Query: ${query}`
+            );
         }
         dmItems = dmItems.concat(items.products);
         await new Promise((resolve) => setTimeout(resolve, 1000));
diff --git a/stores/dm.js b/stores/dm.js
index ab74303..47a3032 100644
--- a/stores/dm.js
+++ b/stores/dm.js
@@ -79,8 +79,10 @@ exports.fetchData = async function () {
             });
         }
         let items = res.data;
-        if (items.count > 1000) {
-            console.warn(`Query returned more than 1000 items! Items may be missing. Adjust queries. Query: ${query}`);
+        if (items.count > items.products.length) {
+            console.warn(
+                `DM Query matches ${items.count} items, but API only returns first ${items.products.length}. Adjust queries. Query: ${query}`
+            );
         }
         dmItems = dmItems.concat(items.products);
         await new Promise((resolve) => setTimeout(resolve, 1000));