update

http-api/app/routes/orders/__init__.py

@@ -34,12 +34,12 @@ def get_orders():
     sort = event.get_query_string_value('sort', 'create_date:desc')
     page = int(event.get_query_string_value('page', '1'))
     hits_per_page = int(event.get_query_string_value('hitsPerPage', '25'))
-    filter_ = meili.parse(parse.unquote(event.get_query_string_value('filter', '')))
+    filter_ = meili.parse(event.get_query_string_value('filter', ''))
 
     if tenant.id != '*':
         filter_ = [
             {
-                'attr': 'tenant',
+                'attr': 'tenant_id',
                 'op': '=',
                 'value': tenant.id,
             },

http-api/app/routes/users/__init__.py

@@ -1,4 +1,4 @@
-import json
+import urllib.parse as parse
 from http import HTTPStatus
 from typing import Annotated
 
@@ -6,7 +6,6 @@ from aws_lambda_powertools.event_handler.api_gateway import Router
 from aws_lambda_powertools.event_handler.exceptions import (
     BadRequestError as PowertoolsBadRequestError,
 )
-from elasticsearch import Elasticsearch
 from layercake.dynamodb import (
     DynamoDBCollection,
     DynamoDBPersistenceLayer,
@@ -15,14 +14,15 @@ from layercake.dynamodb import (
     TransactKey,
 )
 from layercake.extra_types import CpfStr, NameStr
+from meilisearch import Client as Meilisearch
 from pydantic import UUID4, BaseModel, StringConstraints
 
 import cognito
-import elastic
+import meili
 from api_gateway import JSONResponse
 from boto3clients import dynamodb_client, idp_client
-from config import ELASTIC_CONN, USER_POOOL_ID, USER_TABLE
-from middlewares import AuditLogMiddleware
+from config import MEILISEARCH_API_KEY, MEILISEARCH_HOST, USER_POOOL_ID, USER_TABLE
+from middlewares import AuditLogMiddleware, Tenant, TenantMiddleware
 from models import User
 from rules.user import update_user
 
@@ -40,20 +40,45 @@ class BadRequestError(MissingError, PowertoolsBadRequestError):
 router = Router()
 user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
 user_collect = DynamoDBCollection(user_layer, exc_cls=BadRequestError)
-elastic_client = Elasticsearch(**ELASTIC_CONN)
+meili_client = Meilisearch(MEILISEARCH_HOST, MEILISEARCH_API_KEY)  # noqa: F821
 
 
-@router.get('/', compress=True, tags=['User'], summary='Get users')
+@router.get(
+    '/',
+    compress=True,
+    tags=['User'],
+    middlewares=[
+        TenantMiddleware(user_layer.collection),
+    ],
+    summary='Get users',
+)
 def get_users():
+    tenant: Tenant = router.context['tenant']
     event = router.current_event
-    query = event.get_query_string_value('query', '{}')
-    page_size = event.get_query_string_value('page_size', '25')
+    query = parse.unquote(event.get_query_string_value('q', ''))
+    sort = event.get_query_string_value('sort', 'create_date:desc')
+    page = int(event.get_query_string_value('page', '1'))
+    hits_per_page = int(event.get_query_string_value('hitsPerPage', '25'))
+    filter_ = meili.parse(event.get_query_string_value('filter', ''))
 
-    return elastic.search(
-        index=USER_TABLE,
-        page_size=int(page_size),
-        query=json.loads(query),
-        elastic_client=elastic_client,
+    if tenant.id != '*':
+        filter_ = [
+            {
+                'attr': 'tenant_id',
+                'op': '=',
+                'value': tenant.id,
+            },
+        ] + filter_
+
+    return meili_client.index(USER_TABLE).search(
+        query,
+        {
+            'sort': [sort],
+            'locales': ['pt'],
+            'page': page,
+            'hitsPerPage': hits_per_page,
+            'filter': meili.encode(filter_),
+        },
     )