Merge pull request #54 from openimis/release/24.10

delcroip · web-flow · commit 97131723646d · 2024-11-01T13:25:03.000+01:00
MERGING release/24.10 into develop
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include LICENSE.md
-include README.md
+include README.md
+include tools/tests/*
diff --git a/tools/resources.py b/tools/resources.py
@@ -10,10 +10,10 @@
 
 def process_imported_patient_categories(row):
     # Transform the patient category data
-    adult_cat = int(row["adult_cat"])
-    minor_cat = int(row["minor_cat"])
-    female_cat = int(row["female_cat"])
-    male_cat = int(row["male_cat"])
+    adult_cat = int(row.pop("adult_cat", 1))
+    minor_cat = int(row.pop("minor_cat", 1))
+    female_cat = int(row.pop("female_cat", 1))
+    male_cat = int(row.pop("male_cat", 1))
 
     category = 0
     if male_cat:
@@ -26,10 +26,6 @@ def process_imported_patient_categories(row):
         category = category | PATIENT_CATEGORY_MASK_MINOR
 
     # Remove the now useless fields
-    row.pop("adult_cat")
-    row.pop("minor_cat")
-    row.pop("female_cat")
-    row.pop("male_cat")
 
     # Add the merged patient category value
     row["patient_category"] = category
@@ -78,7 +74,7 @@ def dehydrate_minor_cat(self, item_service):
     # This method is called once before importing data
     # This is used to add the two mandatory fields that are required for creating a medical.Item
     # If self.fields do not have a fields.Field, with the column_name set up, then these columns are ignored during import
-    def before_import(self, dataset, using_transactions, dry_run, **kwargs):
+    def before_import(self, dataset, **kwargs):
         if "patient_category" not in self.fields:
             self.fields["patient_category"] = fields.Field(attribute='patient_category', column_name="patient_category",
                                                            saves_null_values=False,
@@ -87,13 +83,21 @@ def before_import(self, dataset, using_transactions, dry_run, **kwargs):
             self.fields["audit_user_id"] = fields.Field(attribute='audit_user_id', column_name="audit_user_id",
                                                         saves_null_values=False,
                                                         widget=IntegerWidget())
+        super().before_import(dataset, **kwargs)
 
     # This method is called when the user flags a row to be deleted (the "delete" column value is '1')
     def for_delete(self, row, instance):
         if "delete" in row:
             return self.fields['delete'].clean(row)
 
-
+    def __init__(self, user, queryset=None, ):
+        """
+        @param user: User to be used for location rights for import and export, and for audit_user_id
+        @param queryset: Queryset to use for export, Default to full quetyset
+        """
+        super().__init__()
+        self._user = user
+        
 # This class is responsible for customizing the import and export processes
 class ItemResource(ItemServiceResource):
 
@@ -102,10 +106,12 @@ class Meta:
 
         # These are the fields that are going to get exported/
         fields = ('code', 'name', 'type', 'package', 'price', 'quantity',
-                  'care_type', 'frequency', 'patient_category')
+                  'care_type', 'frequency', 'patient_category', 
+                  'male_cat', 'female_cat', 'adult_cat', 'minor_cat')
 
         # You can customize the order for exports, but this order is also used during upload
         # (to know which fields will be there, instead of reading the headers)
+        export_order = fields
         # export_order = ('code', 'name', 'type', 'package', 'price', 'quantity',
         #                 'care_type', 'frequency', 'male_cat', 'female_cat', 'adult_cat', 'minor_cat')
 
@@ -131,7 +137,9 @@ class Meta:
 
         # These are the fields that are going to get exported/
         fields = ('code', 'name', 'type', 'level', 'price', 'category',
-                  'care_type', 'frequency', 'patient_category')
+                  'care_type', 'frequency', 'patient_category', 
+                  'male_cat', 'female_cat', 'adult_cat', 'minor_cat')
+        export_order = fields
 
     # This method is called once for each row during import
     # This is where you can do some data validation/modification + add the missing data
diff --git a/tools/services.py b/tools/services.py
@@ -1641,7 +1641,12 @@ def upload_feedbacks(archive, user):
 
 def validate_imported_item_row(row):
     # TODO : refactor this function and the code used in validating XML uploads
-    categories = [row["adult_cat"], row["minor_cat"], row["male_cat"], row["female_cat"]]
+    categories = [
+        row.get("adult_cat", 1),
+        row.get("minor_cat", 1),
+        row.get("male_cat", 1),
+        row.get("female_cat", 1)
+    ]
     if len(row["code"]) < 1 or len(row["code"]) > 6:
         raise ValidationError(f"Item '{row['code']}': code is invalid. Must be between 1 and 6 characters")
     elif len(row["name"]) < 1 or len(row["name"]) > 100:
diff --git a/tools/tests/__init__.py b/tools/tests/__init__.py
@@ -1 +0,0 @@
-from tools.tests.test_services import *
diff --git a/tools/tests/_test_upload_items.py b/tools/tests/_test_upload_items.py
diff --git a/tools/tests/_test_upload_services.py b/tools/tests/_test_upload_services.py
diff --git a/tools/tests/item_example.json b/tools/tests/item_example.json
@@ -0,0 +1,23 @@
+[
+  {
+    "code": "TEST1",
+    "name": "Test item 1",
+    "type": "D",
+    "package": "10 TABLETS",
+    "price": 720,
+    "quantity": 1,
+    "care_type": "B",
+    "frequency": 0
+  },
+  {
+    "code": "TEST2",
+    "name": "Test item 2",
+    "type": "D",
+    "package": "10 TABLETS",
+    "price": 720,
+    "quantity": 1,
+    "care_type": "I",
+    "frequency": 0
+  }
+
+]
diff --git a/tools/tests/service_example.json b/tools/tests/service_example.json
@@ -0,0 +1,31 @@
+[
+  {
+    "code": "TEST1",
+    "name": "Test service 1",
+    "type": "C",
+    "level": "S",
+    "price": 720,
+    "category": "O",
+    "care_type": "B",
+    "frequency": 0,
+    "adult_cat": 0,
+    "minor_cat": 1,
+    "male_cat": 1,
+    "female_cat": 1
+  },
+  {
+    "code": "TEST2",
+    "name": "Test service 2",
+    "type": "C",
+    "level": "S",
+    "price": 720,
+    "category": "O",
+    "care_type": "B",
+    "frequency": 180,
+    "adult_cat": 1,
+    "minor_cat": 0,
+    "male_cat": 0,
+    "female_cat": 1
+  }
+
+]
diff --git a/tools/tests/test_claims.py b/tools/tests/test_claims.py
diff --git a/tools/tests/test_item.py b/tools/tests/test_item.py
@@ -0,0 +1,30 @@
+import os
+from tablib import Dataset
+from core.test_helpers import create_test_interactive_user
+from django.test import TestCase
+from location.test_helpers import create_test_location
+from django.conf import settings
+from tools.resources import ItemResource
+
+class ImportItemTest(TestCase):
+
+    def setUp(self) -> None:
+        super(ImportItemTest, self).setUp()
+        self.user = create_test_interactive_user()
+
+    def test_simple_import(self):
+        dir_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+        resource = ItemResource(user=self.user)
+        dataset = Dataset()
+        with open(os.path.join(dir_path, 'tests/item_example.json'), 'r') as f:
+            dataset.load(f.read())
+            result = resource.import_data(
+                dataset, dry_run=True, use_transactions=True,
+                collect_failed_rows=False,
+            )
+            self.assertEqual(result.has_errors(), False)
+
+    def test_simple_export(self):
+        result = ItemResource(self.user).export().dict
+        self.assertTrue(result)
+
diff --git a/tools/tests/test_rest.py b/tools/tests/test_rest.py
@@ -0,0 +1,64 @@
+
+from core.test_helpers import create_test_interactive_user
+from rest_framework import status
+from rest_framework.test import APITestCase
+from dataclasses import dataclass
+from graphql_jwt.shortcuts import get_token
+from core.models import User
+from django.conf import settings
+from django.db import connection
+import json
+import os
+from django.core.files.uploadedfile import SimpleUploadedFile
+
+
+@dataclass
+class DummyContext:
+    """ Just because we need a context to generate. """
+    user: User
+
+
+class ReportAPITests( APITestCase):
+
+    admin_user = None
+    admin_token = None
+    dir_path = None
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.admin_user = create_test_interactive_user(username="testLocationAdmin")
+        cls.admin_token = get_token(cls.admin_user, DummyContext(user=cls.admin_user))
+        cls.dir_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+
+    def test_import_item_json(self):
+        URL = f'/{settings.SITE_ROOT()}tools/imports/items?file_format=json'
+        headers = {"HTTP_AUTHORIZATION": f"Bearer {self.admin_token}"}
+        with open(os.path.join(self.dir_path, 'tests/item_example.json'), 'rb') as f:
+            file_content = f.read()
+            uploaded_file = SimpleUploadedFile("service_example.json", file_content, content_type="application/json")
+            response = self.client.post(URL, {'file': uploaded_file}, format='multipart', **headers)
+        self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
+              
+    def test_export_item_xls(self):
+        URL = f'/{settings.SITE_ROOT()}tools/exports/items?file_format=xls'
+        headers = {"HTTP_AUTHORIZATION": f"Bearer {self.admin_token}"}
+        response = self.client.get(URL, format='json', **headers)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
+        
+    def test_import_service_json(self):
+        URL = f'/{settings.SITE_ROOT()}tools/imports/services?file_format=json'
+        headers = {"HTTP_AUTHORIZATION": f"Bearer {self.admin_token}"}
+        with open(os.path.join(self.dir_path, 'tests/service_example.json'), 'rb') as f:
+            file_content = f.read()
+            uploaded_file = SimpleUploadedFile("service_example.json", file_content, content_type="application/json")
+            response = self.client.post(URL, {'file': uploaded_file}, format='multipart', **headers)
+        self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
+              
+    def test_export_service_xls(self):
+        URL = f'/{settings.SITE_ROOT()}tools/exports/services?file_format=xls'
+        headers = {"HTTP_AUTHORIZATION": f"Bearer {self.admin_token}"}
+        response = self.client.get(URL, format='json', **headers)
+        self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
+
+# todo expand tests
diff --git a/tools/tests/test_service.py b/tools/tests/test_service.py
@@ -0,0 +1,32 @@
+import os
+from tablib import Dataset
+from core.test_helpers import create_test_interactive_user
+from django.test import TestCase
+from location.test_helpers import create_test_location
+from django.conf import settings
+from tools.resources import ServiceResource
+
+
+class ImportServiceTest(TestCase):
+    
+    def setUp(self) -> None:
+        super(ImportServiceTest, self).setUp()
+        self.user = create_test_interactive_user()
+
+    def test_simple_import(self):
+        dir_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+        resource = ServiceResource(user=self.user)
+        dataset = Dataset()
+
+        with open(os.path.join(dir_path, 'tests/service_example.json'), 'r') as f:
+            dataset.load(f.read())
+            result = resource.import_data(
+                dataset, dry_run=True, use_transactions=True,
+                collect_failed_rows=False,
+            )
+            self.assertEqual(result.has_errors(), False)
+
+    def test_simple_export(self):
+        result = ServiceResource(self.user).export().dict
+        self.assertTrue(result)
+
diff --git a/tools/views.py b/tools/views.py
@@ -578,14 +578,14 @@ def _process_upload(request, process_method):
 def export_items(request):
     export_format = request.GET.get("file_format", "unknown")
     if export_format in SUPPORTED_FORMATS:
-        return process_export_items(request.user.id_for_audit, export_format)
+        return process_export_items(request.user, export_format)
     else:
         return JsonResponse({"error": "Unknown export format."}, status=400)
 
 
-def process_export_items(user_id, data_type):
-    logger.info("User (audit id %s) requested export of medical items in %s", user_id, data_type)
-    item_resource = ItemResource(user_id)
+def process_export_items(user, data_type):
+    logger.info("User (audit id %s) requested export of medical items in %s", user.id_for_audit, data_type)
+    item_resource = ItemResource(user=user)
     query_set = Item.objects.filter(*filter_validity()).order_by("code")
     dataset = item_resource.export(query_set)
     datasets = {
@@ -612,10 +612,9 @@ def import_items(request):
     serializer.is_valid(raise_exception=True)
 
     file = serializer.validated_data.get("file")
-    user_id = request.user.id_for_audit
-    logger.info("User (audit id %s) requested import of medical items", user_id)
+    logger.info("User (audit id %s) requested import of medical items",request.user.id_for_audit)
 
-    item_resource = ItemResource(user_id)
+    item_resource = ItemResource(user=request.user)
     dataset = Dataset()
 
     if CONTENT_TYPES[CSV] == file.content_type:
@@ -637,14 +636,14 @@ def import_items(request):
 def export_services(request):
     export_format = request.GET.get("file_format", "unknown")
     if export_format in SUPPORTED_FORMATS:
-        return process_export_services(request.user.id_for_audit, export_format)
+        return process_export_services(request.user, export_format)
     else:
         return JsonResponse({"error": "Unknown export format."}, status=400)
 
 
-def process_export_services(user_id, data_type):
-    logger.info("User (audit id %s) requested export of medical services in %s", user_id, data_type)
-    service_resource = ServiceResource(user_id)
+def process_export_services(user, data_type):
+    logger.info("User (audit id %s) requested export of medical services in %s", user.id_for_audit, data_type)
+    service_resource = ServiceResource(user)
     query_set = Service.objects.filter(*filter_validity()).order_by("code")
     dataset = service_resource.export(query_set)
     datasets = {
@@ -671,10 +670,9 @@ def import_services(request):
     serializer.is_valid(raise_exception=True)
 
     file = serializer.validated_data.get("file")
-    user_id = request.user.id_for_audit
-    logger.info("User (audit id %s) requested import of medical services", user_id)
+    logger.info("User (audit id %s) requested import of medical services", request.user.id_for_audit)
 
-    service_resource = ServiceResource(user_id)
+    service_resource = ServiceResource(request.user)
     dataset = Dataset()
 
     if CONTENT_TYPES[CSV] == file.content_type:

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-from tools.tests.test_services import *`