Add DELETE by id_plant

Author: fjpacheco

app/controller/device_plant_controller.py

@@ -1,5 +1,6 @@
-from typing import Union
-from fastapi import Request, status, HTTPException
+from fastapi.responses import JSONResponse
+from typing import Optional, Union
+from fastapi import Request, status, HTTPException, Response
 from database.models.device_plant import DevicePlant
 from schemas.device_plant import (
     DevicePlantPartialUpdateSchema,
@@ -9,6 +10,7 @@
 import logging
 from psycopg2.errors import UniqueViolation
 from sqlalchemy.exc import PendingRollbackError, IntegrityError, NoResultFound
+from fastapi.responses import JSONResponse
 
 logger = logging.getLogger("app")
 logger.setLevel("DEBUG")
@@ -85,12 +87,22 @@ def get_all_device_plant_relations(req: Request, limit: int):
 
 
 @withSQLExceptionsHandle
-def delete_device_plant_relation_by_id_device(req: Request, id_device: str):
-    result_rowcount = req.app.database.delete_by_device_id(id_device)
-    if result_rowcount == 0:
+def delete_device_plant_relation(req: Request, response: Response, id_device: Optional[str] = None, plant_id: Optional[str] = None):
+    if (id_device is None and plant_id is None) or (id_device and plant_id):
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="No device-plant relation found with the given device id"
+            detail="No identifier was provided, or both identifiers were provided."
         )
-
-    return {"message": "Device-plant relation deleted successfully"}
+        
+    result_rowcount = 0
+    if id_device is not None:
+        result_rowcount = req.app.database.delete_by_field("id_device", id_device)
+    else:
+        result_rowcount = req.app.database.delete_by_field("id_plant", plant_id)
+    
+    
+    if result_rowcount == 0:
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return # EMPTY RESPONSE! RESOURCE DID NOT EXIST
+    else:
+        return "Device-plant relation deleted successfully"

app/database/database.py

@@ -1,4 +1,4 @@
-from sqlalchemy import create_engine, select, delete, engine
+from sqlalchemy import create_engine, select, delete, engine, column
 from sqlalchemy.orm import Session
 from dotenv import load_dotenv
 from os import environ
@@ -84,15 +84,8 @@ def get_last_measurement(self, id_plant: int) -> Measurement:
 
         return result
 
-    def delete_by_device_id(self, id_device: str) -> int:
-        """
-        Delete a device-plant relation by device id
-        Args:
-            id_device (str): device id
-        Returns:
-            int: number of rows affected. 0 if no rows were affected
-        """
-        query = delete(DevicePlant).where(DevicePlant.id_device == id_device)
+    def delete_by_field(self, field: str, value: str) -> int:
+        query = delete(DevicePlant).where(column(field) == value)
         result = self.session.execute(query)
         self.session.commit()
         return result.rowcount

app/router/device_plant_router.py

@@ -1,6 +1,6 @@
-from typing import List
+from typing import List, Optional
 
-from fastapi import APIRouter, Body, Request, status, Query
+from fastapi import APIRouter, Body, Request, status, Query,Response
 from schemas.device_plant import (
     DevicePlantPartialUpdateSchema,
     DevicePlantSchema,
@@ -58,8 +58,8 @@ async def get_device_plant(req: Request,
 
 
 @device_plant.delete(
-    "/{id_device}",
+    "/",
     status_code=status.HTTP_200_OK
 )
-async def delete_device_plant_relation_by_id_device(req: Request, id_device: str):
-    return controller.delete_device_plant_relation_by_id_device(req, id_device)
+async def delete_device_plant_relation(req: Request, response: Response, id_device: Optional[str] = None, plant_id: Optional[str] = None):
+    return controller.delete_device_plant_relation(req, response, id_device, plant_id)