Mfr api prod

.github/workflows/ci-prod.yml

@@ -0,0 +1,37 @@
+name: CI-Prod
+
+on:
+  push:
+    branches: [ mfr-api-prod ]
+
+
+jobs:
+
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+    - name: Deploy to VPS
+      uses: appleboy/ssh-action@master  
+      with:
+        host: ${{ secrets.SERVER_HOST }}
+        port: ${{ secrets.SERVER_PORT }}
+        username: ${{ secrets.SERVER_USER }}
+        password: ${{ secrets.SERVER_KEY }}
+        script: |
+          set -e
+          cd /opt/mfl_api
+          if ! [[ -d './.git' ]]; then git init; fi
+          if ! [[ `git remote -v | awk '{print $1}' | head -n 1` =~ 'origin' ]]; then git remote add origin ${{ github.server_url }}${{ github.username }}/${{ github.repository }}.git; fi
+          git stash
+          git pull origin mfr-api-prod
+
+
+
+
+
+
+
+
+

chul/filters.py

@@ -59,14 +59,16 @@ def chu_pending_approval(self, qs, name, value):
             return qs.filter(
                 Q(is_approved=None, is_rejected=False, has_edits=False) |
                 Q(is_approved=None, is_rejected=False, has_edits=True) |
-                Q(is_approved=None, is_rejected=True, has_edits=True)
+                Q(is_approved=None, is_rejected=True, has_edits=True) |
+                Q(is_approved=False, is_rejected=True, has_edits=True) | # Added
+                Q(is_approved=False, is_rejected=True, has_edits=False) # Added
             )
         else:
             return qs.filter(
                 Q(is_approved=None, is_rejected=False, has_edits=False) |
                 Q(is_approved=None, is_rejected=True, has_edits=False)
             )
-        
+
     # def chu_approved(self, qs, name, value):
     #     if value in TRUTH_NESS:
     #         return qs.filter(
@@ -84,6 +86,7 @@ def chu_pending_approval(self, qs, name, value):
         name='facility__ward__constituency__county')
     sub_county = ListCharFilter(
         name='facility__ward__sub_county')
+    # facility_code = ListCharFilter(name="facility_code")
 
     is_approved = django_filters.TypedChoiceFilter(
         choices=BOOLEAN_CHOICES, coerce=strtobool

chul/models.py

@@ -273,7 +273,7 @@ def latest_update(self):
             )
 
             return chu
-        
+
         except ChuUpdateBuffer.DoesNotExist:
             return None
 
@@ -304,12 +304,15 @@ def average_rating(self):
     def rating_count(self):
         return self.chu_ratings.count()
 
+
     def push_chu_to_dhis2(self):
         from facilities.models.facility_models import DhisAuth
         import requests
+
         dhisauth = DhisAuth()
         dhisauth.get_oauth2_token()
-        facility_dhis_id = self.get_facility_dhis2_parent_id() if self.facility.reporting_in_dhis else None
+
+        facility_dhis_id = self.get_facility_dhis2_parent_id() # if self.facility.reporting_in_dhis else None
         unit_uuid_status = dhisauth.get_org_unit_id(self.code)
         unit_uuid = unit_uuid_status[0]
         new_chu_payload = {
@@ -330,7 +333,6 @@ def push_chu_to_dhis2(self):
 
         if facility_dhis_id is not None:
             if unit_uuid_status[1] == 'retrieved':
-                LOGGER.info("[>>>>>] Retrieved CHU")
 
                 r = requests.put(
                     settings.DHIS_ENDPOINT + "api/organisationUnits/" + new_chu_payload.pop('id'),
@@ -340,10 +342,12 @@ def push_chu_to_dhis2(self):
                     },
                     json=new_chu_payload
                 )
-                print("Update CHU Response", r.url, r.status_code, r.json())
-                LOGGER.info("Update CHU Response: %s" % r.text)
+
+                LOGGER.info("[DEBUG] Response(retrived): {}".format(r.text))
+
+
             else:
-                LOGGER.info("[>>>>>] Payload for new CHU: {}".format(new_chu_payload));
+
                 r = requests.post(
                     settings.DHIS_ENDPOINT + "api/organisationUnits",
                     auth=(settings.DHIS_USERNAME, settings.DHIS_PASSWORD),
@@ -353,20 +357,24 @@ def push_chu_to_dhis2(self):
                     json=new_chu_payload
                 )
 
-                print("Create CHU Response", r.url, r.status_code, r.json())
-                LOGGER.info("Create CHU Response: %s" % r.text)
+                LOGGER.info("[DEBUG] Response(generated): {}".format(r.text))
 
-            if r.json()["status"] != "OK":
-                LOGGER.error("Failed PUSH: error -> {}".format(r.text))
-                raise ValidationError(
-                    {
-                        "Error!": ["An error occured while pushing Community Unit to DHIS2. This is may be caused by the "
-                                "existance of an organisation unit with as similar name as to the one you are creating. "
-                                "Or some specific information like codes are not unique"]
-                    }
-                )
-            self.push_chu_metadata(metadata_payload, unit_uuid)
+
+
+                if r.json()["status"] != "OK":
+                    LOGGER.error("[DEBUG]: Repsonse(error):{}".format(r.text))
+
+                    raise ValidationError(
+                        {
+                            "Error!": ["An error occured while pushing Community Unit to DHIS2. This is may be caused by the "
+                                    "existance of an organisation unit with as similar name as to the one you are creating. "
+                                    "Or some specific information like codes are not unique"]
+                        }
+                    )
+                self.push_chu_metadata(metadata_payload, unit_uuid)
         else:
+            LOGGER.error("[DEBUG] facility_dhis_id: {}".format(facility_dhis_id))
+
             raise ValidationError(
                     {
                         "Error!": ["Could not find Facility DHIS ID, when pushing CU to DHIS"]
@@ -386,33 +394,43 @@ def push_chu_metadata(self, metadata_payload, chu_uid):
         )
         LOGGER.info('Metadata CUs pushed successfullly')
 
+
+
+
     def get_facility_dhis2_parent_id(self):
-        from facilities.models.facility_models import DhisAuth
+        # from facilities.models.facility_models import DhisAuth
         import requests
-        r = requests.get(
-            settings.DHIS_ENDPOINT + "api/organisationUnits.json",
-            auth=(settings.DHIS_USERNAME, settings.DHIS_PASSWORD),
-            headers={
-                "Accept": "application/json"
-            },
-            params={
-                "query": self.facility.code,
-                "fields": "id,name",
-                "filter": "level:in:[5]",
-                "paging": "false"
-            }
-        )
 
-        if len(r.json()["organisationUnits"]) is 1 and "id" in r.json()["organisationUnits"][0]:
-            if r.json()["organisationUnits"][0]["id"]:
-                return r.json()["organisationUnits"][0]["id"]
-        else:
-            raise ValidationError(
-                {
-                    "Error!": ["Unable to resolve exact Facility linked to the CHU in DHIS2"]
+        if hasattr(self, "facility") and hasattr(self.facility, "code"):
+            r = requests.get(
+                settings.DHIS_ENDPOINT + "api/organisationUnits.json",
+                auth=(settings.DHIS_USERNAME, settings.DHIS_PASSWORD),
+                headers={
+                    "Accept": "application/json"
+                },
+                params={
+                    "query": self.facility.code,
+                    "fields": "id,name",
+                    "filter": "level:in:[5]",
+                    "paging": "false"
                 }
             )
 
+            if len(r.json()["organisationUnits"]) is 1 and "id" in r.json()["organisationUnits"][0]:
+                    if r.json()["organisationUnits"][0]["id"]:
+                        return r.json()["organisationUnits"][0]["id"]
+            else:
+                raise ValidationError(
+                    {
+                        "Error!": ["Unable to find facility with code {} in KHIS.".format(self.facility.code)]
+                    }
+                )
+        else:
+            raise ValidationError({
+                 "Error": ["The linked facility for this CU does not have an MFL code. Therefore it is not in KHIS"]
+                })
+
+
     class Meta(AbstractBase.Meta):
 
         unique_together = ('name', 'facility',)
@@ -544,34 +562,47 @@ def update_basic_details(self):
             basic_details['facility_id'] = basic_details.get(
                 'facility').get('facility_id')
             basic_details.pop('facility')
-        
-        
+
+
         for key, value in basic_details.iteritems():
-            setattr(self.health_unit, key, value)
+            if key is not "basic":
+                setattr(self.health_unit, key, value)
         if 'basic' in basic_details:
-            setattr(self.health_unit, 'facility_id', basic_details.get('basic').get('facility'))
+            if 'basic' in basic_details.get('basic'):
+                if 'facility' in basic_details.get('basic').get('basic'):
+                    setattr(self.health_unit, 'facility_id', basic_details.get('basic').get('basic').get('facility'))
+            else:
+                if 'facility' in basic_details.get('basic'):
+                    setattr(self.health_unit, 'facility_id', basic_details.get('basic').get('facility'))
         self.health_unit.save()
 
     def update_workers(self):
+
         chews = json.loads(self.workers)
+
         for chew in chews:
             chew['health_unit'] = self.health_unit
             chew['created_by_id'] = self.created_by_id
             chew['updated_by_id'] = self.updated_by_id
             chew.pop('created_by', None)
             chew.pop('updated_by', None)
-            if 'id' in chew:
+
+            if hasattr(chew, 'name'):
+                chew.pop('name', None)
+
+            if hasattr(chew, 'id'):
                 chew_obj = CommunityHealthWorker.objects.get(
                     id=chew['id'])
                 chew_obj.first_name = chew['first_name']
                 chew_obj.last_name = chew['last_name']
-                if 'is_incharge' in chew:
+                if hasattr(chew, 'is_incharge'):
                     chew_obj.is_incharge = chew['is_incharge']
                 chew_obj.save()
             else:
                 CommunityHealthWorker.objects.create(**chew)
 
     def update_services(self):
+
         services = json.loads(self.services)
         CHUServiceLink.objects.filter(health_unit=self.health_unit).delete()
         for service in services:
@@ -620,9 +651,11 @@ def update_contacts(self):
     @property
     def updates(self):
         updates = {}
+
         if self.basic and self.basic is not None:
             json_basic = json.loads(self.basic)
-            updates['basic'] = json_basic['basic'] if 'basic' in json_basic else json_basic 
+            updates['basic'] = json_basic['basic'] if hasattr(json_basic, 'basic') else json_basic
+
         if self.contacts:
             updates['contacts'] = json.loads(self.contacts)
         if self.workers:
@@ -632,6 +665,7 @@ def updates(self):
         updates['updated_by'] = self.updated_by.get_full_name
         return updates
 
+
     def clean(self, *args, **kwargs):
         if not self.is_approved and not self.is_rejected:
             self.health_unit.has_edits = True

chul/serializers.py

@@ -72,6 +72,7 @@ class CommunityHealthUnitSerializer(
     status_name = serializers.ReadOnlyField(source="status.name")
     health_unit_workers = serializers.ReadOnlyField(source='workers')
     facility_name = serializers.ReadOnlyField(source='facility.name')
+    facility_code = serializers.ReadOnlyField(source='facility.code')
     facility_ward = serializers.ReadOnlyField(source='facility.ward.name')
     facility_constituency = serializers.ReadOnlyField(
         source='facility.ward.constituency.name')
@@ -121,7 +122,17 @@ def buffer_updates(
         try:
             update = ChuUpdateBuffer.objects.get(
                 health_unit=chu_instance,
-                is_approved=False, is_rejected=False)
+                is_approved=False, is_rejected=False) if len(ChuUpdateBuffer.objects.filter(
+                health_unit=chu_instance,
+                is_approved=False, is_rejected=False)) == 1 else ChuUpdateBuffer.objects.filter(
+                health_unit=chu_instance,
+                is_approved=False, is_rejected=False)[0] if len(ChuUpdateBuffer.objects.filter(
+                health_unit=chu_instance,
+                is_approved=False, is_rejected=False)) > 1 else None
+
+            if update is None:
+                 raise ChuUpdateBuffer.DoesNotExist
+
         except ChuUpdateBuffer.DoesNotExist:
             update = ChuUpdateBuffer.objects.create(
                 health_unit=chu_instance,
@@ -166,6 +177,65 @@ def buffer_updates(
             update.contacts = contacts
         update.save()
 
+    # Previous lateest commit: mfr-api-prod
+    # def buffer_updates(
+    #         self, validated_data, chu_instance, chews=None, contacts=None,
+    #         services=None):
+
+    #     try:
+    #         chu_updates = ChuUpdateBuffer.objects.filter(
+    #             health_unit=chu_instance,
+    #             is_approved=False, is_rejected=False)
+
+    #         update = chu_updates[0] if chu_updates.__len__() > 0 else None
+
+    #         if update is None:
+    #             raise ChuUpdateBuffer.DoesNotExist
+
+    #     except ChuUpdateBuffer.DoesNotExist:
+    #         update = ChuUpdateBuffer.objects.create(
+    #             health_unit=chu_instance,
+    #             created_by_id=self.context['request'].user.id,
+    #             updated_by_id=self.context['request'].user.id,
+    #             is_new=True)
+    #     basic_updates = self.get_basic_updates(chu_instance, validated_data)
+
+    #     update.basic = basic_updates if basic_updates \
+    #         and not update.basic else update.basic
+
+    #     if chews:
+    #         for chew in chews:
+    #             chew.pop('created', None)
+    #             chew.pop('updated', None)
+    #             chew.pop('updated_by', None)
+    #             chew.pop('created_by', None)
+
+    #         chews = json.dumps(chews)
+    #         update.workers = chews
+
+    #     if services:
+    #         for service in services:
+    #             sev_rec = CHUService.objects.get(id=service['service'])
+    #             service.pop('created', None)
+    #             service.pop('updated', None)
+    #             service.pop('updated_by', None)
+    #             service.pop('created_by', None)
+    #             service['name'] = sev_rec.name
+
+    #         services = json.dumps(services)
+    #         update.services = services
+
+    #     if contacts:
+    #         for contact in contacts:
+    #             contact_type = ContactType.objects.get(
+    #                 id=contact['contact_type'])
+    #             contact['contact_type_name'] = contact_type.name
+
+    #         contacts = json.dumps(contacts)
+
+    #         update.contacts = contacts
+    #     update.save()
+
     def _ensure_all_chew_required_provided(self, chew):
         if 'first_name' and 'last_name' not in chew:
             self.inlined_errors.update({
@@ -188,7 +258,7 @@ def save_chew(self, instance, chews, context):
                 chew_obj.last_name = chew['last_name']
                 chew_obj.is_incharge = chew['is_incharge']
                 chew_obj.mobile_no = chew['mobile_no']
-                chew_obj.email = chew['email'] 
+                chew_obj.email = chew['email']
                 chew_obj.save()
             else:
                 chew['health_unit'] = instance.id