Merge pull request #3535 from opensafely-core/evansd/database-name

Move `workspace.db` API field to `database_name`
opensafely-core · Sep 11, 2023 · 36a9661 · 36a9661
2 parents 38a9dcc + 6b80a62
commit 36a9661
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/jobserver/api/jobs.py b/jobserver/api/jobs.py
@@ -229,7 +229,6 @@ class Meta:
             "name",
             "repo",
             "branch",
-            "db",
             "created_by",
             "created_at",
         ]
@@ -257,6 +256,7 @@ class Meta:
                 "created_by",
                 "created_at",
                 "workspace",
+                "database_name",
                 "project",
                 "orgs",
             ]

diff --git a/jobserver/models/core.py b/jobserver/models/core.py
@@ -367,6 +367,13 @@ def status(self):
 
         return "unknown"
 
+    @property
+    def database_name(self):
+        # TODO: This is temporary code. We're going to remove the `workspace.db` column
+        # entirely and use different logic for decided which database a job runs
+        # against.
+        return self.workspace.db
+
 
 class Org(models.Model):
     """An Organisation using the platform"""

diff --git a/tests/unit/jobserver/api/test_jobs.py b/tests/unit/jobserver/api/test_jobs.py
@@ -808,11 +808,11 @@ def dictify(od):
             "project": project.slug,
             "requested_actions": ["frob", "wizzle"],
             "sha": "",
+            "database_name": "full",
             "workspace": {
                 "name": workspace.name,
                 "repo": workspace.repo.url,
                 "branch": "",
-                "db": "full",
                 "created_by": workspace.created_by.username,
                 "created_at": now_iso,
             },
@@ -828,11 +828,11 @@ def dictify(od):
             "project": project.slug,
             "requested_actions": ["frobnicate", "wibble"],
             "sha": "",
+            "database_name": "full",
             "workspace": {
                 "name": workspace.name,
                 "repo": workspace.repo.url,
                 "branch": "",
-                "db": "full",
                 "created_by": workspace.created_by.username,
                 "created_at": now_iso,
             },
@@ -848,11 +848,11 @@ def dictify(od):
             "project": project.slug,
             "requested_actions": ["analyse"],
             "sha": "",
+            "database_name": "full",
             "workspace": {
                 "name": workspace.name,
                 "repo": workspace.repo.url,
                 "branch": "",
-                "db": "full",
                 "created_by": workspace.created_by.username,
                 "created_at": now_iso,
             },