Merge pull request #391 from unicef/expose_year_of_audit

hbarisik · web-flow · commit 048abbefed7a · 2025-03-05T16:18:19.000+03:00
expose year_of_audit in engagement views
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+4.7.15
+----
+* Exposed year_of_audit in two engagement views.
+
 4.7.14
 ----
 * Fix logic error extract_longitude function
diff --git a/src/etools_datamart/__init__.py b/src/etools_datamart/__init__.py
@@ -1,3 +1,3 @@
 NAME = "etools-datamart"
-VERSION = __version__ = "4.7.14"
+VERSION = __version__ = "4.7.15"
 __author__ = ""
diff --git a/src/etools_datamart/api/endpoints/datamart/audit_engagement.py b/src/etools_datamart/api/endpoints/datamart/audit_engagement.py
@@ -51,6 +51,7 @@ class Meta(DataMartSerializer.Meta):
             "partner",
             "agreement",
             "po_item",
+            "year_of_audit",
         )
 
 
@@ -121,6 +122,7 @@ class Meta(DataMartSerializer.Meta):
             "action_points",
             "status",
             "audit_opinion",
+            "year_of_audit",
         )
 
     def get_partner(self, obj):
diff --git a/tests/api/interfaces/_api_checker/test_data/data/_api_latest_datamart_audit_engagement-details_.fixture.json b/tests/api/interfaces/_api_checker/test_data/data/_api_latest_datamart_audit_engagement-details_.fixture.json
@@ -68,7 +68,8 @@
                     "financial_findings": "0.00",
                     "audit_opinion": null,
                     "action_points": null,
-                    "key_internal_control_weaknesses": null
+                    "key_internal_control_weaknesses": null,
+                    "year_of_audit": null
                 }
             },
             {
@@ -138,7 +139,8 @@
                     "financial_findings": "0.00",
                     "audit_opinion": null,
                     "action_points": null,
-                    "key_internal_control_weaknesses": null
+                    "key_internal_control_weaknesses": null,
+                    "year_of_audit": null
                 }
             },
             {
@@ -208,7 +210,8 @@
                     "financial_findings": "0.00",
                     "audit_opinion": null,
                     "action_points": null,
-                    "key_internal_control_weaknesses": null
+                    "key_internal_control_weaknesses": null,
+                    "year_of_audit": null
                 }
             }
         ],
diff --git a/tests/api/interfaces/_api_checker/test_data/data/_api_latest_datamart_audit_engagements_.fixture.json b/tests/api/interfaces/_api_checker/test_data/data/_api_latest_datamart_audit_engagements_.fixture.json
@@ -68,7 +68,8 @@
                     "financial_findings": "0.00",
                     "audit_opinion": null,
                     "action_points": null,
-                    "key_internal_control_weaknesses": null
+                    "key_internal_control_weaknesses": null,
+                    "year_of_audit": null
                 }
             },
             {
@@ -138,7 +139,8 @@
                     "financial_findings": "0.00",
                     "audit_opinion": null,
                     "action_points": null,
-                    "key_internal_control_weaknesses": null
+                    "key_internal_control_weaknesses": null,
+                    "year_of_audit": null
                 }
             },
             {
@@ -208,7 +210,8 @@
                     "financial_findings": "0.00",
                     "audit_opinion": null,
                     "action_points": null,
-                    "key_internal_control_weaknesses": null
+                    "key_internal_control_weaknesses": null,
+                    "year_of_audit": null
                 }
             }
         ],
diff --git a/tests/api/interfaces/_api_checker/test_data/test_list/_api_latest_datamart_audit_engagement-details_/get/197add8e52191fc33bc0669a32ea63213e8608ee9b3b24c42981397919aba411.response.json b/tests/api/interfaces/_api_checker/test_data/test_list/_api_latest_datamart_audit_engagement-details_/get/197add8e52191fc33bc0669a32ea63213e8608ee9b3b24c42981397919aba411.response.json
@@ -15,7 +15,7 @@
         "qs_filter": "{}",
         "qs_exclude": "{}",
         "cache-ttl": "1y",
-        "Content-Length": "1452",
+        "Content-Length": "1515",
         "Referrer-Policy": "same-origin",
         "Cross-Origin-Opener-Policy": "same-origin"
     },
@@ -46,7 +46,8 @@
                 "financial_findings": "0.00",
                 "action_points": null,
                 "status": null,
-                "audit_opinion": null
+                "audit_opinion": null,
+                "year_of_audit": null
             },
             {
                 "po_item": null,
@@ -68,7 +69,8 @@
                 "financial_findings": "0.00",
                 "action_points": null,
                 "status": null,
-                "audit_opinion": null
+                "audit_opinion": null,
+                "year_of_audit": null
             },
             {
                 "po_item": null,
@@ -90,7 +92,8 @@
                 "financial_findings": "0.00",
                 "action_points": null,
                 "status": null,
-                "audit_opinion": null
+                "audit_opinion": null,
+                "year_of_audit": null
             }
         ]
     },
diff --git a/tests/api/interfaces/_api_checker/test_data/test_list/_api_latest_datamart_audit_engagement-details_/get/77293dc2be4d1446d85ffe425e5dbf254c1f0ed35c6c2079410ef1aa19e6063b.response.json b/tests/api/interfaces/_api_checker/test_data/test_list/_api_latest_datamart_audit_engagement-details_/get/77293dc2be4d1446d85ffe425e5dbf254c1f0ed35c6c2079410ef1aa19e6063b.response.json
@@ -15,7 +15,7 @@
         "qs_filter": "{}",
         "qs_exclude": "{}",
         "cache-ttl": "1y",
-        "Content-Length": "2442",
+        "Content-Length": "2505",
         "Referrer-Policy": "same-origin",
         "Cross-Origin-Opener-Policy": "same-origin"
     },
@@ -57,7 +57,8 @@
                 "exchange_rate": "0.00",
                 "partner": 100,
                 "agreement": null,
-                "po_item": null
+                "po_item": null,
+                "year_of_audit": null
             },
             {
                 "country_name": "chad",
@@ -90,7 +91,8 @@
                 "exchange_rate": "0.00",
                 "partner": 100,
                 "agreement": null,
-                "po_item": null
+                "po_item": null,
+                "year_of_audit": null
             },
             {
                 "country_name": "lebanon",
@@ -123,7 +125,9 @@
                 "exchange_rate": "0.00",
                 "partner": 100,
                 "agreement": null,
-                "po_item": null
+                "po_item": null,
+                "year_of_audit": null
+
             }
         ]
     },
diff --git a/tests/api/interfaces/_api_checker/test_data/test_list/_api_latest_datamart_audit_engagements_/get/77293dc2be4d1446d85ffe425e5dbf254c1f0ed35c6c2079410ef1aa19e6063b.response.json b/tests/api/interfaces/_api_checker/test_data/test_list/_api_latest_datamart_audit_engagements_/get/77293dc2be4d1446d85ffe425e5dbf254c1f0ed35c6c2079410ef1aa19e6063b.response.json
@@ -15,7 +15,7 @@
         "qs_filter": "{}",
         "qs_exclude": "{}",
         "cache-ttl": "1y",
-        "Content-Length": "2442",
+        "Content-Length": "2505",
         "Referrer-Policy": "same-origin",
         "Cross-Origin-Opener-Policy": "same-origin"
     },
@@ -57,7 +57,8 @@
                 "exchange_rate": "0.00",
                 "partner": 100,
                 "agreement": null,
-                "po_item": null
+                "po_item": null,
+                "year_of_audit": null
             },
             {
                 "country_name": "chad",
@@ -90,8 +91,9 @@
                 "exchange_rate": "0.00",
                 "partner": 100,
                 "agreement": null,
-                "po_item": null
-            },
+                "po_item": null,
+                "year_of_audit": null
+           },
             {
                 "country_name": "lebanon",
                 "schema": "lebanon",
@@ -123,7 +125,8 @@
                 "exchange_rate": "0.00",
                 "partner": 100,
                 "agreement": null,
-                "po_item": null
+                "po_item": null,
+                "year_of_audit": null
             }
         ]
     },
diff --git a/tests/api/interfaces/_api_checker/test_data/test_record/_api_latest_datamart_audit_engagement-details_797_/get/dc937b59892604f5a86ac96936cd7ff09e25f18ae6b758e8014a24c7fa039e91.response.json b/tests/api/interfaces/_api_checker/test_data/test_record/_api_latest_datamart_audit_engagement-details_797_/get/dc937b59892604f5a86ac96936cd7ff09e25f18ae6b758e8014a24c7fa039e91.response.json
@@ -12,7 +12,7 @@
         "qs_exclude": "{}",
         "cache-hit": "False",
         "cache-ttl": "1y",
-        "Content-Length": "455",
+        "Content-Length": "476",
         "Referrer-Policy": "same-origin",
         "Cross-Origin-Opener-Policy": "same-origin"
     },
@@ -36,7 +36,8 @@
         "financial_findings": "0.00",
         "action_points": null,
         "status": null,
-        "audit_opinion": null
-    },
+        "audit_opinion": null,
+        "year_of_audit": null
+     },
     "content_type": "application/json"
-}
+}
diff --git a/tests/api/interfaces/_api_checker/test_data/test_record/_api_latest_datamart_audit_engagements_1_/get/dc937b59892604f5a86ac96936cd7ff09e25f18ae6b758e8014a24c7fa039e91.response.json b/tests/api/interfaces/_api_checker/test_data/test_record/_api_latest_datamart_audit_engagements_1_/get/dc937b59892604f5a86ac96936cd7ff09e25f18ae6b758e8014a24c7fa039e91.response.json
@@ -86,4 +86,4 @@
         "year_of_audit": null
     },
     "content_type": "application/json"
-}
+}

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +4.7.15
 +----
 +* Exposed year_of_audit in two engagement views.
++
 .7.14
 ----
 * Fix logic error extract_longitude function
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ class Meta(DataMartSerializer.Meta):`
`51`	`51`	`"partner",`
`52`	`52`	`"agreement",`
`53`	`53`	`"po_item",`
	`54`	`+ "year_of_audit",`
`54`	`55`	`)`
`55`	`56`
`56`	`57`
`@@ -121,6 +122,7 @@ class Meta(DataMartSerializer.Meta):`
`121`	`122`	`"action_points",`
`122`	`123`	`"status",`
`123`	`124`	`"audit_opinion",`
	`125`	`+ "year_of_audit",`
`124`	`126`	`)`
`125`	`127`
`126`	`128`	`def get_partner(self, obj):`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@`
`68`	`68`	`"financial_findings": "0.00",`
`69`	`69`	`"audit_opinion": null,`
`70`	`70`	`"action_points": null,`
`71`		`- "key_internal_control_weaknesses": null`
	`71`	`+ "key_internal_control_weaknesses": null,`
	`72`	`+ "year_of_audit": null`
`72`	`73`	`}`
`73`	`74`	`},`
`74`	`75`	`{`
`@@ -138,7 +139,8 @@`
`138`	`139`	`"financial_findings": "0.00",`
`139`	`140`	`"audit_opinion": null,`
`140`	`141`	`"action_points": null,`
`141`		`- "key_internal_control_weaknesses": null`
	`142`	`+ "key_internal_control_weaknesses": null,`
	`143`	`+ "year_of_audit": null`
`142`	`144`	`}`
`143`	`145`	`},`
`144`	`146`	`{`
`@@ -208,7 +210,8 @@`
`208`	`210`	`"financial_findings": "0.00",`
`209`	`211`	`"audit_opinion": null,`
`210`	`212`	`"action_points": null,`
`211`		`- "key_internal_control_weaknesses": null`
	`213`	`+ "key_internal_control_weaknesses": null,`
	`214`	`+ "year_of_audit": null`
`212`	`215`	`}`
`213`	`216`	`}`
`214`	`217`	`],`