hotfix

.circleci/config.yml

@@ -21,6 +21,14 @@ jobs:
             else
               docker build -t unicef/datamart:$BASE_TAG -f Dockerfile-installed .
               docker push unicef/datamart:$BASE_TAG
+              docker build --build-arg BASE_TAG=$BASE_TAG -t unicef/datamart:$TAG .
+              echo "Current directory: $(pwd)"
+              echo "Files in current directory: $(ls -l)"
+              VERSION=$(grep 'VERSION =' src/etools_datamart/__init__.py | awk '{print $5}')
+              VERSION=${VERSION//\"}
+              echo "VERSION value is $VERSION"
+              docker tag unicef/datamart:$TAG unicef/datamart:"cand-tag-$VERSION"
+              docker push unicef/datamart:"cand-tag-$VERSION"
               if (echo "develop" | grep -q "$CIRCLE_BRANCH"); then
                 docker tag unicef/datamart:$BASE_TAG unicef/datamart:latest
                 docker push unicef/datamart:latest
@@ -107,18 +115,34 @@ jobs:
       - run:
           name: Pushing to Docker Hub
           command: |
+            echo "Current directory: $(pwd)"
+            echo "Files in current directory: $(ls -l)"
+            VERSION=$(grep 'VERSION =' src/etools_datamart/__init__.py | awk '{print $5}')
+            VERSION=${VERSION//\"}
+            echo "VERSION value is $VERSION"
             TAG=${CIRCLE_BRANCH}
             BASE_TAG="$(md5sum Pipfile.lock | cut -c1-6)$(md5sum Dockerfile-installed | cut -c1-6)"
             docker login -u $DOCKER_USER -p $DOCKER_PASS
+            echo "TAG value is $TAG"
             docker push unicef/datamart:$TAG
+            docker tag unicef/datamart:$TAG unicef/datamart:"tag-$VERSION"
+            docker push unicef/datamart:"tag-$VERSION"
+            docker tag unicef/datamart:$BASE_TAG unicef/datamart:"base_tag-$VERSION"
+            docker push unicef/datamart:"base_tag-$VERSION"
             if (echo "develop" | grep -q "$CIRCLE_BRANCH"); then
-              docker tag unicef/datamart:$BASE_TAG unicef/datamart:latest
-              docker push unicef/datamart:latest
+              docker tag unicef/datamart:$TAG unicef/datamart:"dev-$VERSION"
+              docker push unicef/datamart:"dev-$VERSION"
+              docker tag unicef/datamart:$TAG unicef/datamart:dev-latest
+              docker push unicef/datamart:dev-latest
+              docker tag unicef/datamart:$BASE_TAG unicef/datamart:base-dev-latest
+              docker push unicef/datamart:base-dev-latest
             elif (echo "master" | grep -q "$CIRCLE_BRANCH"); then
-              docker tag unicef/datamart:$BASE_TAG unicef/datamart:latest_prod
+              docker tag unicef/datamart:$TAG unicef/datamart:"prod-$VERSION"
+              docker push unicef/datamart:"prod-$VERSION"
+              docker tag unicef/datamart:$TAG unicef/datamart:latest_prod
               docker push unicef/datamart:latest_prod
-              docker tag unicef/datamart:$BASE_TAG unicef/datamart:4.7.6
-              docker push unicef/datamart:4.7.6
+              docker tag unicef/datamart:$BASE_TAG unicef/datamart:base-prod-latest
+              docker push unicef/datamart:base-prod-latest
             else
               echo "Not a followed branch not pushing latest"
             fi

CHANGES

@@ -1,3 +1,37 @@
+4.7.14
+----
+* Fix logic error extract_longitude function
+
+4.7.13
+----
+* Improved FMQuestion and FMOntrack loaders to extract latitude and longitude from 
+Location.point when Location.longitude and Location.latitude.
+
+4.7.12
+----
+Formula for SpotCheckFindings.pending_unsupported_amount has been updated as below;
+    = audit_spotcheck.total_amount_of_ineligible_expenditure
+      audit_engagement.additional_supporting_documentation_provided
+      audit_engagement.justification_provided_and_accepted
+      audit_engagement.write_off_required
+      audit_engagement.amount_refunded
+
+4.7.11
+----
+CI pipline improvements for version tagging.
+
+4.7.10
+----
+Further improve Celery task failure error report
+
+4.7.9
+----
+Make groups parameter name consistent 
+
+
+----
+Hotfix for export access log to handle non-standard  date format
+
 4.7.6
 ----
 * Missing dependencies for FMQuestionLoader, FMOntrack and LocationsiteLoader have been fixed.

src/etools_datamart/__init__.py

@@ -1,3 +1,3 @@
 NAME = "etools-datamart"
-VERSION = __version__ = "4.7.6"
+VERSION = __version__ = "4.7.14"
 __author__ = ""

src/etools_datamart/api/filtering.py

@@ -198,7 +198,7 @@ def to_html(self, request, queryset, view):
 
 
 class GroupNameFilter(BaseFilterBackend):
-    query_param = "group"
+    query_param = "groups"
     template = "api/group_filter.html"
 
     def get_query(self, request):

src/etools_datamart/api/templates/api/group_filter.html

@@ -2,7 +2,7 @@
 {#<h2>{% trans "Group" %}</h2>#}
 <div class="list-group">
 <label for="id_vendor_number" class="control-label ">Groups</label>
-<select name="group_name" multiple="multiple" data-allowclear="true" class="select2" style="width: 100%">
+<select name="groups" multiple="multiple" data-allowclear="true" class="select2" style="width: 100%">
 {% for group in groups %}<option {% if group in selection %}selected="selected"{% endif %}>{{ group }}</option>
 {% endfor %}
 </select>

src/etools_datamart/apps/mart/data/models/audit_spotcheck.py

@@ -69,6 +69,7 @@ def get_pending_unsupported_amount(self, record, values, field_name):
             - record.additional_supporting_documentation_provided
             - record.justification_provided_and_accepted
             - record.write_off_required
+            - record.amount_refunded
         )
 
 

src/etools_datamart/apps/mart/data/models/fm_questions.py

@@ -25,6 +25,28 @@
 logger = get_task_logger(__name__)
 
 
+def extract_latitude(location):
+    if location.latitude is not None:
+        return location.latitude
+    elif location.point is not None:
+        return location.point.y
+    elif location.geom is not None:
+        return location.centroid.y
+    else:
+        return None
+
+
+def extract_longitude(location):
+    if location.longitude is not None:
+        return location.longitude
+    elif location.point is not None:
+        return location.point.x
+    elif location.geom is not None:
+        return location.centroid.x
+    else:
+        return None
+
+
 class FMQuestionLoader(EtoolsLoader):
     """Loader for FM Questions"""
 
@@ -244,8 +266,8 @@ def get_location(self, record: FieldMonitoringDataCollectionFinding, values: dic
                 "admin_level": instance.admin_level,
                 "source_id": instance.source_id,
                 "location_type": instance.admin_level_name,
-                "latitude": instance.latitude,
-                "longitude": instance.longitude,
+                "latitude": extract_latitude(instance),
+                "longitude": extract_longitude(instance),
             }
         except Location.DoesNotExist:
             return {key: "N/A" for key in loc_fields}
@@ -486,8 +508,8 @@ def get_location(self, record: FieldMonitoringDataCollectionActivityoverallfindi
                 "admin_level": instance.admin_level,
                 "source_id": instance.source_id,
                 "location_type": instance.admin_level_name,
-                "latitude": instance.latitude,
-                "longitude": instance.longitude,
+                "latitude": extract_latitude(instance),
+                "longitude": extract_longitude(instance),
             }
         except Location.DoesNotExist:
             return {key: "N/A" for key in loc_fields}

src/etools_datamart/celery.py

@@ -18,8 +18,20 @@
 def handle_task_failure(
     sender=None, task_id=None, exception=None, args=None, kwargs=None, traceback=None, einfo=None, **kw
 ):
-    failure_details = f"#Task: {task_id} failed  \n Exception:{exception} \n Error info:|{einfo} "
+    kw_str = ""
+    if kw:
+        kw_str = "|".join(f"{key}={value}" for key, value in kw.items())
+
+    failure_details = (
+        f"# Task: {task_id} with args: {args}\n"
+        f"# Exception: {exception}\n"
+        f"# Error info: |{einfo}\n"
+        f"# Traceback:\n{traceback}\n"
+        f"# kw: {kw_str}"
+    )
+
     logger.error(f"Failure: {failure_details}")
+
     with sentry_sdk.push_scope() as scope:
         scope.set_extra("celery_task_failure_details", failure_details)
         sentry_sdk.capture_exception(exception)

src/unicef_rest_framework/admin/export.py

@@ -1,4 +1,4 @@
-from datetime import timedelta
+from datetime import datetime, timedelta
 
 from django.contrib import admin, messages
 from django.contrib.admin import ModelAdmin, register
@@ -160,11 +160,17 @@ def display_access_history(self, obj):
             user = entry.get("u")
             timestamp_utc = entry.get("t")
             if timestamp_utc:
-                timestamp_local = timezone.localtime(timezone.datetime.fromtimestamp(timestamp_utc))
-                formatted_timestamp = timestamp_local.strftime("%Y-%m-%d %H:%M:%S")
-                formatted_history.append(f"{user}: {formatted_timestamp}")
-
-        return ",".join(formatted_history)
+                try:
+                    # Parse the ISO 8601 string to a datetime object
+                    timestamp_utc = datetime.fromisoformat(timestamp_utc)
+                    timestamp_local = timezone.localtime(timezone.make_aware(timestamp_utc))
+                    formatted_timestamp = timestamp_local.strftime("%Y-%m-%d %H:%M:%S")
+                    formatted_history.append(f"{user}: {formatted_timestamp}")
+                except ValueError:
+                    # Handle cases where the timestamp format is incorrect
+                    formatted_history.append(f"{user}: Invalid timestamp")
+
+        return ", ".join(formatted_history)
 
     display_access_history.short_description = "Export Access History"
     list_display = ("export", "display_access_history")

src/unicef_rest_framework/models/export.py

@@ -142,17 +142,14 @@ class ExportAccessLog(models.Model):
     @classmethod
     def log_access(cls, export, username):
         import datetime
-        import json
 
         utc_now = datetime.datetime.utcnow()
         timestamp = utc_now.isoformat()
         log_entry = {"u": f"{username}", "t": f"{timestamp}"}
 
         try:
             access_log = cls.objects.get(export=export)
-            export_access_data = json.loads(access_log.access_history)
-            export_access_data.append(log_entry)
-            access_log.access_history = json.dumps(export_access_data)
+            access_log.access_history.append(log_entry)
             access_log.save()
         except cls.DoesNotExist:
             cls.objects.create(export=export, access_history=[log_entry])