Merge pull request #446 from nofusscomputing/development

app/access/functions/permissions.py

@@ -15,6 +15,7 @@ def permission_queryset():
         'django_celery_results',
         'itam',
         'itim',
+        'project_management',
         'settings',
     ]
 

app/access/models.py

@@ -108,6 +108,16 @@ def __str__(self):
                 }
             ]
         },
+        {
+            "name": "Knowledge Base",
+            "slug": "kb_articles",
+            "sections": [
+                {
+                    "layout": "table",
+                    "field": "knowledge_base",
+                }
+            ]
+        },
         {
             "name": "Notes",
             "slug": "notes",
@@ -311,6 +321,8 @@ def get_url_kwargs(self) -> dict:
 
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
 
+        self.clean()
+
         if self.organization is None:
 
             raise ValidationError('Organization not defined')
@@ -373,6 +385,16 @@ def save(self, force_insert=False, force_update=False, using=None, update_fields
                 },
             ]
         },
+        {
+            "name": "Knowledge Base",
+            "slug": "kb_articles",
+            "sections": [
+                {
+                    "layout": "table",
+                    "field": "knowledge_base",
+                }
+            ]
+        },
         {
             "name": "Notes",
             "slug": "notes",

app/access/serializers/organization.py

@@ -52,6 +52,14 @@ def get_url(self, item) -> dict:
 
         return {
             '_self': item.get_url( request = self._context['view'].request ),
+            'knowledge_base': reverse(
+                "v2:_api_v2_model_kb-list",
+                request=self._context['view'].request,
+                kwargs={
+                    'model': self.Meta.model._meta.model_name,
+                    'model_pk': item.pk
+                }
+            ),
             'teams': reverse("v2:_api_v2_organization_team-list", request=self._context['view'].request, kwargs={'organization_id': item.pk}),
         }
 

app/access/serializers/teams.py

@@ -63,6 +63,14 @@ def get_url(self, item) -> dict:
 
         return {
             '_self': item.get_url( request = self._context['view'].request ),
+            'knowledge_base': reverse(
+                "v2:_api_v2_model_kb-list",
+                request=self._context['view'].request,
+                kwargs={
+                    'model': self.Meta.model._meta.model_name,
+                    'model_pk': item.pk
+                }
+            ),
             'users': reverse(
                 'v2:_api_v2_organization_team_user-list',
                 request=self.context['view'].request,

app/access/tests/unit/team_user/test_team_user.py

@@ -8,6 +8,9 @@
 
 from app.tests.abstract.models import BaseModel
 
+from core.mixin.history_save import SaveHistory
+
+
 
 class TeamUsersModel(
     TestCase,
@@ -58,3 +61,14 @@ def test_model_property_parent_object_returns_object(self):
         """
 
         assert self.item.parent_object == self.parent_item
+
+
+
+    @pytest.mark.skip( reason = 'TeamUsers is not a tenancy object' )
+    def test_class_inherits_tenancy_objecy(self):
+        """ Confirm class inheritence
+
+        TenancyObject must inherit TenancyObject
+        """
+
+        pass

app/api/react_ui_metadata.py

@@ -11,6 +11,8 @@
 
 from rest_framework_json_api.utils import get_related_resource_type
 
+from access.models import Organization
+
 from app.serializers.user import User, UserBaseSerializer
 
 from core import fields as centurion_field
@@ -450,6 +452,14 @@ def get_navigation(self, user) -> list(dict()):
             'settings.view_appsettings',
         ]
 
+
+        # user = view.request.user
+
+        user_orgainzations = Organization.objects.filter(
+            manager = user
+        )
+
+
         for app, entry in self._nav.items():
 
             new_menu_entry: dict = {}
@@ -494,6 +504,17 @@ def get_navigation(self, user) -> list(dict()):
                             new_pages += [ page ]
 
 
+                if(
+                    app == 'access'
+                    and permission == 'view_organization'
+                    and len(user_orgainzations) > 0
+                ):
+
+                    if page not in new_pages:
+
+                        new_pages += [ page ]
+
+
             if len(new_pages) > 0:
 
                 new_menu_entry = entry.copy()

app/api/tests/abstract/api_permissions_viewset.py

@@ -468,36 +468,36 @@ def test_delete_permission_add_denied(self):
         assert response.status_code == 403
 
 
-    def test_delete_permission_change_denied(self):
+    def test_delete_has_permission(self):
         """ Check correct permission for delete
 
-        Attempt to delete as user with change permission only
+        Delete item as user with delete permission
         """
 
         client = Client()
         url = reverse(self.app_namespace + ':' + self.url_name + '-detail', kwargs=self.url_view_kwargs)
 
 
-        client.force_login(self.change_user)
+        client.force_login(self.delete_user)
         response = client.delete(url, data=self.delete_data)
 
-        assert response.status_code == 403
+        assert response.status_code == 204
 
 
-    def test_delete_has_permission(self):
+    def test_delete_permission_change_denied(self):
         """ Check correct permission for delete
 
-        Delete item as user with delete permission
+        Attempt to delete as user with change permission only
         """
 
         client = Client()
         url = reverse(self.app_namespace + ':' + self.url_name + '-detail', kwargs=self.url_view_kwargs)
 
 
-        client.force_login(self.delete_user)
+        client.force_login(self.change_user)
         response = client.delete(url, data=self.delete_data)
 
-        assert response.status_code == 204
+        assert response.status_code == 403
 
 
 

app/api/urls_v2.py

@@ -26,6 +26,7 @@
     index as assistance_index_v2,
     knowledge_base as knowledge_base_v2,
     knowledge_base_category as knowledge_base_category_v2,
+    model_knowledge_base_article,
     request as request_ticket_v2,
 )
 
@@ -107,6 +108,7 @@
 
 router.register('assistance', assistance_index_v2.Index, basename='_api_v2_assistance_home')
 router.register('assistance/knowledge_base', knowledge_base_v2.ViewSet, basename='_api_v2_knowledge_base')
+router.register('assistance/(?P<model>.+)/(?P<model_pk>[0-9]+)/knowledge_base', model_knowledge_base_article.ViewSet, basename='_api_v2_model_kb')
 router.register('assistance/ticket/request', request_ticket_v2.ViewSet, basename='_api_v2_ticket_request')
 
 

app/api/views/mixin.py

@@ -15,12 +15,32 @@ class OrganizationPermissionAPI(DjangoObjectPermissions, OrganizationMixin):
 
     def has_permission(self, request, view):
 
+        # if view.kwargs.get('pk', None):
+
+        #     if(
+        #         str(type(view.get_object()).__name__).lower() == 'organization'
+        #     ):
+
+        #         if view.get_object().manager == request.user:
+
+        #             return True
+
         return self.permission_check(request, view)
 
 
     def has_object_permission(self, request, view, obj):
 
-        return self.permission_check(request, view, obj)
+        # if view.kwargs.get('pk', None):
+
+        #     if(
+        #         str(type(obj).__name__).lower() == 'organization'
+        #     ):
+
+        #         if obj.manager == request.user:
+
+        #             return True
+
+        return self.permission_check(request, view)
 
 
     def permission_check(self, request, view, obj=None) -> bool:
@@ -67,10 +87,34 @@ def permission_check(self, request, view, obj=None) -> bool:
 
                 if 'organization' in request.data:
 
-                    if not request.data['organization']:
-                        raise centurion_exceptions.ValidationError('you must provide an organization')
+                    serializer = None
+
+                    try:    # Method throws exception if not overridden
+
+                        serializer = view.get_serializer_class()
+
+                    except Exception as e:
+
+                        serializer = None
+
+                    try:    # Method throws exception if not overridden
+
+                        serializer = view.get_serializer()
+
+                    except Exception as e:
+
+                        serializer = None
+
+
+                    if 'organization' not in getattr(serializer.Meta, 'read_only_fields', []):
+
+                        if not request.data['organization']:
+
+                            raise centurion_exceptions.ValidationError('you must provide an organization')
+
+                        object_organization = int(request.data['organization'])
+
 
-                    object_organization = int(request.data['organization'])
             elif method == 'patch':
 
                 action = 'change'
@@ -88,7 +132,7 @@ def permission_check(self, request, view, obj=None) -> bool:
                 action = 'view'
 
             if hasattr(self, 'obj'):
-
+                
                 permission = self.obj._meta.app_label + '.' + action + '_' + self.obj._meta.model_name
 
                 self.permission_required = [ permission ]
@@ -116,6 +160,13 @@ def permission_check(self, request, view, obj=None) -> bool:
                         return False
 
 
+                if object_organization is None and getattr(view, 'parent_model', None):
+
+                    parent_model = view.parent_model.objects.get(pk=view.kwargs[view.parent_model_pk_kwarg])
+
+                    object_organization = parent_model.organization.id
+
+
             if obj:
 
                 if obj.get_organization():

app/app/tests/abstract/models.py

@@ -21,13 +21,23 @@ class BaseModel:
     """ Model to test """
 
 
-    @pytest.mark.skip(reason="figure out how to test sub-sub-class")
+
     def test_class_inherits_save_history(self):
         """ Confirm class inheritence
 
         TenancyObject must inherit SaveHistory
         """
 
+        assert issubclass(self.model, SaveHistory)
+
+
+
+    def test_class_inherits_tenancy_objecy(self):
+        """ Confirm class inheritence
+
+        TenancyObject must inherit TenancyObject
+        """
+
         assert issubclass(self.model, TenancyObject)
 
 

app/assistance/migrations/0003_modelknowledgebasearticle.py

@@ -0,0 +1,39 @@
+# Generated by Django 5.1.4 on 2024-12-20 08:34
+
+import access.fields
+import access.models
+import assistance.models.model_knowledge_base_article
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('access', '0002_alter_organization_options_alter_team_options_and_more'),
+        ('assistance', '0002_alter_knowledgebase_options_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ModelKnowledgeBaseArticle',
+            fields=[
+                ('is_global', models.BooleanField(default=False, help_text='Is this a global object?', verbose_name='Global Object')),
+                ('id', models.AutoField(help_text='ID of this KB article link', primary_key=True, serialize=False, unique=True, verbose_name='ID')),
+                ('model', models.CharField(choices=assistance.models.model_knowledge_base_article.all_models, help_text='Model type to link to article article', max_length=50, verbose_name='Model Type')),
+                ('model_pk', models.IntegerField(help_text='PK of the model the article is linked to', verbose_name='Model Primary Key')),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, help_text='Date and time of creation', verbose_name='Created')),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, help_text='Date and time of last modification', verbose_name='Modified')),
+                ('article', models.ForeignKey(help_text='Article to be linked to model', on_delete=django.db.models.deletion.CASCADE, to='assistance.knowledgebase', verbose_name='Article')),
+                ('organization', models.ForeignKey(help_text='Organization this belongs to', on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists], verbose_name='Organization')),
+            ],
+            options={
+                'verbose_name': 'Model Knowledge Base Article',
+                'verbose_name_plural': 'Model Knowledge Base Articles',
+                'ordering': ['model', 'id'],
+                'default_permissions': ('add', 'delete', 'view'),
+                'unique_together': {('article', 'model', 'model_pk')},
+            },
+        ),
+    ]

app/assistance/models/knowledge_base.py

@@ -291,18 +291,6 @@ class Meta:
                         'target_user',
                         'target_team',
                     ]
-                },
-                {
-                    "layout": "single",
-                    "fields": [
-                        'summary',
-                    ]
-                },
-                {
-                    "layout": "single",
-                    "fields": [
-                        'content',
-                    ]
                 }
             ]
         },