feat(bot search): pagination

brmn · Apr 3, 2021 · bade33b · bade33b
1 parent 43bf8ea
commit bade33b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git a/app/Bot/Command.php b/app/Bot/Command.php
@@ -48,7 +48,7 @@ final private function parseParams(string $paramString, array $paramList): array
         $params = [];
 
         foreach ($paramList as $name => $rules) {
-            $pattern = "/{$name}=([^ ]*)/";
+            $pattern = "/{$name}=([^ $]*)( |$)/";
 
             $matches = [];
 

diff --git a/app/Bot/Purchases/Search.php b/app/Bot/Purchases/Search.php
@@ -20,7 +20,7 @@
 final class Search extends Command
 {
     protected const COMMAND = '/search';
-    protected const PARAMS = ['inn' => ['required']];
+    protected const PARAMS = ['inn' => ['required'], 'perpage' => ['int', 'max:50'], 'page' => ['int', 'max:10']];
 
     private UserSearchesPurchases $search;
     private UserRepo $userRepo;
@@ -39,13 +39,21 @@ public function handle(BotMan $bot): void
         } catch (InvalidArgumentException $e) {
             $bot->reply("wrong command format: {$e->getMessage()}");
 
+            return;
+        } catch (Exception $e) {
+            \Log::error('bot search query', [$e->getMessage()]);
+
+            $bot->reply("something went wrong");
+
             return;
         }
 
         try {
             $bot->reply($this->format($this->search->process($this->getUser($bot), $query)));
         } catch (Exception $e) {
-            $bot->reply("something went wrong: {$e->getMessage()}");
+            \Log::error('bot search process', [$e->getMessage()]);
+
+            $bot->reply("something went wrong");
         }
     }
 
@@ -69,8 +77,10 @@ protected function mapParams(array $params): array
         Assert::notNull($params['inn'], 'empty inn');
 
         return [
-            'query' => $params[self::REST_OF_THE_QUERY],
-            'inn' => Inn::make($params['inn'])
+            'query' => empty($params[self::REST_OF_THE_QUERY]) ? null : $params[self::REST_OF_THE_QUERY],
+            'inn' => Inn::make($params['inn']),
+            'perpage' => (int)$params['perpage'],
+            'page' => (int)$params['page'],
         ];
     }
 
@@ -86,8 +96,15 @@ private function makeQuery(BotMan $bot): PurchasesSearchQuery
 
     private function format(PurchasesSearchResult $searchResult): OutgoingMessage
     {
-        //@todo
+        $result = "Contracts found {$searchResult->data['contracts']['total']}\n\n";
+
+        foreach ($searchResult->data['contracts']['data'] as $contract) {
+            $result .= "signDate: {$contract['signDate']} / publishDate: {$contract['publishDate']}\n"
+                . "price: {$contract['price']} {$contract['currency']['code']}\n"
+                . "products: " . implode('; ', array_column($contract['products'], 'name')) . "\n"
+                . "{$contract['contractUrl']}\n\n\n";
+        }
 
-        return OutgoingMessage::create($searchResult->__toString());
+        return OutgoingMessage::create($result);
     }
 }
diff --git a/app/Clearspending/ClearspendingApi.php b/app/Clearspending/ClearspendingApi.php
@@ -77,6 +77,8 @@ public function contractsSearch(array $query): array
             ]
         );
 
+//        \Log::info('clearspending api', [$response->getStatusCode()]);
+
         $result = Utils::jsonDecode($response->getBody()->getContents(), true);
 
         if ($result === null) {
@@ -96,8 +98,8 @@ private function filterParams(array $query, array $paramList): array
     {
         return array_filter(
             $query,
-            static fn(string $key): bool => in_array($key, $paramList, true),
-            ARRAY_FILTER_USE_KEY
+            static fn(?string $item, string $key): bool => in_array($key, $paramList, true) && $item !== null,
+            ARRAY_FILTER_USE_BOTH
         );
     }
 }
diff --git a/app/Usecases/Purchases/DTO/PurchasesSearchQuery.php b/app/Usecases/Purchases/DTO/PurchasesSearchQuery.php
@@ -9,6 +9,8 @@
 
 class PurchasesSearchQuery extends DataTransferObject
 {
-    public string $query;
+    public ?string $query;
     public Inn $inn;
+    public ?int $perpage;
+    public ?int $page;
 }
diff --git a/app/Usecases/Purchases/UserSearchesPurchases.php b/app/Usecases/Purchases/UserSearchesPurchases.php
@@ -35,12 +35,14 @@ public function process(User $user, PurchasesSearchQuery $query): PurchasesSearc
                         [
                             'productsearch' => $query->query,
                             'customerinn' => $query->inn->getValue(),
+                            'perpage' => $query->perpage,
+                            'page' => $query->page,
                         ]
                     )
                 ]
             );
         } catch (GuzzleException $e) {
-            return new PurchasesSearchResult(['data' => 'network error']);
+            throw $e;
         }
     }
 }
diff --git a/known-issues.xml b/known-issues.xml
@@ -5,4 +5,10 @@
       <code>Str</code>
     </UndefinedClass>
   </file>
+  <file src="app/Bot/Purchases/Search.php">
+    <UndefinedClass occurrences="2">
+      <code>\Log</code>
+      <code>\Log</code>
+    </UndefinedClass>
+  </file>
 </files>