fix(service): get_by_name_or_default no longer works if name wasn't found (#6027)

Author: whitdog47

src/dispatch/case/priority/service.py

@@ -41,7 +41,7 @@ def get_default_or_raise(*, db_session, project_id: int) -> CasePriority:
                     "input": None,
                     "ctx": {"error": ValueError("No default case priority defined.")},
                 }
-            ]
+            ],
         )
     return case_priority
 
@@ -73,9 +73,11 @@ def get_by_name_or_raise(
                     "loc": ("case_priority",),
                     "input": case_priority_in.name,
                     "msg": "Value error, Case priority not found.",
-                    "ctx": {"error": ValueError(f"Case priority not found: {case_priority_in.name}")}
+                    "ctx": {
+                        "error": ValueError(f"Case priority not found: {case_priority_in.name}")
+                    },
                 }
-            ]
+            ],
         )
 
     return case_priority
@@ -85,13 +87,12 @@ def get_by_name_or_default(
     *, db_session, project_id: int, case_priority_in=CasePriorityRead
 ) -> CasePriority:
     """Returns a case priority based on a name or the default if not specified."""
-    if case_priority_in:
-        if case_priority_in.name:
-            return get_by_name_or_raise(
-                db_session=db_session,
-                project_id=project_id,
-                case_priority_in=case_priority_in,
-            )
+    if case_priority_in and case_priority_in.name:
+        case_priority = get_by_name(
+            db_session=db_session, project_id=project_id, name=case_priority_in.name
+        )
+        if case_priority:
+            return case_priority
     return get_default_or_raise(db_session=db_session, project_id=project_id)
 
 

src/dispatch/case/severity/service.py

@@ -32,13 +32,15 @@ def get_default_or_raise(*, db_session, project_id: int) -> CaseSeverity:
     case_severity = get_default(db_session=db_session, project_id=project_id)
 
     if not case_severity:
-        raise ValidationError([
-            {
-                "loc": ("case_severity",),
-                "msg": "No default case severity defined.",
-                "type": "value_error",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("case_severity",),
+                    "msg": "No default case severity defined.",
+                    "type": "value_error",
+                }
+            ]
+        )
     return case_severity
 
 
@@ -61,14 +63,16 @@ def get_by_name_or_raise(
     )
 
     if not case_severity:
-        raise ValidationError([
-            {
-                "loc": ("case_severity",),
-                "msg": "Case severity not found.",
-                "type": "value_error",
-                "case_severity": case_severity_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("case_severity",),
+                    "msg": "Case severity not found.",
+                    "type": "value_error",
+                    "case_severity": case_severity_in.name,
+                }
+            ]
+        )
 
     return case_severity
 
@@ -77,13 +81,12 @@ def get_by_name_or_default(
     *, db_session, project_id: int, case_severity_in=CaseSeverityRead
 ) -> CaseSeverity:
     """Returns a case severity based on a name or the default if not specified."""
-    if case_severity_in:
-        if case_severity_in.name:
-            return get_by_name_or_raise(
-                db_session=db_session,
-                project_id=project_id,
-                case_severity_in=case_severity_in,
-            )
+    if case_severity_in and case_severity_in.name:
+        case_severity = get_by_name(
+            db_session=db_session, project_id=project_id, name=case_severity_in.name
+        )
+        if case_severity:
+            return case_severity
     return get_default_or_raise(db_session=db_session, project_id=project_id)
 
 

src/dispatch/case/type/service.py

@@ -1,4 +1,3 @@
-
 from sqlalchemy.sql.expression import true
 
 from dispatch.case import service as case_service
@@ -58,11 +57,12 @@ def get_by_name_or_raise(*, db_session, project_id: int, case_type_in=CaseTypeRe
 
 def get_by_name_or_default(*, db_session, project_id: int, case_type_in=CaseTypeRead) -> CaseType:
     """Returns a case type based on a name or the default if not specified."""
-    if case_type_in:
-        if case_type_in.name:
-            return get_by_name_or_raise(
-                db_session=db_session, project_id=project_id, case_type_in=case_type_in
-            )
+    if case_type_in and case_type_in.name:
+        case_type = get_by_name(
+            db_session=db_session, project_id=project_id, name=case_type_in.name
+        )
+        if case_type:
+            return case_type
     return get_default_or_raise(db_session=db_session, project_id=project_id)
 
 

src/dispatch/incident/priority/service.py

@@ -36,12 +36,14 @@ def get_default_or_raise(*, db_session, project_id: int) -> IncidentPriority:
     incident_priority = get_default(db_session=db_session, project_id=project_id)
 
     if not incident_priority:
-        raise ValidationError([
-            {
-                "msg": "No default incident priority defined.",
-                "loc": "incident_priority",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "No default incident priority defined.",
+                    "loc": "incident_priority",
+                }
+            ]
+        )
     return incident_priority
 
 
@@ -64,13 +66,15 @@ def get_by_name_or_raise(
     )
 
     if not incident_priority:
-        raise ValidationError([
-            {
-                "msg": "Incident priority not found.",
-                "loc": "incident_priority",
-                "incident_priority": incident_priority_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "Incident priority not found.",
+                    "loc": "incident_priority",
+                    "incident_priority": incident_priority_in.name,
+                }
+            ]
+        )
 
     return incident_priority
 
@@ -79,13 +83,12 @@ def get_by_name_or_default(
     *, db_session, project_id: int, incident_priority_in=IncidentPriorityRead
 ) -> IncidentPriority:
     """Returns a incident priority based on a name or the default if not specified."""
-    if incident_priority_in:
-        if incident_priority_in.name:
-            return get_by_name_or_raise(
-                db_session=db_session,
-                project_id=project_id,
-                incident_priority_in=incident_priority_in,
-            )
+    if incident_priority_in and incident_priority_in.name:
+        incident_priority = get_by_name(
+            db_session=db_session, project_id=project_id, name=incident_priority_in.name
+        )
+        if incident_priority:
+            return incident_priority
     return get_default_or_raise(db_session=db_session, project_id=project_id)
 
 

src/dispatch/incident/severity/service.py

@@ -44,9 +44,9 @@ def get_default_or_raise(*, db_session, project_id: int) -> IncidentSeverity:
                     "loc": ("incident_severity",),
                     "input": None,
                     "msg": "No default incident severity defined.",
-                    "ctx": {"error": ValueError("No default incident severity defined.")}
+                    "ctx": {"error": ValueError("No default incident severity defined.")},
                 }
-            ]
+            ],
         )
 
     return incident_severity
@@ -71,14 +71,16 @@ def get_by_name_or_raise(
     )
 
     if not incident_severity:
-        raise ValidationError([
-            {
-                "msg": "Incident severity not found.",
-                "loc": ("incident_severity",),
-                "type": "value_error.not_found",
-                "incident_severity": incident_severity_in.name,
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "msg": "Incident severity not found.",
+                    "loc": ("incident_severity",),
+                    "type": "value_error.not_found",
+                    "incident_severity": incident_severity_in.name,
+                }
+            ]
+        )
 
     return incident_severity
 
@@ -87,14 +89,12 @@ def get_by_name_or_default(
     *, db_session, project_id: int, incident_severity_in=IncidentSeverityRead
 ) -> IncidentSeverity:
     """Returns an incident severity based on a name or the default if not specified."""
-    if incident_severity_in:
-        if incident_severity_in.name:
-            return get_by_name_or_raise(
-                db_session=db_session,
-                project_id=project_id,
-                incident_severity_in=incident_severity_in,
-            )
-
+    if incident_severity_in and incident_severity_in.name:
+        incident_severity = get_by_name(
+            db_session=db_session, project_id=project_id, name=incident_severity_in.name
+        )
+        if incident_severity:
+            return incident_severity
     return get_default_or_raise(db_session=db_session, project_id=project_id)
 
 

src/dispatch/incident/type/service.py

@@ -41,7 +41,7 @@ def get_default_or_raise(*, db_session, project_id: int) -> IncidentType:
                     "input": None,
                     "ctx": {"error": ValueError("No default incident type defined.")},
                 }
-            ]
+            ],
         )
     return incident_type
 
@@ -74,7 +74,7 @@ def get_by_name_or_raise(
                     "input": incident_type_in.name,
                     "ctx": {"error": ValueError("Incident type not found.")},
                 }
-            ]
+            ],
         )
 
     return incident_type
@@ -84,11 +84,12 @@ def get_by_name_or_default(
     *, db_session, project_id: int, incident_type_in=IncidentTypeRead
 ) -> IncidentType:
     """Returns a incident_type based on a name or the default if not specified."""
-    if incident_type_in:
-        if incident_type_in.name:
-            return get_by_name_or_raise(
-                db_session=db_session, project_id=project_id, incident_type_in=incident_type_in
-            )
+    if incident_type_in and incident_type_in.name:
+        incident_type = get_by_name(
+            db_session=db_session, project_id=project_id, name=incident_type_in.name
+        )
+        if incident_type:
+            return incident_type
     return get_default_or_raise(db_session=db_session, project_id=project_id)
 
 

src/dispatch/organization/service.py

@@ -1,4 +1,3 @@
-
 from pydantic import ValidationError
 from sqlalchemy.sql.expression import true
 
@@ -25,13 +24,15 @@ def get_default_or_raise(*, db_session) -> Organization:
     organization = get_default(db_session=db_session)
 
     if not organization:
-        raise ValidationError([
-            {
-                "loc": ("organization",),
-                "msg": "No default organization defined.",
-                "type": "value_error",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("organization",),
+                    "msg": "No default organization defined.",
+                    "type": "value_error",
+                }
+            ]
+        )
     return organization
 
 
@@ -85,10 +86,11 @@ def get_by_slug_or_raise(*, db_session, organization_in: OrganizationRead) -> Or
 
 def get_by_name_or_default(*, db_session, organization_in: OrganizationRead) -> Organization:
     """Returns a organization based on a name or the default if not specified."""
-    if organization_in.name:
-        return get_by_name_or_raise(db_session=db_session, organization_in=organization_in)
-    else:
-        return get_default_or_raise(db_session=db_session)
+    if organization_in and organization_in.name:
+        organization = get_by_name(db_session=db_session, name=organization_in.name)
+        if organization:
+            return organization
+    return get_default_or_raise(db_session=db_session)
 
 
 def get_all(*, db_session) -> list[Organization | None]:

src/dispatch/project/service.py

@@ -1,4 +1,3 @@
-
 from pydantic import ValidationError
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import true
@@ -22,13 +21,15 @@ def get_default_or_raise(*, db_session: Session) -> Project:
     project = get_default(db_session=db_session)
 
     if not project:
-        raise ValidationError([
-            {
-                "loc": ("project",),
-                "msg": "No default project defined.",
-                "type": "value_error",
-            }
-        ])
+        raise ValidationError(
+            [
+                {
+                    "loc": ("project",),
+                    "msg": "No default project defined.",
+                    "type": "value_error",
+                }
+            ]
+        )
     return project
 
 
@@ -57,9 +58,10 @@ def get_by_name_or_raise(*, db_session: Session, project_in: ProjectRead) -> Pro
 
 def get_by_name_or_default(*, db_session, project_in: ProjectRead) -> Project:
     """Returns a project based on a name or the default if not specified."""
-    if project_in:
-        if project_in.name:
-            return get_by_name_or_raise(db_session=db_session, project_in=project_in)
+    if project_in and project_in.name:
+        project = get_by_name(db_session=db_session, name=project_in.name)
+        if project:
+            return project
     return get_default_or_raise(db_session=db_session)