Merge pull request #1151 from microbiomedata/1148-get-submission-fix

Fix broken GET submission endpoint
microbiomedata · Feb 22, 2024 · b44467f · b44467f
2 parents 806c824 + ed4bead
commit b44467f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/nmdc_server/api.py b/nmdc_server/api.py
@@ -634,7 +634,11 @@ async def get_submission(
         elif user.orcid in submission.viewers:
             permission_level = models.SubmissionEditorRole.viewer.value
         return schemas_submission.SubmissionMetadataSchema(
-            **submission.__dict__,
+            status=submission.status,
+            id=submission.id,
+            metadata_submission=submission.metadata_submission,
+            author_orcid=submission.author_orcid,
+            created=submission.created,
             author=schemas.User(**submission.author.__dict__),
             locked_by=schemas.User(**submission.locked_by.__dict__),
             permission_level=permission_level,

diff --git a/nmdc_server/jobs.py b/nmdc_server/jobs.py
@@ -73,6 +73,7 @@ def do_ingest(function_limit, skip_annotation):
             # Copy persistent data that does not depend on ingest FK
             merge_download_artifact(ingest_db, prod_db.query(models.User))
             merge_download_artifact(ingest_db, prod_db.query(models.SubmissionMetadata))
+            merge_download_artifact(ingest_db, prod_db.query(models.SubmissionRole))
 
             # ingest data
             logger.info(