add chat id

Author: chriskapp

src/Backend/Filter/DateQueryFilter.php

@@ -23,7 +23,6 @@
 use DateTimeImmutable;
 use Exception;
 use Fusio\Engine\RequestInterface;
-use PSX\Sql\ColumnInterface;
 use PSX\Sql\Condition;
 use PSX\Sql\TableInterface;
 

src/Backend/Filter/QueryFilter.php

@@ -36,6 +36,7 @@
 class QueryFilter
 {
     public const COLUMN_SEARCH = 'search';
+    public const DEFAULT_LENGTH = 16;
 
     private int $startIndex;
     private int $count;
@@ -50,7 +51,7 @@ public function __construct(int $startIndex, int $count, ?string $search = null,
         }
 
         if ($count < 1 || $count > 1024) {
-            $count = 16;
+            $count = self::DEFAULT_LENGTH;
         }
 
         if ($sortOrder === 'asc') {

src/Backend/View/Agent/Message.php

@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Backend\View\Agent;
 
 use Fusio\Engine\ContextInterface;
+use Fusio\Impl\Backend\Filter\QueryFilter;
 use Fusio\Impl\Service;
 use Fusio\Impl\Table;
 use PSX\Nested\Builder;
@@ -45,14 +46,18 @@ public function getCollection(int $agentId, ?string $chatId, ContextInterface $c
 
         if (!empty($chatId)) {
             $condition->equals(Table\Generated\AgentMessageColumn::CHAT_ID, $chatId);
+
+            $count = $this->getTable(Table\Agent\Message::class)->getCount($condition);
+            $startIndex = max(0, $count - Service\Agent\Sender::CONTEXT_MESSAGES_LENGTH);
             $sortOrder = OrderBy::ASC;
         } else {
             $condition->equals(Table\Generated\AgentMessageColumn::CHILD, 0);
+
+            $startIndex = 0;
+            $count = QueryFilter::DEFAULT_LENGTH;
             $sortOrder = OrderBy::DESC;
         }
 
-        $count = $this->getTable(Table\Agent\Message::class)->getCount($condition);
-        $startIndex = max(0, $count - Service\Agent\Sender::CONTEXT_MESSAGES_LENGTH);
         $sortBy = Table\Generated\AgentMessageColumn::ID;
 
         $builder = new Builder($this->connection);
@@ -63,6 +68,7 @@ public function getCollection(int $agentId, ?string $chatId, ContextInterface $c
             'itemsPerPage' => Service\Agent\Sender::CONTEXT_MESSAGES_LENGTH,
             'entry' => $builder->doCollection([$this->getTable(Table\Agent\Message::class), 'findBy'], [$condition, $startIndex, $count, $sortBy, $sortOrder], [
                 'id' => $builder->fieldInteger(Table\Generated\AgentMessageTable::COLUMN_ID),
+                'chatId' => Table\Generated\AgentMessageTable::COLUMN_CHAT_ID,
                 'role' => $builder->fieldCallback(Table\Generated\AgentMessageTable::COLUMN_ORIGIN, function ($value) {
                     return match ($value) {
                         Table\Agent\Message::ORIGIN_ASSISTANT => 'assistant',

src/Service/Agent/Sender.php

@@ -56,7 +56,7 @@
     /**
      * Max number of messages which are attached to the context
      */
-    public const CONTEXT_MESSAGES_LENGTH = 16;
+    public const CONTEXT_MESSAGES_LENGTH = 10;
 
     private ObjectMapper $objectMapper;