mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 18:31:13 -05:00
debug s3 partitioning
This commit is contained in:
@@ -264,6 +264,9 @@ def file_exists(file_location):
|
||||
|
||||
|
||||
def get_job_location(service_id, job_id):
|
||||
current_app.logger.info(
|
||||
f"#s3-partitioning NEW JOB_LOCATION: {NEW_FILE_LOCATION_STRUCTURE.format(service_id, job_id)}"
|
||||
)
|
||||
return (
|
||||
current_app.config["CSV_UPLOAD_BUCKET"]["bucket"],
|
||||
NEW_FILE_LOCATION_STRUCTURE.format(service_id, job_id),
|
||||
@@ -279,6 +282,9 @@ def get_old_job_location(service_id, job_id):
|
||||
but it will take a few days where we have to support both formats.
|
||||
Remove this when everything works with the NEW_FILE_LOCATION_STRUCTURE.
|
||||
"""
|
||||
current_app.logger.info(
|
||||
f"#s3-partitioning OLD JOB LOCATION: {FILE_LOCATION_STRUCTURE.format(service_id, job_id)}"
|
||||
)
|
||||
return (
|
||||
current_app.config["CSV_UPLOAD_BUCKET"]["bucket"],
|
||||
FILE_LOCATION_STRUCTURE.format(service_id, job_id),
|
||||
@@ -486,6 +492,9 @@ def get_personalisation_from_s3(service_id, job_id, job_row_number):
|
||||
|
||||
|
||||
def get_job_metadata_from_s3(service_id, job_id):
|
||||
current_app.logger.info(
|
||||
f"#s3-partitioning CALLING GET_JOB_METADATA with {service_id}, {job_id}"
|
||||
)
|
||||
obj = get_s3_object(*get_job_location(service_id, job_id))
|
||||
return obj.get()["Metadata"]
|
||||
|
||||
|
||||
@@ -175,6 +175,7 @@ def create_job(service_id):
|
||||
original_file_name = data.get("original_file_name")
|
||||
data.update({"service": service_id})
|
||||
try:
|
||||
current_app.logger.info(f"#s3-partitioning DATA IN CREATE_JOB: {data}")
|
||||
data.update(**get_job_metadata_from_s3(service_id, data["id"]))
|
||||
except KeyError:
|
||||
raise InvalidRequest(
|
||||
|
||||
@@ -599,7 +599,6 @@ def fetch_user_by_email():
|
||||
fetched_user = get_user_by_email(email["email"])
|
||||
debug_not_production(hilite(f"fetched user is {fetched_user}"))
|
||||
result = fetched_user.serialize()
|
||||
debug_not_production(hilite(f"result is serialized to {result}"))
|
||||
return jsonify(data=result)
|
||||
except Exception as e:
|
||||
debug_not_production(hilite(f"Failed with {e}!!"))
|
||||
|
||||
Reference in New Issue
Block a user