build: bump version 1.2.2 -> 1.3.0

ref: #371 closes #363

.cz.yaml

@@ -1,8 +1,21 @@
 ---
 commitizen:
-  name: cz_conventional_commits
+  customize:
+    change_type_map:
+      feature: Features
+      fix: Fixes
+      refactor: Refactoring
+      test: Tests
+    change_type_order:
+    - BREAKING CHANGE
+    - feat
+    - fix
+    - test
+    - refactor
+    commit_parser: ^(?P<change_type>feat|fix|test|refactor|perf|BREAKING CHANGE)(?:\((?P<scope>[^()\r\n]*)\)|\()?(?P<breaking>!)?:\s(?P<message>.*)?
+  name: cz_customize
   prerelease_offset: 1
   tag_format: $version
   update_changelog_on_bump: false
-  version: 1.0.0-b3
+  version: 1.3.0
   version_scheme: semver

.github/pull_request_template.md

@@ -0,0 +1,39 @@
+### :books: Summary
+<!-- your summary here emojis ref: https://github.com/yodamad/gitlab-emoji -->
+
+
+
+### :link: Links / References
+<!-- 
+
+    using a list as any links to other references or links as required. if relevant, describe the link/reference
+
+    Include any issues or related merge requests. Note: dependent MR's also to be added to "Merge request dependencies"
+
+-->
+
+
+
+### :construction_worker: Tasks
+
+ - [ ] Add your tasks here if required (delete)
+
+<!-- dont remove tasks below strike through including the checkbox by enclosing in double tidle '~~' -->
+
+- [ ] :firecracker: Contains breaking-change Any Breaking change(s)?
+
+    _Breaking Change must also be notated in the commit that introduces it and in [Conventional Commit Format](https://www.conventionalcommits.org/en/v1.0.0/)._
+
+    - [ ] :notebook: Release notes updated
+
+- [ ] :blue_book: Documentation written
+
+    _All features to be documented within the correct section(s). Administration, Development and/or User_
+
+- [ ] :checkered_flag: Milestone assigned
+
+- [ ] :test_tube: [Unit Test(s) Written](https://nofusscomputing.com/projects/centurion_erp/development/testing/)
+
+    _ensure test coverage delta is not less than zero_
+
+- [ ] :page_facing_up: Roadmap updated

.github/workflows/bump.yaml

@@ -0,0 +1,31 @@
+---
+
+name: 'Bump'
+
+
+on:
+  workflow_dispatch:
+    inputs:
+      CZ_PRE_RELEASE:
+        default: none
+        required: false
+        description: Create Pre-Release {alpha,beta,rc,none}
+      CZ_INCREMENT:
+        default: none
+        required: false
+        description: Type of bump to conduct {MAJOR,MINOR,PATCH,none}
+  push:
+    branches:
+      - 'master'
+
+
+jobs:
+
+  bump:
+    name: 'Bump'
+    uses: nofusscomputing/action_bump/.github/workflows/bump.yaml@development
+    with:
+      CZ_PRE_RELEASE: ${{ inputs.CZ_PRE_RELEASE }}
+      CZ_INCREMENT: ${{ inputs.CZ_INCREMENT }}
+    secrets:
+      WORKFLOW_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}

.github/workflows/ci.yaml

@@ -0,0 +1,120 @@
+---
+
+name: 'CI'
+
+
+on:
+  push:
+    branches:
+      - '**'
+    tags:
+      - '*'
+
+env:
+  GIT_SYNC_URL: "https://${{ secrets.GITLAB_USERNAME_ROBOT }}:${{ secrets.GITLAB_TOKEN_ROBOT }}@gitlab.com/nofusscomputing/projects/centurion_erp.git"
+
+jobs:
+
+
+  mkdocs:
+    name: 'MKDocs'
+    permissions:
+      pull-requests: write
+      contents: write
+      statuses: write
+      checks: write
+      actions: write
+    uses: nofusscomputing/action_mkdocs/.github/workflows/reusable_mkdocs.yaml@development
+
+
+  docker:
+    name: 'Docker'
+    uses: nofusscomputing/action_docker/.github/workflows/docker.yaml@development
+    with:
+      DOCKER_BUILD_IMAGE_NAME: "nofusscomputing/centurion-erp"
+      DOCKER_PUBLISH_REGISTRY: "docker.io"
+      DOCKER_PUBLISH_IMAGE_NAME: "nofusscomputing/centurion-erp"
+    secrets:
+      DOCKER_PUBLISH_USERNAME: ${{ secrets.NFC_DOCKERHUB_USERNAME }}
+      DOCKER_PUBLISH_PASSWORD: ${{ secrets.NFC_DOCKERHUB_TOKEN }}
+
+
+  python:
+    name: 'Python'
+    uses: nofusscomputing/action_python/.github/workflows/python.yaml@development
+    secrets:
+      WORKFLOW_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+
+
+  gitlab-mirror:
+    if: ${{ github.repository == 'nofusscomputing/centurion_erp' }}
+    runs-on: ubuntu-latest
+    steps:
+
+
+      - name: Checks
+        shell: bash
+        run: |
+          if [ "0${{ env.GIT_SYNC_URL }}" == "0" ]; then
+
+            echo "[ERROR] you must define variable GIT_SYNC_URL for mirroring this repository.";
+
+            exit 1;
+
+          fi
+
+
+      - name: clone
+        shell: bash
+        run: |
+
+          git clone --mirror https://github.com/${{ github.repository }} repo;
+
+          ls -la repo/
+
+
+      - name: add remote
+        shell: bash
+        run: |
+
+          cd repo;
+
+          echo "**************************************** - git remote -v";
+
+          git remote -v;
+
+          echo "****************************************";
+
+          git remote add destination $GIT_SYNC_URL;
+
+
+      - name: push branches
+        shell: bash
+        run: |
+
+          cd repo;
+
+          echo "**************************************** - git branch";
+
+          git branch;
+
+          echo "****************************************";
+
+          # git push destination --all --force;
+
+          git push destination --mirror || true;
+
+
+      # - name: push tags
+      #   shell: bash
+      #   run: |
+
+      #     cd repo;
+
+      #     echo "**************************************** - git tag";
+
+      #     git tag;
+
+      #     echo "****************************************";
+
+      #     git push destination --tags --force;

.github/workflows/pull-requests.yaml

@@ -0,0 +1,14 @@
+---
+
+name: Pull Requests
+
+
+on:
+  pull_request: {}
+
+
+jobs:
+
+  pull-request:
+    name: pull-request
+    uses: nofusscomputing/action_pull_requests/.github/workflows/pull-requests.yaml@development

.github/workflows/triage.yaml

@@ -0,0 +1,37 @@
+
+---
+
+name: Triage
+
+
+on:
+  issues:
+    types:
+      - opened
+      - reopened
+      - transferred
+      - milestoned
+      - demilestoned
+      - closed
+      - assigned
+  pull_request: 
+    types:
+      - opened
+      - edited
+      - assigned
+      - reopened
+      - closed
+
+
+
+jobs:
+
+
+  project:
+    name: Project
+    uses: nofusscomputing/action_project/.github/workflows/project.yaml@development
+    with:
+      PROJECT_URL: https://github.com/orgs/nofusscomputing/projects/3
+    secrets:
+      WORKFLOW_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+

.gitignore

@@ -9,3 +9,9 @@ artifacts/
 volumes/
 build/
 pages/
+node_modules/
+.markdownlint-cli2.jsonc
+.markdownlint.json
+package-lock.json
+package.json
+**.junit.xml

.gitlab-ci.yml

@@ -2,21 +2,21 @@
 
 variables:
   MY_PROJECT_ID: "57560288"
-  GIT_SYNC_URL: "https://$GITHUB_USERNAME_ROBOT:$GITHUB_TOKEN_ROBOT@github.com/NoFussComputing/centurion_erp.git"
+  # GIT_SYNC_URL: "https://$GITHUB_USERNAME_ROBOT:$GITHUB_TOKEN_ROBOT@github.com/NoFussComputing/centurion_erp.git"
 
-  # Docker Build / Publish
-  DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/amd64,linux/arm64"
-  DOCKER_IMAGE_BUILD_NAME: centurion-erp
-  DOCKER_IMAGE_BUILD_REGISTRY: $CI_REGISTRY_IMAGE
-  DOCKER_IMAGE_BUILD_TAG: $CI_COMMIT_SHA
+  # # Docker Build / Publish
+  # DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/amd64,linux/arm64"
+  # DOCKER_IMAGE_BUILD_NAME: centurion-erp
+  # DOCKER_IMAGE_BUILD_REGISTRY: $CI_REGISTRY_IMAGE
+  # DOCKER_IMAGE_BUILD_TAG: $CI_COMMIT_SHA
 
-  # Docker Publish
-  DOCKER_IMAGE_PUBLISH_NAME: centurion-erp
-  DOCKER_IMAGE_PUBLISH_REGISTRY: docker.io/nofusscomputing
-  DOCKER_IMAGE_PUBLISH_URL: https://hub.docker.com/r/nofusscomputing/$DOCKER_IMAGE_PUBLISH_NAME
+  # # Docker Publish
+  # DOCKER_IMAGE_PUBLISH_NAME: centurion-erp
+  # DOCKER_IMAGE_PUBLISH_REGISTRY: docker.io/nofusscomputing
+  # DOCKER_IMAGE_PUBLISH_URL: https://hub.docker.com/r/nofusscomputing/$DOCKER_IMAGE_PUBLISH_NAME
 
-  # Extra release commands
-  MY_COMMAND: ./.gitlab/additional_actions_bump.sh
+  # # Extra release commands
+  # MY_COMMAND: ./.gitlab/additional_actions_bump.sh
 
   # Docs NFC
   PAGES_ENVIRONMENT_PATH: projects/centurion_erp/
@@ -25,97 +25,101 @@ variables:
 
 
 include:
-  - local: .gitlab/pytest.gitlab-ci.yml
+  # - local: .gitlab/pytest.gitlab-ci.yml
   # - local: .gitlab/unit-test.gitlab-ci.yml
   - project: nofusscomputing/projects/gitlab-ci
     ref: development
     file:
       - .gitlab-ci_common.yaml
-      - template/automagic.gitlab-ci.yaml
-
-
-Update Git Submodules:
-  extends: .ansible_playbook_git_submodule
-
-
-Docker Container:
-  extends: .build_docker_container
-  resource_group: build
-  needs: []
-  script: 
-    - update-binfmts --display
-    - |
-
-      echo "[DEBUG] building multiarch/specified arch image";
-
-      docker buildx build --platform=$DOCKER_IMAGE_BUILD_TARGET_PLATFORMS . \
-        --label org.opencontainers.image.created="$(date '+%Y-%m-%d %H:%M:%S%:z')" \
-        --label org.opencontainers.image.documentation="$CI_PROJECT_URL" \
-        --label org.opencontainers.image.source="$CI_PROJECT_URL" \
-        --label org.opencontainers.image.revision="$CI_COMMIT_SHA" \
-      --push \
-      --build-arg CI_PROJECT_URL=$CI_PROJECT_URL \
-      --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA \
-      --build-arg CI_COMMIT_TAG=$CI_COMMIT_TAG \
-      --file $DOCKER_DOCKERFILE \
-      --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
-
-      docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
-
-      # during docker multi platform build there are >=3 additional unknown images added to gitlab container registry. cleanup
+      # - template/automagic.gitlab-ci.yaml
+      - automation/.gitlab-ci-ansible.yaml
+      - template/mkdocs-documentation.gitlab-ci.yaml
+      - lint/ansible.gitlab-ci.yaml
       
-      DOCKER_MULTI_ARCH_IMAGES=$(docker buildx imagetools inspect "$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG" --format "{{ range .Manifest.Manifests }}{{ if ne (print .Platform) \"&{unknown unknown  [] }\" }}$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG@{{ println .Digest }}{{end}} {{end}}");
 
-      docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
 
-      docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
+# Update Git Submodules:
+#   extends: .ansible_playbook_git_submodule
 
-  rules: # rules manually synced from docker/publish.gitlab-ci.yaml removing git tag
 
-    # - if: # condition_master_branch_push
-    #     $CI_COMMIT_BRANCH == "master" && 
-    #     $CI_PIPELINE_SOURCE == "push"
-    #   exists:
-    #     - '{dockerfile,dockerfile.j2}'
-    #   when: always
+# Docker Container:
+#   extends: .build_docker_container
+#   resource_group: build
+#   needs: []
+#   script: 
+#     - update-binfmts --display
+#     - |
 
-    - if:
-        $CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'
-          &&
-        $CI_COMMIT_BRANCH == "development"
-      when: never
+#       echo "[DEBUG] building multiarch/specified arch image";
 
-    - if: # condition_not_master_or_dev_push
-        $CI_COMMIT_BRANCH != "master" && 
-        $CI_COMMIT_BRANCH != "development" && 
-        $CI_PIPELINE_SOURCE == "push"
-      exists:
-        - '{dockerfile,dockerfile.j2}'
-      changes:
-        paths:
-          - '{dockerfile,dockerfile.j2,includes/**/*}'
-        compare_to: 'development'
-      when: always
+#       docker buildx build --platform=$DOCKER_IMAGE_BUILD_TARGET_PLATFORMS . \
+#         --label org.opencontainers.image.created="$(date '+%Y-%m-%d %H:%M:%S%:z')" \
+#         --label org.opencontainers.image.documentation="$CI_PROJECT_URL" \
+#         --label org.opencontainers.image.source="$CI_PROJECT_URL" \
+#         --label org.opencontainers.image.revision="$CI_COMMIT_SHA" \
+#       --push \
+#       --build-arg CI_PROJECT_URL=$CI_PROJECT_URL \
+#       --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA \
+#       --build-arg CI_COMMIT_TAG=$CI_COMMIT_TAG \
+#       --file $DOCKER_DOCKERFILE \
+#       --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
 
-    - if: $CI_COMMIT_TAG
-      exists:
-        - '{dockerfile,dockerfile.j2}'
-      when: always
+#       docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
 
-    - if: # condition_dev_branch_push
-        (
-          $CI_COMMIT_BRANCH == "development"
-            ||
-          $CI_COMMIT_BRANCH == "master"
-        )
-         && 
-        $CI_PIPELINE_SOURCE == "push"
-      exists:
-        - '{dockerfile,dockerfile.j2}'
-      allow_failure: true
-      when: on_success
+#       # during docker multi platform build there are >=3 additional unknown images added to gitlab container registry. cleanup
+      
+#       DOCKER_MULTI_ARCH_IMAGES=$(docker buildx imagetools inspect "$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG" --format "{{ range .Manifest.Manifests }}{{ if ne (print .Platform) \"&{unknown unknown  [] }\" }}$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG@{{ println .Digest }}{{end}} {{end}}");
 
-    - when: never
+#       docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
+
+#       docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
+
+#   rules: # rules manually synced from docker/publish.gitlab-ci.yaml removing git tag
+
+#     # - if: # condition_master_branch_push
+#     #     $CI_COMMIT_BRANCH == "master" && 
+#     #     $CI_PIPELINE_SOURCE == "push"
+#     #   exists:
+#     #     - '{dockerfile,dockerfile.j2}'
+#     #   when: always
+
+#     - if:
+#         $CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'
+#           &&
+#         $CI_COMMIT_BRANCH == "development"
+#       when: never
+
+#     - if: # condition_not_master_or_dev_push
+#         $CI_COMMIT_BRANCH != "master" && 
+#         $CI_COMMIT_BRANCH != "development" && 
+#         $CI_PIPELINE_SOURCE == "push"
+#       exists:
+#         - '{dockerfile,dockerfile.j2}'
+#       changes:
+#         paths:
+#           - '{dockerfile,dockerfile.j2,includes/**/*}'
+#         compare_to: 'development'
+#       when: always
+
+#     - if: $CI_COMMIT_TAG
+#       exists:
+#         - '{dockerfile,dockerfile.j2}'
+#       when: always
+
+#     - if: # condition_dev_branch_push
+#         (
+#           $CI_COMMIT_BRANCH == "development"
+#             ||
+#           $CI_COMMIT_BRANCH == "master"
+#         )
+#          && 
+#         $CI_PIPELINE_SOURCE == "push"
+#       exists:
+#         - '{dockerfile,dockerfile.j2}'
+#       allow_failure: true
+#       when: on_success
+
+#     - when: never
 
 
 
@@ -123,96 +127,107 @@ Docker Container:
 
 
 
-.gitlab_release:
-    stage: release
-    image: registry.gitlab.com/gitlab-org/release-cli:latest
-    before_script:
-        - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi
-        - echo "[DEBUG] ROOT_DIR[$ROOT_DIR]"
-        - mkdir -p "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME"
-        - mkdir -p "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests"
-        - apk update
-        - apk add git curl
-        - apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
-        - python -m ensurepip  && ln -sf pip3 /usr/bin/pip
-        - pip install --upgrade pip
-        - pip install -r $ROOT_DIR/gitlab_release/requirements.txt
-        # - pip install $ROOT_DIR/gitlab_release/python-module/cz_nfc/.
-        - pip install commitizen --force
-        - 'CLONE_URL="https://gitlab-ci-token:$GIT_COMMIT_TOKEN@gitlab.com/$CI_PROJECT_PATH.git"'
-        - echo "[DEBUG] CLONE_URL[$CLONE_URL]"
-        - git clone -b development $CLONE_URL repo
-        - cd repo
-        - git branch
-        - git config --global user.email "helpdesk@nofusscomputing.com"
-        - git config --global user.name "nfc_bot"
-        - git push --set-upstream origin development
-        - RELEASE_VERSION_CURRENT=$(cz version --project)        
-    script:
-        - if [ "$CI_COMMIT_BRANCH" == "development" ] ; then RELEASE_CHANGELOG=$(cz bump --changelog --changelog-to-stdout --prerelease beta); else RELEASE_CHANGELOG=$(cz bump --changelog --changelog-to-stdout); fi
-        - RELEASE_VERSION_NEW=$(cz version --project)
-        - RELEASE_TAG=$RELEASE_VERSION_NEW
-        - echo "[DEBUG] RELEASE_VERSION_CURRENT[$RELEASE_VERSION_CURRENT]"
-        - echo "[DEBUG] RELEASE_CHANGELOG[$RELEASE_CHANGELOG]"
-        - echo "[DEBUG] RELEASE_VERSION_NEW[$RELEASE_VERSION_NEW]"
-        - echo "[DEBUG] RELEASE_TAG[$RELEASE_TAG]"
-        - RELEASE_TAG_SHA1=$(git log -n1 --format=format:"%H")
-        - echo "[DEBUG] RELEASE_TAG_SHA1[$RELEASE_TAG_SHA1]"
+# .gitlab_release:
+#     stage: release
+#     image: registry.gitlab.com/gitlab-org/release-cli:latest
+#     before_script:
+#         - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi
+#         - echo "[DEBUG] ROOT_DIR[$ROOT_DIR]"
+#         - mkdir -p "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME"
+#         - mkdir -p "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests"
+#         - apk update
+#         - apk add git curl
+#         - apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
+#         - python -m ensurepip  && ln -sf pip3 /usr/bin/pip
+#         - pip install --upgrade pip
+#         - pip install -r $ROOT_DIR/gitlab_release/requirements.txt
+#         # - pip install $ROOT_DIR/gitlab_release/python-module/cz_nfc/.
+#         - pip install commitizen --force
+#         - 'CLONE_URL="https://gitlab-ci-token:$GIT_COMMIT_TOKEN@gitlab.com/$CI_PROJECT_PATH.git"'
+#         - echo "[DEBUG] CLONE_URL[$CLONE_URL]"
+#         - git clone -b development $CLONE_URL repo
+#         - cd repo
+#         - git branch
+#         - git config --global user.email "helpdesk@nofusscomputing.com"
+#         - git config --global user.name "nfc_bot"
+#         - git push --set-upstream origin development
+#         - RELEASE_VERSION_CURRENT=$(cz version --project)        
+#     script:
+#         - if [ "$CI_COMMIT_BRANCH" == "development" ] ; then RELEASE_CHANGELOG=$(cz bump --changelog --changelog-to-stdout --prerelease beta); else RELEASE_CHANGELOG=$(cz bump --changelog --changelog-to-stdout); fi
+#         - RELEASE_VERSION_NEW=$(cz version --project)
+#         - RELEASE_TAG=$RELEASE_VERSION_NEW
+#         - echo "[DEBUG] RELEASE_VERSION_CURRENT[$RELEASE_VERSION_CURRENT]"
+#         - echo "[DEBUG] RELEASE_CHANGELOG[$RELEASE_CHANGELOG]"
+#         - echo "[DEBUG] RELEASE_VERSION_NEW[$RELEASE_VERSION_NEW]"
+#         - echo "[DEBUG] RELEASE_TAG[$RELEASE_TAG]"
+#         - RELEASE_TAG_SHA1=$(git log -n1 --format=format:"%H")
+#         - echo "[DEBUG] RELEASE_TAG_SHA1[$RELEASE_TAG_SHA1]"
 
-        - |
-          if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then 
+#         - |
+#           if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then 
 
-            echo "[DEBUG] not running extra actions, no new version"; 
+#             echo "[DEBUG] not running extra actions, no new version"; 
 
-          else
+#           else
 
-            echo "[DEBUG] Creating new Version Label";
+#             echo "[DEBUG] Creating new Version Label";
 
-            ${MY_COMMAND}
+#             echo "----------------------------";
 
-          fi
+#             echo ${MY_COMMAND};
 
-        - if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then echo "[DEBUG] No tag to delete, version was not bumped"; else git tag -d $RELEASE_TAG; fi
+#             echo "----------------------------";
 
-        - if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then echo "[DEBUG] No push will be conducted, version was not bumped"; else git push; fi
-        - if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then echo "[DEBUG] No release will be created, version was not bumped"; else release-cli create --name "Release $RELEASE_TAG" --tag-name "$RELEASE_TAG" --tag-message "$RELEASE_CHANGELOG" --ref "$RELEASE_TAG_SHA1" --description "$RELEASE_CHANGELOG"; fi
-        - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git checkout master; fi
-        - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git push --set-upstream origin master; fi
-        - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git merge --no-ff development; fi
-        - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git push origin master; fi
-    after_script:
-        - rm -Rf repo
-    rules:
-        - if: '$JOB_STOP_GITLAB_RELEASE'
-          when: never
+#             cat ${MY_COMMAND};
 
-        - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
-          when: never
+#             echo "----------------------------";
 
-        - if: # condition_master_branch_push
-            $CI_COMMIT_BRANCH == "master" && 
-            $CI_PIPELINE_SOURCE == "push"
-          allow_failure: false
-          when: on_success
+#             ${MY_COMMAND};
 
-        - if: # condition_dev_branch_push
-            $CI_COMMIT_BRANCH == "development" && 
-            $CI_PIPELINE_SOURCE == "push"
-          when: manual
-          allow_failure: true
+#             echo "----------------------------";
+#           fi
 
-        # for testing
-        # - if: '$CI_COMMIT_BRANCH != "master"'
-        #   when: always
-        #   allow_failure: true
-        - when: never
+#         - if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then echo "[DEBUG] No tag to delete, version was not bumped"; else git tag -d $RELEASE_TAG; fi
 
-#
-# Release
-#
-Gitlab Release:
-  extends:
-    - .gitlab_release
+#         - if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then echo "[DEBUG] No push will be conducted, version was not bumped"; else git push; fi
+#         - if [ "0$RELEASE_VERSION_CURRENT" == "0$RELEASE_VERSION_NEW" ]; then echo "[DEBUG] No release will be created, version was not bumped"; else release-cli create --name "Release $RELEASE_TAG" --tag-name "$RELEASE_TAG" --tag-message "$RELEASE_CHANGELOG" --ref "$RELEASE_TAG_SHA1" --description "$RELEASE_CHANGELOG"; fi
+#         - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git checkout master; fi
+#         - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git push --set-upstream origin master; fi
+#         - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git merge --no-ff development; fi
+#         - if [ "$CI_COMMIT_BRANCH" == "master" ] ; then git push origin master; fi
+#     after_script:
+#         - rm -Rf repo
+#     rules:
+#         - if: '$JOB_STOP_GITLAB_RELEASE'
+#           when: never
+
+#         - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+#           when: never
+
+#         - if: # condition_master_branch_push
+#             $CI_COMMIT_BRANCH == "master" && 
+#             $CI_PIPELINE_SOURCE == "push"
+#           allow_failure: false
+#           when: on_success
+
+#         - if: # condition_dev_branch_push
+#             $CI_COMMIT_BRANCH == "development" && 
+#             $CI_PIPELINE_SOURCE == "push"
+#           when: manual
+#           allow_failure: true
+
+#         # for testing
+#         # - if: '$CI_COMMIT_BRANCH != "master"'
+#         #   when: always
+#         #   allow_failure: true
+#         - when: never
+
+# #
+# # Release
+# #
+# Gitlab Release:
+#   extends:
+#     - .gitlab_release
 
 
 
@@ -221,59 +236,59 @@ Gitlab Release:
 
 
 
-Docker.Hub.Branch.Publish:
-  extends: .publish-docker-hub
-  needs: [ "Docker Container" ]
-  resource_group: build
-  rules: # rules manually synced from docker/publish.gitlab-ci.yaml removing git tag
+# Docker.Hub.Branch.Publish:
+#   extends: .publish-docker-hub
+#   needs: [ "Docker Container" ]
+#   resource_group: build
+#   rules: # rules manually synced from docker/publish.gitlab-ci.yaml removing git tag
 
-    # - if: # condition_master_branch_push
-    #     $CI_COMMIT_BRANCH == "master" && 
-    #     $CI_PIPELINE_SOURCE == "push"
-    #   exists:
-    #     - '{dockerfile,dockerfile.j2}'
-    #   when: always
+#     # - if: # condition_master_branch_push
+#     #     $CI_COMMIT_BRANCH == "master" && 
+#     #     $CI_PIPELINE_SOURCE == "push"
+#     #   exists:
+#     #     - '{dockerfile,dockerfile.j2}'
+#     #   when: always
 
-    - if:
-        $CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'
-          &&
-        $CI_COMMIT_BRANCH == "development"
-      when: never
+#     - if:
+#         $CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'
+#           &&
+#         $CI_COMMIT_BRANCH == "development"
+#       when: never
 
-    - if: $CI_COMMIT_TAG
-      exists:
-        - '{dockerfile,dockerfile.j2}'
-      when: always
+#     - if: $CI_COMMIT_TAG
+#       exists:
+#         - '{dockerfile,dockerfile.j2}'
+#       when: always
 
-    - if: # condition_dev_branch_push
-        $CI_COMMIT_BRANCH == "development" && 
-        $CI_PIPELINE_SOURCE == "push"
-      exists:
-        - '{dockerfile,dockerfile.j2}'
-      allow_failure: true
-      when: on_success
+#     - if: # condition_dev_branch_push
+#         $CI_COMMIT_BRANCH == "development" && 
+#         $CI_PIPELINE_SOURCE == "push"
+#       exists:
+#         - '{dockerfile,dockerfile.j2}'
+#       allow_failure: true
+#       when: on_success
 
-    - when: never
+#     - when: never
 
 
-Github (Push --mirror):
-  extends:
-    - .git_push_mirror
-  needs: []
-  rules:
-        - if: '$JOB_STOP_GIT_PUSH_MIRROR'
-          when: never
+# Github (Push --mirror):
+#   extends:
+#     - .git_push_mirror
+#   needs: []
+#   rules:
+#         - if: '$JOB_STOP_GIT_PUSH_MIRROR'
+#           when: never
 
-        - if: $GIT_SYNC_URL == null
-          when: never
+#         - if: $GIT_SYNC_URL == null
+#           when: never
 
-        - if: # condition_master_or_dev_push
-            $CI_COMMIT_BRANCH
-              && 
-            $CI_PIPELINE_SOURCE == "push"
-          when: always
+#         - if: # condition_master_or_dev_push
+#             $CI_COMMIT_BRANCH
+#               && 
+#             $CI_PIPELINE_SOURCE == "push"
+#           when: always
 
-        - when: never
+#         - when: never
 
 
 Website.Submodule.Deploy:

.gitlab/merge_request_templates/default.md

@@ -35,3 +35,5 @@
 - [ ] [Unit Test(s) Written](https://nofusscomputing.com/projects/centurion_erp/development/testing/)
 
     _ensure test coverage delta is not less than zero_
+
+- [ ] :page_facing_up: Roadmap updated

.vscode/extensions.json

@@ -7,5 +7,6 @@
         "streetsidesoftware.code-spell-checker",
         "qwtel.sqlite-viewer",
         "jebbs.markdown-extended",
+        "william-voyek.vscode-nginx",
     ]
 }

.vscode/launch.json

@@ -16,6 +16,25 @@
             "autoStartBrowser": false,
             "program": "${workspaceFolder}/app/manage.py"
         },
+        {
+            "name": "Debug: Gunicorn",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "gunicorn",
+            "args": [
+                "--access-logfile",
+                "-",
+                "--workers",
+                "3",
+                "--bind",
+                "0.0.0.0:8002",
+                "app.wsgi:application",
+
+            ],
+            "django": true,
+            "autoStartBrowser": false,
+            "cwd": "${workspaceFolder}/app"
+        },
         {
             "name": "Debug: Celery",
             "type": "python",

CONTRIBUTING.md

@@ -1,6 +1,76 @@
 # Contribution Guide
 
 
+Development of this project has been setup to be done from VSCodium. The following additional requirements need to be met:
+
+- npm has been installed. _required for `markdown` linting_
+
+    `sudo apt install -y --no-install-recommends npm`
+
+- setup of other requirements can be done with `make prepare`
+
+- **ALL** Linting must pass for Merge to be conducted.
+
+    _`make lint`_
+
+## TL;DR
+
+
+from the root of the project to start a test server use:
+
+``` bash
+
+# activate python venv
+source /tmp/centurion_erp/bin/activate
+
+# enter app dir
+cd app
+
+# Start dev server can be viewed at http://127.0.0.1:8002
+python manage.py runserver 8002
+
+# Run any migrations, if required
+python manage.py migrate
+
+# Create a super suer if required
+python manage.py createsuperuser
+
+```
+
+## Makefile
+
+!!! tip "TL;DR"
+    Common make commands are `make prepare` then `make docs` and `make lint`
+
+Included within the root of the repository is a makefile that can be used during development to check/run different items as is required during development. The following make targets are available:
+
+- `prepare`
+
+    _prepare the repository. init's all git submodules and sets up a python virtual env and other make targets_
+
+- `docs`
+
+    _builds the docs and places them within a directory called build, which can be viewed within a web browser_
+
+- `lint`
+
+    _conducts all required linting_
+
+    - `docs-lint`
+
+        _lints the markdown documents within the docs directory for formatting errors that MKDocs may/will have an issue with._
+
+- `clean`
+
+    _cleans up build artifacts and removes the python virtual environment_
+
+
+> this doc is yet to receive a re-write
+
+
+# Old working docs
+
+
 ## Dev Environment
 
 It's advised to setup a python virtual env for development. this can be done with the following commands.
@@ -30,6 +100,9 @@ python3 manage.py createsuperuser
 # If model changes
 python3 manage.py makemigrations --noinput
 
+# To update code highlight run
+pygmentize -S default -f html -a .codehilite > project-static/code.css
+
 ```
 
 Updates to python modules will need to be captured with SCM. This can be done by running `pip freeze > requirements.txt` from the running virtual environment.

README.md

@@ -4,10 +4,10 @@
 
 <br>
 
-![Project Status - Active](https://img.shields.io/badge/Project%20Status-Active-green?logo=gitlab&style=plastic) 
+![Project Status - Active](https://img.shields.io/badge/Project%20Status-Active-green?logo=github&style=plastic) 
 
 
-[![Docker Pulls](https://img.shields.io/docker/pulls/nofusscomputing/centurion-erp?style=plastic&logo=docker&color=0db7ed)](https://hub.docker.com/r/nofusscomputing/centurion-erp)
+[![Docker Pulls](https://img.shields.io/docker/pulls/nofusscomputing/centurion-erp?style=plastic&logo=docker&color=0db7ed)](https://hub.docker.com/r/nofusscomputing/centurion-erp) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/centurion-erp)](https://artifacthub.io/packages/container/centurion-erp/centurion-erp) 
 
 
 
@@ -15,27 +15,36 @@
 
 <br>
 
-![Gitlab forks count](https://img.shields.io/badge/dynamic/json?label=Forks&query=%24.forks_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2F&color=ff782e&logo=gitlab&style=plastic) ![Gitlab stars](https://img.shields.io/badge/dynamic/json?label=Stars&query=%24.star_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2F&color=ff782e&logo=gitlab&style=plastic) [![Open Issues](https://img.shields.io/badge/dynamic/json?color=ff782e&logo=gitlab&style=plastic&label=Open%20Issues&query=%24.statistics.counts.opened&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2Fissues_statistics)](https://gitlab.com/nofusscomputing/projects/centurion_erp/-/issues) [![GitLab Bugs](https://img.shields.io/gitlab/issues/open/nofusscomputing%2Fprojects%2Fcenturion_erp?labels=type%3A%3Abug&style=plastic&logo=gitlab&label=Bug%20Fixes%20Required&color=fc6d26)](https://gitlab.com/nofusscomputing/projects/centurion_erp/-/issues/?sort=created_date&state=opened&label_name%5B%5D=type%3A%3Abug)
-
-
-
 ![GitHub forks](https://img.shields.io/github/forks/NofussComputing/centurion_erp?logo=github&style=plastic&color=000000&labell=Forks) ![GitHub stars](https://img.shields.io/github/stars/NofussComputing/centurion_erp?color=000000&logo=github&style=plastic) ![Github Watchers](https://img.shields.io/github/watchers/NofussComputing/centurion_erp?color=000000&label=Watchers&logo=github&style=plastic)
+
+
+
+![Gitlab forks count](https://img.shields.io/badge/dynamic/json?label=Forks&query=%24.forks_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2F&color=ff782e&logo=gitlab&style=plastic) ![Gitlab stars](https://img.shields.io/badge/dynamic/json?label=Stars&query=%24.star_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2F&color=ff782e&logo=gitlab&style=plastic)
+
 <br>
 
-This project is hosted on [gitlab](https://gitlab.com/nofusscomputing/projects/centurion_erp) and has a read-only copy hosted on [Github](https://github.com/NofussComputing/centurion_erp).
+ ![GitHub Issues or Pull Requests](https://img.shields.io/github/issues/nofusscomputing/centurion_erp?style=plastic&logo=github&label=Open%20Issues&color=000) ![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues/nofusscomputing/centurion_erp/type%3A%3Abug?style=plastic&logo=github&label=Bug%20Fixes%20Required&color=000)
+
+
+This project is hosted on [Github](https://github.com/NofussComputing/centurion_erp) and has a read-only copy hosted on [gitlab](https://gitlab.com/nofusscomputing/projects/centurion_erp).
 
 ----
 
 **Stable Branch**
 
-![Gitlab build status - stable](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2Fpipelines%3Fref%3Dmaster&logo=gitlab&style=plastic) ![branch release version](https://img.shields.io/badge/dynamic/yaml?color=ff782e&logo=gitlab&style=plastic&label=Release&query=%24.commitizen.version&url=https%3A//gitlab.com/nofusscomputing/projects/centurion_erp%2F-%2Fraw%2Fmaster%2F.cz.yaml) [![Gitlab Code Coverage](https://img.shields.io/gitlab/pipeline-coverage/nofusscomputing%2Fprojects%2Fcenturion_erp?branch=master&style=plastic&logo=gitlab&label=Test%20Coverage)](https://gitlab.com/nofusscomputing/projects/centurion_erp/-/jobs/artifacts/master/browse/artifacts/coverage/?job=Unit)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/nofusscomputing/centurion_erp/ci.yaml?branch=master&style=plastic&logo=github&label=Build&color=%23000) ![GitHub Release](https://img.shields.io/github/v/release/nofusscomputing/centurion_erp?sort=date&style=plastic&logo=github&label=Release&color=000) ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fnofusscomputing%2F.github%2Fmaster%2Frepositories%2Fnofusscomputing%2Fcenturion_erp%2Fmaster%2Fbadge_endpoint_coverage.json&style=plastic)
+ ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fnofusscomputing%2F.github%2Fmaster%2Frepositories%2Fnofusscomputing%2Fcenturion_erp%2Fmaster%2Fbadge_endpoint_unit_test.json)
+
 
 
 ----
 
 **Development Branch** 
 
-![Gitlab build status - development](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2Fpipelines%3Fref%3Ddevelopment&logo=gitlab&style=plastic) ![branch release version](https://img.shields.io/badge/dynamic/yaml?color=ff782e&logo=gitlab&style=plastic&label=Release&query=%24.commitizen.version&url=https%3A//gitlab.com/nofusscomputing/projects/centurion_erp%2F-%2Fraw%2Fdevelopment%2F.cz.yaml) [![Gitlab Code Coverage](https://img.shields.io/gitlab/pipeline-coverage/nofusscomputing%2Fprojects%2Fcenturion_erp?branch=development&style=plastic&logo=gitlab&label=Test%20Coverage)](https://gitlab.com/nofusscomputing/projects/centurion_erp/-/jobs/artifacts/development/browse/artifacts/coverage/?job=Unit)
+
+
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/nofusscomputing/centurion_erp/ci.yaml?branch=development&style=plastic&logo=github&label=Build&color=%23000) ![GitHub Release](https://img.shields.io/github/v/release/nofusscomputing/centurion_erp?include_prereleases&sort=date&style=plastic&logo=github&label=Release&color=000) ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fnofusscomputing%2F.github%2Fmaster%2Frepositories%2Fnofusscomputing%2Fcenturion_erp%2Fdevelopment%2Fbadge_endpoint_coverage.json&style=plastic)
+ ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fnofusscomputing%2F.github%2Fmaster%2Frepositories%2Fnofusscomputing%2Fcenturion_erp%2Fdevelopment%2Fbadge_endpoint_unit_test.json)
 
 
 ----
@@ -45,9 +54,9 @@ This project is hosted on [gitlab](https://gitlab.com/nofusscomputing/projects/c
 
 links:
 
-- [Issues](https://gitlab.com/nofusscomputing/projects/centurion_erp/-/issues)
+- [Issues](https://github.com/nofusscomputing/centurion_erp/issues)
 
-- [Merge Requests (Pull Requests)](https://gitlab.com/nofusscomputing/projects/centurion_erp/-/merge_requests)
+- [Merge Requests (Pull Requests)](https://github.com/nofusscomputing/centurion_erp/pulls)
 
 
 An ERP with a large emphasis on the IT Service Management (ITSM) and Automation.
@@ -55,7 +64,7 @@ An ERP with a large emphasis on the IT Service Management (ITSM) and Automation.
 
 ## Contributing
 
-All contributions for this project must conducted from [Gitlab](https://gitlab.com/nofusscomputing/projects/centurion_erp).
+All contributions for this project must conducted from [GitHub](https://github.com/nofusscomputing/centurion_erp).
 
 For further details on contributing please refer to the [contribution guide](CONTRIBUTING.md).
 

Release-Notes.md

@@ -1,3 +1,19 @@
+# Version 1.3.0
+
+!!! danger "Security"
+    As is currently the recommended method of deployment, the Centurion Container must be deployed behind a reverse proxy the conducts the SSL termination.
+
+This release updates the docker container to be a production setup for deployment of Centurion. Prior to this version Centurion ERP was using a development setup for the webserver.
+
+- Docker now uses SupervisorD for container
+
+- Gunicorn WSGI setup for Centurion with NginX as the webserver.
+
+- Container now has a health check.
+
+- To setup container as "Worker", set `IS_WORKER='True'` environmental variable within container. _**Note:** You can still use command `celery -A app worker -l INFO`, although **not** recommended as the container health check will not be functioning_
+
+
 # Version 1.0.0
 
 Initial Release of Centurion ERP.

app/access/forms/team.py

@@ -1,13 +1,13 @@
 from django import forms
-from django.contrib.auth.models import Permission
 from django.db.models import Q
 from django.forms import inlineformset_factory
 
-from app import settings
-
 from .team_users import TeamUsersForm, TeamUsers
 
 from access.models import Team
+from access.functions import permissions
+
+from app import settings
 
 from core.forms.common import CommonModelForm
 
@@ -66,37 +66,4 @@ class TeamForm(CommonModelForm):
 
         self.fields['permissions'].widget.attrs = {'style': "height: 200px;"}
 
-        apps = [
-            'access',
-            'config_management',
-            'core',
-            'django_celery_results',
-            'itam',
-            'settings',
-        ]
-
-        exclude_models = [
-            'appsettings',
-            'chordcounter',
-            'groupresult',
-            'organization'
-            'settings',
-            'usersettings',
-        ]
-
-        exclude_permissions = [
-            'add_organization',
-            'add_taskresult',
-            'change_organization',
-            'change_taskresult',
-            'delete_organization',
-            'delete_taskresult',
-        ]
-
-        self.fields['permissions'].queryset = Permission.objects.filter(
-            content_type__app_label__in=apps,
-        ).exclude(
-            content_type__model__in=exclude_models
-        ).exclude(
-            codename__in = exclude_permissions
-        )
+        self.fields['permissions'].queryset = permissions.permission_queryset()

app/access/functions/permissions.py

@@ -0,0 +1,46 @@
+from django.contrib.auth.models import Permission
+
+def permission_queryset():
+    """Filter Permissions to those used within the application
+
+    Returns:
+        list: Filtered queryset that only contains the used permissions
+    """
+
+    apps = [
+        'access',
+        'assistance',
+        'config_management',
+        'core',
+        'django_celery_results',
+        'itam',
+        'itim',
+        'settings',
+    ]
+
+    exclude_models = [
+        'appsettings',
+        'chordcounter',
+        'comment',
+        'groupresult',
+        'organization'
+        'settings',
+        'usersettings',
+    ]
+
+    exclude_permissions = [
+        'add_organization',
+        'add_taskresult',
+        'change_organization',
+        'change_taskresult',
+        'delete_organization',
+        'delete_taskresult',
+    ]
+
+    return Permission.objects.filter(
+            content_type__app_label__in=apps,
+        ).exclude(
+            content_type__model__in=exclude_models
+        ).exclude(
+            codename__in = exclude_permissions
+        )

app/access/mixin.py

@@ -10,6 +10,19 @@ from .models import Organization, Team
 class OrganizationMixin():
     """Base Organization class"""
 
+    parent_model: str = None
+    """ Parent Model
+
+    This attribute defines the parent model for the model in question. The parent model when defined
+    will be used as the object to obtain the permissions from.
+    """
+
+    parent_model_pk_kwarg: str = 'pk'
+    """Parent Model kwarg
+
+    This value is used to define the kwarg that is used as the parent objects primary key (pk).
+    """
+
     request = None
 
     user_groups = []
@@ -26,20 +39,24 @@ class OrganizationMixin():
             parent_model (Model): with PK from kwargs['pk']
         """
 
-        return self.parent_model.objects.get(pk=self.kwargs['pk'])
+        return self.parent_model.objects.get(pk=self.kwargs[self.parent_model_pk_kwarg])
 
 
     def object_organization(self) -> int:
 
         id = None
 
+        if hasattr(self, '_object_organization'):
+
+            return self._object_organization
+
         try:
 
             if hasattr(self, 'get_queryset'):
                 self.get_queryset()
 
 
-            if hasattr(self, 'parent_model'):
+            if self.parent_model:
                 obj = self.get_parent_obj()
 
                 id = obj.get_organization().id
@@ -61,6 +78,10 @@ class OrganizationMixin():
 
                         id = 0
 
+            if hasattr(self, 'instance') and id is None:    # Form Instance
+
+                id = self.instance.get_organization()
+
 
         except AttributeError:
 
@@ -84,6 +105,10 @@ class OrganizationMixin():
 
             pass
 
+        if id is not None:
+
+            self._object_organization = id
+
 
         return id
 
@@ -147,6 +172,10 @@ class OrganizationMixin():
 
         user_organizations = []
 
+        if hasattr(self, '_user_organizations'):
+
+            return self._user_organizations
+
         teams = Team.objects
 
         for group in self.request.user.groups.all():
@@ -157,14 +186,32 @@ class OrganizationMixin():
 
             user_organizations = user_organizations + [team.organization.id]
 
+        if len(user_organizations) > 0:
+
+            self._user_organizations = user_organizations
+
+
         return user_organizations
 
 
     # ToDo: Ensure that the group has access to item
-    def has_organization_permission(self, organization: int=None) -> bool:
+    def has_organization_permission(self, organization: int = None, permissions_required: list = None) -> bool:
+        """ Check if user has permission within organization.
+
+        Args:
+            organization (int, optional): Organization to check. Defaults to None.
+            permissions_required (list, optional): if doing object level permissions, pass in required permission. Defaults to None.
+
+        Returns:
+            bool: True for yes.
+        """
 
         has_permission = False
 
+        if permissions_required is None:
+
+            permissions_required = self.get_permission_required()
+
         if not organization:
 
             organization = self.object_organization()
@@ -182,7 +229,7 @@ class OrganizationMixin():
 
                     assembled_permission = str(permission["content_type__app_label"]) + '.' + str(permission["codename"])
 
-                    if assembled_permission in self.get_permission_required() and (team['organization_id'] == organization or organization == 0):
+                    if assembled_permission in permissions_required and (team['organization_id'] == organization or organization == 0):
 
                         return True
 
@@ -242,15 +289,23 @@ class OrganizationMixin():
 
             return True
 
-        perms = self.get_permission_required()
+        if permissions_required:
 
-        if self.has_organization_permission():
+            perms = permissions_required
+
+        else:
+
+            perms = self.get_permission_required()
+
+        if self.has_organization_permission(permissions_required = perms):
 
             return True
 
-        if self.request.user.has_perms(perms) and len(self.kwargs) == 0 and str(self.request.method).lower() == 'get':
+        if self.request.user.has_perms(perms) and str(self.request.method).lower() == 'get':
 
-            return True
+            if len(self.kwargs) == 0 or (len(self.kwargs) == 1 and 'ticket_type' in self.kwargs):
+
+                return True
 
         for required_permission in self.permission_required:
 
@@ -327,6 +382,12 @@ class OrganizationPermission(AccessMixin, OrganizationMixin):
 
         if not request.user.is_authenticated:
                 return self.handle_no_permission()
+
+        if len(self.permission_required) == 0:
+
+            if hasattr(self, 'get_dynamic_permissions'):
+
+                self.permission_required = self.get_dynamic_permissions()
         
         if len(self.permission_required) > 0:
 

app/access/models.py

@@ -15,9 +15,6 @@ class Organization(SaveHistory):
         verbose_name_plural = "Organizations"
         ordering = ['name']
 
-    def __str__(self):
-        return self.name
-
     def save(self, *args, **kwargs):
 
         if self.slug == '_':
@@ -62,6 +59,9 @@ class Organization(SaveHistory):
     def get_organization(self):
         return self
 
+    def __str__(self):
+        return self.name
+
 
 
 class TenancyManager(models.Manager):
@@ -106,7 +106,9 @@ class TenancyManager(models.Manager):
 
         if request:
 
-            user = request.user._wrapped if hasattr(request.user,'_wrapped') else request.user
+            # user = request.user._wrapped if hasattr(request.user,'_wrapped') else request.user
+
+            user = request.user
 
 
             if user.is_authenticated:
@@ -124,13 +126,21 @@ class TenancyManager(models.Manager):
                         user_organizations += [ team_user.team.organization.id ]
 
 
-                if len(user_organizations) > 0 and not user.is_superuser:
+                if len(user_organizations) > 0 and not user.is_superuser and self.model.is_global is not None:
 
-                    return super().get_queryset().filter(
-                        models.Q(organization__in=user_organizations)
-                        |
-                        models.Q(is_global = True)
-                    )
+                    if self.model.is_global:
+
+                        return super().get_queryset().filter(
+                            models.Q(organization__in=user_organizations)
+                            |
+                            models.Q(is_global = True)
+                        )
+
+                    else:
+
+                        return super().get_queryset().filter(
+                            models.Q(organization__in=user_organizations)
+                        )
 
         return super().get_queryset()
 
@@ -188,17 +198,23 @@ class TenancyObject(SaveHistory):
     def get_organization(self) -> Organization:
         return self.organization
 
+    
+    def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
+
+        if self.organization is None:
+
+            raise ValidationError('Organization not defined')
+
+        super().save(force_insert=force_insert, force_update=force_update, using=using, update_fields=update_fields)
 
 
-class Team(Group, TenancyObject, SaveHistory):
+
+class Team(Group, TenancyObject):
     class Meta:
         # proxy = True
         verbose_name_plural = "Teams"
         ordering = ['team_name']
 
-    def __str__(self):
-        return self.name
-
 
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
 
@@ -241,6 +257,10 @@ class Team(Group, TenancyObject, SaveHistory):
         return [permission_list, self.permissions.all()]
 
 
+    def __str__(self):
+        return self.team_name
+
+
 
 class TeamUsers(SaveHistory):
 
@@ -318,3 +338,6 @@ class TeamUsers(SaveHistory):
         
         return self.team
 
+    def __str__(self):
+        return self.user.username
+

app/access/tests/abstract/tenancy_object.py

@@ -11,6 +11,19 @@ class TenancyObject:
     model = None
     """ Model to be tested """
 
+    should_model_history_be_saved: bool = True
+    """ Should model history be saved.
+
+    By default this should always be 'True', however in special
+    circumstances, this may not be desired.
+    """
+
+
+    def test_history_save(self):
+        """Confirm the desired intent for saving model history."""
+
+        assert self.model.save_model_history == self.should_model_history_be_saved
+
 
     def test_has_attr_get_organization(self):
         """ TenancyObject attribute check

app/access/tests/unit/organization/test_organizaiton_api.py

@@ -0,0 +1,371 @@
+import pytest
+import unittest
+
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import Client, TestCase
+
+from rest_framework.relations import Hyperlink
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+
+
+class OrganizationAPI(TestCase):
+
+    model = Organization
+
+    app_namespace = 'API'
+    
+    url_name = '_api_organization'
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = organization
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        self.url_kwargs = {'pk': self.item.id}
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+
+        client = Client()
+        url = reverse(self.app_namespace + ':' + self.url_name, kwargs=self.url_view_kwargs)
+
+
+        client.force_login(self.view_user)
+        response = client.get(url)
+
+        self.api_data = response.data
+
+
+
+    def test_api_field_exists_id(self):
+        """ Test for existance of API Field
+
+        id field must exist
+        """
+
+        assert 'id' in self.api_data
+
+
+    def test_api_field_type_id(self):
+        """ Test for type for API Field
+
+        id field must be int
+        """
+
+        assert type(self.api_data['id']) is int
+
+
+    def test_api_field_exists_name(self):
+        """ Test for existance of API Field
+
+        name field must exist
+        """
+
+        assert 'name' in self.api_data
+
+
+    def test_api_field_type_name(self):
+        """ Test for type for API Field
+
+        name field must be str
+        """
+
+        assert type(self.api_data['name']) is str
+
+
+    def test_api_field_exists_teams(self):
+        """ Test for existance of API Field
+
+        teams field must exist
+        """
+
+        assert 'teams' in self.api_data
+
+
+    def test_api_field_type_teams(self):
+        """ Test for type for API Field
+
+        teams field must be list
+        """
+
+        assert type(self.api_data['teams']) is list
+
+
+    def test_api_field_exists_url(self):
+        """ Test for existance of API Field
+
+        url field must exist
+        """
+
+        assert 'url' in self.api_data
+
+
+    def test_api_field_type_url(self):
+        """ Test for type for API Field
+
+        url field must be str
+        """
+
+        assert type(self.api_data['url']) is Hyperlink
+
+
+
+
+    def test_api_field_exists_teams_id(self):
+        """ Test for existance of API Field
+
+        teams.id field must exist
+        """
+
+        assert 'id' in self.api_data['teams'][0]
+
+
+    def test_api_field_type_teams_id(self):
+        """ Test for type for API Field
+
+        teams.id field must be int
+        """
+
+        assert type(self.api_data['teams'][0]['id']) is int
+
+
+    def test_api_field_exists_teams_team_name(self):
+        """ Test for existance of API Field
+
+        teams.team_name field must exist
+        """
+
+        assert 'team_name' in self.api_data['teams'][0]
+
+
+    def test_api_field_type_teams_team_name(self):
+        """ Test for type for API Field
+
+        teams.team_name field must be string
+        """
+
+        assert type(self.api_data['teams'][0]['team_name']) is str
+
+
+    def test_api_field_exists_teams_permissions(self):
+        """ Test for existance of API Field
+
+        teams.permissions field must exist
+        """
+
+        assert 'permissions' in self.api_data['teams'][0]
+
+
+    def test_api_field_type_teams_permissions(self):
+        """ Test for type for API Field
+
+        teams.permissions field must be list
+        """
+
+        assert type(self.api_data['teams'][0]['permissions']) is list
+
+
+    def test_api_field_exists_teams_permissions_url(self):
+        """ Test for existance of API Field
+
+        teams.permissions_url field must exist
+        """
+
+        assert 'permissions_url' in self.api_data['teams'][0]
+
+
+    def test_api_field_type_teams_permissions_url(self):
+        """ Test for type for API Field
+
+        teams.permissions_url field must be url
+        """
+
+        assert type(self.api_data['teams'][0]['permissions_url']) is str
+
+
+    def test_api_field_exists_teams_url(self):
+        """ Test for existance of API Field
+
+        teams.url field must exist
+        """
+
+        assert 'url' in self.api_data['teams'][0]
+
+
+    def test_api_field_type_teams_url(self):
+        """ Test for type for API Field
+
+        teams.url field must be url
+        """
+
+        assert type(self.api_data['teams'][0]['url']) is str
+
+
+
+    def test_api_field_exists_teams_permissions_id(self):
+        """ Test for existance of API Field
+
+        teams.permissions.id field must exist
+        """
+
+        assert 'id' in self.api_data['teams'][0]['permissions'][0]
+
+
+    def test_api_field_type_teams_permissions_id(self):
+        """ Test for type for API Field
+
+        teams.permissions.id field must be int
+        """
+
+        assert type(self.api_data['teams'][0]['permissions'][0]['id']) is int
+
+
+    def test_api_field_exists_teams_permissions_name(self):
+        """ Test for existance of API Field
+
+        teams.permissions.name field must exist
+        """
+
+        assert 'name' in self.api_data['teams'][0]['permissions'][0]
+
+
+    def test_api_field_type_teams_permissions_name(self):
+        """ Test for type for API Field
+
+        teams.permissions.name field must be str
+        """
+
+        assert type(self.api_data['teams'][0]['permissions'][0]['name']) is str
+
+
+    def test_api_field_exists_teams_permissions_codename(self):
+        """ Test for existance of API Field
+
+        teams.permissions.codename field must exist
+        """
+
+        assert 'codename' in self.api_data['teams'][0]['permissions'][0]
+
+
+    def test_api_field_type_teams_permissions_codename(self):
+        """ Test for type for API Field
+
+        teams.permissions.codename field must be str
+        """
+
+        assert type(self.api_data['teams'][0]['permissions'][0]['codename']) is str
+
+
+    def test_api_field_exists_teams_permissions_content_type(self):
+        """ Test for existance of API Field
+
+        teams.permissions.content_type field must exist
+        """
+
+        assert 'content_type' in self.api_data['teams'][0]['permissions'][0]
+
+
+    def test_api_field_type_teams_permissions_content_type(self):
+        """ Test for type for API Field
+
+        teams.permissions.content_type field must be dict
+        """
+
+        assert type(self.api_data['teams'][0]['permissions'][0]['content_type']) is dict
+
+
+
+    def test_api_field_exists_teams_permissions_content_type_id(self):
+        """ Test for existance of API Field
+
+        teams.permissions.content_type.id field must exist
+        """
+
+        assert 'id' in self.api_data['teams'][0]['permissions'][0]['content_type']
+
+
+    def test_api_field_type_teams_permissions_content_type_id(self):
+        """ Test for type for API Field
+
+        teams.permissions.content_type.id field must be int
+        """
+
+        assert type(self.api_data['teams'][0]['permissions'][0]['content_type']['id']) is int
+
+
+    def test_api_field_exists_teams_permissions_content_type_app_label(self):
+        """ Test for existance of API Field
+
+        teams.permissions.content_type.app_label field must exist
+        """
+
+        assert 'app_label' in self.api_data['teams'][0]['permissions'][0]['content_type']
+
+
+    def test_api_field_type_teams_permissions_content_type_app_label(self):
+        """ Test for type for API Field
+
+        teams.permissions.content_type.app_label field must be str
+        """
+
+        assert type(self.api_data['teams'][0]['permissions'][0]['content_type']['app_label']) is str
+
+
+    def test_api_field_exists_teams_permissions_content_type_model(self):
+        """ Test for existance of API Field
+
+        teams.permissions.content_type.model field must exist
+        """
+
+        assert 'model' in self.api_data['teams'][0]['permissions'][0]['content_type']
+
+
+    def test_api_field_type_teams_permissions_content_type_model(self):
+        """ Test for type for API Field
+
+        teams.permissions.content_type.model field must be str
+        """
+
+        assert type(self.api_data['teams'][0]['permissions'][0]['content_type']['model']) is str

app/access/tests/unit/organization/test_organizaiton_permission_api.py

@@ -5,7 +5,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser, User
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
-from django.test import TestCase
+from django.test import Client, TestCase
 
 from access.models import Organization, Team, TeamUsers, Permission
 
@@ -24,7 +24,7 @@ class OrganizationPermissionsAPI(TestCase, APIPermissionChange, APIPermissionVie
     
     url_name = '_api_organization'
 
-    url_list = 'device-list'
+    url_list = '_api_orgs'
 
     change_data = {'name': 'device'}
 
@@ -124,6 +124,8 @@ class OrganizationPermissionsAPI(TestCase, APIPermissionChange, APIPermissionVie
         delete_team.permissions.set([delete_permissions])
 
 
+        self.super_user = User.objects.create_user(username="super_user", password="password", is_superuser=True)
+
         self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
 
 
@@ -171,3 +173,67 @@ class OrganizationPermissionsAPI(TestCase, APIPermissionChange, APIPermissionVie
             team = different_organization_team,
             user = self.different_organization_user
         )
+
+
+    def test_add_is_prohibited_anon_user(self):
+        """ Ensure Organization cant be created 
+
+        Attempt to create organization as anon user
+        """
+
+        client = Client()
+        url = reverse(self.app_namespace + ':' + self.url_list)
+
+
+        # client.force_login(self.add_user)
+        response = client.post(url, data={'name': 'should not create'}, content_type='application/json')
+
+        assert response.status_code == 401
+
+
+    def test_add_is_prohibited_diff_org_user(self):
+        """ Ensure Organization cant be created 
+
+        Attempt to create organization as user with different org permissions.
+        """
+
+        client = Client()
+        url = reverse(self.app_namespace + ':' + self.url_list)
+
+
+        client.force_login(self.different_organization_user)
+        response = client.post(url, data={'name': 'should not create'}, content_type='application/json')
+
+        assert response.status_code == 405
+
+
+    def test_add_is_prohibited_super_user(self):
+        """ Ensure Organization cant be created 
+
+        Attempt to create organization as user who is super user
+        """
+
+        client = Client()
+        url = reverse(self.app_namespace + ':' + self.url_list)
+
+
+        client.force_login(self.super_user)
+        response = client.post(url, data={'name': 'should not create'}, content_type='application/json')
+
+        assert response.status_code == 405
+
+
+    def test_add_is_prohibited_user_same_org(self):
+        """ Ensure Organization cant be created 
+
+        Attempt to create organization as user with permission
+        """
+
+        client = Client()
+        url = reverse(self.app_namespace + ':' + self.url_list)
+
+
+        client.force_login(self.add_user)
+        response = client.post(url, data={'name': 'should not create'}, content_type='application/json')
+
+        assert response.status_code == 405

app/access/tests/unit/team/test_team.py

@@ -63,4 +63,8 @@ class TeamModel(
 
     @pytest.mark.skip(reason="uses Django group manager")
     def test_attribute_is_type_objects(self):
+        pass
+
+    @pytest.mark.skip(reason="uses Django group manager")
+    def test_model_class_tenancy_manager_function_get_queryset_called(self):
         pass

app/access/tests/unit/team/test_team_api.py

@@ -0,0 +1,313 @@
+import pytest
+import unittest
+import requests
+
+
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import Client, TestCase
+
+from rest_framework.relations import Hyperlink
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+# from api.tests.abstract.api_permissions import APIPermissions
+
+
+
+class TeamAPI(TestCase):
+
+    model = Team
+
+    app_namespace = 'API'
+    
+    url_name = '_api_team'
+
+    # url_list = '_api_organization_teams'
+
+    # change_data = {'name': 'device'}
+
+    # delete_data = {'device': 'device'}
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a team
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            team_name = 'teamone',
+            model_notes = 'random note'
+        )
+
+
+        self.url_kwargs = {'organization_id': self.organization.id}
+
+        self.url_view_kwargs = {'organization_id': self.organization.id, 'group_ptr_id': self.item.id}
+
+        self.add_data = {'team_name': 'team_post'}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        # view_team = Team.objects.create(
+        #     team_name = 'view_team',
+        #     organization = organization,
+        # )
+
+        self.item.permissions.set([view_permissions])
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = self.item,
+            user = self.view_user
+        )
+
+        client = Client()
+        url = reverse(self.app_namespace + ':' + self.url_name, kwargs=self.url_view_kwargs)
+
+
+        client.force_login(self.view_user)
+        response = client.get(url)
+
+        self.api_data = response.data
+
+
+
+    def test_api_field_exists_id(self):
+        """ Test for existance of API Field
+
+        id field must exist
+        """
+
+        assert 'id' in self.api_data
+
+
+    def test_api_field_type_id(self):
+        """ Test for type for API Field
+
+        id field must be int
+        """
+
+        assert type(self.api_data['id']) is int
+
+
+    def test_api_field_exists_team_name(self):
+        """ Test for existance of API Field
+
+        team_name field must exist
+        """
+
+        assert 'team_name' in self.api_data
+
+
+    def test_api_field_type_name(self):
+        """ Test for type for API Field
+
+        team_name field must be str
+        """
+
+        assert type(self.api_data['team_name']) is str
+
+
+    def test_api_field_exists_model_notes(self):
+        """ Test for existance of API Field
+
+        model_notes field must exist
+        """
+
+        assert 'model_notes' in self.api_data
+
+
+    def test_api_field_type_model_notes(self):
+        """ Test for type for API Field
+
+        model_notes field must be str
+        """
+
+        assert type(self.api_data['model_notes']) is str
+
+
+    def test_api_field_exists_url(self):
+        """ Test for existance of API Field
+
+        url field must exist
+        """
+
+        assert 'url' in self.api_data
+
+
+    def test_api_field_type_url(self):
+        """ Test for type for API Field
+
+        url field must be str
+        """
+
+        assert type(self.api_data['url']) is str
+
+
+    def test_api_field_exists_permissions(self):
+        """ Test for existance of API Field
+
+        permissions field must exist
+        """
+
+        assert 'permissions' in self.api_data
+
+
+    def test_api_field_type_permissions(self):
+        """ Test for type for API Field
+
+        url field must be list
+        """
+
+        assert type(self.api_data['permissions']) is list
+
+
+
+    def test_api_field_exists_permissions_id(self):
+        """ Test for existance of API Field
+
+        permissions.id field must exist
+        """
+
+        assert 'id' in self.api_data['permissions'][0]
+
+
+    def test_api_field_type_permissions_id(self):
+        """ Test for type for API Field
+
+        permissions.id field must be int
+        """
+
+        assert type(self.api_data['permissions'][0]['id']) is int
+
+
+    def test_api_field_exists_permissions_name(self):
+        """ Test for existance of API Field
+
+        permissions.name field must exist
+        """
+
+        assert 'name' in self.api_data['permissions'][0]
+
+
+    def test_api_field_type_permissions_name(self):
+        """ Test for type for API Field
+
+        permissions.name field must be str
+        """
+
+        assert type(self.api_data['permissions'][0]['name']) is str
+
+
+    def test_api_field_exists_permissions_codename(self):
+        """ Test for existance of API Field
+
+        permissions.codename field must exist
+        """
+
+        assert 'codename' in self.api_data['permissions'][0]
+
+
+    def test_api_field_type_permissions_codename(self):
+        """ Test for type for API Field
+
+        permissions.codename field must be str
+        """
+
+        assert type(self.api_data['permissions'][0]['codename']) is str
+
+
+    def test_api_field_exists_permissions_content_type(self):
+        """ Test for existance of API Field
+
+        permissions.content_type field must exist
+        """
+
+        assert 'content_type' in self.api_data['permissions'][0]
+
+
+    def test_api_field_type_permissions_content_type(self):
+        """ Test for type for API Field
+
+        permissions.content_type field must be dict
+        """
+
+        assert type(self.api_data['permissions'][0]['content_type']) is dict
+
+
+
+    def test_api_field_exists_permissions_content_type_id(self):
+        """ Test for existance of API Field
+
+        permissions.content_type.id field must exist
+        """
+
+        assert 'id' in self.api_data['permissions'][0]['content_type']
+
+
+    def test_api_field_type_permissions_content_type_id(self):
+        """ Test for type for API Field
+
+        permissions.content_type.id field must be int
+        """
+
+        assert type(self.api_data['permissions'][0]['content_type']['id']) is int
+
+
+    def test_api_field_exists_permissions_content_type_app_label(self):
+        """ Test for existance of API Field
+
+        permissions.content_type.app_label field must exist
+        """
+
+        assert 'app_label' in self.api_data['permissions'][0]['content_type']
+
+
+    def test_api_field_type_permissions_content_type_app_label(self):
+        """ Test for type for API Field
+
+        permissions.content_type.app_label field must be str
+        """
+
+        assert type(self.api_data['permissions'][0]['content_type']['app_label']) is str
+
+
+    def test_api_field_exists_permissions_content_type_model(self):
+        """ Test for existance of API Field
+
+        permissions.content_type.model field must exist
+        """
+
+        assert 'model' in self.api_data['permissions'][0]['content_type']
+
+
+    def test_api_field_type_permissions_content_type_model(self):
+        """ Test for type for API Field
+
+        permissions.content_type.model field must be str
+        """
+
+        assert type(self.api_data['permissions'][0]['content_type']['model']) is str

app/access/tests/unit/tenancy_object/test_tenancy_object.py

@@ -91,3 +91,13 @@ class TenancyObjectTests(TestCase):
         """
 
         assert self.item.objects is not None
+
+
+    @pytest.mark.skip(reason="write test")
+    def test_field_not_none_organzation(self):
+        """ Ensure field is set
+
+        Field organization must be defined for all tenancy objects
+        """
+
+        assert self.item.objects is not None

app/api/models/tokens.py

@@ -5,6 +5,8 @@ import string
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
+from django.db.models import Field
+from django.forms import ValidationError
 
 from access.fields import *
 from access.models import TenancyObject
@@ -14,6 +16,37 @@ from access.models import TenancyObject
 class AuthToken(models.Model):
 
 
+    def validate_note_no_token(self, note, token):
+        """ Ensure plaintext token cant be saved to notes field.
+
+        called from app.settings.views.user_settings.TokenAdd.form_valid()
+
+        Args:
+            note (Field): _Note field_
+            token (Field): _Token field_
+
+        Raises:
+            ValidationError: _Validation failed_
+        """
+
+        validation: bool = True
+
+
+        if str(note) == str(token):
+
+            validation = False
+
+
+        if str(token)[:9] in str(note):    # Allow user to use up to 8 chars so they can reference it.
+
+            validation = False
+
+        if not validation:
+
+            raise ValidationError('Token can not be placed in the notes field.')
+
+
+
     id = models.AutoField(
         primary_key=True,
         unique=True,

app/api/serializers/access.py

@@ -14,9 +14,9 @@ class TeamSerializerBase(serializers.ModelSerializer):
     class Meta:
         model = Team
         fields = (
-            "id",
-            "team_name",
-            'organization',
+            'team_name',
+            'model_notes',
+            'permissions',
             'url',
         )
 
@@ -29,9 +29,18 @@ class TeamSerializerBase(serializers.ModelSerializer):
 
 
 
+class TeamPermissionSerializer(serializers.ModelSerializer):
+
+
+    class Meta:
+        model = Permission
+        depth = 1
+        fields = '__all__'
+
+
 class TeamSerializer(TeamSerializerBase):
 
-    permissions = serializers.SerializerMethodField('get_url')
+    permissions_url = serializers.SerializerMethodField('get_url')
 
     def get_url(self, obj):
 
@@ -63,16 +72,19 @@ class TeamSerializer(TeamSerializerBase):
 
     class Meta:
         model = Team
-        depth = 1
+        depth = 2
         fields = (
             "id",
             "team_name",
-            'organization',
+            'model_notes',
             'permissions',
+            'permissions_url',
             'url',
         )
         read_only_fields = [
-            'permissions',
+            'id',
+            'organization',
+            'permissions_url',
             'url'
         ]
 
@@ -111,7 +123,7 @@ class OrganizationSerializer(serializers.ModelSerializer):
 
         return request.build_absolute_uri(reverse('API:_api_organization_teams', args=[obj.id]))
 
-    teams = TeamSerializerBase(source='team_set', many=True, read_only=False)
+    teams = TeamSerializer(source='team_set', many=True, read_only=False)
 
     view_name="API:_api_organization"
 

app/api/serializers/assistance/request.py

@@ -0,0 +1,63 @@
+from rest_framework.fields import empty
+
+from api.serializers.core.ticket import TicketSerializer
+
+from core.models.ticket.ticket import Ticket
+
+
+
+class RequestTicketSerializer(
+    TicketSerializer,
+):
+
+    class Meta:
+
+        model = Ticket
+
+        fields =  [
+            'id',
+            'assigned_teams',
+            'assigned_users',
+            'category',
+            'created',
+            'modified',
+            'status',
+            'title',
+            'description',
+            'estimate',
+            'urgency',
+            'impact',
+            'priority',
+            'external_ref',
+            'external_system',
+            'ticket_type',
+            'is_deleted',
+            'date_closed',
+            # 'planned_start_date',
+            # 'planned_finish_date',
+            # 'real_start_date',
+            # 'real_finish_date',
+            'opened_by',
+            'organization',
+            'project',
+            'milestone',
+            'subscribed_teams',
+            'subscribed_users',
+            'ticket_comments',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'ticket_type',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            request = True
+        )

app/api/serializers/config.py

@@ -0,0 +1,86 @@
+from rest_framework import serializers
+from rest_framework.reverse import reverse
+
+from config_management.models.groups import ConfigGroups
+
+
+
+class ParentGroupSerializer(serializers.ModelSerializer):
+
+    url = serializers.SerializerMethodField('get_url')
+
+
+    class Meta:
+        model = ConfigGroups
+        fields = [
+            'id',
+            'name',
+            'url',
+        ]
+        read_only_fields = [
+            'id',
+            'name',
+            'url',
+        ]
+
+
+    def get_url(self, obj):
+
+        request = self.context.get('request')
+
+        return request.build_absolute_uri(reverse("API:_api_config_group", args=[obj.pk]))
+
+
+
+class ConfigGroupsSerializerBase(serializers.ModelSerializer):
+
+    parent = ParentGroupSerializer(read_only=True)
+    url = serializers.SerializerMethodField('get_url')
+
+
+    class Meta:
+        model = ConfigGroups
+        fields = [
+            'id',
+            'parent',
+            'name',
+            'config',
+            'url',
+        ]
+        read_only_fields = [
+            'id',
+            'name',
+            'config',
+            'url',
+        ]
+
+
+    def get_url(self, obj):
+
+        request = self.context.get('request')
+
+        return request.build_absolute_uri(reverse("API:_api_config_group", args=[obj.pk]))
+
+
+
+class ConfigGroupsSerializer(ConfigGroupsSerializerBase):
+
+
+    class Meta:
+        model = ConfigGroups
+        depth = 1
+        fields = [
+            'id',
+            'parent',
+            'name',
+            'config',
+            'url',
+        ]
+        read_only_fields = [
+            'id',
+            'parent',
+            'name',
+            'config',
+            'url',
+        ]
+

app/api/serializers/core/ticket.py

@@ -0,0 +1,195 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+from api.serializers.core.ticket_comment import TicketCommentSerializer
+
+from core.forms.validate_ticket import TicketValidation
+from core.models.ticket.ticket import Ticket
+
+
+
+class TicketSerializer(
+    serializers.ModelSerializer,
+    TicketValidation,
+):
+
+    url = serializers.SerializerMethodField('get_url_ticket')
+
+
+    def get_url_ticket(self, item):
+
+        request = self.context.get('request')
+
+        kwargs: dict = {
+            'pk': item.id
+        }
+
+        if item.ticket_type == self.Meta.model.TicketType.CHANGE.value:
+
+            view_name = '_api_itim_change'
+        
+        elif item.ticket_type == self.Meta.model.TicketType.INCIDENT.value:
+
+            view_name = '_api_itim_incident'
+
+        elif item.ticket_type == self.Meta.model.TicketType.PROBLEM.value:
+
+            view_name = '_api_itim_problem'
+
+        elif item.ticket_type == self.Meta.model.TicketType.REQUEST.value:
+
+            view_name = '_api_assistance_request'
+
+        elif item.ticket_type == self.Meta.model.TicketType.PROJECT_TASK.value:
+
+            view_name = '_api_project_tasks'
+
+            kwargs.update({'project_id': item.project.id})
+        else:
+
+            raise ValueError('Serializer unable to obtain ticket type')
+
+
+        return request.build_absolute_uri(
+            reverse(
+                'API:' + view_name + '-detail',
+                kwargs = kwargs
+            )
+        )
+
+
+    ticket_comments = serializers.SerializerMethodField('get_url_ticket_comments')
+
+
+    def get_url_ticket_comments(self, item):
+
+        request = self.context.get('request')
+
+        kwargs: dict = {
+            'ticket_id': item.id
+        }
+
+        if item.ticket_type == self.Meta.model.TicketType.CHANGE.value:
+
+            view_name = '_api_itim_change_ticket_comments'
+        
+        elif item.ticket_type == self.Meta.model.TicketType.INCIDENT.value:
+
+            view_name = '_api_itim_incident_ticket_comments'
+
+        elif item.ticket_type == self.Meta.model.TicketType.PROBLEM.value:
+
+            view_name = '_api_itim_problem_ticket_comments'
+
+        elif item.ticket_type == self.Meta.model.TicketType.REQUEST.value:
+
+            view_name = '_api_assistance_request_ticket_comments'
+
+        elif item.ticket_type == self.Meta.model.TicketType.PROJECT_TASK.value:
+
+            view_name = '_api_project_tasks_comments'
+
+            kwargs.update({'project_id': item.project.id})
+
+        else:
+
+            raise ValueError('Serializer unable to obtain ticket type')
+
+
+        return request.build_absolute_uri(
+            reverse(
+                'API:' + view_name + '-list',
+                kwargs = kwargs
+            )
+        )
+
+
+    class Meta:
+
+        model = Ticket
+
+
+        fields =  [
+            'id',
+            'assigned_teams',
+            'assigned_users',
+            'category',
+            'created',
+            'modified',
+            'status',
+            'title',
+            'description',
+            'urgency',
+            'impact',
+            'priority',
+            'external_ref',
+            'external_system',
+            'ticket_type',
+            'is_deleted',
+            'date_closed',
+            'planned_start_date',
+            'planned_finish_date',
+            'real_start_date',
+            'real_finish_date',
+            'opened_by',
+            'organization',
+            'project',
+            'subscribed_teams',
+            'subscribed_users',
+            'ticket_comments',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'url',
+        ]
+
+    
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        self.fields.fields['status'].initial = Ticket.TicketStatus.All.NEW
+        self.fields.fields['status'].default = Ticket.TicketStatus.All.NEW
+
+        self.ticket_type_fields = self.Meta.fields
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields['organization'].required = True
+
+
+    def is_valid(self, *, raise_exception=True) -> bool:
+
+        is_valid = False
+
+        try:
+
+            self.request = self._context['request']
+
+            is_valid = super().is_valid(raise_exception=raise_exception)
+
+            self._ticket_type = str(self.fields['ticket_type'].choices[self._context['view']._ticket_type_value]).lower().replace(' ', '_')
+
+            is_valid = self.validate_ticket()
+
+            self.validated_data['ticket_type'] = int(self._context['view']._ticket_type_value)
+
+            if self.instance is None:
+
+                subscribed_users: list = []
+
+                if 'subscribed_users' in self.validated_data:
+
+                    subscribed_users = self.validated_data['subscribed_users']
+
+                self.validated_data['subscribed_users'] = subscribed_users + [ self.validated_data['opened_by'] ]
+        
+        except Exception as unhandled_exception:
+
+            serializers.ParseError( 
+                detail=f"Server encountered an error during validation, Traceback: {unhandled_exception.with_traceback}"
+            )
+
+        return is_valid

app/api/serializers/core/ticket_category.py

@@ -0,0 +1,44 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+from api.serializers.core.ticket_comment import TicketCommentSerializer
+
+from core.forms.validate_ticket import TicketValidation
+from core.models.ticket.ticket_category import TicketCategory
+
+
+
+class TicketCategorySerializer(
+    serializers.ModelSerializer,
+):
+
+    url = serializers.HyperlinkedIdentityField(
+        view_name="API:_api_ticket_category-detail", format="html"
+    )
+
+
+    class Meta:
+
+        model = TicketCategory
+
+        fields = '__all__'
+
+        read_only_fields = [
+            'id',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        if instance is not None:
+
+            if hasattr(instance, 'id'):
+
+                self.fields.fields['parent'].queryset = self.fields.fields['parent'].queryset.exclude(
+                    id=instance.id
+                )
+
+        super().__init__(instance=instance, data=data, **kwargs)

app/api/serializers/core/ticket_comment.py

@@ -0,0 +1,74 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+from core.models.ticket.ticket_comment import Ticket, TicketComment
+
+
+
+class TicketCommentSerializer(serializers.ModelSerializer):
+
+
+    url = serializers.SerializerMethodField('get_url_ticket_comment')
+
+    def get_url_ticket_comment(self, item):
+
+        request = self.context.get('request')
+
+        if item.ticket.ticket_type == item.ticket.__class__.TicketType.CHANGE:
+
+            view_name = '_api_itim_change_ticket_comments'
+        
+        elif item.ticket.ticket_type == item.ticket.__class__.TicketType.INCIDENT:
+
+            view_name = '_api_itim_incident_ticket_comments'
+
+        elif item.ticket.ticket_type == item.ticket.__class__.TicketType.PROBLEM:
+
+            view_name = '_api_itim_problem_ticket_comments'
+
+        elif item.ticket.ticket_type == item.ticket.__class__.TicketType.REQUEST:
+
+            view_name = '_api_assistance_request_ticket_comments'
+
+        else:
+
+            raise ValueError('Serializer unable to obtain ticket type')
+
+
+        return request.build_absolute_uri(
+            reverse('API:' + view_name + '-detail',
+                kwargs={
+                    'ticket_id': item.ticket.id,
+                    'pk': item.id
+                }
+            )
+        )
+
+
+
+    class Meta:
+        model = TicketComment
+        
+        fields = '__all__'
+
+    
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        if 'context' in self._kwargs:
+
+            if 'view' in self._kwargs['context']:
+
+                if 'ticket_id' in self._kwargs['context']['view'].kwargs:
+
+                    ticket = Ticket.objects.get(pk=int(self._kwargs['context']['view'].kwargs['ticket_id']))
+                    self.fields.fields['organization'].initial = ticket.organization.id
+
+                    self.fields.fields['ticket'].initial = int(self._kwargs['context']['view'].kwargs['ticket_id'])
+
+                    self.fields.fields['comment_type'].initial = TicketComment.CommentType.COMMENT
+
+                    self.fields.fields['user'].initial = kwargs['context']['request']._user.id
+
+        super().__init__(instance=instance, data=data, **kwargs)

app/api/serializers/core/ticket_comment_category.py

@@ -0,0 +1,42 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+
+from core.models.ticket.ticket_comment_category import TicketCommentCategory
+
+
+
+class TicketCommentCategorySerializer(
+    serializers.ModelSerializer,
+):
+
+    url = serializers.HyperlinkedIdentityField(
+        view_name="API:_api_ticket_comment_category-detail", format="html"
+    )
+
+
+    class Meta:
+
+        model = TicketCommentCategory
+
+        fields = '__all__'
+
+        read_only_fields = [
+            'id',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        if instance is not None:
+
+            if hasattr(instance, 'id'):
+
+                self.fields.fields['parent'].queryset = self.fields.fields['parent'].queryset.exclude(
+                    id=instance.id
+                )
+
+        super().__init__(instance=instance, data=data, **kwargs)

app/api/serializers/itam/device.py

@@ -1,9 +1,38 @@
 from django.urls import reverse
 
-from itam.models.device import Device
 from rest_framework import serializers
 
+from api.serializers.config import ParentGroupSerializer
 
+from config_management.models.groups import ConfigGroupHosts
+
+from itam.models.device import Device
+
+
+
+class DeviceConfigGroupsSerializer(serializers.ModelSerializer):
+
+    name = serializers.CharField(source='group.name', read_only=True)
+
+    url = serializers.HyperlinkedIdentityField(
+        view_name="API:_api_config_group", format="html"
+    )
+
+    class Meta:
+
+        model = ConfigGroupHosts
+
+        fields = [
+            'id',
+            'name',
+            'url',
+
+        ]
+        read_only_fields = [
+            'id',
+            'name',
+            'url',
+        ]
 
 
 class DeviceSerializer(serializers.ModelSerializer):
@@ -13,7 +42,9 @@ class DeviceSerializer(serializers.ModelSerializer):
     )
 
     config = serializers.SerializerMethodField('get_device_config')
-    
+
+    groups = DeviceConfigGroupsSerializer(source='configgrouphosts_set', many=True, read_only=True)
+
     def get_device_config(self, device):
 
         request = self.context.get('request')
@@ -22,11 +53,28 @@ class DeviceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Device
-        fields = '__all__'
-
-        read_only_fields = [
-            'inventorydate',
+        fields =  [
+            'id',
             'is_global',
-            'slug',
+            'name',
+            'config',
+            'serial_number',
+            'uuid',
+            'inventorydate',
+            'created',
+            'modified',
+            'groups',
+            'organization',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'config',
+            'inventorydate',
+            'created',
+            'modified',
+            'groups',
+            'url',
         ]
 

app/api/serializers/itim/change.py

@@ -0,0 +1,63 @@
+from rest_framework.fields import empty
+
+from api.serializers.core.ticket import TicketSerializer
+
+from core.models.ticket.ticket import Ticket
+
+
+
+class ChangeTicketSerializer(
+    TicketSerializer,
+):
+
+    class Meta:
+
+        model = Ticket
+
+        fields =  [
+            'id',
+            'assigned_teams',
+            'assigned_users',
+            'category',
+            'created',
+            'modified',
+            'status',
+            'title',
+            'description',
+            'estimate',
+            'urgency',
+            'impact',
+            'priority',
+            'external_ref',
+            'external_system',
+            'ticket_type',
+            'is_deleted',
+            'date_closed',
+            # 'planned_start_date',
+            # 'planned_finish_date',
+            # 'real_start_date',
+            # 'real_finish_date',
+            'opened_by',
+            'organization',
+            'project',
+            'milestone',
+            'subscribed_teams',
+            'subscribed_users',
+            'ticket_comments',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'ticket_type',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            project_task = True
+        )

app/api/serializers/itim/incident.py

@@ -0,0 +1,63 @@
+from rest_framework.fields import empty
+
+from api.serializers.core.ticket import TicketSerializer
+
+from core.models.ticket.ticket import Ticket
+
+
+
+class IncidentTicketSerializer(
+    TicketSerializer,
+):
+
+    class Meta:
+
+        model = Ticket
+
+        fields =  [
+            'id',
+            'assigned_teams',
+            'assigned_users',
+            'category',
+            'created',
+            'modified',
+            'status',
+            'title',
+            'description',
+            'estimate',
+            'urgency',
+            'impact',
+            'priority',
+            'external_ref',
+            'external_system',
+            'ticket_type',
+            'is_deleted',
+            'date_closed',
+            # 'planned_start_date',
+            # 'planned_finish_date',
+            # 'real_start_date',
+            # 'real_finish_date',
+            'opened_by',
+            'organization',
+            'project',
+            'milestone',
+            'subscribed_teams',
+            'subscribed_users',
+            'ticket_comments',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'ticket_type',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            incident = True
+        )

app/api/serializers/itim/problem.py

@@ -0,0 +1,63 @@
+from rest_framework.fields import empty
+
+from api.serializers.core.ticket import TicketSerializer
+
+from core.models.ticket.ticket import Ticket
+
+
+
+class ProblemTicketSerializer(
+    TicketSerializer,
+):
+
+    class Meta:
+
+        model = Ticket
+
+        fields =  [
+            'id',
+            'assigned_teams',
+            'assigned_users',
+            'category',
+            'created',
+            'modified',
+            'status',
+            'title',
+            'description',
+            'estimate',
+            'urgency',
+            'impact',
+            'priority',
+            'external_ref',
+            'external_system',
+            'ticket_type',
+            'is_deleted',
+            'date_closed',
+            # 'planned_start_date',
+            # 'planned_finish_date',
+            # 'real_start_date',
+            # 'real_finish_date',
+            'opened_by',
+            'organization',
+            'project',
+            'milestone',
+            'subscribed_teams',
+            'subscribed_users',
+            'ticket_comments',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'ticket_type',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            problem = True
+        )

app/api/serializers/project_management/project_milestone.py

@@ -0,0 +1,74 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+from project_management.models.projects import Project
+from project_management.models.project_milestone import ProjectMilestone
+
+
+
+class ProjectMilestoneSerializer(
+    serializers.ModelSerializer,
+):
+
+    url = serializers.SerializerMethodField('get_url_project_milestone')
+
+    def get_url_project_milestone(self, item):
+
+        request = self.context.get('request')
+
+        return request.build_absolute_uri(
+            reverse('API:_api_project_milestone-detail',
+                kwargs={
+                    'project_id': item.project.id,
+                    'pk': item.id
+                }
+            )
+        )
+
+
+    class Meta:
+
+        model = ProjectMilestone
+
+        fields = [
+            'name',
+            'description',
+            'organization',
+            'project',
+            'start_date',
+            'finish_date',
+            'created',
+            'modified',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        self.fields.fields['organization'].read_only = True
+        self.fields.fields['project'].read_only = True
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+
+    def is_valid(self, *, raise_exception=False):
+
+        is_valid = super().is_valid(raise_exception=raise_exception)
+
+        project = Project.objects.get(
+                pk = int(self._kwargs['context']['view'].kwargs['project_id'])
+            )
+
+        self._validated_data.update({
+            'organization': project.organization,
+            'project': project
+        })
+
+        return is_valid

app/api/serializers/project_management/project_state.py

@@ -0,0 +1,33 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+from project_management.models.project_states import ProjectState
+
+
+
+class ProjectStateSerializer(
+    serializers.ModelSerializer,
+):
+
+    url = serializers.HyperlinkedIdentityField(
+        view_name="API:_api_project_state-detail", format="html"
+    )
+
+
+    class Meta:
+
+        model = ProjectState
+
+        fields = '__all__'
+
+        read_only_fields = [
+            'id',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)

app/api/serializers/project_management/project_task.py

@@ -0,0 +1,63 @@
+from rest_framework.fields import empty
+
+from api.serializers.core.ticket import TicketSerializer
+
+from core.models.ticket.ticket import Ticket
+
+
+
+class ProjectTaskSerializer(
+    TicketSerializer,
+):
+
+    class Meta:
+
+        model = Ticket
+
+        fields =  [
+            'id',
+            'assigned_teams',
+            'assigned_users',
+            'category',
+            'created',
+            'modified',
+            'status',
+            'title',
+            'description',
+            'estimate',
+            'urgency',
+            'impact',
+            'priority',
+            'external_ref',
+            'external_system',
+            'ticket_type',
+            'is_deleted',
+            'date_closed',
+            'planned_start_date',
+            'planned_finish_date',
+            'real_start_date',
+            'real_finish_date',
+            'opened_by',
+            'organization',
+            'project',
+            'milestone',
+            'subscribed_teams',
+            'subscribed_users',
+            'ticket_comments',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'ticket_type',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)
+
+        self.fields.fields['category'].queryset = self.fields.fields['category'].queryset.filter(
+            project_task = True
+        )

app/api/serializers/project_management/project_type.py

@@ -0,0 +1,33 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+from project_management.models.project_types import ProjectType
+
+
+
+class ProjectTypeSerializer(
+    serializers.ModelSerializer,
+):
+
+    url = serializers.HyperlinkedIdentityField(
+        view_name="API:_api_project_state-detail", format="html"
+    )
+
+
+    class Meta:
+
+        model = ProjectType
+
+        fields = '__all__'
+
+        read_only_fields = [
+            'id',
+            'url',
+        ]
+
+
+    def __init__(self, instance=None, data=empty, **kwargs):
+
+        super().__init__(instance=instance, data=data, **kwargs)

app/api/serializers/project_management/projects.py

@@ -0,0 +1,134 @@
+from django.urls import reverse
+
+from rest_framework import serializers
+from rest_framework.fields import empty
+
+from project_management.models.projects import Project
+
+
+
+class ProjectSerializer(
+    serializers.ModelSerializer,
+):
+
+    percent_completed = serializers.CharField(
+        read_only = True,        
+    )
+
+    url = serializers.SerializerMethodField('get_url')
+
+
+    def get_url(self, item):
+
+        request = self.context.get('request')
+
+        return request.build_absolute_uri(reverse("API:_api_projects-detail", args=[item.pk]))
+
+
+    project_tasks_url = serializers.SerializerMethodField('get_url_project_tasks')
+
+
+    def get_url_project_tasks(self, item):
+
+        request = self.context.get('request')
+
+        return request.build_absolute_uri(
+            reverse(
+                'API:_api_project_tasks-list',
+                kwargs={
+                    'project_id': item.id
+                }
+            )
+        )
+
+
+    project_milestone_url = serializers.SerializerMethodField('get_url_project_milestone')
+
+    def get_url_project_milestone(self, item):
+
+        request = self.context.get('request')
+
+        return request.build_absolute_uri(
+            reverse(
+                'API:_api_project_milestone-list',
+                kwargs={
+                    'project_id': item.id
+                }
+            )
+        )
+
+
+    class Meta:
+
+        model = Project
+
+        fields =  [
+            'id',
+            'organization',
+            'state',
+            'project_type',
+            'priority',
+            'name',
+            'description',
+            'code',
+            'planned_start_date',
+            'planned_finish_date',
+            'real_start_date',
+            'real_finish_date',
+            'manager_user',
+            'manager_team',
+            'team_members',
+            'project_tasks_url',
+            'project_milestone_url',
+            'percent_completed',
+            'created',
+            'modified',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'url',
+            'created',
+            'modified',
+        ]
+
+
+
+class ProjectImportSerializer(ProjectSerializer):
+
+    class Meta:
+
+        model = Project
+
+        fields =  [
+            'id',
+            'organization',
+            'state',
+            'project_type',
+            'priority',
+            'name',
+            'description',
+            'code',
+            'planned_start_date',
+            'planned_finish_date',
+            'real_start_date',
+            'real_finish_date',
+            'manager_user',
+            'manager_team',
+            'team_members',
+            'project_tasks_url',
+            'project_milestone_url',
+            'percent_completed',
+            'created',
+            'modified',
+            'external_ref',
+            'external_system',
+            'is_deleted',
+            'url',
+        ]
+
+        read_only_fields = [
+            'id',
+            'url',
+        ]

app/api/tests/abstract/api_permissions.py

@@ -194,7 +194,7 @@ class APIPermissionAdd:
     def test_add_has_permission(self):
         """ Check correct permission for add 
 
-        Attempt to add as user with no permission
+        Attempt to add as user with permission
         """
 
         client = Client()

app/api/tests/unit/inventory/test_api_inventory.py

@@ -502,7 +502,8 @@ class InventoryAPIDifferentNameSerialNumberMatch(TestCase):
 
         Device.objects.create(
             name='random device name',
-            serial_number='serial_number_123'
+            serial_number='serial_number_123',
+            organization = organization,
         )
 
         add_permissions = Permission.objects.get(
@@ -537,7 +538,7 @@ class InventoryAPIDifferentNameSerialNumberMatch(TestCase):
         process_inventory(json.dumps(self.inventory), organization.id)
 
 
-        self.device = Device.objects.get(name=self.inventory['details']['name'])
+        self.device = Device.objects.get(name=self.inventory['details']['name'], organization = organization)
 
         self.operating_system = OperatingSystem.objects.get(name=self.inventory['os']['name'])
 
@@ -778,7 +779,8 @@ class InventoryAPIDifferentNameUUIDMatch(TestCase):
 
         Device.objects.create(
             name='random device name',
-            uuid='123-456-789'
+            uuid='123-456-789',
+            organization = organization,
         )
 
         add_permissions = Permission.objects.get(

app/api/urls.py

@@ -3,7 +3,26 @@ from django.urls import path
 from rest_framework.routers import DefaultRouter
 from rest_framework.urlpatterns import format_suffix_patterns
 
-from .views import access, index
+from .views import access, config, index
+
+from api.views.settings import permissions
+from api.views.settings import index as settings
+
+from api.views import assistance, itim, project_management
+from api.views.assistance import request_ticket
+from api.views.core import (
+    ticket_categories, 
+    ticket_comment_categories,
+    ticket_comments as core_ticket_comments
+)
+from api.views.itim import change_ticket, incident_ticket, problem_ticket
+from api.views.project_management import (
+    projects,
+    project_milestone,
+    project_state,
+    project_type,
+    project_task
+)
 
 from .views.itam import software, config as itam_config
 from .views.itam.device import DeviceViewSet
@@ -13,19 +32,56 @@ from .views.itam import inventory
 app_name = "API"
 
 
-router = DefaultRouter()
+router = DefaultRouter(trailing_slash=False)
 
 router.register('', index.Index, basename='_api_home')
+
+router.register('assistance/request', request_ticket.View, basename='_api_assistance_request')
+router.register('assistance/request/(?P<ticket_id>[0-9]+)/comments', core_ticket_comments.View, basename='_api_assistance_request_ticket_comments')
+
 router.register('device', DeviceViewSet, basename='device')
+
+router.register('itim/change', change_ticket.View, basename='_api_itim_change')
+router.register('itim/change/(?P<ticket_id>[0-9]+)/comments', core_ticket_comments.View, basename='_api_itim_change_ticket_comments')
+
+router.register('itim/incident', incident_ticket.View, basename='_api_itim_incident')
+router.register('itim/incident/(?P<ticket_id>[0-9]+)/comments', core_ticket_comments.View, basename='_api_itim_incident_ticket_comments')
+
+router.register('itim/problem', problem_ticket.View, basename='_api_itim_problem')
+router.register('itim/problem/(?P<ticket_id>[0-9]+)/comments', core_ticket_comments.View, basename='_api_itim_problem_ticket_comments')
+
+router.register('project_management/projects', projects.View, basename='_api_projects')
+router.register('project_management/projects/(?P<project_id>[0-9]+)/milestones', project_milestone.View, basename='_api_project_milestone')
+router.register('project_management/projects/(?P<project_id>[0-9]+)/tasks', project_task.View, basename='_api_project_tasks')
+router.register('project_management/projects/(?P<project_id>[0-9]+)/tasks/(?P<ticket_id>[0-9]+)/comments', core_ticket_comments.View, basename='_api_project_tasks_comments')
+
+router.register('settings/ticket_categories', ticket_categories.View, basename='_api_ticket_category')
+
+router.register('settings/project_state', project_state.View, basename='_api_project_state')
+router.register('settings/project_type', project_type.View, basename='_api_project_type')
+router.register('settings/ticket_comment_categories', ticket_comment_categories.View, basename='_api_ticket_comment_category')
+
 router.register('software', software.SoftwareViewSet, basename='software')
 
 
 
 urlpatterns = [
+
+    path("assistance", assistance.index.Index.as_view(), name="_api_assistance"),
+
+    #
+    # Sof Old Paths to be refactored
+    #
+
     path("config/<slug:slug>/", itam_config.View.as_view(), name="_api_device_config"),
 
+    path("configuration/", config.ConfigGroupsList.as_view(), name='_api_config_groups'),
+    path("configuration/<int:pk>", config.ConfigGroupsDetail.as_view(), name='_api_config_group'),
+
     path("device/inventory", inventory.Collect.as_view(), name="_api_device_inventory"),
 
+    path("itim", itim.index.Index.as_view(), name="_api_itim"),
+
     path("organization/", access.OrganizationList.as_view(), name='_api_orgs'),
     path("organization/<int:pk>/", access.OrganizationDetail.as_view(), name='_api_organization'),
     path("organization/<int:organization_id>/team", access.TeamList.as_view(), name='_api_organization_teams'),
@@ -33,6 +89,11 @@ urlpatterns = [
     path("organization/<int:organization_id>/team/<int:group_ptr_id>/permissions", access.TeamPermissionDetail.as_view(), name='_api_team_permission'),
     path("organization/team/", access.TeamList.as_view(), name='_api_teams'),
 
+    path("project_management", project_management.index.Index.as_view(), name="_api_project_management"),
+
+    path("settings", settings.View.as_view(), name='_settings'),
+    path("settings/permissions", permissions.View.as_view(), name='_settings_permissions'),
+
 ]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

app/api/views/access.py

@@ -1,5 +1,7 @@
 from django.contrib.auth.models import Permission
 
+from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse
+
 from rest_framework import generics, routers, serializers, views
 from rest_framework.permissions import DjangoObjectPermissions
 from rest_framework.response import Response
@@ -7,12 +9,17 @@ from rest_framework.response import Response
 from access.mixin import OrganizationMixin
 from access.models import Organization, Team
 
-from api.serializers.access import OrganizationSerializer, OrganizationListSerializer, TeamSerializer
+from api.serializers.access import OrganizationSerializer, OrganizationListSerializer, TeamSerializer, TeamPermissionSerializer
 from api.views.mixin import OrganizationPermissionAPI
 
 
-
-class OrganizationList(generics.ListCreateAPIView):
+@extend_schema_view(
+    get=extend_schema(
+        summary = "Fetch Organizations",
+        description="Returns a list of organizations."
+    ),
+)
+class OrganizationList(generics.ListAPIView):
 
     permission_classes = [
         OrganizationPermissionAPI
@@ -28,7 +35,18 @@ class OrganizationList(generics.ListCreateAPIView):
 
 
 
-class OrganizationDetail(generics.RetrieveUpdateDestroyAPIView):
+@extend_schema_view(
+    get=extend_schema(
+        summary = "Get An Organization",
+    ),
+    patch=extend_schema(
+        summary = "Update an organization",
+    ),
+    put=extend_schema(
+        summary = "Update an organization",
+    ),
+)
+class OrganizationDetail(generics.RetrieveUpdateAPIView):
 
     permission_classes = [
         OrganizationPermissionAPI
@@ -44,6 +62,20 @@ class OrganizationDetail(generics.RetrieveUpdateDestroyAPIView):
 
 
 
+@extend_schema_view(
+    post=extend_schema(
+        summary = "Create a Team",
+        description = """Create a team within the defined organization.""",
+        tags = ['team',],
+        request = TeamSerializer,
+        responses = {
+            200: OpenApiResponse(description='Team has been updated with the supplied permissions'),
+            401: OpenApiResponse(description='User Not logged in'),
+            403: OpenApiResponse(description='User is missing permission or in different organization'),
+        }
+    ),
+    create=extend_schema(exclude=True),
+)
 class TeamList(generics.ListCreateAPIView):
 
     permission_classes = [
@@ -66,6 +98,45 @@ class TeamList(generics.ListCreateAPIView):
 
 
 
+@extend_schema_view(
+    get=extend_schema(
+        summary = "Fetch a Team",
+        description = """Fetch a team within the defined organization.
+        """,
+        methods=["GET"],
+        tags = ['team',],
+        request = TeamSerializer,
+        responses = {
+            200: OpenApiResponse(description='Team has been updated with the supplied permissions'),
+            401: OpenApiResponse(description='User Not logged in'),
+            403: OpenApiResponse(description='User is missing permission or in different organization'),
+        }
+    ),
+    patch=extend_schema(
+        summary = "Update a Team",
+        description = """Update a team within the defined organization.
+        """,
+        methods=["Patch"],
+        tags = ['team',],
+        request = TeamSerializer,
+        responses = {
+            200: OpenApiResponse(description='Team has been updated with the supplied permissions'),
+            401: OpenApiResponse(description='User Not logged in'),
+            403: OpenApiResponse(description='User is missing permission or in different organization'),
+        }
+    ),
+    put = extend_schema(
+        summary = "Amend a team",
+        tags = ['team',],
+    ),
+    delete=extend_schema(
+        summary = "Delete a Team",
+        tags = ['team',],
+    ),
+    post = extend_schema(
+        exclude = True,
+    )
+)
 class TeamDetail(generics.RetrieveUpdateDestroyAPIView):
 
     permission_classes = [
@@ -79,12 +150,66 @@ class TeamDetail(generics.RetrieveUpdateDestroyAPIView):
 
 
 
-class TeamPermissionDetail(routers.APIRootView):
+@extend_schema_view(
+    get=extend_schema(
+        summary = "Fetch a teams permissions",
+        tags = ['team',],
+    ),
+    post=extend_schema(
+        summary = "Replace team Permissions",
+        description = """Replace the teams permissions with the permissions supplied.
 
-    # temp disabled until permission checker updated
-    # permission_classes = [
-    #     OrganizationPermissionAPI
-    # ]
+Teams Permissions will be replaced with the permissions supplied. **ALL** existing permissions will be
+removed.
+
+permissions are required to be in format `<module name>_<permission>_<table name>`
+        """,
+
+        methods=["POST"],
+        tags = ['team',],
+        request = TeamPermissionSerializer,
+        responses = {
+            200: OpenApiResponse(description='Team has been updated with the supplied permissions'),
+            401: OpenApiResponse(description='User Not logged in'),
+            403: OpenApiResponse(description='User is missing permission or in different organization'),
+        }
+    ),
+    delete=extend_schema(
+        summary = "Delete permissions",
+        tags = ['team',],
+    ),
+    patch = extend_schema(
+        summary = "Amend team Permissions",
+        description = """Amend the teams permissions with the permissions supplied.
+
+Teams permissions will include the existing permissions along with the ones supplied.
+permissions are required to be in format `<module name>_<permission>_<table name>`
+        """,
+
+        methods=["PATCH"],
+        parameters = None,
+        tags = ['team',],
+        request = TeamPermissionSerializer,
+        responses = {
+            200: OpenApiResponse(description='Team has been updated with the supplied permissions'),
+            401: OpenApiResponse(description='User Not logged in'),
+            403: OpenApiResponse(description='User is missing permission or in different organization'),
+        }
+    ),
+    put = extend_schema(
+        summary = "Amend team Permissions",
+        tags = ['team',],
+    )
+)
+class TeamPermissionDetail(views.APIView):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = Team.objects.all()
+
+    serializer_class = TeamPermissionSerializer
 
 
     def get(self, request, *args, **kwargs):

app/api/views/assistance/__init__.py

@@ -0,0 +1 @@
+from .index import *

app/api/views/assistance/index.py

@@ -0,0 +1,35 @@
+from django.utils.safestring import mark_safe
+
+from rest_framework import generics, permissions, routers, views
+# from rest_framework.decorators import api_view
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+
+
+
+class Index(views.APIView):
+
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
+
+    def get_view_name(self):
+        return "Assistance"
+
+    def get_view_description(self, html=False) -> str:
+        text = "Assistance Module"
+        if html:
+            return mark_safe(f"<p>{text}</p>")
+        else:
+            return text
+
+
+    def get(self, request, *args, **kwargs):
+
+        body: dict = {
+            'requests': reverse('API:_api_assistance_request-list', request=request)
+        }
+
+        return Response(body)

app/api/views/assistance/request_ticket.py

@@ -0,0 +1,77 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from api.serializers.assistance.request import RequestTicketSerializer
+from api.views.core.tickets import View
+
+
+class View(View):
+
+    _ticket_type:str = 'request'
+
+
+    @extend_schema(
+        summary='Create a ticket',
+        description = """This model includes all of the ticket types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        request = RequestTicketSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = RequestTicketSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+
+    @extend_schema(
+        summary='Fetch all tickets',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = RequestTicketSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected ticket',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = RequestTicketSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return "Request Ticket"
+        
+        return 'Request Tickets'

app/api/views/config.py

@@ -0,0 +1,54 @@
+from drf_spectacular.utils import extend_schema, extend_schema_view
+
+from rest_framework import generics
+
+from api.serializers.config import ConfigGroupsSerializer
+from api.views.mixin import OrganizationPermissionAPI
+
+from config_management.models.groups import ConfigGroups
+
+
+
+@extend_schema_view(
+    get=extend_schema(
+        summary = "Fetch Config groups",
+        description="Returns a list of Config Groups."
+    ),
+)
+class ConfigGroupsList(generics.ListAPIView):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = ConfigGroups.objects.all()
+    lookup_field = 'pk'
+    serializer_class = ConfigGroupsSerializer
+
+
+    def get_view_name(self):
+        return "Config Groups"
+
+
+
+@extend_schema_view(
+    get=extend_schema(
+        summary = "Get A Config Group",
+        # responses = {}
+    ),
+)
+class ConfigGroupsDetail(generics.RetrieveAPIView):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = ConfigGroups.objects.all()
+    lookup_field = 'pk'
+    serializer_class = ConfigGroupsSerializer
+
+
+    def get_view_name(self):
+        return "Config Group"
+
+

app/api/views/core/ticket_categories.py

@@ -0,0 +1,79 @@
+from django.shortcuts import get_object_or_404
+
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import generics, viewsets
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.core.ticket_category import TicketCategory, TicketCategorySerializer
+from api.views.mixin import OrganizationPermissionAPI
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = TicketCategory.objects.all()
+
+    serializer_class = TicketCategorySerializer
+
+
+    @extend_schema(
+        summary='Create a ticket category',
+        request = TicketCategorySerializer,
+        responses = {
+            201: OpenApiResponse(description='Ticket category created', response=TicketCategorySerializer),
+            403: OpenApiResponse(description='User tried to edit field they dont have access to'),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch all of a tickets category',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='Success', response=TicketCategorySerializer),
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected ticket category',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='Success', response=TicketCategorySerializer),
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Update a ticket category',
+        methods=["PUT"],
+        responses = {
+            200: OpenApiResponse(description='Ticket comment updated', response=TicketCategorySerializer),
+            403: OpenApiResponse(description='User tried to edit field they dont have access to'),
+        }
+    )
+    def update(self, request, *args, **kwargs):
+
+        return super().update(request, *args, **kwargs)
+
+
+    def get_view_name(self):
+        if self.detail:
+            return "Ticket Category"
+        
+        return 'Ticket Categories'

app/api/views/core/ticket_comment_categories.py

@@ -0,0 +1,79 @@
+from django.shortcuts import get_object_or_404
+
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import generics, viewsets
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.core.ticket_comment_category import TicketCommentCategory, TicketCommentCategorySerializer
+from api.views.mixin import OrganizationPermissionAPI
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = TicketCommentCategory.objects.all()
+
+    serializer_class = TicketCommentCategorySerializer
+
+
+    @extend_schema(
+        summary='Create a ticket comment category',
+        request = TicketCommentCategorySerializer,
+        responses = {
+            201: OpenApiResponse(description='Ticket category created', response=TicketCommentCategorySerializer),
+            403: OpenApiResponse(description='User tried to edit field they dont have access to'),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch all of the ticket comment categories',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='Success', response=TicketCommentCategorySerializer),
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected ticket comment category',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='Success', response=TicketCommentCategorySerializer),
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Update a ticket comment category',
+        methods=["PUT"],
+        responses = {
+            200: OpenApiResponse(description='Ticket comment updated', response=TicketCommentCategorySerializer),
+            403: OpenApiResponse(description='User tried to edit field they dont have access to'),
+        }
+    )
+    def update(self, request, *args, **kwargs):
+
+        return super().update(request, *args, **kwargs)
+
+
+    def get_view_name(self):
+        if self.detail:
+            return "Ticket Comment Category"
+        
+        return 'Ticket Comment Categories'

app/api/views/core/ticket_comments.py

@@ -0,0 +1,102 @@
+from django.shortcuts import get_object_or_404
+
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import generics, viewsets
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.core.ticket_comment import TicketCommentSerializer
+from api.views.mixin import OrganizationPermissionAPI
+
+from core.models.ticket.ticket_comment import TicketComment
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = TicketComment.objects.all()
+
+    serializer_class = TicketCommentSerializer
+
+
+    @extend_schema(
+        summary='Create a ticket comment',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type.
+        """,
+        request = TicketCommentSerializer,
+        responses = {
+            201: OpenApiResponse(description='Ticket comment created', response=TicketCommentSerializer),
+            403: OpenApiResponse(description='User tried to edit field they dont have access to'),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch all of a tickets comments',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='Success', response=TicketCommentSerializer),
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected ticket Comment',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='Success', response=TicketCommentSerializer),
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Update a ticket Comment',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type.
+        """,
+        methods=["PUT"],
+        responses = {
+            200: OpenApiResponse(description='Ticket comment updated', response=TicketCommentSerializer),
+            403: OpenApiResponse(description='User tried to edit field they dont have access to'),
+        }
+    )
+    def update(self, request, *args, **kwargs):
+
+        return super().update(request, *args, **kwargs)
+
+
+    def get_queryset(self):
+
+        if 'ticket_id' in self.kwargs:
+
+            self.queryset = self.queryset.filter(ticket=self.kwargs['ticket_id']).order_by('created')
+
+        if 'pk' in self.kwargs:
+
+            self.queryset = self.queryset.filter(pk = self.kwargs['pk'])
+
+        return self.queryset
+
+
+    def get_view_name(self):
+        if self.detail:
+            return "Ticket Comment"
+        
+        return 'Ticket Comments'

app/api/views/core/tickets.py

@@ -0,0 +1,145 @@
+from django.db.models import Q
+
+from rest_framework import generics, viewsets
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.assistance.request import RequestTicketSerializer
+from api.serializers.itim.change import ChangeTicketSerializer
+from api.serializers.itim.incident import IncidentTicketSerializer
+from api.serializers.itim.problem import ProblemTicketSerializer
+from api.serializers.project_management.project_task import ProjectTaskSerializer
+from api.views.mixin import OrganizationPermissionAPI
+
+from core.models.ticket.ticket import Ticket
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    filterset_fields = [
+        'external_system',
+        'external_ref',
+    ]
+
+    search_fields = [
+        'title',
+        'description',
+    ]
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    def get_dynamic_permissions(self):
+
+        if self.action == 'create':
+
+            action_keyword = 'add'
+
+        elif self.action == 'destroy':
+
+            action_keyword = 'delete'
+
+        elif self.action == 'list':
+
+            action_keyword = 'view'
+
+        elif self.action == 'partial_update':
+
+            action_keyword = 'change'
+
+        elif self.action == 'retrieve':
+
+            action_keyword = 'view'
+
+        elif self.action == 'update':
+
+            action_keyword = 'change'
+
+        elif self.action is None:
+
+            action_keyword = 'view'
+
+        else:
+
+            raise ValueError('unable to determin the action_keyword')
+
+        self.permission_required = [
+            'core.' + action_keyword + '_ticket_' + self._ticket_type,
+        ]
+
+        return super().get_permission_required()
+
+
+    queryset = Ticket.objects.all()
+
+
+    def get_serializer(self, *args, **kwargs):
+
+        if self._ticket_type == 'change':
+            
+            self.serializer_class = ChangeTicketSerializer
+
+            self._ticket_type_value = Ticket.TicketType.CHANGE.value
+
+        elif self._ticket_type == 'incident':
+            
+            self.serializer_class = IncidentTicketSerializer
+            self._ticket_type_value = Ticket.TicketType.INCIDENT.value
+
+        elif self._ticket_type == 'problem':
+            
+            self.serializer_class = ProblemTicketSerializer
+            self._ticket_type_value = Ticket.TicketType.PROBLEM.value
+
+        elif self._ticket_type == 'request':
+            
+            self.serializer_class = RequestTicketSerializer
+            self._ticket_type_value = Ticket.TicketType.REQUEST.value
+
+        elif self._ticket_type == 'project_task':
+            
+            self.serializer_class = ProjectTaskSerializer
+            self._ticket_type_value = Ticket.TicketType.PROJECT_TASK.value
+
+        else:
+
+            raise ValueError('unable to determin the serializer_class')
+
+        return super().get_serializer(*args, **kwargs)
+
+
+    def get_queryset(self):
+
+        if self._ticket_type == 'change':
+
+            ticket_type = self.queryset.model.TicketType.CHANGE.value
+
+        elif self._ticket_type == 'incident':
+
+            ticket_type = self.queryset.model.TicketType.INCIDENT.value
+
+        elif self._ticket_type == 'problem':
+
+            ticket_type = self.queryset.model.TicketType.PROBLEM.value
+
+        elif self._ticket_type == 'request':
+
+            ticket_type = self.queryset.model.TicketType.REQUEST.value
+
+        elif self._ticket_type == 'project_task':
+
+            ticket_type = self.queryset.model.TicketType.REQUEST.value
+
+            return self.queryset.filter(
+                project = self.kwargs['project_id']
+            )
+
+        else:
+
+            raise ValueError('Unknown ticket type. kwarg `ticket_type` must be set')
+
+        return self.queryset.filter(
+            ticket_type = ticket_type
+        )

app/api/views/index.py

@@ -1,15 +1,19 @@
-# from django.contrib.auth.mixins import PermissionRequiredMixin, LoginRequiredMixin
-from django.contrib.auth.models import User
 from django.utils.safestring import mark_safe
 
 from rest_framework import generics, permissions, routers, viewsets
 from rest_framework.decorators import api_view
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 
+
+
 class Index(viewsets.ViewSet):
 
-    # permission_required = 'access.view_organization'
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
 
     def get_view_name(self):
         return "API Index"
@@ -26,8 +30,13 @@ class Index(viewsets.ViewSet):
         return Response(
         {
             # "teams": reverse("_api_teams", request=request),
+            'assistance': reverse("API:_api_assistance", request=request),
             "devices": reverse("API:device-list", request=request),
+            "config_groups": reverse("API:_api_config_groups", request=request),
+            'itim': reverse("API:_api_itim", request=request),
             "organizations": reverse("API:_api_orgs", request=request),
+            'project_management': reverse("API:_api_project_management", request=request),
+            "settings": reverse('API:_settings', request=request),
             "software": reverse("API:software-list", request=request),
         }
     )

app/api/views/itam/device.py

@@ -1,9 +1,10 @@
 from django.db.models import Q
 from django.shortcuts import get_object_or_404
 
-from drf_spectacular.utils import extend_schema
+from drf_spectacular.utils import extend_schema, OpenApiResponse
 
 from rest_framework import generics, viewsets
+from rest_framework.response import Response
 
 from access.mixin import OrganizationMixin
 
@@ -24,6 +25,46 @@ class DeviceViewSet(OrganizationMixin, viewsets.ModelViewSet):
 
     serializer_class = DeviceSerializer
 
+    @extend_schema(
+        summary = 'Create a device',
+        description="""Add a new device to the ITAM database.
+        If you attempt to create a device and a device with a matching name and uuid or name and serial number
+        is found within the database, it will not re-create it. The device will be returned within the message body.
+        """, 
+        methods=["POST"],
+        responses = {
+            200: OpenApiResponse(description='Device allready exists', response=DeviceSerializer),
+            201: OpenApiResponse(description='Device created', response=DeviceSerializer),
+            400: OpenApiResponse(description='Validation failed.'),
+            403: OpenApiResponse(description='User is missing create permissions'),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        current_device = []
+
+        if 'uuid' in self.request.POST:
+
+            current_device = self.serializer_class.Meta.model.objects.filter(
+                organization = int(self.request.POST['organization']),
+                uuid = str(self.request.POST['uuid'])
+            )
+
+        if 'serial_number' in self.request.POST and len(current_device) == 0:
+
+                current_device = self.serializer_class.Meta.model.objects.filter(
+                    organization = int(self.request.POST['organization']),
+                    serial_number = str(self.request.POST['serial_number'])
+                )
+
+        if len(current_device) == 1:
+
+            instance = current_device.get()
+            serializer = self.get_serializer(instance)
+            return Response(serializer.data)
+
+        return super().create(request, *args, **kwargs)
+
 
     @extend_schema( description='Fetch devices that are from the users assigned organization(s)', methods=["GET"])
     def list(self, request):

app/api/views/itam/software.py

@@ -3,6 +3,8 @@ from django.shortcuts import get_object_or_404
 
 from rest_framework import generics, viewsets
 
+from access.mixin import OrganizationMixin
+
 from api.serializers.itam.software import SoftwareSerializer
 from api.views.mixin import OrganizationPermissionAPI
 
@@ -10,7 +12,7 @@ from itam.models.software import Software
 
 
 
-class SoftwareViewSet(viewsets.ModelViewSet):
+class SoftwareViewSet(OrganizationMixin, viewsets.ModelViewSet):
 
     permission_classes = [
         OrganizationPermissionAPI

app/api/views/itim/__init__.py

@@ -0,0 +1 @@
+from .index import *

app/api/views/itim/change_ticket.py

@@ -0,0 +1,82 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from api.serializers.itim.change import ChangeTicketSerializer
+
+from api.views.core.tickets import View
+
+
+
+class View(View):
+
+    _ticket_type:str = 'change'
+
+
+    @extend_schema(
+        summary='Create a ticket',
+        description = """This model includes all of the ticket types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        request = ChangeTicketSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = ChangeTicketSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+
+    @extend_schema(
+        summary='Fetch all tickets',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ChangeTicketSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected ticket',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ChangeTicketSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return "Change Ticket"
+        
+        return 'Change Tickets'

app/api/views/itim/incident_ticket.py

@@ -0,0 +1,81 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from api.serializers.itim.incident import IncidentTicketSerializer
+from api.views.core.tickets import View
+
+
+
+class View(View):
+
+    _ticket_type:str = 'incident'
+
+
+    @extend_schema(
+        summary='Create a ticket',
+        description = """This model includes all of the ticket types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        request = IncidentTicketSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = IncidentTicketSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+
+    @extend_schema(
+        summary='Fetch all tickets',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = IncidentTicketSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected ticket',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = IncidentTicketSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return "Incident Ticket"
+        
+        return 'Incident Tickets'

app/api/views/itim/index.py

@@ -0,0 +1,36 @@
+from django.utils.safestring import mark_safe
+
+from rest_framework import views
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+
+
+
+class Index(views.APIView):
+
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
+
+    def get_view_name(self):
+        return "ITIM"
+
+    def get_view_description(self, html=False) -> str:
+        text = "ITIM Module"
+        if html:
+            return mark_safe(f"<p>{text}</p>")
+        else:
+            return text
+
+
+    def get(self, request, *args, **kwargs):
+
+        body: dict = {
+            'changes': reverse('API:_api_itim_change-list', request=request),
+            'incidents': reverse('API:_api_itim_incident-list', request=request),
+            'problems': reverse('API:_api_itim_problem-list', request=request),
+        }
+
+        return Response(body)

app/api/views/itim/problem_ticket.py

@@ -0,0 +1,81 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from api.serializers.itim.problem import ProblemTicketSerializer
+from api.views.core.tickets import View
+
+
+
+class View(View):
+
+    _ticket_type:str = 'problem'
+
+
+    @extend_schema(
+        summary='Create a ticket',
+        description = """This model includes all of the ticket types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        request = ProblemTicketSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = ProblemTicketSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+
+    @extend_schema(
+        summary='Fetch all tickets',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProblemTicketSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected ticket',
+        description = """This model includes all of the ticket comment types. 
+        Due to this not all fields will be available and what fields are available
+        depends upon the comment type. see
+        [administration docs](https://nofusscomputing.com/projects/centurion_erp/administration/core/ticketing/index.html) for more info.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProblemTicketSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return "Problem Ticket"
+        
+        return 'Problem Tickets'

app/api/views/mixin.py

@@ -1,6 +1,7 @@
 from django.core.exceptions import PermissionDenied
 from django.forms import ValidationError
 
+from rest_framework import exceptions
 from rest_framework.permissions import DjangoObjectPermissions
 
 from access.mixin import OrganizationMixin
@@ -28,12 +29,16 @@ class OrganizationPermissionAPI(DjangoObjectPermissions, OrganizationMixin):
 
         self.request = request
 
+        method = self.request._request.method.lower()
+
+        if method.upper() not in view.allowed_methods:
+
+            view.http_method_not_allowed(request._request)
+
         if hasattr(view, 'queryset'):
             if view.queryset.model._meta:
                 self.obj = view.queryset.model
 
-        method = self.request._request.method.lower()
-
         object_organization = None
 
         if method == 'get':
@@ -70,6 +75,12 @@ class OrganizationPermissionAPI(DjangoObjectPermissions, OrganizationMixin):
 
         self.permission_required = [ permission ]
 
+        if hasattr(view, 'get_dynamic_permissions'):
+
+            self.permission_required = view.get_dynamic_permissions()
+
+
+
 
         if view:
             if 'organization_id' in view.kwargs:

app/api/views/project_management/__init__.py

@@ -0,0 +1 @@
+from .index import *

app/api/views/project_management/index.py

@@ -0,0 +1,34 @@
+from django.utils.safestring import mark_safe
+
+from rest_framework import generics, permissions, routers, views
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+
+
+
+class Index(views.APIView):
+
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
+
+    def get_view_name(self):
+        return "Projects"
+
+    def get_view_description(self, html=False) -> str:
+        text = "Projects Managementn Module"
+        if html:
+            return mark_safe(f"<p>{text}</p>")
+        else:
+            return text
+
+
+    def get(self, request, *args, **kwargs):
+
+        body: dict = {
+            'projects': reverse('API:_api_projects-list', request=request)
+        }
+
+        return Response(body)

app/api/views/project_management/project_milestone.py

@@ -0,0 +1,90 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import viewsets
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.project_management.project_milestone import ProjectMilestone, ProjectMilestoneSerializer
+# from api.views.core.tickets import View
+from api.views.mixin import OrganizationPermissionAPI
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = ProjectMilestone.objects.all()
+
+    serializer_class = ProjectMilestoneSerializer
+
+
+    @extend_schema(
+        summary='Create a project milestone',
+        request = ProjectMilestoneSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = ProjectMilestoneSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch all project milestones',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectMilestoneSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected project milestone',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectMilestoneSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return ProjectMilestone._meta.verbose_name
+        
+        return ProjectMilestone._meta.verbose_name_plural
+
+
+    def get_queryset(self):
+
+        if 'project_id' in self.kwargs:
+
+            self.queryset = self.queryset.filter(
+                project=self.kwargs['project_id']
+            )
+
+        if 'pk' in self.kwargs:
+
+            self.queryset = self.queryset.filter(
+                pk = self.kwargs['pk']
+            )
+
+        return self.queryset

app/api/views/project_management/project_state.py

@@ -0,0 +1,73 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import viewsets
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.project_management.project_state import ProjectState, ProjectStateSerializer
+from api.views.core.tickets import View
+from api.views.mixin import OrganizationPermissionAPI
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = ProjectState.objects.all()
+
+    serializer_class = ProjectStateSerializer
+
+
+    @extend_schema(
+        summary='Create a project state',
+        request = ProjectStateSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = ProjectStateSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch all project states',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectStateSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected project state',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectStateSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return ProjectState._meta.verbose_name
+        
+        return ProjectState._meta.verbose_name_plural

app/api/views/project_management/project_task.py

@@ -0,0 +1,64 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from api.serializers.project_management.project_task import ProjectTaskSerializer
+
+from api.views.core.tickets import View
+
+
+
+class View(View):
+
+    _ticket_type:str = 'project_task'
+
+
+    @extend_schema(
+        summary='Create a Project Task',
+        request = ProjectTaskSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = ProjectTaskSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+
+    @extend_schema(
+        summary='Fetch all project tasks',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectTaskSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected project task',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectTaskSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return "Project Task"
+        
+        return 'Project Tasks'

app/api/views/project_management/project_type.py

@@ -0,0 +1,72 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import viewsets
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.project_management.project_type import ProjectType, ProjectTypeSerializer
+from api.views.mixin import OrganizationPermissionAPI
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = ProjectType.objects.all()
+
+    serializer_class = ProjectTypeSerializer
+
+
+    @extend_schema(
+        summary='Create a project type',
+        request = ProjectTypeSerializer,
+        responses = {
+            201: OpenApiResponse(
+                response = ProjectTypeSerializer,
+            ),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch all project types',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectTypeSerializer
+            )
+        }
+    )
+    def list(self, request, *args, **kwargs):
+
+        return super().list(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch the selected project type',
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(
+                description='Success',
+                response = ProjectTypeSerializer
+            )
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    def get_view_name(self):
+
+        if self.detail:
+            return ProjectType._meta.verbose_name
+        
+        return ProjectType._meta.verbose_name_plural

app/api/views/project_management/projects.py

@@ -0,0 +1,116 @@
+from django.db.models import Q
+from django.shortcuts import get_object_or_404
+
+from drf_spectacular.utils import extend_schema, OpenApiResponse, OpenApiRequest, PolymorphicProxySerializer
+
+from rest_framework import generics, viewsets
+from rest_framework.response import Response
+
+from access.mixin import OrganizationMixin
+
+from api.serializers.project_management.projects import ProjectSerializer, ProjectImportSerializer
+from api.views.mixin import OrganizationPermissionAPI
+
+from project_management.models.projects import Project
+
+from settings.models.user_settings import UserSettings
+
+
+
+class View(OrganizationMixin, viewsets.ModelViewSet):
+
+    filterset_fields = [
+        'external_system',
+        'external_ref',
+    ]
+
+    search_fields = [
+        'name',
+        'description',
+    ]
+
+    permission_classes = [
+        OrganizationPermissionAPI
+    ]
+
+    queryset = Project.objects.all()
+
+    # serializer_class = ProjectSerializer
+
+    def get_serializer_class(self):
+
+        if self.has_organization_permission(
+            organization = UserSettings.objects.get(user = self.request.user).default_organization,
+            permissions_required = ['project_management.import_project']
+        ) or self.request.user.is_superuser:
+
+            return ProjectImportSerializer
+
+        return ProjectSerializer
+
+    @extend_schema(
+        summary = 'Create a project',
+        description = """**Note:** Users whom lack permssion `import_project`,
+        will be unable to add, edit and view fields: `created`, `external_ref`, `external_system`,
+        and `is_deleted`.
+        """,
+        methods=["POST"],
+        request = ProjectImportSerializer,
+        responses = {
+            201: OpenApiResponse(description='project created', response=ProjectImportSerializer),
+            403: OpenApiResponse(description='User is missing create permissions'),
+        }
+    )
+    def create(self, request, *args, **kwargs):
+
+        return super().create(request, *args, **kwargs)
+
+
+    @extend_schema(
+        summary='Fetch projects',
+        description = """**Note:** Users whom lack permssion `import_project`,
+        will be unable to add, edit and view fields: `created`, `external_ref`, `external_system`,
+        and `is_deleted`.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='projects', response=ProjectImportSerializer)
+        }
+    )
+    def list(self, request):
+
+        return super().list(request)
+
+
+    @extend_schema(
+        summary='Fetch the selected project',
+        description = """**Note:** Users whom lack permssion `import_project`,
+        will be unable to add, edit and view fields: `created`, `external_ref`, `external_system`,
+        and `is_deleted`.
+        """,
+        methods=["GET"],
+        responses = {
+            200: OpenApiResponse(description='projects', response=ProjectImportSerializer)
+        }
+    )
+    def retrieve(self, request, *args, **kwargs):
+
+        return super().retrieve(request, *args, **kwargs)
+
+
+    def get_queryset(self):
+
+        if self.request.user.is_superuser:
+
+            return self.queryset.filter()
+
+        else:
+
+            return self.queryset.filter(Q(organization__in=self.user_organizations()) | Q(is_global = True))
+
+
+    def get_view_name(self):
+        if self.detail:
+            return "Project"
+        
+        return 'Projects'

app/api/views/settings/index.py

@@ -0,0 +1,51 @@
+from django.contrib.auth.models import Permission
+
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import views
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+
+from core.http.common import Http
+
+
+
+class View(views.APIView):
+
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
+
+    @extend_schema(
+        summary = "Settings Index Page",
+        description = """This endpoint provides the available settings as available via the API.
+        """,
+
+        methods=["GET"],
+        parameters = None,
+        tags = ['settings',],
+        responses = {
+            200: OpenApiResponse(description='Inventory upload successful'),
+            401: OpenApiResponse(description='User Not logged in'),
+            500: OpenApiResponse(description='Exception occured. View server logs for the Stack Trace'),
+        }
+    )
+    def get(self, request, *args, **kwargs):
+
+        status = Http.Status.OK
+
+        response_data: dict = {
+            "permissions": reverse('API:_settings_permissions', request=request),
+            "project_state": reverse('API:_api_project_state-list', request=request),
+            "project_type": reverse('API:_api_project_type-list', request=request),
+            "ticket_categories": reverse('API:_api_ticket_category-list', request=request),
+            "ticket_comment_categories": reverse('API:_api_ticket_comment_category-list', request=request)
+        }
+
+        return Response(data=response_data,status=status)
+
+
+    def get_view_name(self):
+        return "Settings"

app/api/views/settings/permissions.py

@@ -0,0 +1,67 @@
+from drf_spectacular.utils import extend_schema, OpenApiResponse
+
+from rest_framework import views
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+
+from access.functions import permissions
+
+from core.http.common import Http
+
+
+
+class View(views.APIView):
+
+    permission_classes = [
+        IsAuthenticated,
+    ]
+
+
+    @extend_schema(
+        summary = "Fetch available permissions",
+        description = """This endpoint provides a list of permissions that are available within
+Centurion ERP. The format of each permission is `<app name>.<permission>_<model>`.
+
+This endpoint is available to **all** authenticated users.
+        """,
+
+        methods=["GET"],
+        parameters = None,
+        tags = ['settings',],
+        responses = {
+            200: OpenApiResponse(description='Inventory upload successful'),
+            401: OpenApiResponse(description='User Not logged in'),
+            500: OpenApiResponse(description='Exception occured. View server logs for the Stack Trace'),
+        }
+    )
+    def get(self, request, *args, **kwargs):
+
+        status = Http.Status.OK
+
+        response_data: list = []
+
+        try:
+
+            for permission in permissions.permission_queryset():
+
+                response_data += [ str(f"{permission.content_type.app_label}.{permission.codename}") ]
+
+        except PermissionDenied as e:
+
+            status = Http.Status.FORBIDDEN
+            response_data = ''
+
+
+        except Exception as e:
+
+            print(f'An error occured{e}')
+
+            status = Http.Status.SERVER_ERROR
+            response_data = 'Unknown Server Error occured'
+
+
+        return Response(data=response_data,status=status)
+
+
+    def get_view_name(self):
+        return "Permissions"

app/app/settings.py

@@ -108,15 +108,19 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'rest_framework',
     'rest_framework_json_api',
+    'django_filters',
     'social_django',
     'django_celery_results',
     'core.apps.CoreConfig',
     'access.apps.AccessConfig',
     'itam.apps.ItamConfig',
+    'itim.apps.ItimConfig',
+    'assistance.apps.AssistanceConfig',
     'settings.apps.SettingsConfig',
     'drf_spectacular',
     'drf_spectacular_sidecar',
     'config_management.apps.ConfigManagementConfig',
+    'project_management.apps.ProjectManagementConfig',
 ]
 
 MIDDLEWARE = [
@@ -255,7 +259,9 @@ if API_ENABLED:
         # ),
         'DEFAULT_METADATA_CLASS': 'rest_framework_json_api.metadata.JSONAPIMetadata',
         'DEFAULT_FILTER_BACKENDS': (
-            'rest_framework_json_api.filters.QueryParameterValidationFilter',
+            # 'rest_framework_json_api.filters.QueryParameterValidationFilter',
+            'rest_framework.filters.SearchFilter',
+            'rest_framework_json_api.django_filters.DjangoFilterBackend',
             'rest_framework_json_api.filters.OrderingFilter',
             'rest_framework_json_api.django_filters.DjangoFilterBackend',
             'rest_framework.filters.SearchFilter',
@@ -307,6 +313,9 @@ curl:
         'SWAGGER_UI_DIST': 'SIDECAR',
         'SWAGGER_UI_FAVICON_HREF': 'SIDECAR',
         'REDOC_DIST': 'SIDECAR',
+        'PREPROCESSING_HOOKS': [
+            'drf_spectacular.hooks.preprocess_exclude_path_format'
+        ],
     }
 
 DATETIME_FORMAT = 'j N Y H:i:s'
@@ -352,12 +361,6 @@ if DEBUG:
         "127.0.0.1",
     ]
 
-    # Apps Under Development
-    INSTALLED_APPS += [
-        'information.apps.InformationConfig',
-        'project_management.apps.ProjectManagementConfig',
-    ]
-
 
 if SSO_ENABLED:
 

app/app/tests/abstract/model_permissions.py

@@ -135,7 +135,14 @@ class ModelPermissionsAdd:
         """
 
         client = Client()
-        url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        if self.app_namespace:
+
+            url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        else:
+
+            url = reverse(self.url_name_add, kwargs=self.url_add_kwargs)
 
 
         response = client.put(url, data=self.add_data)
@@ -150,7 +157,14 @@ class ModelPermissionsAdd:
         """
 
         client = Client()
-        url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        if self.app_namespace:
+
+            url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        else:
+
+            url = reverse(self.url_name_add, kwargs=self.url_add_kwargs)
 
 
         client.force_login(self.no_permissions_user)
@@ -167,7 +181,14 @@ class ModelPermissionsAdd:
         """
 
         client = Client()
-        url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        if self.app_namespace:
+
+            url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        else:
+
+            url = reverse(self.url_name_add, kwargs=self.url_add_kwargs)
 
 
         client.force_login(self.different_organization_user)
@@ -183,7 +204,14 @@ class ModelPermissionsAdd:
         """
 
         client = Client()
-        url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        if self.app_namespace:
+
+            url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        else:
+
+            url = reverse(self.url_name_add, kwargs=self.url_add_kwargs)
 
 
         client.force_login(self.view_user)
@@ -195,11 +223,18 @@ class ModelPermissionsAdd:
     def test_model_add_has_permission(self):
         """ Check correct permission for add 
 
-        Attempt to add as user with no permission
+        Attempt to add as user with permission
         """
 
         client = Client()
-        url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        if self.app_namespace:
+
+            url = reverse(self.app_namespace + ':' + self.url_name_add, kwargs=self.url_add_kwargs)
+
+        else:
+
+            url = reverse(self.url_name_add, kwargs=self.url_add_kwargs)
 
 
         client.force_login(self.add_user)

app/app/tests/abstract/models.py

@@ -1,12 +1,15 @@
+import importlib
 import pytest
 import unittest
 
+
 from access.models import TenancyObject
 from access.tests.abstract.tenancy_object import TenancyObject as TenancyObjectTestCases
 
 from app.tests.abstract.views import AddView, ChangeView, DeleteView, DisplayView, IndexView
 
 from core.mixin.history_save import SaveHistory
+from core.tests.abstract.models import Models
 
 
 
@@ -30,7 +33,8 @@ class BaseModel:
 
 class TenancyModel(
     BaseModel,
-    TenancyObjectTestCases
+    TenancyObjectTestCases,
+    Models
 ):
     """ Test cases for tenancy models"""
 
@@ -38,6 +42,40 @@ class TenancyModel(
     """ Model to test """
 
 
+    def test_field_exists_verbose_name_plural(self):
+        """Test for existance of field in `<model>.Meta`
+
+        Field is required for `templates/detail.html.js`
+
+        Attribute `verbose_name_plural` must be defined in `Meta` class.
+        """
+
+        assert 'verbose_name_plural' in self.model._meta.original_attrs
+
+
+    def test_field_not_empty_verbose_name_plural(self):
+        """Test field `<model>.Meta` is not empty
+
+        Field is required for `templates/detail.html.js`
+
+        Attribute `verbose_name_plural` must be defined in `Meta` class.
+        """
+
+        assert self.model._meta.original_attrs['verbose_name_plural'] is not None
+
+
+    def test_field_type_verbose_name_plural(self):
+        """Test field `<model>.Meta` is not empty
+
+        Field is required for `templates/detail.html.js`
+
+        Attribute `verbose_name_plural` must be of type str.
+        """
+
+        assert type(self.model._meta.original_attrs['verbose_name_plural']) is str
+
+
+
 
 class ModelAdd(
     AddView

app/app/tests/abstract/views.py

@@ -134,6 +134,34 @@ class AddView:
         assert type(viewclass.template_name) is str
 
 
+    def test_view_add_function_get_initial_exists(self):
+        """Ensure that get_initial exists
+
+        Field `get_initial` must be defined as the base class is used for setup.
+        """
+
+        module = __import__(self.add_module, fromlist=[self.add_view])
+
+        view_class = getattr(module, 'Add')
+
+        assert hasattr(view_class, 'get_initial')
+
+
+    def test_view_add_function_get_initial_callable(self):
+        """Ensure that get_initial is a function
+
+        Field `get_initial` must be callable as it's used for setup.
+        """
+
+        module = __import__(self.add_module, fromlist=[self.add_view])
+
+        view_class = getattr(module, 'Add')
+
+        func = getattr(view_class, 'get_initial')
+
+        assert callable(func)
+
+
 
 class ChangeView:
     """ Testing of Display view """
@@ -524,6 +552,9 @@ class IndexView:
 
 
 
+
+
+
 class AllViews(
     AddView,
     ChangeView,
@@ -563,3 +594,33 @@ class AllViews(
     index_view: str = None
     """ Index Class name to test """
 
+
+    @pytest.mark.skip(reason='write test')
+    def test_view_index_attribute_missing_permission_required(self):
+        """ Attribute missing Test
+        
+        Ensure that `permission_required` attribute is not defined within the view.
+
+        this can be done by mocking the inherited class with the `permission_required` attribute
+        set to a value that if it changed would be considered defined in the created view.
+
+        ## Why?
+
+        This attribute can be dynamically added based of of the view name along with attributes
+        `model._meta.model_name` and `str(__class__.__name__).lower()`. 
+
+        Additional test:
+        - ensure that the attribute does get automagically created.
+        - ensure that the classes name is one of add, change, delete, display or index.
+        """
+
+
+    @pytest.mark.skip(reason='write test')
+    def test_view_index_attribute_missing_template_name(self):
+        """ Attribute missing Test
+        
+        Ensure that `template_name` attribute is not defined within the view if the value
+        is `form.html.j2`
+
+        this valuse is already defined in the base form
+        """

app/app/urls.py

@@ -24,7 +24,7 @@ from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
 
 from .views import home
 
-from core.views import history
+from core.views import history, related_ticket, ticket_linked_item
 
 from settings.views import user_settings
 
@@ -42,12 +42,19 @@ urlpatterns = [
     path("account/", include("django.contrib.auth.urls")),
 
     path("organization/", include("access.urls")),
+    path("assistance/", include("assistance.urls")),
     path("itam/", include("itam.urls")),
+    path("itim/", include("itim.urls")),
     path("config_management/", include("config_management.urls")),
 
     path("history/<str:model_name>/<int:model_pk>", history.View.as_view(), name='_history'),
     re_path(r'^static/(?P<path>.*)$', serve,{'document_root': settings.STATIC_ROOT}),
 
+
+    path('ticket/<str:ticket_type>/<int:ticket_id>/relate/add', related_ticket.Add.as_view(), name="_ticket_related_add"),
+
+    path('ticket/<str:ticket_type>/<int:ticket_id>/linked_item/add', ticket_linked_item.Add.as_view(), name="_ticket_linked_item_add"),
+
 ]
 
 
@@ -72,15 +79,13 @@ if settings.DEBUG:
     urlpatterns += [
 
         path("__debug__/", include("debug_toolbar.urls"), name='_debug'),
-        # Apps Under Development
-        path("itim/", include("itim.urls")),
-        path("information/", include("information.urls")),
-        path("project_management/", include("project_management.urls")),
     ]
 
 # must be after above
 urlpatterns += [
 
+    path("project_management/", include("project_management.urls")),
+
     path("settings/", include("settings.urls")),
 
 ]

app/assistance/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class InformationConfig(AppConfig):
+class AssistanceConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'information'
+    name = 'assistance'

app/assistance/forms/knowledge_base.py

@@ -0,0 +1,147 @@
+
+from django import forms
+from django.urls import reverse
+from django.forms import ValidationError
+
+from app import settings
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+from core.forms.common import CommonModelForm
+
+
+
+class KnowledgeBaseForm(CommonModelForm):
+
+    __name__ = 'asdsa'
+
+    class Meta:
+
+        fields = '__all__'
+
+        model = KnowledgeBase
+
+    prefix = 'knowledgebase'
+
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields['expiry_date'].widget = forms.widgets.DateTimeInput(attrs={'type': 'datetime-local', 'format': "%Y-%m-%dT%H:%M"})
+        self.fields['expiry_date'].input_formats = settings.DATETIME_FORMAT
+        self.fields['expiry_date'].format="%Y-%m-%dT%H:%M"
+
+        self.fields['release_date'].widget = forms.widgets.DateTimeInput(attrs={'type': 'datetime-local', 'format': "%Y-%m-%dT%H:%M"})
+        self.fields['release_date'].input_formats = settings.DATETIME_FORMAT
+        self.fields['release_date'].format="%Y-%m-%dT%H:%M"
+
+
+    def clean(self):
+        
+        cleaned_data = super().clean()
+
+        responsible_user = cleaned_data.get("responsible_user")
+        responsible_teams = cleaned_data.get("responsible_teams")
+
+
+        if not responsible_user and not responsible_teams:
+
+            raise ValidationError('A Responsible User or Team must be assigned.')
+
+
+        target_team = cleaned_data.get("target_team")
+        target_user = cleaned_data.get("target_user")
+
+
+        if not target_team and not target_user:
+
+            raise ValidationError('A Target Team or Target User must be assigned.')
+
+
+        if target_team and target_user:
+
+            raise ValidationError('Both a Target Team or Target User Cant be assigned at the same time. Use one or the other')
+
+
+        return cleaned_data
+
+
+
+class DetailForm(KnowledgeBaseForm):
+
+    tabs: dict = {
+        "details": {
+            "name": "Details",
+            "slug": "details",
+            "sections": [
+                {
+                    "layout": "double",
+                    "left": [
+                        'title',
+                        'category',
+                        'responsible_user',
+                        'organization',
+                        'is_global',
+                        'c_created',
+                        'c_modified',
+                    ],
+                    "right": [
+                        'release_date',
+                        'expiry_date',
+                        'target_user',
+                        'target_team',
+                    ]
+                },
+                {
+                    "layout": "single",
+                    "name": "Summary",
+                    "fields": [
+                        'summary',
+                    ],
+                    "markdown": [
+                        'summary',
+                    ]
+                },
+                {
+                    "layout": "single",
+                    "name": "Content",
+                    "fields": [
+                        'content',
+                    ],
+                    "markdown": [
+                        'content',
+                    ]
+                }
+            ]
+        },
+        "notes": {
+            "name": "Notes",
+            "slug": "notes",
+            "sections": []
+        }
+    }
+
+
+    def __init__(self, *args, **kwargs):
+
+        super().__init__(*args, **kwargs)
+
+        self.fields['c_created'] = forms.DateTimeField(
+            label = 'Created',
+            input_formats=settings.DATETIME_FORMAT,
+            disabled = True,
+            initial = self.instance.created,
+        )
+
+        self.fields['c_modified'] = forms.DateTimeField(
+            label = 'Modified',
+            input_formats=settings.DATETIME_FORMAT,
+            disabled = True,
+            initial = self.instance.modified,
+        )
+
+        self.tabs['details'].update({
+            "edit_url": reverse('Assistance:_knowledge_base_change', args=(self.instance.pk,))
+        })
+
+        self.url_index_view = reverse('Assistance:Knowledge Base')

app/assistance/forms/knowledge_base_category.py

@@ -0,0 +1,36 @@
+from django.forms import ValidationError
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+from core.forms.common import CommonModelForm
+
+
+
+class KnowledgeBaseCategoryForm(CommonModelForm):
+
+    __name__ = 'asdsa'
+
+    class Meta:
+
+        fields = '__all__'
+
+        model = KnowledgeBaseCategory
+
+    prefix = 'knowledgebase_category'
+
+
+    def clean(self):
+        
+        cleaned_data = super().clean()
+
+        target_team = cleaned_data.get("target_team")
+        target_user = cleaned_data.get("target_user")
+
+
+        if target_team and target_user:
+
+            raise ValidationError('Both a Target Team or Target User Cant be assigned at the same time. Use one or the other or None')
+
+
+        return cleaned_data
+

app/assistance/migrations/0001_initial.py

@@ -0,0 +1,68 @@
+# Generated by Django 5.0.7 on 2024-07-20 14:37
+
+import access.fields
+import access.models
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('access', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='KnowledgeBaseCategory',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_global', models.BooleanField(default=False)),
+                ('model_notes', models.TextField(blank=True, default=None, null=True, verbose_name='Notes')),
+                ('name', models.CharField(help_text='Name/Title of the Category', max_length=50, verbose_name='Title')),
+                ('slug', access.fields.AutoSlugField()),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False)),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False)),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+                ('parent_category', models.ForeignKey(blank=True, default=None, help_text='Category this category belongs to', null=True, on_delete=django.db.models.deletion.SET_NULL, to='assistance.knowledgebasecategory', verbose_name='Parent Category')),
+                ('target_team', models.ManyToManyField(blank=True, default=None, help_text='Team(s) to grant access to the article', to='access.team', verbose_name='Target Team(s)')),
+                ('target_user', models.ForeignKey(blank=True, default=None, help_text='User(s) to grant access to the article', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Target Users(s)')),
+            ],
+            options={
+                'verbose_name': 'Category',
+                'verbose_name_plural': 'Categorys',
+                'ordering': ['name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='KnowledgeBase',
+            fields=[
+                ('is_global', models.BooleanField(default=False)),
+                ('id', models.AutoField(primary_key=True, serialize=False, unique=True)),
+                ('title', models.CharField(help_text='Title of the article', max_length=50, verbose_name='Title')),
+                ('summary', models.TextField(blank=True, default=None, help_text='Short Summary of the article', null=True, verbose_name='Summary')),
+                ('content', models.TextField(blank=True, default=None, help_text='Content of the article. Markdown is supported', null=True, verbose_name='Article Content')),
+                ('release_date', models.DateTimeField(blank=True, default=None, help_text='Date the article will be published', null=True, verbose_name='Publish Date')),
+                ('expiry_date', models.DateTimeField(blank=True, default=None, help_text='Date the article will be removed from published articles', null=True, verbose_name='End Date')),
+                ('public', models.BooleanField(default=False, help_text='Is this article to be made available publically', verbose_name='Public Article')),
+                ('created', access.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False)),
+                ('modified', access.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False)),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='access.organization', validators=[access.models.TenancyObject.validatate_organization_exists])),
+                ('responsible_teams', models.ManyToManyField(blank=True, default=None, help_text='Team(s) whom is considered the articles owner.', related_name='responsible_teams', to='access.team', verbose_name='Responsible Team(s)')),
+                ('responsible_user', models.ForeignKey(default=None, help_text='User(s) whom is considered the articles owner.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='responsible_user', to=settings.AUTH_USER_MODEL, verbose_name='Responsible User')),
+                ('target_team', models.ManyToManyField(blank=True, default=None, help_text='Team(s) to grant access to the article', to='access.team', verbose_name='Target Team(s)')),
+                ('target_user', models.ForeignKey(blank=True, default=None, help_text='User(s) to grant access to the article', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Target Users(s)')),
+                ('category', models.ForeignKey(default=None, help_text='Article Category', max_length=50, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assistance.knowledgebasecategory', verbose_name='Category')),
+            ],
+            options={
+                'verbose_name': 'Article',
+                'verbose_name_plural': 'Articles',
+                'ordering': ['title'],
+            },
+        ),
+    ]

app/assistance/models/knowledge_base.py

@@ -0,0 +1,219 @@
+from django.contrib.auth.models import User
+from django.db import models
+from django.forms import ValidationError
+
+from access.fields import *
+from access.models import Team, TenancyObject
+
+
+
+class KnowledgeBaseCategory(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'name',
+        ]
+
+        verbose_name = "Category"
+
+        verbose_name_plural = "Categorys"
+
+
+    parent_category = models.ForeignKey(
+        'self',
+        blank = True,
+        default = None,
+        help_text = 'Category this category belongs to',
+        null = True,
+        on_delete = models.SET_NULL,
+        verbose_name = 'Parent Category',
+    )
+
+
+    name = models.CharField(
+        blank = False,
+        help_text = 'Name/Title of the Category',
+        max_length = 50,
+        unique = False,
+        verbose_name = 'Title',
+    )
+
+
+    slug = AutoSlugField()
+
+
+    target_team = models.ManyToManyField(
+        Team,
+        blank = True,
+        default = None,
+        help_text = 'Team(s) to grant access to the article',
+        verbose_name = 'Target Team(s)',
+    )
+
+
+    target_user = models.ForeignKey(
+        User,
+        blank = True,
+        default = None,
+        help_text = 'User(s) to grant access to the article',
+        null = True,
+        on_delete = models.SET_NULL,
+        verbose_name = 'Target Users(s)',
+    )
+
+
+    created = AutoCreatedField()
+
+
+    modified = AutoLastModifiedField()
+
+
+    def __str__(self):
+
+        return self.name
+
+
+
+class KnowledgeBase(TenancyObject):
+
+
+    class Meta:
+
+        ordering = [
+            'title',
+        ]
+
+        verbose_name = "Article"
+
+        verbose_name_plural = "Articles"
+
+
+    model_notes = None
+
+
+    id = models.AutoField(
+        primary_key=True,
+        unique=True,
+        blank=False
+    )
+
+
+    title = models.CharField(
+        blank = False,
+        help_text = 'Title of the article',
+        max_length = 50,
+        unique = False,
+        verbose_name = 'Title',
+    )
+
+
+    summary = models.TextField(
+        blank = True,
+        default = None,
+        help_text = 'Short Summary of the article',
+        null = True,
+        verbose_name = 'Summary',
+    )
+
+
+    content = models.TextField(
+        blank = True,
+        default = None,
+        help_text = 'Content of the article. Markdown is supported',
+        null = True,
+        verbose_name = 'Article Content',
+    )
+
+
+    category = models.ForeignKey(
+        KnowledgeBaseCategory,
+        blank = False,
+        default = None,
+        help_text = 'Article Category',
+        max_length = 50,
+        null = True,
+        on_delete = models.SET_NULL,
+        unique = False,
+        verbose_name = 'Category',
+    )
+
+
+    release_date = models.DateTimeField(
+        blank = True,
+        default = None,
+        help_text = 'Date the article will be published',
+        null = True,
+        verbose_name = 'Publish Date',
+    )
+
+
+    expiry_date = models.DateTimeField(
+        blank = True,
+        default = None,
+        help_text = 'Date the article will be removed from published articles',
+        null = True,
+        verbose_name = 'End Date',
+    )
+
+
+    target_team = models.ManyToManyField(
+        Team,
+        blank = True,
+        default = None,
+        help_text = 'Team(s) to grant access to the article',
+        verbose_name = 'Target Team(s)',
+    )
+
+
+    target_user = models.ForeignKey(
+        User,
+        blank = True,
+        default = None,
+        help_text = 'User(s) to grant access to the article',
+        null = True,
+        on_delete = models.SET_NULL,
+        verbose_name = 'Target Users(s)',
+    )
+
+
+    responsible_user = models.ForeignKey(
+        User,
+        blank = False,
+        default = None,
+        help_text = 'User(s) whom is considered the articles owner.',
+        null = True,
+        on_delete = models.SET_NULL,
+        related_name = 'responsible_user',
+        verbose_name = 'Responsible User',
+    )
+
+
+    responsible_teams = models.ManyToManyField(
+        Team,
+        blank = True,
+        default = None,
+        help_text = 'Team(s) whom is considered the articles owner.',
+        related_name = 'responsible_teams',
+        verbose_name = 'Responsible Team(s)',
+    )
+
+
+    public = models.BooleanField(
+        blank = False,
+        default = False,
+        help_text = 'Is this article to be made available publically',
+        verbose_name = 'Public Article',
+    )
+
+
+    created = AutoCreatedField()
+
+
+    modified = AutoLastModifiedField()
+
+
+    def __str__(self):
+
+        return self.title

app/assistance/templates/assistance/kb_article.html.j2

@@ -0,0 +1,40 @@
+{% extends 'detail.html.j2' %}
+
+{% load json %}
+{% load markdown %}
+
+
+{% block tabs %}
+<form action="" method="post">
+  {% csrf_token %}
+<div id="details" class="content-tab">
+
+    {% include 'content/section.html.j2' with tab=form.tabs.details %}
+
+</div>
+
+
+
+{% if perms.assistance.change_knowledgebase %}
+<div id="notes" class="content-tab">
+
+    {% include 'content/section.html.j2' with tab=form.tabs.notes %}
+
+    {{ notes_form }}
+
+    <input type="submit" name="{{notes_form.prefix}}" value="Submit" />
+
+    <div class="comments">
+        {% if notes %}
+        {% for note in notes%}
+        {% include 'note.html.j2' %}
+        {% endfor %}
+        {% endif %}
+    </div>
+
+</div>
+{% endif %}
+
+</form>
+{% endblock %}
+

app/assistance/templates/assistance/kb_category.html.j2

@@ -0,0 +1,213 @@
+{% extends 'base.html.j2' %}
+
+{% load markdown %}
+
+{% block content %}
+
+<script>
+
+    function openCity(evt, cityName) {
+        var i, tabcontent, tablinks;
+
+        tabcontent = document.getElementsByClassName("tabcontent");
+        for (i = 0; i < tabcontent.length; i++) {
+            tabcontent[i].style.display = "none";
+        }
+
+        tablinks = document.getElementsByClassName("tablinks");
+        for (i = 0; i < tablinks.length; i++) {
+            tablinks[i].className = tablinks[i].className.replace(" active", "");
+        }
+
+        document.getElementById(cityName).style.display = "block";
+        evt.currentTarget.className += " active";
+    }
+
+</script>
+
+<style>
+
+.detail-view-field {
+  display:unset;
+  height: 30px;
+  line-height: 30px;
+  padding: 0px 20px 40px 20px;
+
+}
+
+.detail-view-field label {
+  display: inline-block;
+  font-weight: bold;
+  width: 200px;
+  margin: 10px;
+  /*padding: 10px;*/
+  height: 30px;
+  line-height: 30px;
+
+}
+
+.detail-view-field span {
+  display: inline-block;
+  width: 340px;
+  margin: 10px;
+  /*padding: 10px;*/
+  border-bottom: 1px solid #ccc;
+  height: 30px;
+  line-height: 30px;
+
+}
+
+pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+}
+
+</style>
+<div class="tab">
+    <button
+        onclick="window.location='{% url 'Settings:KB Categories' %}';"
+        style="vertical-align: middle; padding: auto; margin: 0px">
+        <svg xmlns="http://www.w3.org/2000/svg" height="25px" viewBox="0 -960 960 960" width="25px"
+            style="vertical-align: middle; margin: 0px; padding: 0px border: none; " fill="#6a6e73">
+            <path
+                d="m313-480 155 156q11 11 11.5 27.5T468-268q-11 11-28 11t-28-11L228-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T468-692q11 11 11 28t-11 28L313-480Zm264 0 155 156q11 11 11.5 27.5T732-268q-11 11-28 11t-28-11L492-452q-6-6-8.5-13t-2.5-15q0-8 2.5-15t8.5-13l184-184q11-11 27.5-11.5T732-692q11 11 11 28t-11 28L577-480Z" />
+        </svg>Back to Articles</button>
+
+    <button id="defaultOpen" class="tablinks" onclick="openCity(event, 'Details')">Details</button>
+    <button class="tablinks" onclick="openCity(event, 'Articles')">Articles</button>
+    {% if perms.assistance.change_knowledgebase %}
+    <button class="tablinks" onclick="openCity(event, 'Notes')">Notes</button>
+    {% endif %}
+</div>
+
+<form method="post">
+    <div id="Details" class="tabcontent">
+
+        <h3>Details</h3>
+
+        {% csrf_token %}
+        
+        
+      <div style="align-items:flex-start; align-content: center; display: flexbox; width: 100%">
+
+        <div style="display: inline; width: 40%; margin: 30px;">
+
+          <div class="detail-view-field">
+            <label>{{ form.name.label }}</label>
+            <span>{{ form.name.value }}</span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>{{ form.parent_category.label }}</label>
+            <span>
+            {% if item.parent_category %}
+              {{ item.parent_category }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>Created</label>
+            <span>{{ item.created }}</span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>Modified</label>
+            <span>{{ item.modified }}</span>
+          </div>
+
+
+        </div>
+
+        <div style="display: inline; width: 40%; margin: 30px; text-align: left;">
+
+          <div class="detail-view-field">
+            <label>{{ form.organization.label }}</label>
+            <span>
+            {% if form.organization.value %}
+              {{ item.organization }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>{{ form.target_user.label }}</label>
+            <span>
+            {% if form.target_user.value %}
+              {{ form.target_user.value }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+          <div class="detail-view-field">
+            <label>{{ form.target_team.label }}</label>
+            <span>
+            {% if form.target_team.value %}
+              {{ form.target_team.value }}
+            {% else %}
+              &nbsp;
+            {% endif %}
+            </span>
+          </div>
+
+
+        </div>
+      </div>
+
+
+      <input type="button" value="Edit" onclick="window.location='{% url 'Settings:_knowledge_base_category_change' item.id %}';">
+
+      <br>
+
+      <script>
+          document.getElementById("defaultOpen").click();
+      </script>
+
+    </div>
+
+        <div id="Articles" class="tabcontent">
+        <h3>
+            Articles
+        </h3>
+        <table>
+          <tr>
+            <th>Title</th>
+            <th>Organization</th>
+          </tr>
+          {% for article in articles %}
+          <tr>
+            <td><a href="{% url 'Assistance:_knowledge_base_view' article.id %}">{{ article.title }}</a></td>
+            <td>{{ article.organization }}</td>
+          </tr>
+          {% endfor %}
+        </table>
+
+    </div>
+
+    {% if perms.assistance.change_knowledgebase %}
+    <div id="Notes" class="tabcontent">
+        <h3>
+            Notes
+        </h3>
+        {{ notes_form }}
+        <input type="submit" name="{{notes_form.prefix}}" value="Submit" />
+        <div class="comments">
+            {% if notes %}
+            {% for note in notes %}
+            {% include 'note.html.j2' %}
+            {% endfor %}
+            {% endif %}
+        </div>
+
+    </div>
+    {% endif %}
+
+</form>
+
+{% endblock %}

app/assistance/templates/assistance/kb_category_index.html.j2

@@ -0,0 +1,47 @@
+{% extends 'base.html.j2' %}
+
+{% block content %}
+
+<input type="button" value="New Article" onclick="window.location='{% url 'Settings:_knowledge_base_category_add' %}';">
+<table class="data">
+    <tr>
+        <th>Title</th>
+        <th>Parent</th>
+        <th>Organization</th>
+        <th>&nbsp;</th>
+    </tr>
+    {% if items %}
+    {% for item in items %}
+    <tr>
+        <td><a href="{% url 'Settings:_knowledge_base_category_view' pk=item.id %}">{{ item.name }}</a></td>
+        <td>{{ item.parent_category }}</td>
+        <td>{{ item.organization }}</td>
+        <td>&nbsp;</td>
+    </tr>
+    {% endfor %}
+    {% else %}
+    <tr>
+        <td colspan="4">Nothing Found</td>
+    </tr>
+    {% endif %}
+</table>
+<br>
+<div class="pagination">
+    <span class="step-links">
+        {% if page_obj.has_previous %}
+        <a href="?page=1">&laquo; first</a>
+        <a href="?page={{ page_obj.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}">next</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+        {% endif %}
+    </span>
+</div>
+
+{% endblock %}

app/assistance/templates/assistance/kb_index.html.j2

@@ -0,0 +1,47 @@
+{% extends 'base.html.j2' %}
+
+{% block content %}
+
+<input type="button" value="New Article" onclick="window.location='{% url 'Assistance:_knowledge_base_add' %}';">
+<table class="data">
+    <tr>
+        <th>Title</th>
+        <th>Category</th>
+        <th>Organization</th>
+        <th>&nbsp;</th>
+    </tr>
+    {% if items %}
+    {% for item in items %}
+    <tr>
+        <td><a href="{% url 'Assistance:_knowledge_base_view' pk=item.id %}">{{ item.title }}</a></td>
+        <td><a href="{% url 'Settings:_knowledge_base_category_view' pk=item.category.id %}">{{ item.category }}</a></td>
+        <td>{{ item.organization }}</td>
+        <td>&nbsp;</td>
+    </tr>
+    {% endfor %}
+    {% else %}
+    <tr>
+        <td colspan="4">Nothing Found</td>
+    </tr>
+    {% endif %}
+</table>
+<br>
+<div class="pagination">
+    <span class="step-links">
+        {% if page_obj.has_previous %}
+        <a href="?page=1">&laquo; first</a>
+        <a href="?page={{ page_obj.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
+        </span>
+
+        {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}">next</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}">last &raquo;</a>
+        {% endif %}
+    </span>
+</div>
+
+{% endblock %}

app/assistance/tests/unit/knowledge_base/test_knowledge_base.py

@@ -0,0 +1,44 @@
+import pytest
+import unittest
+
+from django.test import TestCase
+
+from access.models import Organization
+
+from app.tests.abstract.models import TenancyModel
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+
+
+@pytest.mark.django_db
+class KnowledgeBaseModel(
+    TestCase,
+    TenancyModel
+):
+
+    model = KnowledgeBase
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. Create an item
+
+        """
+
+        self.organization = Organization.objects.create(name='test_org')
+
+
+        self.item = self.model.objects.create(
+            organization = self.organization,
+            title = 'one',
+            content = 'dict({"key": "one", "existing": "dont_over_write"})'
+        )
+
+        self.second_item = self.model.objects.create(
+            organization = self.organization,
+            title = 'one_two',
+            content = 'dict({"key": "two"})',
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_core_history.py

@@ -0,0 +1,78 @@
+
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from access.models import Organization
+
+from core.models.history import History
+from core.tests.abstract.history_entry import HistoryEntry
+from core.tests.abstract.history_entry_parent_model import HistoryEntryParentItem
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+
+
+class KnowledgeBaseHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
+
+
+    model = KnowledgeBase
+
+
+    @classmethod
+    def setUpTestData(self):
+        """ Setup Test """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        self.item_parent = self.model.objects.create(
+            title = 'test_item_parent_' + self.model._meta.model_name,
+            organization = self.organization
+        )
+
+        self.item_create = self.model.objects.create(
+            title = 'test_item_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+
+        self.history_create = History.objects.get(
+            action = History.Actions.ADD[0],
+            item_pk = self.item_create.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_change = self.item_create
+        self.item_change.title = 'test_item_' + self.model._meta.model_name + '_changed'
+        self.item_change.save()
+
+        self.field_after_expected_value = '{"title": "' + self.item_change.title + '"}'
+
+        self.history_change = History.objects.get(
+            action = History.Actions.UPDATE[0],
+            item_pk = self.item_change.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_delete = self.model.objects.create(
+            title = 'test_item_delete_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+        self.deleted_pk = self.item_delete.pk
+
+        self.item_delete.delete()
+
+        self.history_delete = History.objects.filter(
+            item_pk = self.deleted_pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.history_delete_children = History.objects.filter(
+            item_parent_pk = self.deleted_pk,
+            item_parent_class = self.item_parent._meta.model_name,
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_history_permission.py

@@ -0,0 +1,95 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+from core.tests.abstract.history_permissions import HistoryPermissions
+
+
+
+class KnowledgeBaseHistoryPermissions(TestCase, HistoryPermissions):
+
+
+    item_model = KnowledgeBase
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. create an organization that is different to item
+        3. Create a device
+        4. Add history device history entry as item
+        5. create a user
+        6. create user in different organization (with the required permission)
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+        self.item = self.item_model.objects.create(
+            organization=organization,
+            title = 'deviceone'
+        )
+
+        self.history = self.model.objects.get(
+            item_pk = self.item.id,
+            item_class = self.item._meta.model_name,
+            action = self.model.Actions.ADD,
+        )
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py

@@ -0,0 +1,189 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.model_permissions import ModelPermissions
+
+from assistance.models.knowledge_base import KnowledgeBase
+
+
+class KnowledgeBasePermissions(TestCase, ModelPermissions):
+
+
+    model = KnowledgeBase
+
+    app_namespace = 'Assistance'
+
+    url_name_view = '_knowledge_base_view'
+
+    url_name_add = '_knowledge_base_add'
+
+    url_name_change = '_knowledge_base_change'
+
+    url_name_delete = '_knowledge_base_delete'
+
+    url_delete_response = reverse('Assistance:Knowledge Base')
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            title = 'deviceone'
+        )
+
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        # self.url_add_kwargs = {'pk': self.item.id}
+
+        self.add_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_change_kwargs = {'pk': self.item.id}
+
+        self.change_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_delete_kwargs = {'pk': self.item.id}
+
+        self.delete_data = {'device': 'device', 'organization': self.organization.id}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+
+        add_permissions = Permission.objects.get(
+                codename = 'add_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        add_team = Team.objects.create(
+            team_name = 'add_team',
+            organization = organization,
+        )
+
+        add_team.permissions.set([add_permissions])
+
+
+
+        change_permissions = Permission.objects.get(
+                codename = 'change_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        change_team = Team.objects.create(
+            team_name = 'change_team',
+            organization = organization,
+        )
+
+        change_team.permissions.set([change_permissions])
+
+
+
+        delete_permissions = Permission.objects.get(
+                codename = 'delete_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        delete_team = Team.objects.create(
+            team_name = 'delete_team',
+            organization = organization,
+        )
+
+        delete_team.permissions.set([delete_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.add_user = User.objects.create_user(username="test_user_add", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = add_team,
+            user = self.add_user
+        )
+
+        self.change_user = User.objects.create_user(username="test_user_change", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = change_team,
+            user = self.change_user
+        )
+
+        self.delete_user = User.objects.create_user(username="test_user_delete", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = delete_team,
+            user = self.delete_user
+        )
+
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+            add_permissions,
+            change_permissions,
+            delete_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base/test_knowledge_base_views.py

@@ -0,0 +1,29 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase
+
+from app.tests.abstract.models import PrimaryModel
+
+
+
+class KnowledgeBaseViews(
+    TestCase,
+    PrimaryModel
+):
+
+    add_module = 'assistance.views.knowledge_base'
+    add_view = 'Add'
+
+    change_module = add_module
+    change_view = 'Change'
+
+    delete_module = add_module
+    delete_view = 'Delete'
+
+    display_module = add_module
+    display_view = 'View'
+
+    index_module = add_module
+    index_view = 'Index'

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category.py

@@ -0,0 +1,42 @@
+import pytest
+import unittest
+
+from django.test import TestCase
+
+from access.models import Organization
+
+from app.tests.abstract.models import TenancyModel
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+
+
+@pytest.mark.django_db
+class KnowledgeBaseModel(
+    TestCase,
+    TenancyModel
+):
+
+    model = KnowledgeBaseCategory
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. Create an item
+
+        """
+
+        self.organization = Organization.objects.create(name='test_org')
+
+
+        self.item = self.model.objects.create(
+            organization = self.organization,
+            name = 'one',
+        )
+
+        self.second_item = self.model.objects.create(
+            organization = self.organization,
+            name = 'one_two',
+        )

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_core_history.py

@@ -0,0 +1,75 @@
+
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase, Client
+
+from access.models import Organization
+
+from core.models.history import History
+from core.tests.abstract.history_entry import HistoryEntry
+from core.tests.abstract.history_entry_parent_model import HistoryEntryParentItem
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+
+
+class KnowledgeBaseHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
+
+
+    model = KnowledgeBaseCategory
+
+
+    @classmethod
+    def setUpTestData(self):
+        """ Setup Test """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+
+        self.item_create = self.model.objects.create(
+            name = 'test_item_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+
+        self.history_create = History.objects.get(
+            action = History.Actions.ADD[0],
+            item_pk = self.item_create.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_change = self.item_create
+        self.item_change.name = 'test_item_' + self.model._meta.model_name + '_changed'
+        self.item_change.save()
+
+        self.field_after_expected_value = '{"name": "' + self.item_change.name + '"}'
+
+        self.history_change = History.objects.get(
+            action = History.Actions.UPDATE[0],
+            item_pk = self.item_change.pk,
+            item_class = self.model._meta.model_name,
+        )
+
+        self.item_delete = self.model.objects.create(
+            name = 'test_item_delete_' + self.model._meta.model_name,
+            organization = self.organization,
+        )
+
+        self.deleted_pk = self.item_delete.pk
+
+        self.item_delete.delete()
+
+        self.history_delete = History.objects.filter(
+            item_pk = self.deleted_pk,
+            item_class = self.model._meta.model_name,
+        )
+
+
+    def test_history_entry_children_delete(self):
+        """ Model has no child items """
+        pass
+

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_history_permission.py

@@ -0,0 +1,95 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+from core.tests.abstract.history_permissions import HistoryPermissions
+
+
+
+class KnowledgeBaseHistoryPermissions(TestCase, HistoryPermissions):
+
+
+    item_model = KnowledgeBaseCategory
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        2. create an organization that is different to item
+        3. Create a device
+        4. Add history device history entry as item
+        5. create a user
+        6. create user in different organization (with the required permission)
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+        self.item = self.item_model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+        self.history = self.model.objects.get(
+            item_pk = self.item.id,
+            item_class = self.item._meta.model_name,
+            action = self.model.Actions.ADD,
+        )
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py

@@ -0,0 +1,189 @@
+# from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import TestCase, Client
+
+import pytest
+import unittest
+import requests
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.model_permissions import ModelPermissions
+
+from assistance.models.knowledge_base import KnowledgeBaseCategory
+
+
+class KnowledgeBasePermissions(TestCase, ModelPermissions):
+
+
+    model = KnowledgeBaseCategory
+
+    app_namespace = 'Settings'
+
+    url_name_view = '_knowledge_base_category_view'
+
+    url_name_add = '_knowledge_base_category_add'
+
+    url_name_change = '_knowledge_base_category_change'
+
+    url_name_delete = '_knowledge_base_category_delete'
+
+    url_delete_response = reverse('Settings:KB Categories')
+
+
+    @classmethod
+    def setUpTestData(self):
+        """Setup Test
+
+        1. Create an organization for user and item
+        . create an organization that is different to item
+        2. Create a device
+        3. create teams with each permission: view, add, change, delete
+        4. create a user per team
+        """
+
+        organization = Organization.objects.create(name='test_org')
+
+        self.organization = organization
+
+        different_organization = Organization.objects.create(name='test_different_organization')
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            name = 'deviceone'
+        )
+
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        # self.url_add_kwargs = {'pk': self.item.id}
+
+        self.add_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_change_kwargs = {'pk': self.item.id}
+
+        self.change_data = {'device': 'device', 'organization': self.organization.id}
+
+        self.url_delete_kwargs = {'pk': self.item.id}
+
+        self.delete_data = {'device': 'device', 'organization': self.organization.id}
+
+
+        view_permissions = Permission.objects.get(
+                codename = 'view_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        view_team = Team.objects.create(
+            team_name = 'view_team',
+            organization = organization,
+        )
+
+        view_team.permissions.set([view_permissions])
+
+
+
+        add_permissions = Permission.objects.get(
+                codename = 'add_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        add_team = Team.objects.create(
+            team_name = 'add_team',
+            organization = organization,
+        )
+
+        add_team.permissions.set([add_permissions])
+
+
+
+        change_permissions = Permission.objects.get(
+                codename = 'change_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        change_team = Team.objects.create(
+            team_name = 'change_team',
+            organization = organization,
+        )
+
+        change_team.permissions.set([change_permissions])
+
+
+
+        delete_permissions = Permission.objects.get(
+                codename = 'delete_' + self.model._meta.model_name,
+                content_type = ContentType.objects.get(
+                    app_label = self.model._meta.app_label,
+                    model = self.model._meta.model_name,
+                )
+            )
+
+        delete_team = Team.objects.create(
+            team_name = 'delete_team',
+            organization = organization,
+        )
+
+        delete_team.permissions.set([delete_permissions])
+
+
+        self.no_permissions_user = User.objects.create_user(username="test_no_permissions", password="password")
+
+
+        self.view_user = User.objects.create_user(username="test_user_view", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = view_team,
+            user = self.view_user
+        )
+
+        self.add_user = User.objects.create_user(username="test_user_add", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = add_team,
+            user = self.add_user
+        )
+
+        self.change_user = User.objects.create_user(username="test_user_change", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = change_team,
+            user = self.change_user
+        )
+
+        self.delete_user = User.objects.create_user(username="test_user_delete", password="password")
+        teamuser = TeamUsers.objects.create(
+            team = delete_team,
+            user = self.delete_user
+        )
+
+
+        self.different_organization_user = User.objects.create_user(username="test_different_organization_user", password="password")
+
+
+        different_organization_team = Team.objects.create(
+            team_name = 'different_organization_team',
+            organization = different_organization,
+        )
+
+        different_organization_team.permissions.set([
+            view_permissions,
+            add_permissions,
+            change_permissions,
+            delete_permissions,
+        ])
+
+        TeamUsers.objects.create(
+            team = different_organization_team,
+            user = self.different_organization_user
+        )

app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_views.py

@@ -0,0 +1,29 @@
+import pytest
+import unittest
+import requests
+
+from django.test import TestCase
+
+from app.tests.abstract.models import PrimaryModel
+
+
+
+class ConfigManagementViews(
+    TestCase,
+    PrimaryModel
+):
+
+    add_module = 'assistance.views.knowledge_base_category'
+    add_view = 'Add'
+
+    change_module = add_module
+    change_view = 'Change'
+
+    delete_module = add_module
+    delete_view = 'Delete'
+
+    display_module = add_module
+    display_view = 'View'
+
+    index_module = add_module
+    index_view = 'Index'

app/assistance/urls.py

@@ -0,0 +1,27 @@
+from django.urls import path
+
+from assistance.views import knowledge_base
+
+from core.views import ticket, ticket_comment
+
+app_name = "Assistance"
+
+urlpatterns = [
+
+    path("information", knowledge_base.Index.as_view(), name="Knowledge Base"),
+    path("information/add", knowledge_base.Add.as_view(), name="_knowledge_base_add"),
+    path("information/<int:pk>/edit", knowledge_base.Change.as_view(), name="_knowledge_base_change"),
+    path("information/<int:pk>/delete", knowledge_base.Delete.as_view(), name="_knowledge_base_delete"),
+    path("information/<int:pk>", knowledge_base.View.as_view(), name="_knowledge_base_view"),
+
+    path('ticket/request', ticket.Index.as_view(), kwargs={'ticket_type': 'request'}, name="Requests"),
+    path('ticket/<str:ticket_type>/add', ticket.Add.as_view(), name="_ticket_request_add"),
+    path('ticket/<str:ticket_type>/<int:pk>/edit', ticket.Change.as_view(), name="_ticket_request_change"),
+    path('ticket/<str:ticket_type>/<int:pk>/delete', ticket.Delete.as_view(), name="_ticket_request_delete"),
+    path('ticket/<str:ticket_type>/<int:pk>', ticket.View.as_view(), name="_ticket_request_view"),
+
+    path('ticket/<str:ticket_type>/<int:ticket_id>/comment/add', ticket_comment.Add.as_view(), name="_ticket_comment_request_add"),
+    path('ticket/<str:ticket_type>/<int:ticket_id>/comment/<int:pk>/edit', ticket_comment.Change.as_view(), name="_ticket_comment_request_change"),
+    path('ticket/<str:ticket_type>/<int:ticket_id>/comment/<int:parent_id>/add', ticket_comment.Add.as_view(), name="_ticket_comment_request_reply_add"),
+
+]