Jlc/extende usersupport admin

eox_nelp/admin/__init__.py

@@ -1,10 +1,17 @@
 """General admin module file.
 Register all the nelp admin models.
 """
+from importlib.util import find_spec
+
+from django.conf import settings
+
 from eox_nelp.admin.certificates import *  # noqa: F401
 from eox_nelp.admin.course_creators import *  # noqa: F401
 from eox_nelp.admin.student import *  # noqa: F401
 from eox_nelp.course_experience.admin import *  # noqa: F401
 from eox_nelp.notifications.admin import *  # noqa: F401
 from eox_nelp.payment_notifications.admin import *  # noqa: F401
 from eox_nelp.pearson_vue.admin import *  # noqa: F401
+
+if find_spec('eox_support') and 'eox_support.apps.EoxSupportConfig' in settings.INSTALLED_APPS:
+    from eox_nelp.admin.user import *  # noqa: F401

eox_nelp/admin/tests/__init__.py

@@ -8,6 +8,8 @@
 from unittest.mock import MagicMock, patch
 
 from ddt import data, ddt, unpack
+from django.contrib import admin
+from django.contrib.auth import get_user_model
 from django.test import RequestFactory, TestCase, override_settings
 
 from eox_nelp.admin import (
@@ -19,6 +21,8 @@
     pearson_update_ead_action,
 )
 
+User = get_user_model()
+
 
 @ddt
 class TestPearsonAction(TestCase):
@@ -149,3 +153,37 @@ def test_actions(self, admin_action):
             - pearson_real_time_action method is in model actions.
         """
         self.assertIn(admin_action, self.modeladmin.actions)
+
+
+class TestNelpUserAdmin(TestCase):
+    """
+    Unit tests for the NelpUserAdmin class.
+    """
+
+    def test_load_module(self):
+        """
+        Test loading module of NelpUserAdmin when eox_support condition is bypassed.
+
+        Expected behavior:
+            - Test NelpUserAdmin is loaded in the user model key of admin registry.
+            - user_national_id is in list_display
+            - UserExtraInfoInline in inlines
+        """
+        class ProtoAdminUserSupportModule:
+            """Proto class to simulate module"""
+            class SupportUserAdmin(admin.ModelAdmin):
+                """Base User Model admin for testing purposes. With empty tuple to add the nelp values"""
+                list_display = ((),)
+                search_fields = ((),)
+                inlines = ((),)
+                readonly_fields = ((),)
+
+        with patch.dict("sys.modules", {"eox_support.admin.user": ProtoAdminUserSupportModule}):
+            from eox_nelp.admin.user import (  # pylint: disable=import-outside-toplevel
+                NelpUserAdmin,
+                UserExtraInfoInline,
+            )
+
+            self.assertIsInstance(admin.site._registry[User], NelpUserAdmin)  # pylint: disable=protected-access
+            self.assertIn("user_national_id", NelpUserAdmin.list_display)
+            self.assertIn(UserExtraInfoInline, NelpUserAdmin.inlines)

eox_nelp/admin/user.py

@@ -0,0 +1,41 @@
+"""
+This module defines the Django admin configuration for handling user model.
+
+Classes:
+    NelpUserAdmin: Custom admin class for User model to include extra info fields like national_id.
+    UserExtraInfoInline: inline for extra info model
+"""
+
+
+from custom_reg_form.models import ExtraInfo
+from django.contrib.admin import StackedInline
+from django.contrib.auth import get_user_model
+from eox_support.admin.user import SupportUserAdmin  # pylint: disable=import-error
+
+from eox_nelp.admin.register_admin_model import register_admin_model as register
+
+User = get_user_model()
+
+
+class UserExtraInfoInline(StackedInline):
+    """ Inline admin interface for Extra Info model. """
+    model = ExtraInfo
+    can_delete = False
+    verbose_name_plural = 'Extra info'
+
+
+class NelpUserAdmin(SupportUserAdmin):
+    """EoxNelp User admin class."""
+    list_display = SupportUserAdmin.list_display[:2] + ('user_national_id',) + SupportUserAdmin.list_display[2:]
+    search_fields = SupportUserAdmin.search_fields + ('extrainfo__national_id',)
+    inlines = SupportUserAdmin.inlines + (UserExtraInfoInline,)
+
+    def user_national_id(self, instance):
+        """Return national_id associated with the user extra_info instance."""
+        if getattr(instance, "extrainfo", None):
+            return instance.extrainfo.national_id
+
+        return None
+
+
+register(User, NelpUserAdmin)