build: bump version 1.0.0-b14 -> 1.0.0

ref: #213

.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-b2
+  version: 1.0.0
   version_scheme: semver

.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 }}
+

.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,104 +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";
 
-            curl \
-              --data "name=v${RELEASE_TAG}&color=#eee600&description=Version%20that%20is%20affected" \
-              --header "PRIVATE-TOKEN: $GIT_COMMIT_TOKEN" \
-              "https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/labels";
+#             echo "----------------------------";
 
-            echo curl \
-              --data "name=v${RELEASE_TAG}&color=#eee600&description=Version%20that%20is%20affected" \
-              --header "PRIVATE-TOKEN: $GIT_COMMIT_TOKEN" \
-              "https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/labels";
+#             echo ${MY_COMMAND};
 
-          fi
+#             echo "----------------------------";
 
-        - 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
+#             cat ${MY_COMMAND};
 
-        - 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
+#             echo "----------------------------";
 
-        - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
-          when: never
+#             ${MY_COMMAND};
 
-        - if: # condition_master_branch_push
-            $CI_COMMIT_BRANCH == "master" && 
-            $CI_PIPELINE_SOURCE == "push"
-          allow_failure: false
-          when: on_success
+#             echo "----------------------------";
+#           fi
 
-        - if: # condition_dev_branch_push
-            $CI_COMMIT_BRANCH == "development" && 
-            $CI_PIPELINE_SOURCE == "push"
-          when: manual
-          allow_failure: true
+#         - 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
 
-        # 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 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
 
-#
-# Release
-#
-Gitlab Release:
-  extends:
-    - .gitlab_release
+#         - 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
 
 
 
@@ -229,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:

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).
 

app/access/models.py

@@ -190,7 +190,7 @@ class TenancyObject(SaveHistory):
 
 
 
-class Team(Group, TenancyObject, SaveHistory):
+class Team(Group, TenancyObject):
     class Meta:
         # proxy = True
         verbose_name_plural = "Teams"

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/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/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/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,29 @@ class DeviceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Device
-        fields = '__all__'
-
-        read_only_fields = [
-            'inventorydate',
+        depth = 1
+        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/urls.py

@@ -3,7 +3,7 @@ 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 .views.itam import software, config as itam_config
 from .views.itam.device import DeviceViewSet
@@ -24,6 +24,9 @@ router.register('software', software.SoftwareViewSet, basename='software')
 urlpatterns = [
     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("organization/", access.OrganizationList.as_view(), name='_api_orgs'),

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/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/index.py

@@ -27,6 +27,7 @@ class Index(viewsets.ViewSet):
         {
             # "teams": reverse("_api_teams", request=request),
             "devices": reverse("API:device-list", request=request),
+            "config_groups": reverse("API:_api_config_groups", request=request),
             "organizations": reverse("API:_api_orgs", request=request),
             "software": reverse("API:software-list", request=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/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':

app/app/settings.py

@@ -307,6 +307,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'

app/app/tests/abstract/models.py

@@ -7,6 +7,7 @@ from access.tests.abstract.tenancy_object import TenancyObject as TenancyObjectT
 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 +31,8 @@ class BaseModel:
 
 class TenancyModel(
     BaseModel,
-    TenancyObjectTestCases
+    TenancyObjectTestCases,
+    Models
 ):
     """ Test cases for tenancy models"""
 

app/config_management/models/groups.py

@@ -195,6 +195,12 @@ class ConfigGroups(GroupsCommonFields, SaveHistory):
             # Prevent organization change. ToDo: add feature so that config can change organizations
             self.organization = obj.organization
 
+        if self.parent is not None:
+
+            if self.pk == self.parent.pk:
+
+                raise ValidationError('Can not set self as parent')
+
         super().save(*args, **kwargs)
 
 

app/config_management/tests/unit/config_groups/test_config_groups_api.py

@@ -0,0 +1,224 @@
+import pytest
+import unittest
+
+from django.contrib.auth.models import User
+from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import reverse
+from django.test import Client, TestCase
+
+from access.models import Organization, Team, TeamUsers, Permission
+
+from app.tests.abstract.models import TenancyModel
+
+from config_management.models.groups import ConfigGroups
+
+
+
+@pytest.mark.django_db
+class ConfigGroupsAPI(
+    TestCase,
+):
+
+    model = ConfigGroups
+
+    @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',
+            config = dict({"key": "one", "existing": "dont_over_write"})
+        )
+
+        self.second_item = self.model.objects.create(
+            organization = self.organization,
+            name = 'one_two',
+            config = dict({"key": "two"}),
+            parent = self.item
+        )
+
+        self.url_view_kwargs = {'pk': self.second_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 = self.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('API:_api_config_group', 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_parent(self):
+        """ Test for existance of API Field
+
+        parent field must exist
+        """
+
+        assert 'parent' in self.api_data
+
+
+    def test_api_field_type_parent(self):
+        """ Test for type for API Field
+
+        parent field must be dict
+        """
+
+        assert type(self.api_data['parent']) is dict
+
+
+    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_config(self):
+        """ Test for existance of API Field
+
+        config field must exist
+        """
+
+        assert 'config' in self.api_data
+
+
+    def test_api_field_type_config(self):
+        """ Test for type for API Field
+
+        config field must be dict
+        """
+
+        assert type(self.api_data['config']) is dict
+
+
+    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_parent_id(self):
+        """ Test for existance of API Field
+
+        parent.id field must exist
+        """
+
+        assert 'id' in self.api_data['parent']
+
+
+    def test_api_field_type_parent_id(self):
+        """ Test for type for API Field
+
+        parent.id field must be int
+        """
+
+        assert type(self.api_data['parent']['id']) is int
+
+
+    def test_api_field_exists_parent_name(self):
+        """ Test for existance of API Field
+
+        parent.name field must exist
+        """
+
+        assert 'name' in self.api_data['parent']
+
+
+    def test_api_field_type_parent_name(self):
+        """ Test for type for API Field
+
+        parent.name field must be str
+        """
+
+        assert type(self.api_data['parent']['name']) is str
+
+
+    def test_api_field_exists_parent_url(self):
+        """ Test for existance of API Field
+
+        parent.url field must exist
+        """
+
+        assert 'url' in self.api_data['parent']
+
+
+    def test_api_field_type_parent_url(self):
+        """ Test for type for API Field
+
+        parent.url field must be str
+        """
+
+        assert type(self.api_data['parent']['url']) is str

app/core/tests/abstract/models.py

@@ -3,21 +3,38 @@ import unittest
 
 from django.test import TestCase
 
+from unittest.mock import patch
+
+from access.models import TenancyManager
 
 
 class Models:
     """ Test cases for Model Abstract Classes """
 
 
-
-    @pytest.mark.skip(reason="write test")
+    
     def test_model_class_tenancy_manager_function_get_queryset(self):
         """ Function Check
 
         function `get_queryset()` must exist
         """
 
-        pass
+        assert hasattr(self.model.objects, 'get_queryset')
+
+        assert callable(self.model.objects.get_queryset)
+
+
+    @patch.object(TenancyManager, 'get_queryset')
+    def test_model_class_tenancy_manager_function_get_queryset_called(self, get_queryset):
+        """ Function Check
+
+        function `access.models.TenancyManager.get_queryset()` within the Tenancy manager must
+        be called as this function limits queries to the current users organizations.
+        """
+
+        self.model.objects.filter()
+
+        assert get_queryset.called
 
 
     @pytest.mark.skip(reason="write test")

app/itam/models/device.py

@@ -1,8 +1,10 @@
 import json
+import re
 
 from datetime import timedelta
 
 from django.db import models
+from django.forms import ValidationError
 
 from access.fields import *
 from access.models import TenancyObject
@@ -18,6 +20,8 @@ from itam.models.operating_system import OperatingSystemVersion
 
 from settings.models.app_settings import AppSettings
 
+
+
 class DeviceType(DeviceCommonFieldsName, SaveHistory):
 
 
@@ -39,6 +43,35 @@ class DeviceType(DeviceCommonFieldsName, SaveHistory):
 
 class Device(DeviceCommonFieldsName, SaveHistory):
 
+
+    def validate_uuid_format(self):
+
+        pattern = r'[0-9|a-f]{8}\-[0-9|a-f]{4}\-[0-9|a-f]{4}\-[0-9|a-f]{4}\-[0-9|a-f]{12}'
+
+        if not re.match(pattern, str(self)):
+
+            raise ValidationError(f'UUID Must be in {str(pattern)}')
+
+
+    def validate_hostname_format(self):
+
+        pattern = r'^[a-z]{1}[a-z|0-9|\-]+[a-z|0-9]{1}$'
+
+        if not re.match(pattern, str(self).lower()):
+
+            raise ValidationError(
+                '''[RFC1035 2.3.1] A hostname must start with a letter, end with a letter or digit,
+                and have as interior characters only letters, digits, and hyphen.'''
+            )
+
+
+    name = models.CharField(
+        blank = False,
+        max_length = 50,
+        unique = True,
+        validators = [ validate_hostname_format ]
+    )
+
     serial_number = models.CharField(
         verbose_name = 'Serial Number',
         max_length = 50,
@@ -58,6 +91,7 @@ class Device(DeviceCommonFieldsName, SaveHistory):
         blank = True,
         unique = True,
         help_text = 'System GUID/UUID.',
+        validators = [ validate_uuid_format ]
     )
 
     device_model = models.ForeignKey(

app/itam/tests/unit/device/test_device_api.py

@@ -0,0 +1,522 @@
+import pytest
+import unittest
+
+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
+
+from config_management.models.groups import ConfigGroups, ConfigGroupHosts
+
+from itam.models.device import Device
+
+
+class DeviceAPI(TestCase):
+
+
+    model = 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 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',
+            uuid = 'val',
+            serial_number = 'another val'
+        )
+
+        config_group = ConfigGroups.objects.create(
+            organization = self.organization,
+            name = 'one',
+            config = dict({"key": "one", "existing": "dont_over_write"})
+        )
+
+        config_group_second_item = ConfigGroups.objects.create(
+            organization = self.organization,
+            name = 'one_two',
+            config = dict({"key": "two"}),
+            parent = config_group
+        )
+
+        config_group_hosts = ConfigGroupHosts.objects.create(
+            organization = organization,
+            host = self.item,
+            group = config_group,
+        )
+
+
+        config_group_hosts_two = ConfigGroupHosts.objects.create(
+            organization = organization,
+            host = self.item,
+            group = config_group_second_item,
+        )
+
+
+        # self.url_kwargs = {'pk': self.item.id}
+
+        self.url_view_kwargs = {'pk': self.item.id}
+
+        # self.add_data = {'name': '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
+        # )
+
+
+        client = Client()
+        url = reverse('API:device-detail', 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_is_global(self):
+        """ Test for existance of API Field
+
+        is_global field must exist
+        """
+
+        assert 'is_global' in self.api_data
+
+
+    def test_api_field_type_is_global(self):
+        """ Test for type for API Field
+
+        is_global field must be boolean
+        """
+
+        assert type(self.api_data['is_global']) is bool
+
+
+    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_config(self):
+        """ Test for existance of API Field
+
+        config field must exist
+        """
+
+        assert 'config' in self.api_data
+
+
+    def test_api_field_type_config(self):
+        """ Test for type for API Field
+
+        config field must be dict
+        """
+
+        assert type(self.api_data['config']) is str
+
+
+    def test_api_field_exists_serial_number(self):
+        """ Test for existance of API Field
+
+        serial_number field must exist
+        """
+
+        assert 'serial_number' in self.api_data
+
+
+    def test_api_field_type_serial_number(self):
+        """ Test for type for API Field
+
+        serial_number field must be str
+        """
+
+        assert type(self.api_data['serial_number']) is str
+
+
+    def test_api_field_exists_uuid(self):
+        """ Test for existance of API Field
+
+        uuid field must exist
+        """
+
+        assert 'uuid' in self.api_data
+
+
+    def test_api_field_type_uuid(self):
+        """ Test for type for API Field
+
+        uuid field must be str
+        """
+
+        assert type(self.api_data['uuid']) is str
+
+
+    def test_api_field_exists_inventorydate(self):
+        """ Test for existance of API Field
+
+        inventorydate field must exist
+        """
+
+        assert 'inventorydate' in self.api_data
+
+
+    def test_api_field_type_inventorydate(self):
+        """ Test for type for API Field
+
+        inventorydate field must be str
+        """
+
+        assert (
+            type(self.api_data['inventorydate']) is str
+            or
+            self.api_data['inventorydate'] is None
+        )
+
+
+    def test_api_field_exists_created(self):
+        """ Test for existance of API Field
+
+        created field must exist
+        """
+
+        assert 'created' in self.api_data
+
+
+    def test_api_field_type_created(self):
+        """ Test for type for API Field
+
+        created field must be str
+        """
+
+        assert type(self.api_data['created']) is str
+
+
+    def test_api_field_exists_modified(self):
+        """ Test for existance of API Field
+
+        modified field must exist
+        """
+
+        assert 'modified' in self.api_data
+
+
+    def test_api_field_type_modified(self):
+        """ Test for type for API Field
+
+        modified field must be str
+        """
+
+        assert type(self.api_data['modified']) is str
+
+
+    def test_api_field_exists_groups(self):
+        """ Test for existance of API Field
+
+        groups field must exist
+        """
+
+        assert 'groups' in self.api_data
+
+
+    def test_api_field_type_groups(self):
+        """ Test for type for API Field
+
+        groups field must be list
+        """
+
+        assert type(self.api_data['groups']) is list
+
+
+    def test_api_field_exists_organization(self):
+        """ Test for existance of API Field
+
+        organization field must exist
+        """
+
+        assert 'organization' in self.api_data
+
+
+    def test_api_field_type_organization(self):
+        """ Test for type for API Field
+
+        organization field must be dict
+        """
+
+        assert type(self.api_data['organization']) is dict
+
+
+    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_organization_id(self):
+        """ Test for existance of API Field
+
+        organization.id field must exist
+        """
+
+        assert 'id' in self.api_data['organization']
+
+
+    def test_api_field_type_organization_id(self):
+        """ Test for type for API Field
+
+        organization.id field must be int
+        """
+
+        assert type(self.api_data['organization']['id']) is int
+
+
+    def test_api_field_exists_organization_name(self):
+        """ Test for existance of API Field
+
+        organization.name field must exist
+        """
+
+        assert 'name' in self.api_data['organization']
+
+
+    def test_api_field_type_organization_name(self):
+        """ Test for type for API Field
+
+        organization.name field must be str
+        """
+
+        assert type(self.api_data['organization']['name']) is str
+
+
+
+
+    def test_api_field_exists_groups_id(self):
+        """ Test for existance of API Field
+
+        groups.id field must exist
+        """
+
+        assert 'id' in self.api_data['groups'][0]
+
+
+    def test_api_field_type_groups_id(self):
+        """ Test for type for API Field
+
+        groups.id field must be int
+        """
+
+        assert type(self.api_data['groups'][0]['id']) is int
+
+
+    def test_api_field_exists_groups_name(self):
+        """ Test for existance of API Field
+
+        groups.name field must exist
+        """
+
+        assert 'name' in self.api_data['groups'][0]
+
+
+    def test_api_field_type_groups_name(self):
+        """ Test for type for API Field
+
+        groups.name field must be str
+        """
+
+        assert type(self.api_data['groups'][0]['name']) is str
+
+
+    def test_api_field_exists_groups_url(self):
+        """ Test for existance of API Field
+
+        groups.url field must exist
+        """
+
+        assert 'url' in self.api_data['groups'][0]
+
+
+    def test_api_field_type_groups_url(self):
+        """ Test for type for API Field
+
+        groups.url field must be str
+        """
+
+        assert type(self.api_data['groups'][0]['url']) is Hyperlink

app/itam/tests/unit/software/test_software_api.py

@@ -0,0 +1,294 @@
+import pytest
+import unittest
+import requests
+
+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 core.models.manufacturer import Manufacturer
+
+from itam.models.software import Software, SoftwareCategory
+
+
+class SoftwareAPI(TestCase):
+
+
+    model = Software
+
+    app_namespace = 'API'
+    
+    url_name = 'software-detail'
+
+
+    @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 software
+        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')
+
+        category = SoftwareCategory.objects.create(
+            name='a category'
+        )
+
+        publisher = Manufacturer.objects.create(
+            name='a manufacturer'
+        )
+
+
+        self.item = self.model.objects.create(
+            organization=organization,
+            name = 'softwareone',
+            model_notes = 'random str',
+            category = category,
+            publisher = publisher
+        )
+
+        self.url_view_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_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_is_global(self):
+        """ Test for existance of API Field
+
+        is_global field must exist
+        """
+
+        assert 'is_global' in self.api_data
+
+
+    def test_api_field_type_is_global(self):
+        """ Test for type for API Field
+
+        is_global field must be boolean
+        """
+
+        assert type(self.api_data['is_global']) is bool
+
+
+    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_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_slug(self):
+        """ Test for existance of API Field
+
+        slug field must exist
+        """
+
+        assert 'slug' in self.api_data
+
+
+    def test_api_field_type_slug(self):
+        """ Test for type for API Field
+
+        slug field must be str
+        """
+
+        assert type(self.api_data['slug']) is str
+
+
+    def test_api_field_exists_created(self):
+        """ Test for existance of API Field
+
+        created field must exist
+        """
+
+        assert 'created' in self.api_data
+
+
+    def test_api_field_type_created(self):
+        """ Test for type for API Field
+
+        created field must be str
+        """
+
+        assert type(self.api_data['created']) is str
+
+
+    def test_api_field_exists_modified(self):
+        """ Test for existance of API Field
+
+        modified field must exist
+        """
+
+        assert 'modified' in self.api_data
+
+
+    def test_api_field_type_modified(self):
+        """ Test for type for API Field
+
+        modified field must be str
+        """
+
+        assert type(self.api_data['modified']) is str
+
+
+    def test_api_field_exists_organization(self):
+        """ Test for existance of API Field
+
+        organization field must exist
+        """
+
+        assert 'organization' in self.api_data
+
+
+    def test_api_field_type_organization(self):
+        """ Test for type for API Field
+
+        organization field must be intt
+        """
+
+        assert type(self.api_data['organization']) is int
+
+
+    def test_api_field_exists_publisher(self):
+        """ Test for existance of API Field
+
+        publisher field must exist
+        """
+
+        assert 'publisher' in self.api_data
+
+
+    def test_api_field_type_publisher(self):
+        """ Test for type for API Field
+
+        publisher field must be int
+        """
+
+        assert type(self.api_data['publisher']) is int
+
+
+    def test_api_field_exists_category(self):
+        """ Test for existance of API Field
+
+        category field must exist
+        """
+
+        assert 'category' in self.api_data
+
+
+    def test_api_field_type_category(self):
+        """ Test for type for API Field
+
+        category field must be int
+        """
+
+        assert type(self.api_data['category']) is int
+

app/itam/views/operating_system.py

@@ -67,8 +67,14 @@ class View(ChangeView):
         ).order_by(
             'name'
         ).annotate(
-            installs=Count("deviceoperatingsystem"),
-            filter=Q(deviceoperatingsystem__operating_system_version__organization__in = self.user_organizations())
+            installs=Count(
+                "deviceoperatingsystem",
+                filter=Q(deviceoperatingsystem__device__organization__in = self.user_organizations())
+            ),
+            # filter=Q(deviceoperatingsystem__operating_system_version__organization__in = self.user_organizations())
+            # filter=Q(deviceoperatingsystem__operating_system_version__deviceoperatingsystem__device__organization__in = self.user_organizations()),
+            filter=Q(deviceoperatingsystem__operating_system_version__organization__in = self.user_organizations()),
+            
         )
         
         context['operating_system_versions'] = operating_system_versions

app/settings/views/user_settings.py

@@ -101,6 +101,8 @@ class TokenAdd(AddView):
         form.instance.user = self.request.user
         form.instance.token = form.instance.token_hash(form.fields['gen_token'].initial)
 
+        self.model.validate_note_no_token(self, note=form.instance.note, token=form.fields['gen_token'].initial)
+
         return super().form_valid(form)
 
 

app/templates/base.html.j2

@@ -133,7 +133,7 @@ section h2 span svg {
           <a title="Swagger API Documentation" href="/api/swagger/" target="_blank">
             {% include 'icons/swagger_docs.svg' %}
           </a>
-          <a title="Code Home" href="https://gitlab.com/nofusscomputing/projects/centurion_erp" target="_blank">
+          <a title="Code Home" href="{{ build_details.project_url }}" target="_blank">
             {% include 'icons/git.svg' %}
           </a>
         </span>
@@ -147,7 +147,7 @@ section h2 span svg {
           {% else %}
             development
           {% endif %}
-          ( {% if build_details.project_url %}<a href="{{ build_details.project_url }}/-/commit/{{ build_details.sha }}" target="_blank">{% endif %}
+          ( {% if build_details.project_url %}<a href="{{ build_details.project_url }}/commit/{{ build_details.sha }}" target="_blank">{% endif %}
           {{ build_details.sha }}
           {% if build_details.project_url %}</a>{% endif %} )
         </span>

app/templates/icons/issue_link.html.j2

@@ -2,5 +2,5 @@
     <span class="icon-issue">
         <svg xmlns="http://www.w3.org/2000/svg" height="25px" viewBox="0 -960 960 960" width="25px"><path d="M480-144q-60 0-109-32.5T302-264h-74q-15.3 0-25.65-10.29Q192-284.58 192-299.79t10.35-25.71Q212.7-336 228-336h60v-60h-60q-15.3 0-25.65-10.29Q192-416.58 192-431.79t10.35-25.71Q212.7-468 228-468h60v-60h-60q-15.3 0-25.65-10.29Q192-548.58 192-563.79t10.35-25.71Q212.7-600 228-600h74q8-26 25.8-47.09Q345.6-668.18 369-684l-56-56q-11-11-10.5-25.5T314-791q11-11 25-11t25 11l76 75q19.86-5 40.43-5t40.57 5l75-75q11-11 25.67-11 14.66 0 25.33 11 11 11 11 25.5T647-740l-56 56q23 16 40 37t27 47h74q15.3 0 25.65 10.29Q768-579.42 768-564.21t-10.35 25.71Q747.3-528 732-528h-60v60h60q15.3 0 25.65 10.29Q768-447.42 768-432.21t-10.35 25.71Q747.3-396 732-396h-60v60h60q15.3 0 25.65 10.29Q768-315.42 768-300.21t-10.35 25.71Q747.3-264 732-264h-74q-20 55-69 87.5T480-144Zm0-72q48.67 0 83.34-35Q598-286 600-336v-192q2-50-33.5-85t-86-35q-50.5 0-85 35T360-528v192q-1 50 34 85t86 35Zm-36.09-120h71.83q15.26 0 25.76-10.29 10.5-10.29 10.5-25.5t-10.32-25.71Q531.35-408 516.09-408h-71.83q-15.26 0-25.76 10.29-10.5 10.29-10.5 25.5t10.32 25.71q10.33 10.5 25.59 10.5Zm0-120h71.83q15.26 0 25.76-10.29 10.5-10.29 10.5-25.5t-10.32-25.71Q531.35-528 516.09-528h-71.83q-15.26 0-25.76 10.29-10.5 10.29-10.5 25.5t10.32 25.71q10.33 10.5 25.59 10.5ZM480-430Z"/></svg>
     </span>
-    <a href="https://gitlab.com/nofusscomputing/projects/django_template/-/issues/{{ issue }}" target="_blank"> see #{{ issue }}</a>
+    <a href="https://github.com/nofusscomputing/centurion_erp/issues/{{ issue }}" target="_blank"> see #{{ issue }}</a>
 </span>

artifacthub-repo.yml

@@ -0,0 +1,4 @@
+repositoryID: 17eaf871-a980-41ba-b841-2a78734535ca
+owners:
+  - name: no-fuss-computing
+    email: helpdesk@nofusscomputing.com

dockerfile

@@ -5,6 +5,11 @@ ARG CI_COMMIT_TAG=''
 FROM python:3.11-alpine3.19 as build
 
 
+RUN pip --disable-pip-version-check list --outdated --format=json | \
+    python -c "import json, sys; print('\n'.join([x['name'] for x in json.load(sys.stdin)]))" | \
+    xargs -n1 pip install --no-cache-dir -U;
+
+
 RUN apk add --update \
         bash \
         git \
@@ -57,6 +62,14 @@ RUN cd /tmp/python_modules \
 
 FROM python:3.11-alpine3.19
 
+LABEL \
+  org.opencontainers.image.vendor="No Fuss Computing" \
+  org.opencontainers.image.title="Centurion ERP" \
+  org.opencontainers.image.description="An ERP with a focus on ITSM and automation" \
+  org.opencontainers.image.vendor="No Fuss Computing" \
+  io.artifacthub.package.license="MIT"
+
+
 ARG CI_PROJECT_URL
 ARG CI_COMMIT_SHA
 ARG CI_COMMIT_TAG
@@ -75,7 +88,10 @@ COPY --from=build /tmp/python_builds /tmp/python_builds
 
 COPY includes/ /
 
-RUN apk update --no-cache; \
+RUN pip --disable-pip-version-check list --outdated --format=json | \
+    python -c "import json, sys; print('\n'.join([x['name'] for x in json.load(sys.stdin)]))" | \
+    xargs -n1 pip install --no-cache-dir -U; \
+  apk update --no-cache; \
   apk add --no-cache \
     mariadb-client \
     mariadb-dev \

docs/projects/centurion_erp/administration/index.md

@@ -16,3 +16,8 @@ This documentation is targeted towards those whom administer the applications de
 - [Backup](./backup.md)
 
 - [Installation](./installation.md)
+
+
+## Ansible Automation Platform / AWX
+
+We have built an [Ansible Collection](../../ansible/collections/centurion/index.md) for Centurion ERP that you could consider the bridge between the config within Centurion and the end device. This collection can be directly added to AAP / AWX as a project which enables accessing the features the collection has to offer. Please refer to the [collections documentation](../../ansible/collections/centurion/index.md) for further information.

docs/projects/centurion_erp/development/media/ticket-issue-ux-wireframe.drawio

@@ -0,0 +1,94 @@
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36" version="24.7.7">
+  <diagram name="Page-1" id="0p1o9D85wg9-GzEIQXPA">
+    <mxGraphModel dx="2049" dy="1094" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-24" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E0E0E0;" vertex="1" parent="1">
+          <mxGeometry x="170" y="140" width="990" height="890" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="5" width="1155" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-3" value="Navigation" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="5" y="80" width="165" height="950" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-4" value="&lt;font style=&quot;font-size: 22px;&quot;&gt;&amp;lt;Type&amp;gt; &amp;lt;Title&amp;gt;&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
+          <mxGeometry x="170" y="80" width="990" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-5" value="Metadata ??" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="1010" y="150" width="150" height="660" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-6" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="180" y="150" width="820" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-7" value="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&lt;br&gt;Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat&amp;nbsp;" style="text;spacingTop=-5;whiteSpace=wrap;html=1;align=left;fontSize=12;fontFamily=Helvetica;fillColor=none;strokeColor=none;" vertex="1" parent="1">
+          <mxGeometry x="190" y="170" width="800" height="160" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-8" value="Related" style="swimlane;strokeColor=#999999;swimlaneFillColor=#FFFFFF;fillColor=#ffffff;fontColor=#008CFF;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=0;marginBottom=0;whiteSpace=wrap;html=1;fontSize=17;align=left;" vertex="1" parent="1">
+          <mxGeometry x="180" y="310" width="770" height="100" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-9" value="Item 1" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fillColor=none;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-8">
+          <mxGeometry y="30" width="770" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-10" value="Item 2" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;rSize=5;fillColor=none;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-8">
+          <mxGeometry y="50" width="770" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-11" value="Item 3" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;rSize=5;fillColor=#DDEEFF;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-8">
+          <mxGeometry y="70" width="770" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-13" value="" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fillColor=none;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-8">
+          <mxGeometry y="90" width="770" height="10" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-15" value="Linked Items" style="swimlane;strokeColor=#999999;swimlaneFillColor=#FFFFFF;fillColor=#ffffff;fontColor=#008CFF;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=0;marginBottom=0;whiteSpace=wrap;html=1;fontSize=17;align=left;" vertex="1" parent="1">
+          <mxGeometry x="180" y="420" width="770" height="100" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-16" value="Item 1" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fillColor=none;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-15">
+          <mxGeometry y="30" width="770" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-17" value="Item 2" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;rSize=5;fillColor=none;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-15">
+          <mxGeometry y="50" width="770" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-18" value="Item 3" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;rSize=5;fillColor=#DDEEFF;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-15">
+          <mxGeometry y="70" width="770" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-19" value="" style="text;spacing=0;strokeColor=none;align=left;verticalAlign=middle;spacingLeft=7;spacingRight=10;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;fillColor=none;fontColor=#666666;fontSize=17;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-15">
+          <mxGeometry y="90" width="770" height="10" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-20" value="xx added ticket X as blocking" style="verticalLabelPosition=bottom;shadow=0;dashed=0;align=left;html=1;verticalAlign=top;strokeWidth=1;shape=mxgraph.mockup.graphics.simpleIcon;strokeColor=#999999;spacing=-20;spacingRight=0;spacingLeft=50;" vertex="1" parent="1">
+          <mxGeometry x="200" y="540" width="20" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-21" value="xx added Device as related" style="verticalLabelPosition=bottom;shadow=0;dashed=0;align=left;html=1;verticalAlign=top;strokeWidth=1;shape=mxgraph.mockup.graphics.simpleIcon;strokeColor=#999999;spacing=-20;spacingRight=0;spacingLeft=50;" vertex="1" parent="1">
+          <mxGeometry x="200" y="580" width="20" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-22" value="" style="verticalLabelPosition=bottom;shadow=0;dashed=0;align=center;html=1;verticalAlign=top;strokeWidth=1;shape=mxgraph.mockup.navigation.scrollBar;strokeColor=#999999;barPos=20;fillColor2=#99ddff;strokeColor2=none;direction=north;" vertex="1" parent="1">
+          <mxGeometry x="980" y="310" width="20" height="720" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-32" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="200" y="620" width="750" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-29" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-32">
+          <mxGeometry width="750" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-30" value="XX replied on xx month year" style="rounded=0;whiteSpace=wrap;html=1;align=left;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-32">
+          <mxGeometry width="750" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-28" value="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&lt;div&gt;&lt;br/&gt;&lt;/div&gt;" style="text;spacingTop=-5;whiteSpace=wrap;html=1;align=left;fontSize=12;fontFamily=Helvetica;fillColor=none;strokeColor=none;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-32">
+          <mxGeometry x="10" y="30" width="730" height="77" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-33" value="" style="group" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="230" y="740" width="720" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-34" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-33">
+          <mxGeometry width="720" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-35" value="XX replied on xx month year" style="rounded=0;whiteSpace=wrap;html=1;align=left;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-33">
+          <mxGeometry width="720" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="RO_ATfNDEhmNTfwGVFBN-36" value="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.&lt;div&gt;&lt;br/&gt;&lt;/div&gt;" style="text;spacingTop=-5;whiteSpace=wrap;html=1;align=left;fontSize=12;fontFamily=Helvetica;fillColor=none;strokeColor=none;" vertex="1" parent="RO_ATfNDEhmNTfwGVFBN-33">
+          <mxGeometry x="9.6" y="30" width="700.8" height="77" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

docs/projects/centurion_erp/development/testing.md

@@ -8,14 +8,18 @@ about: https://gitlab.com/nofusscomputing/infrastructure/configuration-managemen
 
 Unit tests are written to aid in application stability and to assist in preventing regression bugs. As part of development the developer working on a Merge/Pull request is to ensure that tests are written. Failing to do so will more likely than not ensure that your Merge/Pull request is not merged.
 
-User Interface (UI) test are written to test the user interface to ensure that it functions as it should. Changes to the UI will need to be tested.
+User Interface (UI) test are written _if applicable_ to test the user interface to ensure that it functions as it should. Changes to the UI will need to be tested.
+
+In most cases functional tests will not need to be written, however you should confirm this with a maintainer.
+
+Integration tests **will** be required if the development introduces code that interacts with an independent third-party application.
 
 
 ## Writing Tests
 
 We use class based tests. Each class will require a `setUpTestData` method for test setup. To furhter assist in the writing of tests, we have written the test cases for common items as an abstract class. You are advised to review the [test cases](./api/tests/index.md) and if it's applicable to the item you have added, than add the test case class to be inherited by your test class.
 
-naming of test classes is in `CamelCase` in format `<Model Name><what's being tested>` for example the class name for device model history entry tests would be `DeviceHistory`.
+Naming of test classes is in `CamelCase` in format `<Model Name><what's being tested>` for example the class name for device model history entry tests would be `DeviceHistory`.
 
 Test setup is written in a method called `setUpTestData` and is to contain the setup for all tests within the test class.
 
@@ -51,22 +55,40 @@ class DeviceHistory(TestCase, HistoryEntry, HistoryEntryParentItem):
 
 Each module is to contain a tests directory of the model being tested with a single file for grouping of what is being tested. for items that depend upon a parent model, the test file is to be within the child-models test directory named with format `test_<model>_<parent app>_<parent model name>`
 
-_example file system structure for the device model that relies upon access app model organization, core app model history and model notes._
+_example file system structure showing the layout of the tests directory for a module_
 
 ``` text
-
+.
 ├── tests
-│   ├── <model name>
-│   │   ├── test_<model name>_access_organization.py
-│   │   ├── test_<model name>_api_permission.py
-│   │   ├── test_<model name>_core_history.py
-│   │   ├── test_<model name>_core_notes.py
-│   │   ├── test_<model name>_permission.py
-│   │   └── test_device.py
-
+│   ├── functional
+│   │   ├── __init__.py
+│   │   └── <model name>
+│   │       └── test_<model name>_a_tast_name.py
+│   ├── __init__.py
+│   ├── integration
+│   │   ├── __init__.py
+│   │   └── <model name>
+│   │       └── test_<model name>_a_tast_name.py
+│   ├── ui
+│   │   ├── __init__.py
+│   │   └── <model name>
+│   │       └── test_<model name>_a_tast_name.py
+│   └── unit
+│       ├── __init__.py
+│       └── <model name>
+│           ├── test_<model name>_api.py
+│           ├── test_<model name>_permission_api.py
+│           ├── test_<model name>_permission.py
+│           ├── test_<model name>_core_history.py
+│           ├── test_<model name>_history_permission.py
+│           ├── test_<model name>.py
+│           └── test_<model name>_views.py
 
 ```
 
+Tests are broken up into the type the test is (sub-directory to test), and they are `unit`, `functional`, `UI` and `integration`. These sub-directories each contain a sub-directory for each model they are testing.
+
+
 Items to test include, and are not limited to:
 
 - CRUD permissions admin site
@@ -105,6 +127,10 @@ Items to test include, and are not limited to:
 
     _applicable if notes are able to be added to an item._
 
+- API Fields
+
+    _Field exists, Type is checked_
+
 
 ## Running Tests
 

docs/projects/centurion_erp/index.md

@@ -8,15 +8,16 @@ about: https://gitlab.com/nofusscomputing/infrastructure/configuration-managemen
 
 <span style="text-align: center;">
 
-![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)
 
-![Gitlab build status - stable](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Stable%20Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2Fpipelines%3Fref%3Dmaster&logo=gitlab&style=plastic) ![Gitlab build status - development](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Dev%20Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F57560288%2Fpipelines%3Fref%3Ddevelopment&logo=gitlab&style=plastic)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/nofusscomputing/centurion_erp/ci.yaml?branch=master&style=plastic&logo=github&label=Stable%20Build&color=%23000) ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/nofusscomputing/centurion_erp/ci.yaml?branch=development&style=plastic&logo=github&label=Dev%20Build&color=%23000)
 
-![GitLab Issues](https://img.shields.io/gitlab/issues/open/nofusscomputing%2Fprojects%2Fcenturion_erp?style=plastic&logo=gitlab&label=Issues&color=fc6d26) [![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 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)
 
-![Gitlab Code Coverage](https://img.shields.io/gitlab/pipeline-coverage/nofusscomputing%2Fprojects%2Fcenturion_erp?branch=master&style=plastic&logo=gitlab&label=Test%20Coverage)
+![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)
 
-![Docker Pulls](https://img.shields.io/docker/pulls/nofusscomputing/centurion-erp?style=plastic&logo=docker&color=0db7ed)
+
+![Docker Pulls](https://img.shields.io/docker/pulls/nofusscomputing/centurion-erp?style=plastic&logo=docker&color=0db7ed) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/centurion-erp)](https://artifacthub.io/packages/container/centurion-erp/centurion-erp)
 
 </span>
 
@@ -27,6 +28,8 @@ Whilst there are many Enterprise Rescource Planning (ERP) applications, Centurio
 
 Centurion ERP contains the following modules:
 
+- [Companion Ansible Collection](../ansible/collections/centurion/index.md)
+
 - [Configuration Management](./user/config_management/index.md)
 
 - [IT Asset Management (ITAM)](./user/itam/index.md)

docs/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 relevent, 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 as required (delete task if n/a)
+
+<!-- dont remove tasks below strike through including the checkbox by enclosing in double tidle '~~' -->
+
+- [ ] :orange_circle: Related issue(s) closed via [commit message](https://www.conventionalcommits.org/en/v1.0.0) footer
+
+- [ ] :yellow_circle: Contains `breaking-change` Any Breaking change(s)? [commit message](https://www.conventionalcommits.org/en/v1.0.0)
+
+    _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/)._
+
+    - [ ] :memo: Release notes updated
+
+- [ ] :large_blue_circle: Documentation Documentation written
+
+    _All features to be documented within the correct section(s). Administration, Development and/or User_
+
+- [ ] Milestone assigned
+
+- [ ] :red_circle: [Unit Test(s) Written](https://nofusscomputing.com/projects/centurion_erp/development/testing/)
+
+    _ensure test coverage delta is not less than zero_

mkdocs.yml

@@ -3,8 +3,8 @@ INHERIT: website-template/mkdocs.yml
 docs_dir: 'docs'
 
 repo_name: Centurion ERP
-repo_url: https://gitlab.com/nofusscomputing/projects/centurion_erp
-edit_uri: '/-/ide/project/nofusscomputing/projects/centurion_erp/edit/development/-/docs/'
+repo_url: https://github.com/nofusscomputing/centurion_erp
+edit_uri: '/edit/development/docs/'
 
 plugins:
   mkdocstrings:

requirements.txt

@@ -1,4 +1,4 @@
-Django==5.0.7
+Django==5.0.8
 django-debug-toolbar==4.3.0
 social-auth-app-django==5.4.1