Added precinct class

Author: maxaaronson

backend/database/models/types/location.py renamed to backend/database/models/location.py

@@ -1,5 +1,6 @@
 from neomodel import (
     StructuredNode,
+    StructuredRel,
     StringProperty,
     UniqueIdProperty,
     RelationshipTo,
@@ -13,6 +14,8 @@ class Place(StructuredNode):
     """
     Base class for all places. Adds the 'Place' label to all subclasses.
     """
+    # __abstract_node__ = True
+
     uid = UniqueIdProperty()
     name = StringProperty(required=True)  # Common property for all places
     coordinates = PointProperty(crs="wgs-84")  # Spatial property for geographic coordinates
@@ -25,28 +28,43 @@ class State(Place):
     abbreviation = StringProperty(required=True, unique_index=True)  # e.g., "IL"
 
     # Relationships
-    capital = RelationshipTo("City", "HAS_CAPITAL", cardinality=One)  # A state has one capital city
-    counties = RelationshipTo("County", "HAS_COUNTY")  # A state contains multiple counties
+    cities = RelationshipTo("City", "HAS_CITY")  
+    counties = RelationshipTo("County", "HAS_COUNTY")  
 
     def __repr__(self):
         return f"<State {self.name}>"
 
 
 class County(Place):  
     # Relationships
-    state = RelationshipFrom("State", "HAS_COUNTY")  # A county belongs to a state
-    cities = RelationshipTo("City", "HAS_CITY")  # A county contains multiple cities
+    state = RelationshipFrom("State", "HAS_COUNTY")  
+    cities = RelationshipTo("City", "HAS_CITY") 
 
     def __repr__(self):
         return f"<County {self.name}>"
 
 
 class City(Place):  
-    population = StringProperty()  # Optional: population of the city
+    population = StringProperty()  
+
+    # Relationships
+    state = RelationshipFrom("State", "HAS_CITY")  
+    county = RelationshipFrom("County", "HAS_CITY")  
+
+    def __repr__(self):
+        return f"<City {self.name}>"
+
+
+class Precinct(Place):
+    """
+    Represents a precinct, which is a smaller administrative division within a city or county.
+    """
 
     # Relationships
-    state = RelationshipFrom("State", "HAS_CAPITAL")  # A city can be the capital of a state
-    county = RelationshipFrom("County", "HAS_CITY")  # A city belongs to a county
+    city = RelationshipFrom("City", "HAS_PRECINCT")
+    county = RelationshipFrom("County", "HAS_PRECINCT")
+    agency = RelationshipTo("Agency", "SERVED_BY")  # Connects Precinct to Agency
+    units = RelationshipTo("Unit", "PATROLLED_BY")  # Connects Precinct to Unit
 
     def __repr__(self):
-        return f"<City {self.name}>"
+        return f"<Precinct {self.name}>"

backend/tests/test_locations.py

@@ -1,6 +1,7 @@
 import pytest
 from neomodel.contrib.spatial_properties import NeomodelPoint
-from backend.database.models.types.location import State, County, City, Place
+from backend.database.models.location import State, County, City, Place
+
 
 def test_create_state():
     # Create a State node
@@ -31,12 +32,12 @@ def test_relationships():
     # Create relationships
     state.counties.connect(county)
     county.cities.connect(city)
-    state.capital.connect(city)
+    state.cities.connect(city)
 
     # Verify relationships
     assert county in state.counties.all()
     assert city in county.cities.all()
-    assert city in state.capital.all()
+    assert city in state.cities.all()
 
 def test_create_place_with_coordinates():
     coordinates = NeomodelPoint(latitude=41.8781, longitude=-87.6298, crs="wgs-84")
@@ -61,16 +62,16 @@ def test_relationships_with_coordinates():
     # Create relationships
     state.counties.connect(county)
     county.cities.connect(city)
-    state.capital.connect(city)
+    state.cities.connect(city)
 
     # Verify relationships
     assert county in state.counties.all()
     assert city in county.cities.all()
-    assert city in state.capital.all()
+    assert city in state.cities.all()
 
     # Verify spatial data
     assert state.coordinates.latitude == 40.6331
     assert state.coordinates.longitude == -89.3985
     assert county.coordinates.latitude == 41.7377
     assert county.coordinates.longitude == -87.6976
-    assert city.coordinates.latitude == 41.8781
+    assert city.coordinates.latitude == 41.8781