From 1a80bcd96c985a7b4cfca0c2d6b87b208afd2568 Mon Sep 17 00:00:00 2001
From: monsieurtanuki <fabrice_fontaine@hotmail.com>
Date: Wed, 15 Nov 2023 12:06:55 +0100
Subject: [PATCH] feat: new field pageCount for searchResult

Impacted files:
* `api_get_user_products_test.dart`: now using `pageCount` instead of `count`
* `api_search_products_test.dart`: skipped a test failing because of the server
* `search_result.dart`: added field `pageCount`
* `search_result.g.dart`: generated
---
 lib/src/model/search_result.dart     | 4 ++++
 lib/src/model/search_result.g.dart   | 2 ++
 test/api_get_user_products_test.dart | 4 ++--
 test/api_search_products_test.dart   | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/src/model/search_result.dart b/lib/src/model/search_result.dart
index 6c8b8bf601..9b5ff5697f 100644
--- a/lib/src/model/search_result.dart
+++ b/lib/src/model/search_result.dart
@@ -15,6 +15,9 @@ class SearchResult extends JsonObject {
   @JsonKey(name: 'count', fromJson: JsonObject.parseInt)
   final int? count;
 
+  @JsonKey(name: 'page_count', fromJson: JsonObject.parseInt)
+  final int? pageCount;
+
   @JsonKey(name: 'skip', fromJson: JsonObject.parseInt)
   final int? skip;
 
@@ -25,6 +28,7 @@ class SearchResult extends JsonObject {
     this.page,
     this.pageSize,
     this.count,
+    this.pageCount,
     this.skip,
     this.products,
   });
diff --git a/lib/src/model/search_result.g.dart b/lib/src/model/search_result.g.dart
index 33e5f82915..8c053c7501 100644
--- a/lib/src/model/search_result.g.dart
+++ b/lib/src/model/search_result.g.dart
@@ -10,6 +10,7 @@ SearchResult _$SearchResultFromJson(Map<String, dynamic> json) => SearchResult(
       page: JsonObject.parseInt(json['page']),
       pageSize: JsonObject.parseInt(json['page_size']),
       count: JsonObject.parseInt(json['count']),
+      pageCount: JsonObject.parseInt(json['page_count']),
       skip: JsonObject.parseInt(json['skip']),
       products: (json['products'] as List<dynamic>?)
           ?.map((e) => Product.fromJson(e as Map<String, dynamic>))
@@ -21,6 +22,7 @@ Map<String, dynamic> _$SearchResultToJson(SearchResult instance) {
     'page': instance.page,
     'page_size': instance.pageSize,
     'count': instance.count,
+    'page_count': instance.pageCount,
     'skip': instance.skip,
   };
 
diff --git a/test/api_get_user_products_test.dart b/test/api_get_user_products_test.dart
index 076d39fa8a..ce93fd295c 100644
--- a/test/api_get_user_products_test.dart
+++ b/test/api_get_user_products_test.dart
@@ -51,13 +51,13 @@ void main() {
       expect(result.page, 1, reason: reason); // default
       expect(result.pageSize, pageSize, reason: reason);
       expect(result.products, isNotNull, reason: reason);
-      expect(result.products!.length, result.count, reason: reason);
+      expect(result.products!.length, result.pageCount, reason: reason);
       if (additionalCheck != null) {
         for (final Product product in result.products!) {
           additionalCheck(product);
         }
       }
-      return result.count!;
+      return result.pageCount!;
     }
 
     Future<int> getCountForAllLanguages(
diff --git a/test/api_search_products_test.dart b/test/api_search_products_test.dart
index bd8e02f16d..5f333f8295 100644
--- a/test/api_search_products_test.dart
+++ b/test/api_search_products_test.dart
@@ -785,7 +785,7 @@ void main() {
       expect(result.products!.length, 24);
       expect(result.products![0].runtimeType, Product);
       expect(result.count, greaterThan(1500));
-    });
+    }, skip: 'Temporarily not working (server issue)');
 
     test('many many products', () async {
       final List<String> manyBarcodes = <String>[];