wbhuman_resources 1.61.3__tar.gz → 1.61.4__tar.gz

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbhuman_resources
-Version: 1.61.3
+Version: 1.61.4
 Summary: A workbench module for managing human resources.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: wbcore

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/wbhuman_resources/permissions/backend.py

@@ -1,6 +1,6 @@
 from django.db.models import Q, QuerySet
 from wbcore.contrib.authentication.models.users import User
-from wbcore.permissions.backend import UserBackend as BaseUserBackend
+from wbcore.contrib.permission.internal.backend import UserBackend as BaseUserBackend
 
 from wbhuman_resources.models.employee import EmployeeHumanResource
 

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/wbhuman_resources/tests/test_permission.py

@@ -3,8 +3,7 @@ from dynamic_preferences.registries import global_preferences_registry
 from faker import Faker
 from rest_framework.test import APIRequestFactory
 from wbcore.contrib.authentication.factories import UserFactory
-from wbcore.contrib.authentication.models.users import User
-from wbcore.permissions.shortcuts import is_internal_user
+from wbcore.contrib.permission.internal.registry import UserBackendRegistry
 
 from wbhuman_resources.factories.employee import EmployeeHumanResourceFactory
 from wbhuman_resources.models.employee import EmployeeHumanResource
@@ -16,48 +15,54 @@ fake = Faker()
 class TestPermissionTasks:
     @pytest.fixture
     def request_user_external(self):
-        request = APIRequestFactory()
         user = UserFactory()
         EmployeeHumanResourceFactory.create(
             profile=user.profile, contract_type=EmployeeHumanResource.ContractType.EXTERNAL
         )
+        UserBackendRegistry().refresh_users()
+
+        user.refresh_from_db()
+        request = APIRequestFactory()
         request.user = user
         return request
 
     @pytest.fixture
     def request_user_active_internal(self):
-        request = APIRequestFactory()
         user = UserFactory()
         EmployeeHumanResourceFactory.create(
             profile=user.profile, contract_type=EmployeeHumanResource.ContractType.INTERNAL
         )
+        UserBackendRegistry().refresh_users()
+
+        user.refresh_from_db()
+        request = APIRequestFactory()
         request.user = user
         return request
 
     @pytest.fixture
     def request_user_inactive_internal(self):
-        request = APIRequestFactory()
-        user = UserFactory()
+        user = UserFactory.create()
         EmployeeHumanResourceFactory.create(
             profile=user.profile, contract_type=EmployeeHumanResource.ContractType.INTERNAL, is_active=False
         )
+        UserBackendRegistry().refresh_users()
+        user.refresh_from_db()
+        request = APIRequestFactory()
         request.user = user
         return request
 
     def test_permission_active_internal(self, request_user_active_internal):
-        assert is_internal_user(request_user_active_internal.user) is True
+        assert request_user_active_internal.user.is_internal is True
 
     def test_permission_inactive_internal(self, request_user_inactive_internal):
-        assert is_internal_user(request_user_inactive_internal.user) is False
+        assert request_user_inactive_internal.user.is_internal is False
 
     def test_permission_external(self, request_user_external):
-        assert is_internal_user(request_user_external.user) is False
+        assert request_user_external.user.is_internal is False
 
     def test_permission_external_but_considered_internal(self, request_user_external):
-        from wbcore.permissions.registry import user_registry
-
         user = request_user_external.user
         global_preferences_registry.manager()["wbhuman_resources__is_external_considered_as_internal"] = True
-        user = User.objects.get(id=user.id)  # reload to reset cached property
-        user_registry.reset_cache()
-        assert is_internal_user(user) is True
+        UserBackendRegistry().refresh_users()
+        user.refresh_from_db()
+        assert user.is_internal

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/wbhuman_resources/viewsets/menu/absence.py

@@ -1,6 +1,5 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 from wbhuman_resources.models.absence import get_valid_employee_human_resource
 
@@ -8,7 +7,7 @@ ABSENCEPLANNER_MENUITEM = MenuItem(
     label=_("Absence Graph"),
     endpoint="wbhuman_resources:absenceplanner-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequest"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequest"]
     ),
 )
 
@@ -16,7 +15,7 @@ ABSENCETABLE_MENUITEM = MenuItem(
     label=_("Presence Table"),
     endpoint="wbhuman_resources:absencetable-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequest"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequest"]
     ),
 )
 
@@ -24,13 +23,13 @@ ABSENCEREQUEST_MENUITEM = MenuItem(
     label=_("Requests"),
     endpoint="wbhuman_resources:absencerequest-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequest"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequest"]
     ),
     add=MenuItem(
         label=_("Add Requests"),
         endpoint="wbhuman_resources:absencerequest-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user)
+            method=lambda request: request.user.is_internal
             and get_valid_employee_human_resource(request.user) is not None,
             permissions=["wbhuman_resources.add_absencerequest"],
             include_superuser=False,
@@ -42,13 +41,13 @@ ABSENCEREQUESTTYPE_MENUITEM = MenuItem(
     label=_("Request Types"),
     endpoint="wbhuman_resources:absencerequesttype-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_absencerequesttpe"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_absencerequesttpe"]
     ),
     add=MenuItem(
         label=_("Add Request Types"),
         endpoint="wbhuman_resources:absencerequesttype-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["wbhuman_resources.add_absencerequesttype"],
         ),
     ),

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/wbhuman_resources/viewsets/menu/calendars.py

@@ -1,18 +1,17 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 DAYOFF_MENUITEM = MenuItem(
     label=_("Days Off"),
     endpoint="wbhuman_resources:dayoff-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_dayoff"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_dayoff"]
     ),
     add=MenuItem(
         label=_("Add Day Off"),
         endpoint="wbhuman_resources:dayoff-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_dayoff"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_dayoff"]
         ),
     ),
 )
@@ -21,13 +20,13 @@ DAYOFFCALENDAR_MENUITEM = MenuItem(
     label=_("Calendars"),
     endpoint="wbhuman_resources:dayoffcalendar-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_dayoffcalendar"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_dayoffcalendar"]
     ),
     add=MenuItem(
         label=_("Add Calendar"),
         endpoint="wbhuman_resources:dayoffcalendar-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_dayoffcalendar"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_dayoffcalendar"]
         ),
     ),
 )

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/wbhuman_resources/viewsets/menu/employee.py

@@ -1,12 +1,11 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 EMPLOYEEHUMANRESOURCE_MENUITEM = MenuItem(
     label=_("Balance & Usage"),
     endpoint="wbhuman_resources:employeebalance-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["wbhuman_resources.view_employeehumanresource"],
     ),
 )
@@ -15,14 +14,14 @@ EMPLOYEE_MENUITEM = MenuItem(
     label=_("Employees"),
     endpoint="wbhuman_resources:employee-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["wbhuman_resources.view_employeehumanresource"],
     ),
     add=MenuItem(
         label=_("Add Employee"),
         endpoint="wbhuman_resources:employee-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["wbhuman_resources.add_employeehumanresource"],
         ),
     ),
@@ -32,13 +31,13 @@ POSITION_MENUITEM = MenuItem(
     label=_("Positions"),
     endpoint="wbhuman_resources:position-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_position"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_position"]
     ),
     add=MenuItem(
         label=_("Add Position"),
         endpoint="wbhuman_resources:position-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_position"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_position"]
         ),
     ),
 )

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/wbhuman_resources/viewsets/menu/kpis.py

@@ -1,18 +1,17 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 KPI_MENUITEM = MenuItem(
     label=_("KPIs"),
     endpoint="wbhuman_resources:kpi-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_kpi"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_kpi"]
     ),
 )
 KPIEVALUATIONPANDAS_MENUITEM = MenuItem(
     label=_("KPI Evaluations"),
     endpoint="wbhuman_resources:kpievaluationpandas-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_kpi"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_kpi"]
     ),
 )

{wbhuman_resources-1.61.3 → wbhuman_resources-1.61.4}/wbhuman_resources/viewsets/menu/review.py

@@ -1,18 +1,17 @@
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 REVIEWGROUP_MENUITEM = MenuItem(
     label=_("Groups"),
     endpoint="wbhuman_resources:reviewgroup-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_reviewgroup"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_reviewgroup"]
     ),
     add=MenuItem(
         label=_("Add Group"),
         endpoint="wbhuman_resources:reviewgroup-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_reviewgroup"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_reviewgroup"]
         ),
     ),
 )
@@ -22,13 +21,13 @@ REVIEW_MENUITEM = MenuItem(
     label=_("Employee Reviews"),
     endpoint="wbhuman_resources:review-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_review"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_review"]
     ),
     add=MenuItem(
         label=_("Add Review"),
         endpoint="wbhuman_resources:review-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_review"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_review"]
         ),
     ),
 )
@@ -37,13 +36,13 @@ REVIEWTEMPLATE_MENUITEM = MenuItem(
     label=_("Templates"),
     endpoint="wbhuman_resources:reviewtemplate-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_review"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_review"]
     ),
     add=MenuItem(
         label=_("Add Template"),
         endpoint="wbhuman_resources:reviewtemplate-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_review"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_review"]
         ),
     ),
 )
@@ -52,14 +51,14 @@ REVIEWQUESTIONCATEFORY_MENUITEM = MenuItem(
     label=_("Categories"),
     endpoint="wbhuman_resources:reviewquestioncategory-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user),
+        method=lambda request: request.user.is_internal,
         permissions=["wbhuman_resources.view_reviewquestioncategory"],
     ),
     add=MenuItem(
         label=_("Add Question Category"),
         endpoint="wbhuman_resources:reviewquestioncategory-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user),
+            method=lambda request: request.user.is_internal,
             permissions=["wbhuman_resources.add_reviewquestioncategory"],
         ),
     ),
@@ -69,13 +68,13 @@ REVIEWQUESTION_MENUITEM = MenuItem(
     label=_("Questions"),
     endpoint="wbhuman_resources:reviewquestion-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_reviewquestion"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_reviewquestion"]
     ),
     add=MenuItem(
         label=_("Add Question"),
         endpoint="wbhuman_resources:reviewquestion-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_reviewquestion"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_reviewquestion"]
         ),
     ),
 )
@@ -85,13 +84,13 @@ REVIEWANDWER_MENUITEM = MenuItem(
     label=_("Answers"),
     endpoint="wbhuman_resources:reviewanswer-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.view_reviewanswer"]
+        method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.view_reviewanswer"]
     ),
     add=MenuItem(
         label=_("Add Review"),
         endpoint="wbhuman_resources:reviewanswer-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbhuman_resources.add_reviewanswer"]
+            method=lambda request: request.user.is_internal, permissions=["wbhuman_resources.add_reviewanswer"]
         ),
     ),
 )