Merge pull request #60 from openagri-eu/missing-farm-info

Missing farm info

Author: prske

README.md

@@ -122,6 +122,7 @@ Response is uuid of generated PDF file.
 ### calendar_activity_type
 - **Type**: `str`
 - **Description**:  All Farm Calendar Observation Type values are possible as input (optional). If operation_id provided not used.
+  (**Compost Operation** _calendar_activity_type_ is used to get all Compost Operations)
 
 ### operation_id
 - **Type**: `uudi str`

app/tests/unit/test_reports_endpoints.py

@@ -91,3 +91,55 @@ def test_get_report_endpoint_success(self):
         response =  self.client.get(f"{TestReportAPI.BASE_URL}/123/", headers={"X-Token": "OK"},
                           params={"token": TestReportAPI.CORRECT_TOKEN})
         assert response.status_code == 200
+
+
+
+    def test_generate_irrigation_report_success(self):
+        from api.api_v1.endpoints import report
+
+        mock_bg_task = self.patch(report, "process_irrigation_fertilization_data")
+        params = {
+            "token": TestReportAPI.CORRECT_TOKEN,
+            "irrigation_id": "test_irrigation_id",
+            "from_date": "2023-01-01",
+            "to_date": "2023-01-31",
+            "parcel_id": "test_parcel_id"
+        }
+
+        response = self.client.post(
+            f"{TestReportAPI.BASE_URL}/irrigation-report/",
+            headers={"X-Token": "OK"},
+            params=params
+        )
+
+        assert response.status_code == 200
+        response_json = response.json()
+        assert "uuid" in response_json
+        assert len(response_json["uuid"]) == 36
+
+        mock_bg_task.assert_called_once()
+
+        args, kwargs = mock_bg_task.call_args
+        assert "123/" in kwargs['pdf_file_name']
+
+    def test_generate_irrigation_report_with_file_upload(self):
+        from api.api_v1.endpoints import report
+        mock_bg_task = self.patch(report, "process_irrigation_fertilization_data")
+
+        file_content = b'{"some": "json_data"}'
+        files = {
+            'data': ('test_data.json', file_content, 'application/json')
+        }
+
+        response = self.client.post(
+            f"{TestReportAPI.BASE_URL}/irrigation-report/",
+            headers={"X-Token": "OK"},
+            params={"token": TestReportAPI.CORRECT_TOKEN},
+            files=files
+        )
+
+        assert response.status_code == 200
+        mock_bg_task.assert_called_once()
+
+        _, kwargs = mock_bg_task.call_args
+        assert kwargs['data'] == file_content

app/utils/animals_report.py

@@ -7,7 +7,7 @@
 from fpdf.fonts import FontFace
 
 from core import settings
-from utils import EX, add_fonts, decode_jwt_token, decode_dates_filters, get_parcel_info
+from utils import EX, add_fonts, decode_jwt_token, decode_dates_filters, get_parcel_info, FarmInfo
 from schemas.animals import *
 from utils.farm_calendar_report import geolocator
 from utils.json_handler import make_get_request
@@ -67,7 +67,7 @@ def create_pdf_from_animals(
         an = animals[0]
         parcel_id = an.hasAgriParcel.id if an.hasAgriParcel else None
         address = ""
-        farm = ""
+        farm = FarmInfo(description="", administrator="", vatID="", name="", municipality="", contactPerson="")
         identifier = ""
         if parcel_id:
             parcel = parcel_id.split(":")[3]
@@ -274,6 +274,8 @@ def process_animal_data(
         raise HTTPException(
             status_code=400, detail="PDF generation of animal report failed."
         )
+
+
     pdf_dir = f"{settings.PDF_DIRECTORY}{pdf_file_name}"
     os.makedirs(os.path.dirname(f"{pdf_dir}.pdf"), exist_ok=True)
     anima_pdf.output(f"{pdf_dir}.pdf")

app/utils/farm_calendar_report.py

@@ -112,11 +112,12 @@ def create_farm_calendar_pdf(
             )
             parcel_id = (
                 agr_resp.get("hasAgriParcel", {}).get("@id", None)
-                if agr_mach_id
+                if agr_resp and agr_mach_id
                 else None
             )
 
-        address, farm = "", ""
+        address = ""
+        farm = FarmInfo(description="", administrator="", vatID="", name="", municipality="", contactPerson="")
         if parcel_id:
             parcel_data, farm = get_parcel_info(
                 parcel_id.split(":")[-1], token, geolocator

app/utils/irrig_fert_pest_report.py

@@ -10,7 +10,7 @@
 from core import settings
 from schemas import IrrigationOperation, FertilizationOperation, CropProtectionOperation
 from utils.satellite_image_get import fetch_wms_image, SatelliteImageException
-from utils import EX, add_fonts, decode_dates_filters, get_parcel_info, display_pdf_parcel_details
+from utils import EX, add_fonts, decode_dates_filters, get_parcel_info, display_pdf_parcel_details, FarmInfo
 from utils.farm_calendar_report import geolocator
 from utils.generate_aggregation_data import (
     generate_total_volume_graph,
@@ -99,7 +99,10 @@ def create_pdf_from_operations(
     pdf.line(pdf.l_margin, y_position, line_end_x, y_position)
     pdf.ln(5)
 
-    address, farm, parcel_defined = None, None, None
+    address = ""
+    identifier = ""
+    farm = FarmInfo(description="", administrator="", vatID="", name="", municipality="", contactPerson="")
+    parcel_defined = None
     from_date_local, to_date_local = today, None
     if from_date:
         from_date_local = from_date.strftime("%Y-%m-%d")
@@ -271,7 +274,7 @@ def create_pdf_from_operations(
                 if not parcel_defined:
                     parcel_id = op.operatedOn.get("@id") if op.operatedOn else None
                     address = ""
-                    farm = ""
+                    farm = FarmInfo(description="", administrator="", vatID="", name="", municipality="", contactPerson="")
                     identifier = ""
                     if parcel_id:
                         parcel = parcel_id.split(":")[3] if op.operatedOn else None