Fixes a few issues with project deletion (#2918)

Netflix · Jan 31, 2023 · ab172fd · ab172fd
1 parent 440e858
commit ab172fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/dispatch/project/models.py b/src/dispatch/project/models.py
@@ -30,6 +30,11 @@ class Project(Base):
     organization_id = Column(Integer, ForeignKey(Organization.id))
     organization = relationship("Organization")
 
+    dispatch_user_project = relationship(
+        "DispatchUserProject",
+        cascade="all, delete-orphan",
+    )
+
     @hybrid_property
     def slug(self):
         return slugify(self.name)

diff --git a/src/dispatch/service/views.py b/src/dispatch/service/views.py
@@ -100,4 +100,14 @@ def delete_service(*, db_session: Session = Depends(get_db), service_id: Primary
             status_code=status.HTTP_404_NOT_FOUND,
             detail=[{"msg": "A service with this id does not exist."}],
         )
-    delete(db_session=db_session, service_id=service_id)
+    try:
+        delete(db_session=db_session, service_id=service_id)
+    except IntegrityError:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail=[
+                {
+                    "msg": "Unable to delete service because it is referenced by an incident `Role`. Remove this reference before deletion."
+                }
+            ],
+        )