Merge pull request #41 from TaskarCenterAtUW/feature-1467

Fixed Task - 1467

Author: sujata-m

.github/workflows/blank.yml

@@ -0,0 +1,71 @@
+name: Unit Tests
+on:
+  workflow_dispatch:
+  push:
+    branches-ignore:
+      - '**'
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  UnitTest:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Determine output folder
+        id: set_output_folder
+        run: |
+          if [[ $GITHUB_EVENT_NAME == "pull_request" ]]; then
+            branch_name=$GITHUB_BASE_REF
+          else
+            branch_name=$GITHUB_REF_NAME
+          fi
+          if [[ $branch_name == "main" ]]; then
+            echo "output_folder=prod" >> $GITHUB_ENV
+          elif [[ $branch_name == "stage" ]]; then
+            echo "output_folder=stage" >> $GITHUB_ENV
+          elif [[ $branch_name == "develop" ]]; then
+            echo "output_folder=dev" >> $GITHUB_ENV
+          else
+            echo "Unknown branch: $branch_name"
+            exit 1
+          fi
+
+      - name: Run tests with coverage
+        run: |
+          timestamp=$(date '+%Y-%m-%d_%H-%M-%S')
+          mkdir -p test_results
+          log_file="test_results/${timestamp}_report.log"
+          echo -e "\nTest Cases Report Report\n" >> $log_file
+          # Run the tests and append output to the log file
+          python -m coverage run --source=src/python_ms_core -m unittest discover -v tests/unit_tests >> $log_file 2>&1
+          echo -e "\nCoverage Report\n" >> $log_file
+          coverage report >> $log_file
+
+      - name: Check coverage
+        run: |
+          coverage report --fail-under=85
+
+      - name: Upload report to Azure
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v2
+        with:
+          source_folder: 'test_results'
+          destination_folder: '${{ env.output_folder }}'
+          connection_string: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
+          container_name: 'python-ms-core-package'
+          clean_destination_folder: false
+          delete_if_exists: false
+

.github/workflows/ci.yml

@@ -1,5 +1,10 @@
 # Change log
 
+# Version 0.0.23
+- Updated unit test cases pipeline
+- Added support to upload test cases results on Azure blob
+
+
 # Version 0.0.21
 ### New Features and Enhancements
 - **Message Lock Renewal:** Implemented a mechanism to automatically renew message locks during processing. This ensures that messages remain active and are not returned to the queue for reprocessing while they are being handled.  

.github/workflows/unit_tests.yml

@@ -23,7 +23,7 @@ def __init__(self, config=None):
         if config is not None:
             if config.upper() == LOCAL_ENV:
                 self.config = LocalConfig()
-            elif config.upper() == LOCAL_ENV:
+            elif config.upper() == AZURE_ENV:
                 self.config = CoreConfig()
                 self.__check_health()
             else:

CHANGELOG.md

@@ -29,7 +29,7 @@ def project_group_id(self):
 
     @project_group_id.setter
     def project_group_id(self, value):
-        self.project_group_id = value
+        self._project_group_id = value
 
     @property
     def permissions(self):

src/python_ms_core/__init__.py

@@ -1 +1 @@
-__version__ = '0.0.22'
+__version__ = '0.0.23'

src/python_ms_core/core/auth/models/permission_request.py

@@ -4,23 +4,81 @@
 
 class TestPermissionRequest(unittest.TestCase):
 
-    def test_get_search_params(self):
-        user_id = '123'
-        project_group_id = '456'
-        permissions = 'read,write'
-        should_satisfy_all = True
+    def setUp(self):
+        # Sample input values for testing
+        self.user_id = "user123"
+        self.project_group_id = "project_group_1"
+        self.permissions = "read,write"
+        self.should_satisfy_all = True
 
-        request = PermissionRequest(user_id, project_group_id, permissions, should_satisfy_all)
-        search_params = request.get_search_params()
+        # Create an instance of PermissionRequest
+        self.permission_request = PermissionRequest(
+            user_id=self.user_id,
+            project_group_id=self.project_group_id,
+            permissions=self.permissions,
+            should_satisfy_all=self.should_satisfy_all
+        )
 
+    # Test initialization
+    def test_initialization(self):
+        self.assertEqual(self.permission_request.user_id, self.user_id)
+        self.assertEqual(self.permission_request.project_group_id, self.project_group_id)
+        self.assertEqual(self.permission_request.permissions, self.permissions)
+        self.assertEqual(self.permission_request.should_satisfy_all, self.should_satisfy_all)
+
+    # Test getter and setter for user_id
+    def test_user_id_property(self):
+        new_user_id = "user456"
+        self.permission_request.user_id = new_user_id
+        self.assertEqual(self.permission_request.user_id, new_user_id)
+
+    # Test getter and setter for project_group_id
+    def test_project_group_id_property(self):
+        new_project_group_id = "project_group_2"
+        self.permission_request.project_group_id = new_project_group_id
+        self.assertEqual(self.permission_request.project_group_id, new_project_group_id)
+
+    # Test getter and setter for permissions
+    def test_permissions_property(self):
+        new_permissions = "read"
+        self.permission_request.permissions = new_permissions
+        self.assertEqual(self.permission_request.permissions, new_permissions)
+
+    # Test getter and setter for should_satisfy_all
+    def test_should_satisfy_all_property(self):
+        self.permission_request.should_satisfy_all = False
+        self.assertFalse(self.permission_request.should_satisfy_all)
+
+    # Test get_search_params with default values and permissions
+    def test_get_search_params_with_permissions(self):
         expected_params = {
-            'userId': user_id,
-            'projectGroupId': project_group_id,
+            'userId': self.user_id,
+            'projectGroupId': self.project_group_id,
             'affirmative': 'true',
-            'roles': permissions
+            'roles': self.permissions
         }
+        self.assertEqual(self.permission_request.get_search_params(), expected_params)
 
-        self.assertEqual(search_params, expected_params)
+    # Test get_search_params when permissions are None
+    def test_get_search_params_without_permissions(self):
+        self.permission_request.permissions = None  # Set permissions to None
+        expected_params = {
+            'userId': self.user_id,
+            'projectGroupId': self.project_group_id,
+            'affirmative': 'true'
+        }
+        self.assertEqual(self.permission_request.get_search_params(), expected_params)
+
+    # Test get_search_params when should_satisfy_all is False
+    def test_get_search_params_with_false_should_satisfy_all(self):
+        self.permission_request.should_satisfy_all = False  # Set should_satisfy_all to False
+        expected_params = {
+            'userId': self.user_id,
+            'projectGroupId': self.project_group_id,
+            'affirmative': 'false',
+            'roles': self.permissions
+        }
+        self.assertEqual(self.permission_request.get_search_params(), expected_params)
 
 
 if __name__ == '__main__':