Update queries and hard coded delete

backend/database/queries/queries.py

@@ -1,21 +1,20 @@
 from .. import Officer, StateID, Incident
 from sqlalchemy.orm import Session
+from typing import Optional
 
 
-def officer_exists(db: Session, stateID: StateID) -> bool:
+def officer_exists(db: Session, stateID: StateID) -> Optional[Officer]:
     return (
         db.query(Officer)
         .join(StateID)
         .filter(
             StateID.value == stateID.value and StateID.state == stateID.state
         )
         .first()
-        is not None
     )
 
 
-def incident_exists(db: Session, incident: Incident) -> bool:
+def incident_exists(db: Session, incident: Incident) -> Optional[Incident]:
     return (
         db.query(Incident).filter(Incident.case_id == incident.case_id).first()
-        is not None
     )

backend/scraper/run_scrape.py

@@ -45,8 +45,7 @@ def add_to_database(
         raise ValueError(f"Invalid table {table}")
     if model_exists:  # type: ignore
         logger.info(f"{table} {uid} already in database")
-        return
-
+        model.delete()
     model.create()
 
     # add the model to the cache

backend/tests/test_queries.py

@@ -1,6 +1,7 @@
 from backend.database.queries.queries import officer_exists, incident_exists
 from backend.database import Officer, StateID, Incident
 from typing import Any
+from sqlalchemy.orm import Session
 
 
 def test_officer_exists(db_session: Any):
@@ -52,3 +53,39 @@ def test_incident_exists(db_session: Any):
 
     # Test that a non-existing incident returns False
     assert not incident_exists(db_session, Incident(**{"case_id": "654321"}))
+
+
+def test_officer_exists_with_state_id(db_session: Session):
+    # Create a test officer with a state ID value
+    state_id_value = "ABC123"
+    officer = Officer(**{"first_name": "Test Officer"})
+    state_id = StateID(**{"value": state_id_value, "state": "NY"})
+    officer.stateId = state_id  # type: ignore
+    db_session.add(officer)
+    db_session.commit()
+
+    # Test that the officer exists
+    assert officer_exists(db_session, state_id) is not None
+
+
+def test_officer_exists_with_invalid_state_id(db_session: Session):
+    # Test that a non-existing officer returns False
+    assert not officer_exists(
+        db_session, StateID(**{"value": "DEF456", "state": "NY"})
+    )
+
+
+def test_incident_exists_with_case_id(db_session: Session):
+    # Create a test incident with a case ID value
+    case_id_value = "123456"
+    incident = Incident(**{"case_id": case_id_value})
+    db_session.add(incident)
+    db_session.commit()
+
+    # Test that the incident exists
+    assert incident_exists(db_session, incident) is not None
+
+
+def test_incident_exists_with_invalid_case_id(db_session: Session):
+    # Test that a non-existing incident returns False
+    assert not incident_exists(db_session, Incident(**{"case_id": "654321"}))