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

feat(chalice): flag record for delete in S3

Browse source 
feat(chalice): flag record for no-delete in S3
This commit is contained in:
Taha Yassine Kraiem 2022-11-18 13:26:01 +01:00
parent 23b2dcc73e
commit 94a8f77e5b
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,18 +1,25 @@
import hashlib
from decouple import config
import schemas
import schemas_ee
from chalicelib.utils import s3, pg_client, helper
from chalicelib.utils import s3, pg_client, helper, s3_extra
from chalicelib.utils.TimeUTC import TimeUTC
def generate_file_key(project_id, key):
return f"{project_id}/{hashlib.md5(key.encode()).hexdigest()}"
def presign_record(project_id, data: schemas_ee.AssistRecordPayloadSchema, context: schemas_ee.CurrentContext):
key = s3.generate_file_key(project_id=project_id, key=f"{TimeUTC.now()}-{data.name}")
key = generate_file_key(project_id=project_id, key=f"{TimeUTC.now()}-{data.name}")
presigned_url = s3.get_presigned_url_for_upload(bucket=config('ASSIST_RECORDS_BUCKET'), expires_in=1800, key=key)
return {"URL": presigned_url, "key": presigned_url}
def save_record(project_id, data: schemas_ee.AssistRecordSavePayloadSchema, context: schemas_ee.CurrentContext):
s3_extra.tag_record(file_key=data.key, tag_value=config('RETENTION_L_VALUE', default='vault'))
params = {"user_id": context.user_id, "project_id": project_id, **data.dict()}
with pg_client.PostgresClient() as cur:
query = cur.mogrify(
@ -122,9 +129,10 @@ def delete_record(project_id, record_id, context: schemas_ee.CurrentContext):
query = cur.mogrify(f"""UPDATE assist_records
SET deleted_at= (now() at time zone 'utc')
WHERE {" AND ".join(conditions)}
RETURNING 1;""", params)
RETURNING file_key;""", params)
cur.execute(query)
result = helper.dict_to_camel_case(cur.fetchone())
if not result:
return {"errors": ["record not found"]}
s3_extra.tag_record(file_key=result["fileKey"], tag_value=config('RETENTION_D_VALUE', default='default'))
return {"state": "success"}

4
ee/api/chalicelib/utils/s3_extra.py
View file

@ -7,6 +7,10 @@ def tag_session(file_key, tag_key='retention', tag_value='vault'):
return tag_file(file_key=file_key, bucket=config("sessions_bucket"), tag_key=tag_key, tag_value=tag_value)
def tag_record(file_key, tag_key='retention', tag_value='vault'):
return tag_file(file_key=file_key, bucket=config('ASSIST_RECORDS_BUCKET'), tag_key=tag_key, tag_value=tag_value)
def tag_file(file_key, bucket, tag_key, tag_value):
return s3.client.put_object_tagging(
Bucket=bucket,