From 6d4064e8887ed764bbfd6c02539e5771dd72901a Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 28 Feb 2024 07:41:13 -0800
Subject: [PATCH 1/2] make sure original_file_name is stored as part of job
 (notify-admin-1148)

---
 app/job/rest.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/job/rest.py b/app/job/rest.py
index 1aab2ca60..c5df0dddb 100644
--- a/app/job/rest.py
+++ b/app/job/rest.py
@@ -144,6 +144,7 @@ def get_jobs_by_service(service_id):
     )
 
 
+
 @job_blueprint.route("", methods=["POST"])
 def create_job(service_id):
     service = dao_fetch_service_by_id(service_id)
@@ -151,6 +152,7 @@ def create_job(service_id):
         raise InvalidRequest("Create job is not allowed: service is inactive ", 403)
 
     data = request.get_json()
+    original_file_name = data["original_file_name"]
     data.update({"service": service_id})
     try:
         data.update(**get_job_metadata_from_s3(service_id, data["id"]))
@@ -173,6 +175,8 @@ def create_job(service_id):
     data.update({"template_version": template.version})
 
     job = job_schema.load(data)
+    # See admin #1148, for whatever reason schema loading doesn't load this
+    job.original_file_name = original_file_name
 
     if job.scheduled_for:
         job.job_status = JOB_STATUS_SCHEDULED

From 689d82280b46e4d2a987d4948a63cc11d3b5e35a Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 28 Feb 2024 08:23:56 -0800
Subject: [PATCH 2/2] fix tests

---
 app/job/rest.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/job/rest.py b/app/job/rest.py
index c5df0dddb..d86a4ec62 100644
--- a/app/job/rest.py
+++ b/app/job/rest.py
@@ -144,7 +144,6 @@ def get_jobs_by_service(service_id):
     )
 
 
-
 @job_blueprint.route("", methods=["POST"])
 def create_job(service_id):
     service = dao_fetch_service_by_id(service_id)
@@ -152,7 +151,7 @@ def create_job(service_id):
         raise InvalidRequest("Create job is not allowed: service is inactive ", 403)
 
     data = request.get_json()
-    original_file_name = data["original_file_name"]
+    original_file_name = data.get("original_file_name")
     data.update({"service": service_id})
     try:
         data.update(**get_job_metadata_from_s3(service_id, data["id"]))
@@ -176,7 +175,8 @@ def create_job(service_id):
 
     job = job_schema.load(data)
     # See admin #1148, for whatever reason schema loading doesn't load this
-    job.original_file_name = original_file_name
+    if original_file_name is not None:
+        job.original_file_name = original_file_name
 
     if job.scheduled_for:
         job.job_status = JOB_STATUS_SCHEDULED