refactor: rename active_location to current_location

Author: jacob-a-brown

db/thing.py

@@ -239,18 +239,18 @@ class Thing(Base, AutoBaseMixin, ReleaseMixin, StatusHistoryMixin, PermissionMix
     )
 
     @property
-    def active_location(self):
+    def current_location(self):
         """
         Returns the currently active Location by sorting the effective_start
         field. Thing eagerly loads location_association, which eagerly loads
         location, which will hopefully prevent N+1 query problems.
         """
-        active_location = sorted(
+        current_location = sorted(
             self.location_associations, key=lambda x: x.effective_start, reverse=True
         )
         return (
-            active_location[0].location
-            if active_location and active_location[0].effective_end is None
+            current_location[0].location
+            if current_location and current_location[0].effective_end is None
             else None
         )
 

schemas/thing.py

@@ -139,7 +139,7 @@ def check_depths(self):
 class BaseThingResponse(BaseResponseModel):
     name: str
     thing_type: str
-    active_location: LocationResponse | None
+    current_location: LocationResponse | None
     first_visit_date: PastDate | None
 
 

tests/test_thing.py

@@ -122,7 +122,7 @@ def test_add_water_well(location, group):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["active_location"] == expected_location
+    assert data["current_location"] == expected_location
 
     cleanup_post_test(Thing, data["id"])
 
@@ -199,7 +199,7 @@ def test_add_spring(location, group):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["active_location"] == expected_location
+    assert data["current_location"] == expected_location
 
     cleanup_post_test(Thing, data["id"])
 
@@ -408,7 +408,7 @@ def test_get_water_wells(water_well_thing, location):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["items"][0]["active_location"] == expected_location
+    assert data["items"][0]["current_location"] == expected_location
 
 
 def test_get_water_well_by_id(water_well_thing, location):
@@ -439,7 +439,7 @@ def test_get_water_well_by_id(water_well_thing, location):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["active_location"] == expected_location
+    assert data["current_location"] == expected_location
 
 
 def test_get_water_well_by_id_404_not_found(water_well_thing):
@@ -485,7 +485,7 @@ def test_get_springs(spring_thing, location):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["items"][0]["active_location"] == expected_location
+    assert data["items"][0]["current_location"] == expected_location
 
 
 def test_get_spring_by_id(spring_thing, location):
@@ -505,7 +505,7 @@ def test_get_spring_by_id(spring_thing, location):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["active_location"] == expected_location
+    assert data["current_location"] == expected_location
 
 
 def test_get_spring_by_id_404_not_found(spring_thing):
@@ -710,7 +710,7 @@ def test_get_thing_by_id(water_well_thing, location):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["active_location"] == expected_location
+    assert data["current_location"] == expected_location
 
 
 def test_get_thing_by_id_404_not_found(water_well_thing):
@@ -798,7 +798,7 @@ def test_patch_water_well(water_well_thing, location):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["active_location"] == expected_location
+    assert data["current_location"] == expected_location
 
     cleanup_patch_test(Thing, payload, water_well_thing)
 
@@ -861,7 +861,7 @@ def test_patch_spring(spring_thing, location):
     expected_location["created_at"] = (
         expected_location["created_at"].isoformat().replace("+00:00", "Z")
     )
-    assert data["active_location"] == expected_location
+    assert data["current_location"] == expected_location
 
     cleanup_patch_test(Thing, payload, spring_thing)