Merge pull request #5 from openagri-eu/46-issue

Author: JoleVLF

README.md

@@ -52,7 +52,7 @@ docker compose up
 
 The application will be served on http://127.0.0.1:8009 (I.E. typing localhost/docs in your browser will load the swagger documentation)
 
-Full list of APIs available you can check [here](https://editor-next.swagger.io/?url=https://gist.githubusercontent.com/JoleVLF/c0d5998cda18b2d0d3a1da3a98e379aa/raw/0f159195275da4156a593d0a50e4e5b08563a02b/v23.json)
+Full list of APIs available you can check [here](https://editor-next.swagger.io/?url=https://gist.githubusercontent.com/JoleVLF/c29adf44808a683149426912383c75eb/raw/7b57a845ab37954424c0ef2108962fd248c6966f/api_v4.json)
 # Documentation
 <h3>GET</h3>
 
@@ -94,6 +94,10 @@ Response is generated PDF file.
 - ### to_date
 - **Type**: `date`
 - **Description**:  AOptional date filter (until which data is filtered)
+
+- ### parcel_id
+- **Type**: `str`
+- **Description**:  Optional parcel filter.
 - 
 ## Response
 
@@ -121,7 +125,12 @@ Response is uuid of generated PDF file.
 
 - ### to_date
 - **Type**: `date`
-- **Description**:  AOptional date filter (until which data is filtered). If operation_id provided not used.
+- **Description**:  Optional date filter (until which data is filtered). If operation_id provided not used.
+
+- ### parcel_id
+- **Type**: `str`
+- **Description**:  Optional parcel filter (When operation id not used).
+
 
 ### data
 - **Type**: `UploadFile`
@@ -174,6 +183,10 @@ When service is run without Gatekeeper data must be provided in .json file forma
 - **Type**: `date`
 - **Description**:  AOptional date filter (until which data is filtered)
 
+- ### parcel_id
+- **Type**: `str`
+- **Description**:  Optional parcel filter.
+
 ### data
 - **Type**: `UploadFile`
 - **Description**: API processes the data directly to generate the report if data passed. This parameter is not required and when it is, must be provided as an `UploadFile`.

app/api/api_v1/endpoints/report.py

@@ -61,6 +61,7 @@ async def generate_irrigation_report(
     data: UploadFile = None,
     from_date: datetime.date = None,
     to_date: datetime.date = None,
+    parcel_id: str = None
 ):
     """
     Generates Irrigation Report PDF file
@@ -88,6 +89,7 @@ async def generate_irrigation_report(
         from_date=from_date,
         to_date=to_date,
         irrigation_id=irrigation_id,
+        parcel_id=parcel_id
     )
 
     return PDF(uuid=uuid_v4)
@@ -102,6 +104,7 @@ async def generate_generic_observation_report(
     operation_id: str = None,
     from_date: datetime.date = None,
     to_date: datetime.date = None,
+    parcel_id: str = None
 ):
     """
     Generates Observation Report PDF file
@@ -126,6 +129,7 @@ async def generate_generic_observation_report(
         operation_id=operation_id,
         from_date=from_date,
         to_date=to_date,
+        parcel_id=parcel_id
     )
 
     return PDF(uuid=uuid_v4)
@@ -143,6 +147,7 @@ async def generate_animal_report(
     data: UploadFile = None,
     from_date: datetime.date = None,
     to_date: datetime.date = None,
+    parcel_id: str = None
 ):
     """
     Generates Animal Report PDF file
@@ -171,6 +176,8 @@ async def generate_animal_report(
             params["parcel"] = str(parcel)
         if status is not None:
             params["status"] = status
+        if parcel_id:
+            params['parcel'] = parcel_id
 
     background_tasks.add_task(
         process_animal_data,

app/schemas/compost.py

@@ -47,24 +47,24 @@ class CropObservation(BaseModel):
     isMeasuredIn: Optional[str] = None
     observedProperty: Optional[str] = None
 
-
 class Operation(BaseModel):
     """Model for farm operations"""
 
     type: str = Field(alias="@type")
     id: str = Field(alias="@id")
-    activityType: dict
+    activityType: Optional[dict] = {}
     title: str = ""
     details: str = ""
     hasStartDatetime: Optional[datetime] = None
     hasEndDatetime: Optional[datetime] = None
     responsibleAgent: Optional[str] = ""
     usesAgriculturalMachinery: List[dict] = []
-    isOperatedOn: dict = None
-    operatedOn: dict = None
+    isOperatedOn: Optional[dict] = None
+    operatedOn: Optional[dict] = {}
     hasMeasurement: list[dict] = None
     hasNestedOperation: list[dict] = None
     usesIrrigationSystem: Optional[str] = None
+    hasAgriParcel: Optional[dict] = None
 
 
 class AddRawMaterialOperation(Operation):

app/utils/animals_report.py

@@ -247,8 +247,10 @@ def process_animal_data(
                     token=token,
                     params={"format": "json"},
                 )
-
-    animals = parse_animal_data(json_data)
+    if json_data:
+        animals = parse_animal_data(json_data)
+    else:
+        animals = []
     try:
         anima_pdf = create_pdf_from_animals(animals, token)
     except Exception:

app/utils/farm_calendar_report.py

@@ -91,33 +91,39 @@ def create_farm_calendar_pdf(
             if operation.usesAgriculturalMachinery
             else None
         )
-        if agr_mach_id:
+
+        agr_resp = None
+        parcel_id = None
+        if operation.hasAgriParcel:
+            parcel_id = operation.hasAgriParcel.get("@id", None)
+
+        elif agr_mach_id:
             agr_resp = make_get_request(
-                url=f'{settings.REPORTING_FARMCALENDAR_BASE_URL}{settings.REPORTING_FARMCALENDAR_URLS["machines"]}{agr_mach_id}/',
-                token=token,
-                params={"format": "json"},
+                    url=f'{settings.REPORTING_FARMCALENDAR_BASE_URL}{settings.REPORTING_FARMCALENDAR_URLS["machines"]}{agr_mach_id}/',
+                    token=token,
+                    params={"format": "json"})
+            parcel_id = agr_resp.get("hasAgriParcel", {}).get("@id", None) if agr_mach_id else None
+
+
+        address, farm = "", ""
+        if parcel_id:
+            address, farm = get_parcel_info(
+                parcel_id.split(":")[-1], token, geolocator
             )
-            if agr_resp:
-                parcel_id = agr_resp.get("hasAgriParcel", {}).get("@id", None)
-                address, farm = "", ""
-                if parcel_id:
-                    address, farm = get_parcel_info(
-                        parcel_id.split(":")[-1], token, geolocator
-                    )
 
-                pdf.set_font("FreeSerif", "B", 10)
-                pdf.cell(40, 8, "Parcel Location:")
-                pdf.set_font("FreeSerif", "", 10)
-                pdf.multi_cell(0, 8, address, ln=True, fill=True)
+        pdf.set_font("FreeSerif", "B", 10)
+        pdf.cell(40, 8, "Parcel Location:")
+        pdf.set_font("FreeSerif", "", 10)
+        pdf.multi_cell(0, 8, address, ln=True, fill=True)
 
-                pdf.set_font("FreeSerif", "B", 10)
-                pdf.cell(
-                    40,
-                    8,
-                    "Farm information:",
-                )
-                pdf.set_font("FreeSerif", "", 10)
-                pdf.multi_cell(0, 8, farm, ln=True, fill=True)
+        pdf.set_font("FreeSerif", "B", 10)
+        pdf.cell(
+            40,
+            8,
+            "Farm information:",
+        )
+        pdf.set_font("FreeSerif", "", 10)
+        pdf.multi_cell(0, 8, farm, ln=True, fill=True)
 
         cp_id = (
             operation.isOperatedOn.get("@id", "N/A:N/A").split(":")[-1]
@@ -385,6 +391,7 @@ def process_farm_calendar_data(
     operation_id: str = None,
     from_date: datetime.date = None,
     to_date: datetime.date = None,
+    parcel_id: str = None
 ) -> None:
     """
     Process farm calendar data and generate PDF report
@@ -428,6 +435,8 @@ def process_farm_calendar_data(
                             params=params,
                         )
 
+                        if parcel_id:
+                            params['parcel'] = parcel_id
                         operations = make_get_request(
                             url=operation_url,
                             token=token,
@@ -448,7 +457,7 @@ def process_farm_calendar_data(
             else:
                 operation_url = f"{operation_url}{operation_id}/"
                 del params["activity_type"]
-
+                logger.info("Delete act from params")
                 operation_params = params.copy()
                 operations = make_get_request(
                     url=operation_url,

app/utils/irrigation_report.py

@@ -177,6 +177,7 @@ def process_irrigation_data(
     from_date: datetime.date = None,
     to_date: datetime.date = None,
     irrigation_id: str = None,
+    parcel_id: str = None,
 ) -> None:
     """
     Process irrigation data and generate PDF report
@@ -194,6 +195,9 @@ def process_irrigation_data(
     else:
         if not data:
             params = {"format": "json"}
+            if parcel_id:
+                params['parcel'] = parcel_id
+
             decode_dates_filters(params, from_date, to_date)
             json_data = make_get_request(
                 url=f'{settings.REPORTING_FARMCALENDAR_BASE_URL}{settings.REPORTING_FARMCALENDAR_URLS["irrigations"]}',
@@ -204,7 +208,10 @@ def process_irrigation_data(
         else:
             json_data = json.load(data.file)
 
-    operations = parse_irrigation_operations(json_data)
+    if json_data:
+        operations = parse_irrigation_operations(json_data)
+    else:
+        operations = []
 
     try:
         pdf = create_pdf_from_operations(operations, token)