drop elastic
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
import json
|
||||
import urllib.parse as parse
|
||||
|
||||
from aws_lambda_powertools.event_handler.api_gateway import Router
|
||||
from elasticsearch import Elasticsearch
|
||||
from layercake.dynamodb import (
|
||||
DynamoDBCollection,
|
||||
DynamoDBPersistenceLayer,
|
||||
SortKey,
|
||||
TransactKey,
|
||||
)
|
||||
from meilisearch import Client as Meilisearch
|
||||
|
||||
import elastic
|
||||
import meili
|
||||
from boto3clients import dynamodb_client
|
||||
from config import ELASTIC_CONN, ENROLLMENT_TABLE, USER_TABLE
|
||||
from config import ENROLLMENT_TABLE, MEILISEARCH_API_KEY, MEILISEARCH_HOST, USER_TABLE
|
||||
from middlewares import Tenant, TenantMiddleware
|
||||
|
||||
from .cancel import router as cancel
|
||||
from .enroll import router as enroll
|
||||
@@ -21,30 +21,52 @@ __all__ = ['slots', 'cancel', 'enroll']
|
||||
|
||||
|
||||
router = Router()
|
||||
elastic_client = Elasticsearch(**ELASTIC_CONN)
|
||||
enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
|
||||
enrollment_collect = DynamoDBCollection(enrollment_layer)
|
||||
user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
|
||||
user_collect = DynamoDBCollection(user_layer)
|
||||
meili_client = Meilisearch(MEILISEARCH_HOST, MEILISEARCH_API_KEY)
|
||||
|
||||
|
||||
@router.get('/', compress=True, tags=['Enrollment'])
|
||||
@router.get(
|
||||
'/',
|
||||
compress=True,
|
||||
tags=['Enrollment'],
|
||||
middlewares=[
|
||||
TenantMiddleware(user_layer.collection),
|
||||
],
|
||||
)
|
||||
def get_enrollments():
|
||||
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( # type: ignore
|
||||
index=ENROLLMENT_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(ENROLLMENT_TABLE).search(
|
||||
query,
|
||||
{
|
||||
'sort': [sort],
|
||||
'locales': ['pt'],
|
||||
'page': page,
|
||||
'hitsPerPage': hits_per_page,
|
||||
'filter': meili.encode(filter_),
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@router.get('/<id>', compress=True, tags=['Enrollment'])
|
||||
def get_enrollment(id: str):
|
||||
return enrollment_collect.get_items(
|
||||
return enrollment_layer.collection.get_items(
|
||||
TransactKey(id)
|
||||
+ SortKey('0')
|
||||
+ SortKey('started_date')
|
||||
|
||||
Reference in New Issue
Block a user