update f string

Author: samobermiller

nmdc_server/api.py

@@ -1270,7 +1270,7 @@ def create_github_issue(submission: schemas_submission.SubmissionMetadataSchema,
         f"Has data been generated: {data_generated}",
         f"PI name: {pi_name}",
         f"PI orcid: {pi_orcid}",
-        f"Status: {submission.status}",
+        f"Status: {SubmissionStatusEnum['SubmittedPendingReview'].title}",
         f"Data types: {omics_processing_types}",
         f"Sample type: {sample_types}",
         f"Number of samples: {num_samples}",

nmdc_server/models.py

@@ -1,9 +1,10 @@
 import enum
 from datetime import datetime
+from importlib import resources
 from typing import Any, Dict, Iterator, List, Optional, Type, Union
 from uuid import uuid4
 
-from nmdc_schema.nmdc_data import get_nmdc_schema_definition
+from linkml_runtime.utils.schemaview import SchemaView
 from sqlalchemy import (
     BigInteger,
     Boolean,
@@ -37,8 +38,15 @@
 
 def get_submission_status_enum():
     """Get SubmissionStatusEnum from the NMDC schema definition."""
-    schema = get_nmdc_schema_definition()
-    return schema.enums["SubmissionStatusEnum"].permissible_values
+    permissible_values = {}
+    submission_schema_files = resources.files("nmdc_schema")
+    schema_path = submission_schema_files / "nmdc_materialized_patterns.yaml"
+    sv = SchemaView(str(schema_path))
+    for enum_name, enum_definition in sv.all_enums().items():
+        if enum_name == "SubmissionStatusEnum":
+            permissible_values = enum_definition.permissible_values
+            break
+    return permissible_values
 
 
 SubmissionStatusEnum = get_submission_status_enum()

tests/test_submission.py

@@ -3,21 +3,13 @@
 from datetime import datetime, timedelta
 
 import pytest
-from nmdc_schema.nmdc_data import get_nmdc_schema_definition
 from sqlalchemy.orm.session import Session
 from starlette.testclient import TestClient
 
 from nmdc_server import fakes
-from nmdc_server.models import SubmissionEditorRole, SubmissionRole
+from nmdc_server.models import SubmissionEditorRole, SubmissionRole, get_submission_status_enum
 from nmdc_server.schemas_submission import SubmissionMetadataSchema, SubmissionMetadataSchemaPatch
 
-
-def get_submission_status_enum():
-    """Get SubmissionStatusEnum from the NMDC schema definition."""
-    schema = get_nmdc_schema_definition()
-    return schema.enums["SubmissionStatusEnum"].permissible_values
-
-
 SubmissionStatusEnum = get_submission_status_enum()
 
 
@@ -55,18 +47,6 @@ def test_get_metadata_submissions_mixs_as_non_admin(
     assert response.status_code == 403
 
 
-def test_print_submission_enum(db: Session, client: TestClient, logged_in_user):
-    submission = fakes.MetadataSubmissionFactory(
-        author=logged_in_user, author_orcid=logged_in_user.orcid
-    )
-    print("Available submission status enum values:")
-    print(SubmissionStatusEnum)
-    print("\nSpecific enum value string")
-    print(SubmissionStatusEnum["InProgress"].title)
-
-    assert submission
-
-
 def test_get_metadata_submissions_mixs_as_admin(
     db: Session, client: TestClient, logged_in_admin_user
 ):