jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1192 from openreplay/v1.11.0-patch

Browse source 
feat(chalice): return all records if date is not specified
This commit is contained in:
Kraiem Taha Yassine 2023-04-21 00:33:08 +01:00 • committed by GitHub
commit 837067157c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ee/api/chalicelib/core/assist_records.py
View file

@ -41,9 +41,12 @@ def save_record(project_id, data: schemas_ee.AssistRecordSavePayloadSchema, cont
def search_records(project_id, data: schemas_ee.AssistRecordSearchPayloadSchema, context: schemas_ee.CurrentContext):
conditions = ["projects.tenant_id=%(tenant_id)s",
"projects.deleted_at ISNULL",
"assist_records.created_at>=%(startDate)s",
"assist_records.created_at<=%(endDate)s",
"assist_records.deleted_at ISNULL"]
if data.startDate:
conditions.append("assist_records.created_at>=%(startDate)s")
if data.endDate:
conditions.append("assist_records.created_at<=%(endDate)s")
params = {"tenant_id": context.tenant_id, "project_id": project_id,
"startDate": data.startDate, "endDate": data.endDate,
"p_start": (data.page - 1) * data.limit, "p_limit": data.limit,

4
ee/api/schemas_ee.py
View file

@ -137,8 +137,8 @@ class AssistRecordSavePayloadSchema(AssistRecordPayloadSchema):
class AssistRecordSearchPayloadSchema(schemas._PaginatedSchema):
limit: int = Field(default=200, gt=0)
startDate: int = Field(default=TimeUTC.now(-7))
endDate: int = Field(default=TimeUTC.now(1))
startDate: Optional[int] = Field(default=None)
endDate: Optional[int] = Field(default=None)
user_id: Optional[int] = Field(default=None)
query: Optional[str] = Field(default=None)
order: Literal["asc", "desc"] = Field(default="desc")