RF update work title to remove hanging dash

bcgov · Dec 5, 2024 · eb53c2a · eb53c2a
1 parent 03068f9
commit eb53c2a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/epictrack-api/src/api/models/work.py b/epictrack-api/src/api/models/work.py
@@ -29,6 +29,7 @@
     String,
     Text,
     and_,
+    case,
     exists,
     func,
     or_
@@ -143,7 +144,15 @@ def title(self):
     def title(self):
         """SQL expression for title."""
         from api.models.work_type import WorkType  # pylint:disable=import-outside-toplevel
-        return func.concat(Project.name, " - ", WorkType.name, " - ", self.simple_title)  # pylint:disable=not-callable
+        return (
+            case(
+                    (
+                        func.coalesce(self.simple_title, "") != "",
+                        func.concat(Project.name, " - ", WorkType.name, " - ", self.simple_title),  # pylint:disable=not-callable
+                    ),
+                    else_=func.concat(Project.name, " - ", WorkType.name)
+                )
+        )
 
     @hybrid_property
     def anticipated_referral_date(self):