From 52dda2c9efcadd745c43329fe17be14459023a0b Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sat, 30 Mar 2024 23:05:08 +0000
Subject: [PATCH 01/15] WIP feature: Started adding quotas. Now how a working
 quotas list page

---
 assets/data/default_quota_limits.json         | 60 +++++++++++++
 backend/admin.py                              | 10 +++
 backend/api/base/modal.py                     |  9 +-
 backend/api/quotas/fetch.py                   | 22 +++++
 backend/api/quotas/urls.py                    | 13 +++
 backend/api/urls.py                           |  1 +
 backend/data/default_quota_limits.py          | 86 +++++++++++++++++++
 .../0027_quotalimit_quotaoverrides.py         | 49 +++++++++++
 backend/models.py                             | 42 ++++++++-
 backend/signals.py                            | 25 ++++--
 backend/urls.py                               |  3 +
 backend/utils.py                              |  1 -
 backend/views/core/quotas/view.py             | 11 +++
 frontend/templates/base/+left_drawer.html     |  7 ++
 .../modals/view_quota_limit_info.html         | 39 +++++++++
 .../templates/pages/quotas/_fetch_body.html   | 30 +++++++
 .../templates/pages/quotas/dashboard.html     | 24 ++++++
 frontend/templates/pages/quotas/list.html     | 25 ++++++
 18 files changed, 447 insertions(+), 10 deletions(-)
 create mode 100644 assets/data/default_quota_limits.json
 create mode 100644 backend/api/quotas/fetch.py
 create mode 100644 backend/api/quotas/urls.py
 create mode 100644 backend/data/default_quota_limits.py
 create mode 100644 backend/migrations/0027_quotalimit_quotaoverrides.py
 create mode 100644 backend/views/core/quotas/view.py
 create mode 100644 frontend/templates/modals/view_quota_limit_info.html
 create mode 100644 frontend/templates/pages/quotas/_fetch_body.html
 create mode 100644 frontend/templates/pages/quotas/dashboard.html
 create mode 100644 frontend/templates/pages/quotas/list.html

diff --git a/assets/data/default_quota_limits.json b/assets/data/default_quota_limits.json
new file mode 100644
index 00000000..ca1d34b4
--- /dev/null
+++ b/assets/data/default_quota_limits.json
@@ -0,0 +1,60 @@
+{
+  "invoices": {
+    "count": {
+      "name": "Creations per month",
+      "description": "Amount of invoice creations allowed per month",
+      "default_value": 100,
+      "adjustable": true
+    },
+    "schedules": {
+      "name": "Schedules per month",
+      "description": "Amount of invoice scheduled sends allowed per month",
+      "default_value": 100,
+      "adjustable": true
+    },
+    "access_codes": {
+      "name": "Access codes",
+      "description": " Amount of invoice access codes allowed per invoice",
+      "default_value": 3,
+      "adjustable": true
+    }
+  },
+  "receipts": {
+    "count": {
+      "Receipts stored per month": {
+        "name": "Receipts stored per month",
+        "description": "Amount of receipts stored per month",
+        "default_value": 100,
+        "adjustable": true
+      }
+    }
+  },
+  "clients": {
+    "count": {
+      "name": "Stored clients",
+      "description": "Amount of clients stored in total",
+      "default_value": 40,
+      "adjustable": true
+    }
+  },
+  "teams": {
+    "count": {
+      "name": "Created teams",
+      "description": "Amount of teams created in total",
+      "default_value": 3,
+      "adjustable": true
+    },
+    "joined": {
+      "name": "Joined teams",
+      "description": "Amount of teams joined in total",
+      "default_value": 5,
+      "adjustable": true
+    },
+    "user_count": {
+      "name": "Users per team",
+      "description": "Amount of users per team",
+      "default_value": 10,
+      "adjustable": true
+    }
+  }
+}
diff --git a/backend/admin.py b/backend/admin.py
index b936979c..a811326b 100644
--- a/backend/admin.py
+++ b/backend/admin.py
@@ -21,6 +21,8 @@
     VerificationCodes,
     APIKey,
     InvoiceOnetimeSchedule,
+    QuotaLimit,
+    QuotaOverrides
 )
 
 # from django.contrib.auth.models imp/ort User
@@ -45,9 +47,17 @@
         VerificationCodes,
         APIKey,
         InvoiceOnetimeSchedule,
+        QuotaOverrides
     ]
 )
 
+
+class QuotaLimitAdmin(admin.ModelAdmin):
+    readonly_fields = ["name", "slug"]
+
+
+admin.site.register(QuotaLimit, QuotaLimitAdmin)
+
 # admin.site.unregister(User)
 fields = list(UserAdmin.fieldsets)
 fields[0] = (None, {"fields": ("username", "password", "logged_in_as_team", "awaiting_email_verification")})
diff --git a/backend/api/base/modal.py b/backend/api/base/modal.py
index 24ad3606..fdb4dc90 100644
--- a/backend/api/base/modal.py
+++ b/backend/api/base/modal.py
@@ -1,7 +1,7 @@
 from django.http import HttpRequest, HttpResponseBadRequest
 from django.shortcuts import render
 
-from backend.models import UserSettings, Invoice, Team
+from backend.models import UserSettings, Invoice, Team, QuotaLimit
 
 
 # Still working on
@@ -51,6 +51,13 @@ def open_modal(request: HttpRequest, modal_name, context_type=None, context_valu
                         context["invoice"] = invoice
                 except Invoice.DoesNotExist:
                     ...
+            elif context_type == "quota":
+                try:
+                    quota = QuotaLimit.objects.prefetch_related("quota_overrides").get(slug=context_value)
+                    context["quota"] = quota
+                    context["current_limit"] = quota.get_quota_limit(user=request.user)
+                except QuotaLimit.DoesNotExist:
+                    ...
             else:
                 context[context_type] = context_value
 
diff --git a/backend/api/quotas/fetch.py b/backend/api/quotas/fetch.py
new file mode 100644
index 00000000..0642811c
--- /dev/null
+++ b/backend/api/quotas/fetch.py
@@ -0,0 +1,22 @@
+from django.db.models import Q
+from django.http import HttpRequest
+from django.shortcuts import render, redirect
+
+from backend.models import QuotaLimit
+
+
+def fetch_all_quotas(request: HttpRequest, group: str):
+    context = {}
+    if not request.htmx:
+        return redirect("quotas")
+
+    search_text = request.GET.get("search")
+
+    results = QuotaLimit.objects.filter(slug__startswith=group).prefetch_related("quota_overrides").order_by("-slug")
+
+    if search_text:
+        results = results.filter(Q(name__icontains=search_text))
+
+    quota_list = zip(results, [q.get_quota_limit(user=request.user) for q in results])
+    context.update({"quotas": quota_list})
+    return render(request, "pages/quotas/_fetch_body.html", context)
diff --git a/backend/api/quotas/urls.py b/backend/api/quotas/urls.py
new file mode 100644
index 00000000..d546b77e
--- /dev/null
+++ b/backend/api/quotas/urls.py
@@ -0,0 +1,13 @@
+from django.urls import path
+
+from . import fetch
+
+urlpatterns = [
+    path(
+        "fetch/<str:group>/",
+        fetch.fetch_all_quotas,
+        name="fetch",
+    )
+]
+
+app_name = "quotas"
diff --git a/backend/api/urls.py b/backend/api/urls.py
index 6a2d03d7..3eef0cc6 100644
--- a/backend/api/urls.py
+++ b/backend/api/urls.py
@@ -10,6 +10,7 @@
     path("settings/", include("backend.api.settings.urls")),
     path("products/", include("backend.api.products.urls")),
     path("currency_converter/", include("backend.api.currency_converter.urls")),
+    path("quotas/", include("backend.api.quotas.urls")),
     path("hc/", include("backend.api.healthcheck.urls")),
 ]
 
diff --git a/backend/data/default_quota_limits.py b/backend/data/default_quota_limits.py
new file mode 100644
index 00000000..11742f01
--- /dev/null
+++ b/backend/data/default_quota_limits.py
@@ -0,0 +1,86 @@
+from dataclasses import dataclass
+from typing import List
+
+
+@dataclass
+class QuotaItem:
+    slug: str
+    name: str
+    description: str
+    default_value: int
+    adjustable: bool
+
+
+@dataclass
+class QuotaGroup:
+    name: str
+    items: List[QuotaItem]
+
+
+default_quota_limits: List[QuotaGroup] = [
+    QuotaGroup("invoices", [
+        QuotaItem(
+            slug="count",
+            name="Creations per month",
+            description="Amount of invoices created per month",
+            default_value=100,
+            adjustable=True
+        ),
+        QuotaItem(
+            slug="schedules",
+            name="Schedules per month",
+            description="Amount of invoice scheduled sends allowed per month",
+            default_value=100,
+            adjustable=True
+        ),
+        QuotaItem(
+            slug="access_codes",
+            name="Created access codes",
+            description="Amount of invoice access codes allowed per invoice",
+            default_value=3,
+            adjustable=True
+        )
+    ]),
+    QuotaGroup("receipts", [
+        QuotaItem(
+            slug="count",
+            name="Created receipts",
+            description="Amount of receipts stored per month",
+            default_value=100,
+            adjustable=True
+        )
+    ]),
+
+    QuotaGroup("clients", [
+        QuotaItem(
+            slug="count",
+            name="Created clients",
+            description="Amount of clients stored in total",
+            default_value=40,
+            adjustable=True
+        )
+    ]),
+    QuotaGroup("teams", [
+        QuotaItem(
+            slug="count",
+            name="Created teams",
+            description="Amount of teams created in total",
+            default_value=3,
+            adjustable=True
+        ),
+        QuotaItem(
+            slug="joined",
+            name="Joined teams",
+            description="Amount of teams joined in total",
+            default_value=5,
+            adjustable=True
+        ),
+        QuotaItem(
+            slug="user_count",
+            name="Users per team",
+            description="Amount of users per team",
+            default_value=10,
+            adjustable=True
+        )
+    ])
+]
diff --git a/backend/migrations/0027_quotalimit_quotaoverrides.py b/backend/migrations/0027_quotalimit_quotaoverrides.py
new file mode 100644
index 00000000..b796b228
--- /dev/null
+++ b/backend/migrations/0027_quotalimit_quotaoverrides.py
@@ -0,0 +1,49 @@
+# Generated by Django 5.0.3 on 2024-03-30 22:49
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("backend", "0026_invoice_discount_amount_invoice_discount_percentage"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="QuotaLimit",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("slug", models.CharField(editable=False, max_length=100, unique=True)),
+                ("name", models.CharField(editable=False, max_length=100, unique=True)),
+                ("description", models.TextField(blank=True, max_length=500, null=True)),
+                ("value", models.IntegerField()),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                ("adjustable", models.BooleanField(default=True)),
+            ],
+            options={
+                "verbose_name": "Quota Limit",
+                "verbose_name_plural": "Quota Limits",
+            },
+        ),
+        migrations.CreateModel(
+            name="QuotaOverrides",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("value", models.IntegerField()),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "quota_limit",
+                    models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name="quota_overrides", to="backend.quotalimit"),
+                ),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                "verbose_name": "Quota Override",
+                "verbose_name_plural": "Quota Overrides",
+            },
+        ),
+    ]
diff --git a/backend/models.py b/backend/models.py
index 95438a9d..7d0dff78 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -544,9 +544,47 @@ class FeatureFlags(models.Model):
     value = models.BooleanField(default=False)
     updated_at = models.DateTimeField(auto_now=True)
 
+    class Meta:
+        verbose_name = "Feature Flag"
+        verbose_name_plural = "Feature Flags"
+
     def __str__(self):
         return self.name
 
+
+class QuotaLimit(models.Model):
+    slug = models.CharField(max_length=100, unique=True, editable=False)
+    name = models.CharField(max_length=100, unique=True, editable=False)
+    description = models.TextField(max_length=500, null=True, blank=True)
+    value = models.IntegerField()
+    updated_at = models.DateTimeField(auto_now=True)
+    adjustable = models.BooleanField(default=True)
+
     class Meta:
-        verbose_name = "Feature Flag"
-        verbose_name_plural = "Feature Flags"
+        verbose_name = "Quota Limit"
+        verbose_name_plural = "Quota Limits"
+
+    def __str__(self):
+        return self.name
+
+    def get_quota_limit(self, user: User):
+        try:
+            user_quota_override = self.quota_overrides.get(user=user)
+            return user_quota_override.value
+        except QuotaOverrides.DoesNotExist:
+            return self.value
+
+
+class QuotaOverrides(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    quota_limit = models.ForeignKey(QuotaLimit, on_delete=models.CASCADE, related_name="quota_overrides")
+    value = models.IntegerField()
+    updated_at = models.DateTimeField(auto_now=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        verbose_name = "Quota Override"
+        verbose_name_plural = "Quota Overrides"
+
+    def __str__(self):
+        return f"{self.user}"
diff --git a/backend/signals.py b/backend/signals.py
index 2dc8d5b4..0485f8ce 100644
--- a/backend/signals.py
+++ b/backend/signals.py
@@ -1,6 +1,8 @@
 from django.core.cache import cache
 from django.core.cache.backends.redis import RedisCacheClient
 
+from backend.data.default_quota_limits import default_quota_limits
+
 cache: RedisCacheClient = cache
 from django.core.files.storage import default_storage
 from django.db.models.signals import pre_save, post_delete, post_save, post_migrate
@@ -8,7 +10,7 @@
 from django.urls import reverse
 
 import settings.settings
-from backend.models import UserSettings, Receipt, User, FeatureFlags, VerificationCodes
+from backend.models import UserSettings, Receipt, User, FeatureFlags, VerificationCodes, QuotaLimit
 from settings.helpers import ARE_EMAILS_ENABLED, send_email
 
 
@@ -65,7 +67,6 @@ def delete_receipt_image_on_delete(sender, instance: Receipt, **kwargs):
     {"name": "isInvoiceSchedulingEnabled", "default": False, "pk": 2},
 ]
 
-
 def insert_initial_data(**kwargs):
     for feature in feature_flags:
         try:
@@ -76,6 +77,18 @@ def insert_initial_data(**kwargs):
             flag.value = feature.get("default")
             flag.save()
 
+    for group in default_quota_limits:
+        for item in group.items:
+            QuotaLimit.objects.get_or_create(
+                slug=f"{group.name}-{item.slug}",
+                defaults={
+                    "name": f"{item.name}",
+                    "value": item.default_value,
+                    "adjustable": item.adjustable,
+                    "description": item.description
+                }
+            )
+
 
 post_migrate.connect(insert_initial_data)
 
@@ -96,12 +109,12 @@ def send_welcome_email(sender, instance: User, created, **kwargs):
     if created:
         email_message = f"""
             Welcome to MyFinances{f", {instance.first_name}" if instance.first_name else ""}!
-            
+
             We're happy to have you join us. We are still in development and are still working on the core mechanics.
-            If you find any bugs with our software, create a bug report on our 
+            If you find any bugs with our software, create a bug report on our
             Github Issues (https://github.com/TreyWW/MyFinances/issues/new?assignees=&labels=bug&projects=&template=bug-report.md&title=%5BBUG%5D+)
             and we'll try to help debug the issue or squash the bug.
-            
+
             Thank you for using MyFinances.
         """
         if ARE_EMAILS_ENABLED:
@@ -114,7 +127,7 @@ def send_welcome_email(sender, instance: User, created, **kwargs):
             email_message += f"""
                 To start with, you must first **verify this email** so that we can link your account to this email.
                 Click the link below to activate your account, no details are required, once pressed you're all set!
-                
+
                 Verify Link: {magic_link_url}
             """
 
diff --git a/backend/urls.py b/backend/urls.py
index 3af88996..4b7c9e56 100644
--- a/backend/urls.py
+++ b/backend/urls.py
@@ -14,6 +14,7 @@
 from backend.views.core.currency_converter import dashboard as cc_dashboard
 from backend.views.core.invoices.overview import manage_invoice
 from backend.views.core.other.index import index, dashboard
+from backend.views.core.quotas.view import quotas_page, quotas_list
 
 url(
     r"^frontend/static/(?P<path>.*)$",
@@ -27,6 +28,8 @@
     path("dashboard/", dashboard, name="dashboard"),
     path("dashboard/settings/", settings_v.view.settings_page, name="user settings"),
     path("dashboard/invoices/", include("backend.views.core.invoices.urls")),
+                  path("dashboard/quotas/", quotas_page, name="quotas"),
+                  path("dashboard/quotas/<str:group>/", quotas_list, name="quotas group"),
     path(
         "dashboard/invoice/<str:invoice_id>/",
         manage_invoice,
diff --git a/backend/utils.py b/backend/utils.py
index 7bfa2238..24406f49 100644
--- a/backend/utils.py
+++ b/backend/utils.py
@@ -5,7 +5,6 @@
 
 from backend.models import FeatureFlags
 
-
 def get_feature_status(feature, should_use_cache=True):
     if should_use_cache:
         key = f"myfinances:feature_flag:{feature}"
diff --git a/backend/views/core/quotas/view.py b/backend/views/core/quotas/view.py
new file mode 100644
index 00000000..58ab1332
--- /dev/null
+++ b/backend/views/core/quotas/view.py
@@ -0,0 +1,11 @@
+from django.http import HttpResponse, HttpRequest
+
+from django.shortcuts import render
+
+
+def quotas_page(request: HttpRequest) -> HttpResponse:
+    return render(request, "pages/quotas/dashboard.html")
+
+
+def quotas_list(request: HttpRequest, group: str) -> HttpResponse:
+    return render(request, "pages/quotas/list.html", {"group": group})
diff --git a/frontend/templates/base/+left_drawer.html b/frontend/templates/base/+left_drawer.html
index af37b6a8..94b2b051 100644
--- a/frontend/templates/base/+left_drawer.html
+++ b/frontend/templates/base/+left_drawer.html
@@ -39,5 +39,12 @@
                    {% if request.resolver_match.url_name == i_url %}class="active"{% endif %}>Currency Converter</a>
             {% endwith %}
         </li>
+        <li>
+            {% with i_url="quotas" %}
+                <a href="{% url i_url %}"
+                   {% if request.resolver_match.url_name == i_url %}class="active"{% endif %}>Service Quotas
+                </a>
+            {% endwith %}
+        </li>
     </ul>
 </div>
diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
new file mode 100644
index 00000000..4f077895
--- /dev/null
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -0,0 +1,39 @@
+{% component_block "modal" start_open="true" %}
+    {% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
+    {% fill "title" %}
+        <h3 class="font-bold text-lg">
+            {{ quota.name }}
+        </h3>
+    {% endfill %}
+    {% fill "content" %}
+        <div class="p-4">
+            <h2 class="text-xl mb-2">Description</h2>
+            <p class="mb-4">{{ quota.description }}</p>
+
+            <div class="mb-4">
+                <h2>Applied account-level quota value</h2>
+                <p>{{ current_limit }}</p>
+            </div>
+
+            <div class="mb-4">
+                <h2>Default quota value</h2>
+                <p>{{ quota.value }}</p>
+            </div>
+
+            <div class="mb-4">
+                <h2>Adjustability</h2>
+                <p>{{ quota.adjustable }}</p>
+            </div>
+        </div>
+
+        <div class="modal-action">
+            <button type="button"
+                    _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
+                    class="btn">Close
+            </button>
+            {% if quota.adjustable %}
+                <button class="btn-disabled btn btn-primary">Request quota increase at account-level</button>
+            {% endif %}
+        </div>
+    {% endfill %}
+{% endcomponent_block %}
diff --git a/frontend/templates/pages/quotas/_fetch_body.html b/frontend/templates/pages/quotas/_fetch_body.html
new file mode 100644
index 00000000..28af8085
--- /dev/null
+++ b/frontend/templates/pages/quotas/_fetch_body.html
@@ -0,0 +1,30 @@
+<tbody id="table_body">
+{% for quota in quotas %}
+    <tr>
+        <td>
+            <button hx-trigger="click once"
+                    hx-swap="beforeend"
+                    hx-target="#modal_container"
+                    _="on click call modal_view_quota_limit_info_{{ quota.0.id }}.showModal()"
+                    hx-get="{% url "api:base:modal retrieve with context" context_type="quota" context_value=quota.0.slug modal_name="view_quota_limit_info" %}">
+                {{ quota.0.name }}
+            </button>
+        </td>
+        <td>
+            {{ quota.1 }}
+        </td>
+        <td>
+            {{ quota.0.value }}
+        </td>
+        <td>
+            {% if quota.0.adjustable %}
+                Account Level
+            {% else %}
+                Not adjustable
+            {% endif %}
+        </td>
+    </tr>
+{% empty %}
+    <td colspan="100%" class="text-center">No Quotas Found</td>
+{% endfor %}
+</tbody>
diff --git a/frontend/templates/pages/quotas/dashboard.html b/frontend/templates/pages/quotas/dashboard.html
new file mode 100644
index 00000000..6597e8f5
--- /dev/null
+++ b/frontend/templates/pages/quotas/dashboard.html
@@ -0,0 +1,24 @@
+{% extends 'base/base.html' %}
+{% block content %}
+    <div class="card w-full p-6 bg-base-100 shadow-xl mt-2">
+        <h2 class="text-xl">Service Quotas</h2>
+
+        <div class="grid grid-cols-3 gap-4 mt-8">
+            <a href="{% url "quotas group" group="invoices" %}" class="card p-6 bg-base-300 shadow-xl">
+                <h2 class="text-xl text-center">
+                    Invoices
+                </h2>
+            </a>
+            <a href="{% url "quotas group" group="clients" %}" class="card p-6 bg-base-300 shadow-xl">
+                <h2 class="text-xl text-center">
+                    Clients
+                </h2>
+            </a>
+            <a href="{% url "quotas group" group="teams" %}" class="card p-6 bg-base-300 shadow-xl">
+                <h2 class="text-xl text-center">
+                    Teams
+                </h2>
+            </a>
+        </div>
+    </div>
+{% endblock content %}
diff --git a/frontend/templates/pages/quotas/list.html b/frontend/templates/pages/quotas/list.html
new file mode 100644
index 00000000..f834dbec
--- /dev/null
+++ b/frontend/templates/pages/quotas/list.html
@@ -0,0 +1,25 @@
+{% extends 'base/base.html' %}
+{% block content %}
+    <div class="card w-full p-6 bg-base-100 shadow-xl mt-2">
+        <h2 class="text-xl">Service Quotas</h2>
+
+        <div class="flex w-full h-full overflow-x-hidden overflow-y-auto mt-8">
+            <table class="table">
+                <thead>
+                <tr>
+                    <th>Quota Name</th>
+                    <th>Applied account quota value</th>
+                    <th>Default quota value</th>
+                    <th>Adjustability</th>
+                </tr>
+                </thead>
+                <tbody id="table_body"
+                       hx-swap="outerHTML"
+                       hx-trigger="load"
+                       hx-get="{% url 'api:quotas:fetch' group=group %}">
+                {% include 'components/table/skeleton_rows.html' with rows=3 cols=5 %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+{% endblock content %}

From dd1c7e0a34d9bd47e3cd9c778fbe12a373d6e9e9 Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sat, 30 Mar 2024 23:07:16 +0000
Subject: [PATCH 02/15] WIP feature: Started adding quotas. Now how a working
 quotas list page

---
 frontend/templates/pages/quotas/_fetch_body.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/templates/pages/quotas/_fetch_body.html b/frontend/templates/pages/quotas/_fetch_body.html
index 28af8085..dfdf3c4a 100644
--- a/frontend/templates/pages/quotas/_fetch_body.html
+++ b/frontend/templates/pages/quotas/_fetch_body.html
@@ -5,6 +5,8 @@
             <button hx-trigger="click once"
                     hx-swap="beforeend"
                     hx-target="#modal_container"
+                    class="link link-primary"
+                    title="{{ quota.0.description }}"
                     _="on click call modal_view_quota_limit_info_{{ quota.0.id }}.showModal()"
                     hx-get="{% url "api:base:modal retrieve with context" context_type="quota" context_value=quota.0.slug modal_name="view_quota_limit_info" %}">
                 {{ quota.0.name }}

From bd0e26727ff927ce3af3dba443b4d8410aff3437 Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 14:13:26 +0100
Subject: [PATCH 03/15] WIP feature: Added quota usage

---
 backend/admin.py                              |  6 +-
 backend/api/quotas/fetch.py                   | 14 +++-
 backend/data/default_quota_limits.py          | 11 ++-
 backend/decorators.py                         | 29 ++++++++
 ...7_quotalimit_quotaoverrides_quotausage.py} | 34 ++++++++-
 backend/models.py                             | 74 +++++++++++++++++++
 backend/signals.py                            |  3 +-
 .../templates/pages/quotas/_fetch_body.html   | 17 +++--
 frontend/templates/pages/quotas/list.html     |  1 +
 9 files changed, 174 insertions(+), 15 deletions(-)
 rename backend/migrations/{0027_quotalimit_quotaoverrides.py => 0027_quotalimit_quotaoverrides_quotausage.py} (57%)

diff --git a/backend/admin.py b/backend/admin.py
index a811326b..2669cfa7 100644
--- a/backend/admin.py
+++ b/backend/admin.py
@@ -22,7 +22,8 @@
     APIKey,
     InvoiceOnetimeSchedule,
     QuotaLimit,
-    QuotaOverrides
+    QuotaOverrides,
+    QuotaUsage
 )
 
 # from django.contrib.auth.models imp/ort User
@@ -47,7 +48,8 @@
         VerificationCodes,
         APIKey,
         InvoiceOnetimeSchedule,
-        QuotaOverrides
+        QuotaOverrides,
+        QuotaUsage
     ]
 )
 
diff --git a/backend/api/quotas/fetch.py b/backend/api/quotas/fetch.py
index 0642811c..69aa93d8 100644
--- a/backend/api/quotas/fetch.py
+++ b/backend/api/quotas/fetch.py
@@ -12,11 +12,19 @@ def fetch_all_quotas(request: HttpRequest, group: str):
 
     search_text = request.GET.get("search")
 
-    results = QuotaLimit.objects.filter(slug__startswith=group).prefetch_related("quota_overrides").order_by("-slug")
+    results = QuotaLimit.objects.filter(slug__startswith=group).prefetch_related("quota_overrides", "quota_usage").order_by("-slug")
 
     if search_text:
         results = results.filter(Q(name__icontains=search_text))
 
-    quota_list = zip(results, [q.get_quota_limit(user=request.user) for q in results])
-    context.update({"quotas": quota_list})
+    quotas = [
+        {
+            "quota_limit": ql.get_quota_limit(request.user),
+            "period_usage": ql.get_period_usage(request.user),
+            "quota_object": ql,
+        }
+        for ql in results
+    ]
+
+    context.update({"quotas": quotas})
     return render(request, "pages/quotas/_fetch_body.html", context)
diff --git a/backend/data/default_quota_limits.py b/backend/data/default_quota_limits.py
index 11742f01..0ade9b97 100644
--- a/backend/data/default_quota_limits.py
+++ b/backend/data/default_quota_limits.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import List
+from typing import List, Literal
 
 
 @dataclass
@@ -9,6 +9,7 @@ class QuotaItem:
     description: str
     default_value: int
     adjustable: bool
+    period: Literal["forever", "per_month", "per_day", "per_client", "per_invoice", "per_team"]
 
 
 @dataclass
@@ -24,6 +25,7 @@ class QuotaGroup:
             name="Creations per month",
             description="Amount of invoices created per month",
             default_value=100,
+            period="per_month",
             adjustable=True
         ),
         QuotaItem(
@@ -31,6 +33,7 @@ class QuotaGroup:
             name="Schedules per month",
             description="Amount of invoice scheduled sends allowed per month",
             default_value=100,
+            period="per_month",
             adjustable=True
         ),
         QuotaItem(
@@ -38,6 +41,7 @@ class QuotaGroup:
             name="Created access codes",
             description="Amount of invoice access codes allowed per invoice",
             default_value=3,
+            period="per_invoice",
             adjustable=True
         )
     ]),
@@ -47,6 +51,7 @@ class QuotaGroup:
             name="Created receipts",
             description="Amount of receipts stored per month",
             default_value=100,
+            period="per_month",
             adjustable=True
         )
     ]),
@@ -57,6 +62,7 @@ class QuotaGroup:
             name="Created clients",
             description="Amount of clients stored in total",
             default_value=40,
+            period="forever",
             adjustable=True
         )
     ]),
@@ -66,6 +72,7 @@ class QuotaGroup:
             name="Created teams",
             description="Amount of teams created in total",
             default_value=3,
+            period="forever",
             adjustable=True
         ),
         QuotaItem(
@@ -73,6 +80,7 @@ class QuotaGroup:
             name="Joined teams",
             description="Amount of teams joined in total",
             default_value=5,
+            period="forever",
             adjustable=True
         ),
         QuotaItem(
@@ -80,6 +88,7 @@ class QuotaGroup:
             name="Users per team",
             description="Amount of users per team",
             default_value=10,
+            period="per_team",
             adjustable=True
         )
     ])
diff --git a/backend/decorators.py b/backend/decorators.py
index 0072731b..c2ddb8eb 100644
--- a/backend/decorators.py
+++ b/backend/decorators.py
@@ -1,9 +1,11 @@
 from functools import wraps
+from typing import Optional
 
 from django.contrib import messages
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect, render
 
+from backend.models import QuotaLimit
 from backend.utils import get_feature_status
 
 
@@ -61,5 +63,32 @@ def wrapper(request, *args, **kwargs):
     return decorator
 
 
+def quota_usage_check(limit: str | QuotaLimit, extra_data: Optional[str | int] = None, api=False, htmx=False):
+    def decorator(view_func):
+        @wraps(view_func)
+        def wrapper(request, *args, **kwargs):
+            try:
+                quota_limit = QuotaLimit.objects.get(slug=limit) if isinstance(limit, str) else limit
+            except QuotaLimit.DoesNotExist:
+                return view_func(request, *args, **kwargs)
+
+            print(quota_limit.strict_goes_above_limit(request.user, extra=extra_data))
+
+            if not quota_limit.strict_goes_above_limit(request.user, extra=extra_data):
+                return view_func(request, *args, **kwargs)
+
+            if api and htmx:
+                messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
+                return render(request, "base/toasts.html")
+            elif api:
+                return HttpResponse(status=403, content="fYou have reached the quota limit for this service '{quota_limit.slug}'")
+            messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
+            return HttpResponseRedirect(request.META.get("HTTP_REFERER"))
+
+        return wrapper
+
+    return decorator
+
+
 not_logged_in = not_authenticated
 logged_out = not_authenticated
diff --git a/backend/migrations/0027_quotalimit_quotaoverrides.py b/backend/migrations/0027_quotalimit_quotaoverrides_quotausage.py
similarity index 57%
rename from backend/migrations/0027_quotalimit_quotaoverrides.py
rename to backend/migrations/0027_quotalimit_quotaoverrides_quotausage.py
index b796b228..cb0552bc 100644
--- a/backend/migrations/0027_quotalimit_quotaoverrides.py
+++ b/backend/migrations/0027_quotalimit_quotaoverrides_quotausage.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-03-30 22:49
+# Generated by Django 5.0.3 on 2024-03-31 13:12
 
 import django.db.models.deletion
 from django.conf import settings
@@ -22,6 +22,21 @@ class Migration(migrations.Migration):
                 ("value", models.IntegerField()),
                 ("updated_at", models.DateTimeField(auto_now=True)),
                 ("adjustable", models.BooleanField(default=True)),
+                (
+                    "limit_type",
+                    models.CharField(
+                        choices=[
+                            ("per_month", "Per Month"),
+                            ("per_day", "Per Day"),
+                            ("per_client", "Per Client"),
+                            ("per_invoice", "Per Invoice"),
+                            ("per_team", "Per Team"),
+                            ("forever", "Forever"),
+                        ],
+                        default="per_month",
+                        max_length=20,
+                    ),
+                ),
             ],
             options={
                 "verbose_name": "Quota Limit",
@@ -46,4 +61,21 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "Quota Overrides",
             },
         ),
+        migrations.CreateModel(
+            name="QuotaUsage",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("extra_data", models.IntegerField(blank=True, null=True)),
+                (
+                    "quota_limit",
+                    models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name="quota_usage", to="backend.quotalimit"),
+                ),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                "verbose_name": "Quota Usage",
+                "verbose_name_plural": "Quota Usage",
+            },
+        ),
     ]
diff --git a/backend/models.py b/backend/models.py
index 7d0dff78..310ec03d 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -1,4 +1,6 @@
+from datetime import datetime
 from decimal import Decimal
+from typing import Optional
 from uuid import uuid4
 
 from django.contrib.auth.hashers import make_password, check_password
@@ -553,12 +555,21 @@ def __str__(self):
 
 
 class QuotaLimit(models.Model):
+    class LimitTypes(models.TextChoices):
+        PER_MONTH = "per_month"
+        PER_DAY = "per_day"
+        PER_CLIENT = "per_client"
+        PER_INVOICE = "per_invoice"
+        PER_TEAM = "per_team"
+        FOREVER = "forever"
+
     slug = models.CharField(max_length=100, unique=True, editable=False)
     name = models.CharField(max_length=100, unique=True, editable=False)
     description = models.TextField(max_length=500, null=True, blank=True)
     value = models.IntegerField()
     updated_at = models.DateTimeField(auto_now=True)
     adjustable = models.BooleanField(default=True)
+    limit_type = models.CharField(max_length=20, choices=LimitTypes.choices, default=LimitTypes.PER_MONTH)
 
     class Meta:
         verbose_name = "Quota Limit"
@@ -574,6 +585,33 @@ def get_quota_limit(self, user: User):
         except QuotaOverrides.DoesNotExist:
             return self.value
 
+    def get_period_usage(self, user: User):
+        if self.limit_type == "forever":
+            return self.quota_usage.filter(user=user, quota_limit=self).count()
+        elif self.limit_type == "per_month":
+            return self.quota_usage.filter(user=user, quota_limit=self, created_at__month=datetime.now().month).count()
+        elif self.limit_type == "per_day":
+            return self.quota_usage.filter(user=user, quota_limit=self, created_at__day=datetime.now().day).count()
+        else:
+            return "Not available"
+
+    def strict_goes_above_limit(self, user: User, extra: Optional[str | int] = None) -> bool:
+        current = None
+        if self.limit_type == "forever":
+            current = self.quota_usage.filter(user=user, quota_limit=self).count()
+        elif self.limit_type == "per_month":
+            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__month=datetime.now().month).count()
+        elif self.limit_type == "per_day":
+            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__day=datetime.now().day).count()
+        elif self.limit_type == "per_client":
+            current = self.quota_usage.filter(user=user, quota_limit=self,
+                                              extra_data__exact=extra).count()
+        elif self.limit_type == "per_invoice":
+            current = self.quota_usage.filter(user=user, quota_limit=self,
+                                              extra_data__exact=extra).count()
+
+        return current >= self.get_quota_limit(user) if current else False
+
 
 class QuotaOverrides(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
@@ -588,3 +626,39 @@ class Meta:
 
     def __str__(self):
         return f"{self.user}"
+
+
+class QuotaUsage(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    quota_limit = models.ForeignKey(QuotaLimit, on_delete=models.CASCADE, related_name="quota_usage")
+    created_at = models.DateTimeField(auto_now_add=True)
+    extra_data = models.IntegerField(null=True, blank=True)  # id of Limit Type
+
+    class Meta:
+        verbose_name = "Quota Usage"
+        verbose_name_plural = "Quota Usage"
+
+    def __str__(self):
+        return f"{self.user} quota usage for {self.quota_limit_id}"
+
+    @classmethod
+    def create_str(cls, user: User, limit: str | QuotaLimit, extra_data: Optional[str | int] = None):
+        try:
+            quota_limit = limit if isinstance(limit, QuotaLimit) else QuotaLimit.objects.get(slug=limit)
+        except QuotaLimit.DoesNotExist:
+            return "Not Found"
+
+        return cls.objects.create(
+            user=user,
+            quota_limit=quota_limit,
+            extra_data=extra_data
+        )
+
+    @classmethod
+    def get_usage(self, user: User, limit: str | QuotaLimit):
+        try:
+            ql: QuotaLimit = QuotaLimit.objects.get(slug=limit) if isinstance(limit, str) else limit
+        except QuotaLimit.DoesNotExist:
+            return "Not Found"
+
+        return self.objects.filter(user=user, quota_limit=ql).count()
diff --git a/backend/signals.py b/backend/signals.py
index 0485f8ce..a435845b 100644
--- a/backend/signals.py
+++ b/backend/signals.py
@@ -85,7 +85,8 @@ def insert_initial_data(**kwargs):
                     "name": f"{item.name}",
                     "value": item.default_value,
                     "adjustable": item.adjustable,
-                    "description": item.description
+                    "description": item.description,
+                    "limit_type": item.period
                 }
             )
 
diff --git a/frontend/templates/pages/quotas/_fetch_body.html b/frontend/templates/pages/quotas/_fetch_body.html
index dfdf3c4a..a181bb12 100644
--- a/frontend/templates/pages/quotas/_fetch_body.html
+++ b/frontend/templates/pages/quotas/_fetch_body.html
@@ -6,20 +6,23 @@
                     hx-swap="beforeend"
                     hx-target="#modal_container"
                     class="link link-primary"
-                    title="{{ quota.0.description }}"
-                    _="on click call modal_view_quota_limit_info_{{ quota.0.id }}.showModal()"
-                    hx-get="{% url "api:base:modal retrieve with context" context_type="quota" context_value=quota.0.slug modal_name="view_quota_limit_info" %}">
-                {{ quota.0.name }}
+                    title="{{ quota.quota_object.description }}"
+                    _="on click call modal_view_quota_limit_info_{{ quota.quota_object.id }}.showModal()"
+                    hx-get="{% url "api:base:modal retrieve with context" context_type="quota" context_value=quota.quota_object.slug modal_name="view_quota_limit_info" %}">
+                {{ quota.quota_object.name }}
             </button>
         </td>
         <td>
-            {{ quota.1 }}
+            {{ quota.period_usage }}
         </td>
         <td>
-            {{ quota.0.value }}
+            {{ quota.quota_limit }}
         </td>
         <td>
-            {% if quota.0.adjustable %}
+            {{ quota.quota_object.value }}
+        </td>
+        <td>
+            {% if quota.quota_object.adjustable %}
                 Account Level
             {% else %}
                 Not adjustable
diff --git a/frontend/templates/pages/quotas/list.html b/frontend/templates/pages/quotas/list.html
index f834dbec..aa0c1a81 100644
--- a/frontend/templates/pages/quotas/list.html
+++ b/frontend/templates/pages/quotas/list.html
@@ -8,6 +8,7 @@ <h2 class="text-xl">Service Quotas</h2>
                 <thead>
                 <tr>
                     <th>Quota Name</th>
+                    <th>Current usage</th>
                     <th>Applied account quota value</th>
                     <th>Default quota value</th>
                     <th>Adjustability</th>

From eedaac75c211555635589f175ce8af6261cfd5bb Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 18:06:34 +0100
Subject: [PATCH 04/15] fix: Fixed receipt not being deleted on first delete

---
 backend/signals.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/signals.py b/backend/signals.py
index a435845b..20176e80 100644
--- a/backend/signals.py
+++ b/backend/signals.py
@@ -5,7 +5,7 @@
 
 cache: RedisCacheClient = cache
 from django.core.files.storage import default_storage
-from django.db.models.signals import pre_save, post_delete, post_save, post_migrate
+from django.db.models.signals import pre_save, post_delete, post_save, post_migrate, pre_delete
 from django.dispatch import receiver
 from django.urls import reverse
 
@@ -36,8 +36,8 @@ def set_profile_picture_to_none(sender, instance, **kwargs):
         instance.profile_picture.delete(save=False)
 
 
-@receiver(post_delete, sender=Receipt)
-def set_profile_picture_to_none(sender, instance, **kwargs):
+@receiver(pre_delete, sender=Receipt)
+def delete_old_receipts(sender, instance, **kwargs):
     # Check if the file exists in the storage
     if instance.image and default_storage.exists(instance.image.name):
         instance.image.delete(save=False)

From 1cbbd6a018f85465550914c46a9ae3f2c99ef84b Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 18:07:00 +0100
Subject: [PATCH 05/15] WIP Feature: Added quotas for invoices and receipts

---
 backend/admin.py                              |  8 ++-
 backend/api/invoices/delete.py                | 10 ++--
 backend/api/receipts/delete.py                |  4 +-
 backend/api/receipts/new.py                   |  7 ++-
 backend/decorators.py                         | 19 +++++--
 backend/models.py                             | 57 +++++++++++++++----
 backend/utils.py                              | 33 ++++++++++-
 backend/views/core/invoices/create.py         | 10 +++-
 backend/views/core/invoices/manage_access.py  | 14 ++++-
 frontend/templates/base/toast.html            |  1 +
 .../invoices/manage_access/_table_row.html    |  2 +-
 .../templates/pages/quotas/_fetch_body.html   |  1 +
 .../templates/pages/quotas/dashboard.html     |  5 ++
 13 files changed, 137 insertions(+), 34 deletions(-)
 create mode 100644 frontend/templates/base/toast.html

diff --git a/backend/admin.py b/backend/admin.py
index 2669cfa7..2cb9813e 100644
--- a/backend/admin.py
+++ b/backend/admin.py
@@ -23,7 +23,9 @@
     InvoiceOnetimeSchedule,
     QuotaLimit,
     QuotaOverrides,
-    QuotaUsage
+    QuotaUsage,
+    Receipt,
+    ReceiptDownloadToken
 )
 
 # from django.contrib.auth.models imp/ort User
@@ -49,7 +51,9 @@
         APIKey,
         InvoiceOnetimeSchedule,
         QuotaOverrides,
-        QuotaUsage
+        QuotaUsage,
+        Receipt,
+        ReceiptDownloadToken
     ]
 )
 
diff --git a/backend/api/invoices/delete.py b/backend/api/invoices/delete.py
index 0074dbcf..3cf644f8 100644
--- a/backend/api/invoices/delete.py
+++ b/backend/api/invoices/delete.py
@@ -5,7 +5,7 @@
 from django.urls.exceptions import Resolver404
 from django.views.decorators.http import require_http_methods
 
-from backend.models import Invoice
+from backend.models import Invoice, QuotaLimit
 
 
 @require_http_methods(["DELETE"])
@@ -20,16 +20,14 @@ def delete_invoice(request: HttpRequest):
     except Invoice.DoesNotExist:
         return JsonResponse({"message": "Invoice not found"}, status=404)
 
-    if not invoice.user.logged_in_as_team and invoice.user != request.user:
+    if not invoice.has_access(request.user):
         return JsonResponse({"message": "You do not have permission to delete this invoice"}, status=404)
 
-    if invoice.user.logged_in_as_team and invoice.organization != request.user.logged_in_as_team:
-        return JsonResponse({"message": "You do not have permission to delete this invoice"}, status=404)
+    QuotaLimit.delete_quota_usage("invoices-count", request.user, invoice.id, invoice.date_created)
 
     invoice.delete()
 
     if request.htmx:
-        print("should send msg")
         if not redirect:
             messages.success(request, "Invoice deleted")
             return render(request, "base/toasts.html")
@@ -40,6 +38,6 @@ def delete_invoice(request: HttpRequest):
             response["HX-Location"] = redirect
             return response
         except Resolver404:
-            ...
+            return HttpResponseRedirect(reverse("dashboard"))
 
     return JsonResponse({"message": "Invoice successfully deleted"}, status=200)
diff --git a/backend/api/receipts/delete.py b/backend/api/receipts/delete.py
index 55ebe036..33a9a397 100644
--- a/backend/api/receipts/delete.py
+++ b/backend/api/receipts/delete.py
@@ -5,7 +5,6 @@
 from django.views.decorators.http import require_http_methods
 
 from backend.models import Receipt
-from django.db.models import Q
 
 
 @require_http_methods(["DELETE"])
@@ -20,6 +19,9 @@ def receipt_delete(request: HttpRequest, id: int):
     elif receipt.user != request.user:
         return JsonResponse(status=403, data={"message": "Forbidden"})
 
+    # QuotaLimit.delete_quota_usage("receipts-count", request.user, receipt.id, receipt.date_uploaded) # Don't want to delete receipts
+    # from records because it does cost us PER receipt. So makes sense not to allow Upload, delete, upload .. etc
+
     receipt.delete()
     messages.success(request, "Receipt deleted")
     return render(
diff --git a/backend/api/receipts/new.py b/backend/api/receipts/new.py
index 989c8694..9c5df029 100644
--- a/backend/api/receipts/new.py
+++ b/backend/api/receipts/new.py
@@ -1,14 +1,15 @@
 from django.contrib import messages
-from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest, HttpResponseBadRequest
 from django.shortcuts import render, redirect
 from django.views.decorators.http import require_http_methods
 
-from backend.models import Receipt
+from backend.decorators import quota_usage_check
+from backend.models import Receipt, QuotaUsage
 
 
 @require_http_methods(["POST"])
+@quota_usage_check("receipts-count", api=True, htmx=True)
 @login_required
 def receipt_create(request: HttpRequest):
     if not request.htmx:
@@ -42,12 +43,14 @@ def receipt_create(request: HttpRequest):
         total_price=total_price,
     )
 
+
     if request.user.logged_in_as_team:
         receipt.organization = request.user.logged_in_as_team
     else:
         receipt.user = request.user
 
     receipt.save()
+    QuotaUsage.create_str(request.user, "receipts-count", receipt.id)
     # r = requests.post(
     #     "https://ocr.asprise.com/api/receipt",
     #     data={
diff --git a/backend/decorators.py b/backend/decorators.py
index c2ddb8eb..60c32ba0 100644
--- a/backend/decorators.py
+++ b/backend/decorators.py
@@ -4,6 +4,7 @@
 from django.contrib import messages
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect, render
+from django.urls import reverse
 
 from backend.models import QuotaLimit
 from backend.utils import get_feature_status
@@ -56,7 +57,11 @@ def wrapper(request, *args, **kwargs):
             elif api:
                 return HttpResponse(status=403, content="This feature is currently disabled.")
             messages.error(request, "This feature is currently disabled.")
-            return HttpResponseRedirect(request.META.get("HTTP_REFERER"))
+            referer = request.META.get("HTTP_REFERER")
+            current_url = request.build_absolute_uri()
+            if referer != current_url:
+                return HttpResponseRedirect(referer)
+            return HttpResponseRedirect(reverse("dashboard"))
 
         return wrapper
 
@@ -72,18 +77,20 @@ def wrapper(request, *args, **kwargs):
             except QuotaLimit.DoesNotExist:
                 return view_func(request, *args, **kwargs)
 
-            print(quota_limit.strict_goes_above_limit(request.user, extra=extra_data))
-
             if not quota_limit.strict_goes_above_limit(request.user, extra=extra_data):
                 return view_func(request, *args, **kwargs)
 
             if api and htmx:
                 messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
-                return render(request, "base/toasts.html")
+                return render(request, "base/toast.html")
             elif api:
-                return HttpResponse(status=403, content="fYou have reached the quota limit for this service '{quota_limit.slug}'")
+                return HttpResponse(status=403, content=f"You have reached the quota limit for this service '{quota_limit.slug}'")
             messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
-            return HttpResponseRedirect(request.META.get("HTTP_REFERER"))
+            referer = request.META.get("HTTP_REFERER")
+            current_url = request.build_absolute_uri()
+            if referer != current_url:
+                return HttpResponseRedirect(referer)
+            return HttpResponseRedirect(reverse("dashboard"))
 
         return wrapper
 
diff --git a/backend/models.py b/backend/models.py
index 310ec03d..ba89416c 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Optional
+from typing import Optional, NoReturn, Union
 from uuid import uuid4
 
 from django.contrib.auth.hashers import make_password, check_password
@@ -596,21 +596,56 @@ def get_period_usage(self, user: User):
             return "Not available"
 
     def strict_goes_above_limit(self, user: User, extra: Optional[str | int] = None) -> bool:
+        current = self.strict_get_quotas(user, extra)
+        current = current.count() if current else None
+        return current >= self.get_quota_limit(user) if current else False
+
+    def strict_get_quotas(self, user: User, extra: Optional[str | int] = None):
         current = None
         if self.limit_type == "forever":
-            current = self.quota_usage.filter(user=user, quota_limit=self).count()
+            current = self.quota_usage.filter(user=user, quota_limit=self)
         elif self.limit_type == "per_month":
-            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__month=datetime.now().month).count()
+            current_month = timezone.now().month
+            current_year = timezone.now().year
+            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month)
         elif self.limit_type == "per_day":
-            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__day=datetime.now().day).count()
-        elif self.limit_type == "per_client":
-            current = self.quota_usage.filter(user=user, quota_limit=self,
-                                              extra_data__exact=extra).count()
-        elif self.limit_type == "per_invoice":
-            current = self.quota_usage.filter(user=user, quota_limit=self,
-                                              extra_data__exact=extra).count()
+            current_day = timezone.now().day
+            current_month = timezone.now().month
+            current_year = timezone.now().year
+            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month,
+                                              created_at__day=current_day)
+        elif self.limit_type in ["per_client", "per_invoice"]:
+            current = self.quota_usage.filter(user=user, quota_limit=self, extra_data__exact=extra)
+        return current
 
-        return current >= self.get_quota_limit(user) if current else False
+    @classmethod
+    def delete_quota_usage(cls, quota_limit: Union[str, "QuotaLimit"], user: User, extra, timestamp=None) -> NoReturn:
+        quota_limit = cls.objects.get(slug=quota_limit) if isinstance(quota_limit, str) else quota_limit
+
+        all_usages = quota_limit.strict_get_quotas(user, extra)
+
+        if all_usages.count() > 1 and timestamp:
+            earliest: QuotaUsage = all_usages.filter(created_at__gte=timestamp).order_by("created_at").first()
+            latest: QuotaUsage = all_usages.filter(created_at__lte=timestamp).order_by("created_at").last()
+
+            if earliest and latest:
+                time_until_soonest_obj = abs(earliest.created_at - timestamp)
+                time_since_most_recent_obj = abs(latest.created_at - timestamp)
+                if time_until_soonest_obj < time_since_most_recent_obj:
+                    closest_obj = earliest
+                else:
+                    closest_obj = latest
+
+            if earliest and latest and closest_obj:
+                closest_obj.delete()
+        elif all_usages.count() > 1:
+            earliest = all_usages.order_by("created_at").first()
+            if earliest:
+                earliest.delete()
+        else:
+            first = all_usages.first()
+            if first:
+                first.delete()
 
 
 class QuotaOverrides(models.Model):
diff --git a/backend/utils.py b/backend/utils.py
index 24406f49..6b810604 100644
--- a/backend/utils.py
+++ b/backend/utils.py
@@ -1,9 +1,16 @@
+from typing import Optional
+
+from django.contrib import messages
 from django.core.cache import cache
 from django.core.cache.backends.redis import RedisCacheClient
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render
+from django.urls import reverse
 
 cache: RedisCacheClient = cache
 
-from backend.models import FeatureFlags
+from backend.models import FeatureFlags, QuotaLimit
+
 
 def get_feature_status(feature, should_use_cache=True):
     if should_use_cache:
@@ -19,3 +26,27 @@ def get_feature_status(feature, should_use_cache=True):
         return value.value
     else:
         return False
+
+
+def quota_usage_check_under(
+    request, limit: str | QuotaLimit, extra_data: Optional[str | int] = None, api=False, htmx=False
+) -> bool | HttpResponse | HttpResponseRedirect:
+    try:
+        quota_limit = QuotaLimit.objects.get(slug=limit) if isinstance(limit, str) else limit
+    except QuotaLimit.DoesNotExist:
+        return True
+
+    if not quota_limit.strict_goes_above_limit(request.user, extra=extra_data):
+        return True
+
+    if api and htmx:
+        messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
+        return render(request, "base/toast.html")
+    elif api:
+        return HttpResponse(status=403, content=f"You have reached the quota limit for this service '{quota_limit.slug}'")
+    messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
+    referer = request.META.get("HTTP_REFERER")
+    current_url = request.build_absolute_uri()
+    if referer != current_url:
+        return HttpResponseRedirect(referer)
+    return HttpResponseRedirect(reverse("dashboard"))
diff --git a/backend/views/core/invoices/create.py b/backend/views/core/invoices/create.py
index d9fbfdc3..c02e99de 100644
--- a/backend/views/core/invoices/create.py
+++ b/backend/views/core/invoices/create.py
@@ -5,10 +5,15 @@
 from django.shortcuts import render, redirect
 from django.views.decorators.http import require_http_methods
 
-from backend.models import Invoice, InvoiceItem, Client, InvoiceProduct
+from backend.decorators import quota_usage_check
+from backend.models import Invoice, InvoiceItem, Client, InvoiceProduct, QuotaUsage
+from backend.utils import quota_usage_check_under
 
 
 def invoice_page_get(request: HttpRequest):
+    check_usage = quota_usage_check_under(request, "invoices-count")
+    if not isinstance(check_usage, bool):
+        return check_usage
     context = {
         "clients": Client.objects.filter(user=request.user),
         "existing_products": InvoiceProduct.objects.filter(user=request.user),
@@ -16,6 +21,7 @@ def invoice_page_get(request: HttpRequest):
     return render(request, "pages/invoices/create/create.html", context)
 
 
+@quota_usage_check("invoices-count")
 def invoice_page_post(request: HttpRequest):
     invoice_items = [
         InvoiceItem.objects.create(name=row[0], description=row[1], hours=row[2], price_per_hour=row[3])
@@ -78,6 +84,8 @@ def invoice_page_post(request: HttpRequest):
     invoice.save()
     invoice.items.set(invoice_items)
 
+    QuotaUsage.create_str(request.user, "invoices-count", invoice.id)
+
     return redirect("invoices:dashboard")
 
 
diff --git a/backend/views/core/invoices/manage_access.py b/backend/views/core/invoices/manage_access.py
index 518f84ba..f6854309 100644
--- a/backend/views/core/invoices/manage_access.py
+++ b/backend/views/core/invoices/manage_access.py
@@ -2,7 +2,8 @@
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, render
 
-from backend.models import Invoice, InvoiceURL
+from backend.decorators import quota_usage_check
+from backend.models import Invoice, InvoiceURL, QuotaUsage, QuotaLimit
 
 
 def manage_access(request: HttpRequest, invoice_id):
@@ -21,6 +22,7 @@ def manage_access(request: HttpRequest, invoice_id):
     )
 
 
+@quota_usage_check("invoices-access_codes", 1, api=True, htmx=True)
 def create_code(request: HttpRequest, invoice_id):
     if not request.htmx:
         return redirect("invoices:dashboard")
@@ -36,6 +38,9 @@ def create_code(request: HttpRequest, invoice_id):
     code = InvoiceURL.objects.create(invoice=invoice, created_by=request.user)
 
     messages.success(request, "Successfully created code")
+
+    QuotaUsage.create_str(request.user, "invoices-access_codes", invoice_id)
+
     return render(
         request,
         "pages/invoices/manage_access/_table_row.html",
@@ -49,13 +54,16 @@ def delete_code(request: HttpRequest, code):
 
     try:
         code_obj = InvoiceURL.objects.get(uuid=code)
-        invoice = Invoice.objects.get(id=code_obj.invoice.id, user=request.user)
+        invoice = Invoice.objects.get(id=code_obj.invoice.id)
+        if not invoice.has_access(request.user):
+            raise Invoice.DoesNotExist
     except (Invoice.DoesNotExist, InvoiceURL.DoesNotExist):
         return redirect("invoices:dashboard")
 
+    QuotaLimit.delete_quota_usage("invoices-access_codes", request.user, invoice.id, code_obj.created_on)
+
     code_obj.delete()
 
-    # return HttpResponse("", status=200)
     messages.success(request, "Successfully deleted code")
     return render(
         request,
diff --git a/frontend/templates/base/toast.html b/frontend/templates/base/toast.html
new file mode 100644
index 00000000..5c5a96fc
--- /dev/null
+++ b/frontend/templates/base/toast.html
@@ -0,0 +1 @@
+{% component "messages_list" %}
\ No newline at end of file
diff --git a/frontend/templates/pages/invoices/manage_access/_table_row.html b/frontend/templates/pages/invoices/manage_access/_table_row.html
index 4410c10a..55537985 100644
--- a/frontend/templates/pages/invoices/manage_access/_table_row.html
+++ b/frontend/templates/pages/invoices/manage_access/_table_row.html
@@ -18,4 +18,4 @@
         {% if added %}<script>navigator.clipboard.writeText("{{ code }}");</script>{% endif %}
     </tr>
 {% endif %}
-{% component "messages_list" %}
+{% component "messages_list" %}
\ No newline at end of file
diff --git a/frontend/templates/pages/quotas/_fetch_body.html b/frontend/templates/pages/quotas/_fetch_body.html
index a181bb12..4309ae1a 100644
--- a/frontend/templates/pages/quotas/_fetch_body.html
+++ b/frontend/templates/pages/quotas/_fetch_body.html
@@ -33,3 +33,4 @@
     <td colspan="100%" class="text-center">No Quotas Found</td>
 {% endfor %}
 </tbody>
+{% component "messages_list" %}
\ No newline at end of file
diff --git a/frontend/templates/pages/quotas/dashboard.html b/frontend/templates/pages/quotas/dashboard.html
index 6597e8f5..02d52526 100644
--- a/frontend/templates/pages/quotas/dashboard.html
+++ b/frontend/templates/pages/quotas/dashboard.html
@@ -19,6 +19,11 @@ <h2 class="text-xl text-center">
                     Teams
                 </h2>
             </a>
+            <a href="{% url "quotas group" group="receipts" %}" class="card p-6 bg-base-300 shadow-xl">
+                <h2 class="text-xl text-center">
+                    Receipts
+                </h2>
+            </a>
         </div>
     </div>
 {% endblock content %}

From 43bcf6d60e7fcd451596f56a1cfa0c3a769a29ce Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 19:41:11 +0100
Subject: [PATCH 06/15] WIP Feature: Added quotas for teams

---
 backend/api/teams/create.py                   |  9 ++++--
 backend/api/teams/invites.py                  | 31 +++++++++++++++----
 backend/api/teams/leave.py                    |  1 +
 backend/data/default_quota_limits.py          |  3 +-
 backend/models.py                             |  2 +-
 backend/views/core/settings/teams.py          |  5 ++-
 components/+messages_list.html                |  4 ++-
 .../modals/view_quota_limit_info.html         |  2 +-
 .../templates/pages/quotas/_fetch_body.html   | 10 +++---
 frontend/templates/pages/quotas/list.html     | 17 +++++++---
 .../templates/partials/messages_list.html     |  2 +-
 11 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/backend/api/teams/create.py b/backend/api/teams/create.py
index 75c74c79..14a77c0e 100644
--- a/backend/api/teams/create.py
+++ b/backend/api/teams/create.py
@@ -1,12 +1,12 @@
 from django.http import HttpRequest
-from django.shortcuts import render
 from django.views.decorators.http import require_POST
 
 from backend.decorators import *
-from backend.models import Team
+from backend.models import Team, QuotaUsage
 
 
 @require_POST
+@quota_usage_check("teams-count", api=True, htmx=True)
 def create_team(request: HttpRequest):
     name = request.POST.get("name")
 
@@ -15,6 +15,11 @@ def create_team(request: HttpRequest):
         return render(request, "partials/messages_list.html")
 
     team = Team.objects.create(name=name, leader=request.user)
+
+    QuotaUsage.create_str(request.user, "teams-count", team.id)
+    QuotaUsage.create_str(request.user, "teams-joined", team.id)
+
+
     if not request.user.logged_in_as_team:
         request.user.logged_in_as_team = team
         request.user.save()
diff --git a/backend/api/teams/invites.py b/backend/api/teams/invites.py
index 75386025..cf146970 100644
--- a/backend/api/teams/invites.py
+++ b/backend/api/teams/invites.py
@@ -1,6 +1,4 @@
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import render
-from django.urls import reverse
+from django.http import HttpRequest
 
 from backend.decorators import *
 from backend.models import Notification, Team, TeamInvitation, User
@@ -29,6 +27,15 @@ def check_team_invitation_is_valid(request, invitation: TeamInvitation, code=Non
         valid = False
         messages.error(request, "Invitation has expired")
 
+    try:
+        quota_limit = QuotaLimit.objects.get(slug="teams-user_count")
+        if invitation.team.members.count() >= quota_limit.get_quota_limit(invitation.team.leader):
+            valid = False
+            messages.error(request, "Unfortunately this team is currently full")
+    except QuotaLimit.DoesNotExist:
+        valid = False
+        messages.error(request, "Something went wrong with fetching the quota limit")
+
     if not valid:
         delete_notification(request.user, code)
         return False
@@ -41,12 +48,14 @@ def send_user_team_invite(request: HttpRequest):
     team_id = request.POST.get("team_id")
     team = Team.objects.filter(leader=request.user, id=team_id).first()
 
-    def return_error_notif(request: HttpRequest, message: str):
+    def return_error_notif(request: HttpRequest, message: str, autohide=None):
         messages.error(request, message)
-        resp = render(request, "partials/messages_list.html", status=200)
+        context = {"autohide": False} if autohide == False else {}
+        resp = render(request, "partials/messages_list.html", context=context, status=200)
         resp["HX-Trigger-After-Swap"] = "invite_user_error"
         return resp
 
+
     if not user_email:
         return return_error_notif(request, "Please enter a valid user email")
 
@@ -61,6 +70,16 @@ def return_error_notif(request: HttpRequest, message: str):
     if user.teams_joined.exists():
         return return_error_notif(request, "User already is in this team")
 
+    try:
+        quota_limit = QuotaLimit.objects.get(slug="teams-user_count")
+        if team.members.count() >= quota_limit.get_quota_limit(team.leader):
+            return return_error_notif(request, "Unfortunately your team has reached the maximum members limit. Go to the service quotas "
+                                               "page to request a higher number or kick some users to make space.", autohide=False)
+    except QuotaLimit.DoesNotExist:
+        return return_error_notif(request, "Something went wrong with fetching the quota limit")
+
+
+
     invitation = TeamInvitation.objects.create(team=team, user=user, invited_by=request.user)
 
     # if EMAIL_SERVER_ENABLED and EMAIL_FROM_ADDRESS:
@@ -96,7 +115,7 @@ def return_error_notif(request: HttpRequest, message: str):
 
 
 def accept_team_invite(request: HttpRequest, code):
-    invitation: TeamInvitation = TeamInvitation.objects.filter(code=code).first()
+    invitation: TeamInvitation = TeamInvitation.objects.filter(code=code).prefetch_related("team").first()
 
     if not check_team_invitation_is_valid(request, invitation, code):
         messages.error(request, "Invalid invite - Maybe it has expired?")
diff --git a/backend/api/teams/leave.py b/backend/api/teams/leave.py
index 4a31295c..bf140ac0 100644
--- a/backend/api/teams/leave.py
+++ b/backend/api/teams/leave.py
@@ -1,3 +1,4 @@
+from django.contrib import messages
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 
diff --git a/backend/data/default_quota_limits.py b/backend/data/default_quota_limits.py
index 0ade9b97..869473e3 100644
--- a/backend/data/default_quota_limits.py
+++ b/backend/data/default_quota_limits.py
@@ -55,7 +55,6 @@ class QuotaGroup:
             adjustable=True
         )
     ]),
-
     QuotaGroup("clients", [
         QuotaItem(
             slug="count",
@@ -78,7 +77,7 @@ class QuotaGroup:
         QuotaItem(
             slug="joined",
             name="Joined teams",
-            description="Amount of teams joined in total",
+            description="Amount of teams that you have joined in total",
             default_value=5,
             period="forever",
             adjustable=True
diff --git a/backend/models.py b/backend/models.py
index ba89416c..55beab36 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -614,7 +614,7 @@ def strict_get_quotas(self, user: User, extra: Optional[str | int] = None):
             current_year = timezone.now().year
             current = self.quota_usage.filter(user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month,
                                               created_at__day=current_day)
-        elif self.limit_type in ["per_client", "per_invoice"]:
+        elif self.limit_type in ["per_client", "per_invoice", "per_team", "per_receipt"]:
             current = self.quota_usage.filter(user=user, quota_limit=self, extra_data__exact=extra)
         return current
 
diff --git a/backend/views/core/settings/teams.py b/backend/views/core/settings/teams.py
index 5f18b1e0..49eb2135 100644
--- a/backend/views/core/settings/teams.py
+++ b/backend/views/core/settings/teams.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 from django.db.models import When, Case, BooleanField
 from django.http import HttpRequest
 from django.shortcuts import render
@@ -12,7 +10,8 @@ def teams_dashboard(request: HttpRequest):
     users_team: Optional[Team] = request.user.logged_in_as_team
 
     if not users_team:
-        user_with_counts = User.objects.prefetch_related("teams_joined", "teams_leader_of").get(pk=request.user.pk)
+        user_with_counts = User.objects.prefetch_related("teams_joined", "teams_leader_of").get(
+            pk=request.user.pk)
         return render(
             request,
             "pages/settings/teams/main.html",
diff --git a/components/+messages_list.html b/components/+messages_list.html
index 844415ca..17df1c57 100644
--- a/components/+messages_list.html
+++ b/components/+messages_list.html
@@ -12,13 +12,15 @@
                     {{ message }}
                 {% endautoescape %}
             </div>
+            {% if autohide != False %}
             <script>
                 var scriptElement = document.currentScript;
                 var divElement = scriptElement.parentNode;
                 setTimeout(function () {
                     clicked_alert_to_close(divElement);
-                }, 5000);
+                }, 7000);
             </script>
+            {% endif %}
         </div>
     {% endfor %}
     {% if with_js %}
diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
index 4f077895..7ba90e7b 100644
--- a/frontend/templates/modals/view_quota_limit_info.html
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -2,7 +2,7 @@
     {% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
     {% fill "title" %}
         <h3 class="font-bold text-lg">
-            {{ quota.name }}
+            {{ quota.name }} - ({{ quota.slug }})
         </h3>
     {% endfill %}
     {% fill "content" %}
diff --git a/frontend/templates/pages/quotas/_fetch_body.html b/frontend/templates/pages/quotas/_fetch_body.html
index 4309ae1a..484b6250 100644
--- a/frontend/templates/pages/quotas/_fetch_body.html
+++ b/frontend/templates/pages/quotas/_fetch_body.html
@@ -12,16 +12,16 @@
                 {{ quota.quota_object.name }}
             </button>
         </td>
-        <td>
+        <td class="text-right">
             {{ quota.period_usage }}
         </td>
-        <td>
+        <td class="text-right">
             {{ quota.quota_limit }}
         </td>
-        <td>
+        <td class="text-right">
             {{ quota.quota_object.value }}
         </td>
-        <td>
+        <td class="text-center">
             {% if quota.quota_object.adjustable %}
                 Account Level
             {% else %}
@@ -33,4 +33,4 @@
     <td colspan="100%" class="text-center">No Quotas Found</td>
 {% endfor %}
 </tbody>
-{% component "messages_list" %}
\ No newline at end of file
+{% component "messages_list" %}
diff --git a/frontend/templates/pages/quotas/list.html b/frontend/templates/pages/quotas/list.html
index aa0c1a81..a4a9beb6 100644
--- a/frontend/templates/pages/quotas/list.html
+++ b/frontend/templates/pages/quotas/list.html
@@ -1,16 +1,25 @@
 {% extends 'base/base.html' %}
 {% block content %}
     <div class="card w-full p-6 bg-base-100 shadow-xl mt-2">
-        <h2 class="text-xl">Service Quotas</h2>
+        <div class=" text-3xl w-full grid grid-cols-4">
+            <div>
+                <a href="{% url "quotas" %}"
+                   class="btn btn-sm btn-outline btn-secondary me-3 float-left">Back to list
+                </a>
+            </div>
+            <h1 class="text-center col-span-2">Service Quotas</h1>
+            <div>
+            </div>
+        </div>
 
         <div class="flex w-full h-full overflow-x-hidden overflow-y-auto mt-8">
             <table class="table">
                 <thead>
                 <tr>
                     <th>Quota Name</th>
-                    <th>Current usage</th>
-                    <th>Applied account quota value</th>
-                    <th>Default quota value</th>
+                    <th class="text-right">Current usage</th>
+                    <th class="text-right">Applied account quota value</th>
+                    <th class="text-right">Default quota value</th>
                     <th>Adjustability</th>
                 </tr>
                 </thead>
diff --git a/frontend/templates/partials/messages_list.html b/frontend/templates/partials/messages_list.html
index bb637a64..dd30e4e3 100644
--- a/frontend/templates/partials/messages_list.html
+++ b/frontend/templates/partials/messages_list.html
@@ -1 +1 @@
-{% component "messages_list" %}
+{% if autohide != False %}{% component "messages_list" %}{% else %}{% component "messages_list" autohide=False %}{% endif %}
\ No newline at end of file

From 53a8737f5f29197c5f0e766fc5b5cdb0a6db1fc2 Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 21:14:13 +0100
Subject: [PATCH 07/15] WIP Feature: Added quotas for ... quotas

---
 backend/admin.py                              |  2 +
 backend/api/quotas/submit_request.py          | 73 +++++++++++++++
 backend/api/quotas/urls.py                    |  7 +-
 backend/data/default_quota_limits.py          | 12 ++-
 backend/decorators.py                         |  2 +-
 ...ncreaserequest_quotaoverrides_and_more.py} | 24 ++++-
 backend/models.py                             | 25 ++++-
 backend/utils.py                              |  2 +-
 .../modals/view_quota_limit_info.html         | 92 ++++++++++++++-----
 9 files changed, 209 insertions(+), 30 deletions(-)
 create mode 100644 backend/api/quotas/submit_request.py
 rename backend/migrations/{0027_quotalimit_quotaoverrides_quotausage.py => 0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py} (75%)

diff --git a/backend/admin.py b/backend/admin.py
index 2cb9813e..1f599845 100644
--- a/backend/admin.py
+++ b/backend/admin.py
@@ -24,6 +24,7 @@
     QuotaLimit,
     QuotaOverrides,
     QuotaUsage,
+    QuotaIncreaseRequest,
     Receipt,
     ReceiptDownloadToken
 )
@@ -52,6 +53,7 @@
         InvoiceOnetimeSchedule,
         QuotaOverrides,
         QuotaUsage,
+        QuotaIncreaseRequest,
         Receipt,
         ReceiptDownloadToken
     ]
diff --git a/backend/api/quotas/submit_request.py b/backend/api/quotas/submit_request.py
new file mode 100644
index 00000000..667bbf40
--- /dev/null
+++ b/backend/api/quotas/submit_request.py
@@ -0,0 +1,73 @@
+from dataclasses import dataclass
+from typing import Union
+
+from django.contrib import messages
+from django.http import HttpRequest, HttpResponse
+from django.shortcuts import redirect, render
+
+from backend.models import QuotaIncreaseRequest, QuotaLimit, QuotaUsage
+from backend.utils import quota_usage_check_under
+
+
+def submit_request(request: HttpRequest, slug) -> HttpResponse:
+    if not request.htmx:
+        return redirect("quotas")
+
+    new_value = request.POST.get("new_value")
+    reason = request.POST.get("reason")
+
+    try:
+        quota_limit = QuotaLimit.objects.get(slug=slug)
+    except QuotaLimit.DoesNotExist:
+        return error(request, "Failed to get the quota limit type")
+
+    check_usage = quota_usage_check_under(request, "quota_increase-request", extra_data=quota_limit.id, api=True, htmx=True)
+
+    if not isinstance(check_usage, bool):
+        return check_usage
+
+    current = quota_limit.get_quota_limit(request.user)
+
+    validate = validate_request(new_value, reason, current)
+
+    if isinstance(validate, Error):
+        return error(request, validate.message)
+
+    QuotaIncreaseRequest.objects.create(
+        user=request.user,
+        quota_limit=quota_limit,
+        new_value=new_value,
+        current_value=current
+    )
+
+    QuotaUsage.create_str(request.user, "quota_increase-request", quota_limit.id)
+
+    messages.success(request, "Successfully submitted a quota increase request")
+    return render(request, "partials/messages_list.html")
+
+
+@dataclass
+class Error:
+    message: str
+
+
+def error(request: HttpRequest, message: str) -> HttpResponse:
+    messages.error(request, message)
+    return render(request, "partials/messages_list.html")
+
+
+def validate_request(new_value, reason, current) -> Union[True, Error]:
+    if not new_value:
+        return Error("Please enter a valid increase value")
+
+    try:
+        new_value = int(new_value)
+        if new_value <= current:
+            raise ValueError
+    except ValueError:
+        return Error("Please enter a valid increase value that is above your current limit.")
+
+    if len(reason) < 25:
+        return Error("Please enter a valid reason for the increase.")
+
+    return True
diff --git a/backend/api/quotas/urls.py b/backend/api/quotas/urls.py
index d546b77e..107877cd 100644
--- a/backend/api/quotas/urls.py
+++ b/backend/api/quotas/urls.py
@@ -1,12 +1,17 @@
 from django.urls import path
 
-from . import fetch
+from . import fetch, submit_request
 
 urlpatterns = [
     path(
         "fetch/<str:group>/",
         fetch.fetch_all_quotas,
         name="fetch",
+    ),
+    path(
+        "submit_request/<slug:slug>/",
+        submit_request.submit_request,
+        name="submit_request"
     )
 ]
 
diff --git a/backend/data/default_quota_limits.py b/backend/data/default_quota_limits.py
index 869473e3..adacc333 100644
--- a/backend/data/default_quota_limits.py
+++ b/backend/data/default_quota_limits.py
@@ -9,7 +9,7 @@ class QuotaItem:
     description: str
     default_value: int
     adjustable: bool
-    period: Literal["forever", "per_month", "per_day", "per_client", "per_invoice", "per_team"]
+    period: Literal["forever", "per_month", "per_day", "per_client", "per_invoice", "per_team", "per_quota"]
 
 
 @dataclass
@@ -90,5 +90,15 @@ class QuotaGroup:
             period="per_team",
             adjustable=True
         )
+    ]),
+    QuotaGroup("quota_increase", [
+        QuotaItem(
+            slug="request",
+            name="Quota Increase Request",
+            description="Amount of increase requests allowed PER quota",
+            default_value=1,
+            period="per_quota",
+            adjustable=False
+        )
     ])
 ]
diff --git a/backend/decorators.py b/backend/decorators.py
index 60c32ba0..17e45ab8 100644
--- a/backend/decorators.py
+++ b/backend/decorators.py
@@ -82,7 +82,7 @@ def wrapper(request, *args, **kwargs):
 
             if api and htmx:
                 messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
-                return render(request, "base/toast.html")
+                return render(request, "partials/messages_list.html", {"autohide": False})
             elif api:
                 return HttpResponse(status=403, content=f"You have reached the quota limit for this service '{quota_limit.slug}'")
             messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
diff --git a/backend/migrations/0027_quotalimit_quotaoverrides_quotausage.py b/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
similarity index 75%
rename from backend/migrations/0027_quotalimit_quotaoverrides_quotausage.py
rename to backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
index cb0552bc..e074936c 100644
--- a/backend/migrations/0027_quotalimit_quotaoverrides_quotausage.py
+++ b/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-03-31 13:12
+# Generated by Django 5.0.3 on 2024-03-31 20:13
 
 import django.db.models.deletion
 from django.conf import settings
@@ -31,6 +31,7 @@ class Migration(migrations.Migration):
                             ("per_client", "Per Client"),
                             ("per_invoice", "Per Invoice"),
                             ("per_team", "Per Team"),
+                            ("per_quota", "Per Quota"),
                             ("forever", "Forever"),
                         ],
                         default="per_month",
@@ -43,6 +44,27 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "Quota Limits",
             },
         ),
+        migrations.CreateModel(
+            name="QuotaIncreaseRequest",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("new_value", models.IntegerField()),
+                ("current_value", models.IntegerField()),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    "quota_limit",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, related_name="quota_increase_requests", to="backend.quotalimit"
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Quota Increase Request",
+                "verbose_name_plural": "Quota Increase Requests",
+            },
+        ),
         migrations.CreateModel(
             name="QuotaOverrides",
             fields=[
diff --git a/backend/models.py b/backend/models.py
index 55beab36..b2c26ac8 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -561,6 +561,7 @@ class LimitTypes(models.TextChoices):
         PER_CLIENT = "per_client"
         PER_INVOICE = "per_invoice"
         PER_TEAM = "per_team"
+        PER_QUOTA = "per_quota"
         FOREVER = "forever"
 
     slug = models.CharField(max_length=100, unique=True, editable=False)
@@ -614,7 +615,7 @@ def strict_get_quotas(self, user: User, extra: Optional[str | int] = None):
             current_year = timezone.now().year
             current = self.quota_usage.filter(user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month,
                                               created_at__day=current_day)
-        elif self.limit_type in ["per_client", "per_invoice", "per_team", "per_receipt"]:
+        elif self.limit_type in ["per_client", "per_invoice", "per_team", "per_receipt", "per_quota"]:
             current = self.quota_usage.filter(user=user, quota_limit=self, extra_data__exact=extra)
         return current
 
@@ -623,6 +624,7 @@ def delete_quota_usage(cls, quota_limit: Union[str, "QuotaLimit"], user: User, e
         quota_limit = cls.objects.get(slug=quota_limit) if isinstance(quota_limit, str) else quota_limit
 
         all_usages = quota_limit.strict_get_quotas(user, extra)
+        closest_obj = None
 
         if all_usages.count() > 1 and timestamp:
             earliest: QuotaUsage = all_usages.filter(created_at__gte=timestamp).order_by("created_at").first()
@@ -697,3 +699,24 @@ def get_usage(self, user: User, limit: str | QuotaLimit):
             return "Not Found"
 
         return self.objects.filter(user=user, quota_limit=ql).count()
+
+
+class QuotaIncreaseRequest(models.Model):
+    class StatusTypes(models.TextChoices):
+        PENDING = "pending"
+        APPROVED = "approved"
+        REJECTED = "rejected"
+
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    quota_limit = models.ForeignKey(QuotaLimit, on_delete=models.CASCADE, related_name="quota_increase_requests")
+    new_value = models.IntegerField()
+    current_value = models.IntegerField()
+    updated_at = models.DateTimeField(auto_now=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        verbose_name = "Quota Increase Request"
+        verbose_name_plural = "Quota Increase Requests"
+
+    def __str__(self):
+        return f"{self.user}"
diff --git a/backend/utils.py b/backend/utils.py
index 6b810604..ff24ff0a 100644
--- a/backend/utils.py
+++ b/backend/utils.py
@@ -41,7 +41,7 @@ def quota_usage_check_under(
 
     if api and htmx:
         messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
-        return render(request, "base/toast.html")
+        return render(request, "partials/messages_list.html", {"autohide": False})
     elif api:
         return HttpResponse(status=403, content=f"You have reached the quota limit for this service '{quota_limit.slug}'")
     messages.error(request, f"You have reached the quota limit for this service '{quota_limit.slug}'")
diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
index 7ba90e7b..f337db2a 100644
--- a/frontend/templates/modals/view_quota_limit_info.html
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -6,34 +6,78 @@ <h3 class="font-bold text-lg">
         </h3>
     {% endfill %}
     {% fill "content" %}
-        <div class="p-4">
-            <h2 class="text-xl mb-2">Description</h2>
-            <p class="mb-4">{{ quota.description }}</p>
+        <form class="py-4 group"
+              id="modal_invoices_edit_discount-form"
+              hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
+              hx-swap="none">
+            {% csrf_token %}
+            <div class="p-4">
+                <h2 class="text-xl mb-4">Description</h2>
+                <p class="">{{ quota.description }}</p>
 
-            <div class="mb-4">
-                <h2>Applied account-level quota value</h2>
-                <p>{{ current_limit }}</p>
-            </div>
+                <table class="w-full table my-8">
+                    <thead>
+                    <tr>
+                        <th class="px-4 py-2">Type</th>
+                        <th class="px-4 py-2">Value</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>Applied account-level quota value</td>
+                        <td>{{ current_limit }}</td>
+                    </tr>
+                    <tr>
+                        <td>Default quota value</td>
+                        <td>{{ quota.value }}</td>
+                    </tr>
+                    <tr>
+                        <td>Adjustable</td>
+                        <td>{{ quota.adjustable }}</td>
+                    </tr>
+                    </tbody>
+                </table>
 
-            <div class="mb-4">
-                <h2>Default quota value</h2>
-                <p>{{ quota.value }}</p>
-            </div>
 
-            <div class="mb-4">
-                <h2>Adjustability</h2>
-                <p>{{ quota.adjustable }}</p>
+                {% if quota.adjustable %}
+                    <div class="divider divider-info mt-4 mb-8">Submit Request</div>
+                    <div class="form-control w-full">
+                        <label class="label justify-start">
+                            New limit value
+                            <span class="required_star">*</span>
+                        </label>
+                        <input
+                            name="new_value"
+                            type="text"
+                            class="input input-block input-bordered"
+                            required>
+                    </div>
+                    <div class="form-control w-full">
+                        <label class="label justify-start">
+                            Reason for increased limit
+                            <span class="required_star">*</span>
+                        </label>
+                        <textarea
+                            name="reason"
+                            minlength="25"
+                            class="textarea textarea-block textarea-bordered"
+                            required></textarea>
+                    </div>
+                {% endif %}
             </div>
-        </div>
 
-        <div class="modal-action">
-            <button type="button"
-                    _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
-                    class="btn">Close
-            </button>
-            {% if quota.adjustable %}
-                <button class="btn-disabled btn btn-primary">Request quota increase at account-level</button>
-            {% endif %}
-        </div>
+            <div class="modal-action">
+                <button type="button"
+                        _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
+                        class="btn btn-white">
+                    Close
+                </button>
+                {% if quota.adjustable %}
+                    <button class="group-invalid:btn-disabled btn btn-outline btn-secondary">
+                        Request quota increase at account-level
+                    </button>
+                {% endif %}
+            </div>
+        </form>
     {% endfill %}
 {% endcomponent_block %}

From c5d44549aad4f592e37e719aec1721738bc4220a Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 22:35:05 +0100
Subject: [PATCH 08/15] Feature: Added quotas

---
 assets/data/default_quota_limits.json         |  60 ---------
 backend/api/quotas/requests.py                | 124 ++++++++++++++++++
 backend/api/quotas/submit_request.py          |  73 -----------
 backend/api/quotas/urls.py                    |  14 +-
 backend/data/default_quota_limits.py          |  10 +-
 ...increaserequest_quotaoverrides_and_more.py |  10 +-
 backend/models.py                             |   1 +
 backend/signals.py                            |   6 +-
 backend/urls.py                               |   3 +-
 backend/views/core/quotas/view.py             |  10 +-
 .../templates/pages/quotas/dashboard.html     |  35 ++---
 .../templates/pages/quotas/view_requests.html |  50 +++++++
 12 files changed, 240 insertions(+), 156 deletions(-)
 delete mode 100644 assets/data/default_quota_limits.json
 create mode 100644 backend/api/quotas/requests.py
 delete mode 100644 backend/api/quotas/submit_request.py
 create mode 100644 frontend/templates/pages/quotas/view_requests.html

diff --git a/assets/data/default_quota_limits.json b/assets/data/default_quota_limits.json
deleted file mode 100644
index ca1d34b4..00000000
--- a/assets/data/default_quota_limits.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "invoices": {
-    "count": {
-      "name": "Creations per month",
-      "description": "Amount of invoice creations allowed per month",
-      "default_value": 100,
-      "adjustable": true
-    },
-    "schedules": {
-      "name": "Schedules per month",
-      "description": "Amount of invoice scheduled sends allowed per month",
-      "default_value": 100,
-      "adjustable": true
-    },
-    "access_codes": {
-      "name": "Access codes",
-      "description": " Amount of invoice access codes allowed per invoice",
-      "default_value": 3,
-      "adjustable": true
-    }
-  },
-  "receipts": {
-    "count": {
-      "Receipts stored per month": {
-        "name": "Receipts stored per month",
-        "description": "Amount of receipts stored per month",
-        "default_value": 100,
-        "adjustable": true
-      }
-    }
-  },
-  "clients": {
-    "count": {
-      "name": "Stored clients",
-      "description": "Amount of clients stored in total",
-      "default_value": 40,
-      "adjustable": true
-    }
-  },
-  "teams": {
-    "count": {
-      "name": "Created teams",
-      "description": "Amount of teams created in total",
-      "default_value": 3,
-      "adjustable": true
-    },
-    "joined": {
-      "name": "Joined teams",
-      "description": "Amount of teams joined in total",
-      "default_value": 5,
-      "adjustable": true
-    },
-    "user_count": {
-      "name": "Users per team",
-      "description": "Amount of users per team",
-      "default_value": 10,
-      "adjustable": true
-    }
-  }
-}
diff --git a/backend/api/quotas/requests.py b/backend/api/quotas/requests.py
new file mode 100644
index 00000000..77ad1487
--- /dev/null
+++ b/backend/api/quotas/requests.py
@@ -0,0 +1,124 @@
+from dataclasses import dataclass
+from typing import Union
+
+from django.contrib import messages
+from django.http import HttpRequest, HttpResponse
+from django.shortcuts import redirect, render
+from django.views.decorators.http import require_http_methods
+
+from backend.decorators import superuser_only
+from backend.models import QuotaIncreaseRequest, QuotaLimit, QuotaUsage, QuotaOverrides
+from backend.utils import quota_usage_check_under
+
+
+def submit_request(request: HttpRequest, slug) -> HttpResponse:
+    if not request.htmx:
+        return redirect("quotas")
+
+    new_value = request.POST.get("new_value")
+    reason = request.POST.get("reason")
+
+    try:
+        quota_limit = QuotaLimit.objects.get(slug=slug)
+    except QuotaLimit.DoesNotExist:
+        return error(request, "Failed to get the quota limit type")
+
+    usage_per_item = quota_usage_check_under(request, "quota_increase-request", extra_data=quota_limit.id, api=True, htmx=True)
+    usage_per_month = quota_usage_check_under(request, "quota_increase-requests_per_month", extra_data=quota_limit.id, api=True, htmx=True)
+
+    if not isinstance(usage_per_item, bool):
+        return usage_per_item
+
+    if not isinstance(usage_per_month, bool):
+        return usage_per_month
+
+    current = quota_limit.get_quota_limit(request.user)
+
+    validate = validate_request(new_value, reason, current)
+
+    if isinstance(validate, Error):
+        return error(request, validate.message)
+
+    quota_increase_request = QuotaIncreaseRequest.objects.create(
+        user=request.user,
+        quota_limit=quota_limit,
+        new_value=new_value,
+        current_value=current
+    )
+
+    QuotaUsage.create_str(request.user, "quota_increase-request", quota_increase_request.id)
+    QuotaUsage.create_str(request.user, "quota_increase-requests_per_month", quota_increase_request.id)
+
+    messages.success(request, "Successfully submitted a quota increase request")
+    return render(request, "partials/messages_list.html")
+
+
+@dataclass
+class Error:
+    message: str
+
+
+def error(request: HttpRequest, message: str) -> HttpResponse:
+    messages.error(request, message)
+    return render(request, "partials/messages_list.html")
+
+
+def validate_request(new_value, reason, current) -> Union[True, Error]:
+    if not new_value:
+        return Error("Please enter a valid increase value")
+
+    try:
+        new_value = int(new_value)
+        if new_value <= current:
+            raise ValueError
+    except ValueError:
+        return Error("Please enter a valid increase value that is above your current limit.")
+
+    if len(reason) < 25:
+        return Error("Please enter a valid reason for the increase.")
+
+    return True
+
+
+@superuser_only
+@require_http_methods(["DELETE", "POST"])
+def approve_request(request: HttpRequest, request_id) -> HttpResponse:
+    if not request.htmx:
+        return redirect("quotas")
+    try:
+        quota_request = QuotaIncreaseRequest.objects.get(id=request_id)
+    except QuotaIncreaseRequest.DoesNotExist:
+        return error(request, "Failed to get the quota increase request")
+
+    QuotaOverrides.objects.filter(user=quota_request.user).delete()
+
+    QuotaOverrides.objects.create(
+        user=quota_request.user,
+        value=quota_request.new_value,
+        quota_limit=quota_request.quota_limit,
+    )
+
+    quota_limit_for_increase = QuotaLimit.objects.get(slug="quota_increase-request")
+    QuotaUsage.objects.filter(user=quota_request.user, quota_limit=quota_limit_for_increase, extra_data=quota_request.id).delete()
+    quota_request.status = "approved"
+    quota_request.save()
+
+    return HttpResponse(status=200)
+
+
+@superuser_only
+@require_http_methods(["DELETE", "POST"])
+def decline_request(request: HttpRequest, request_id) -> HttpResponse:
+    if not request.htmx:
+        return redirect("quotas")
+    try:
+        quota_request = QuotaIncreaseRequest.objects.get(id=request_id)
+    except QuotaIncreaseRequest.DoesNotExist:
+        return error(request, "Failed to get the quota increase request")
+
+    quota_limit_for_increase = QuotaLimit.objects.get(slug="quota_increase-request")
+    QuotaUsage.objects.filter(user=quota_request.user, quota_limit=quota_limit_for_increase, extra_data=quota_request.id).delete()
+    quota_request.status = "decline"
+    quota_request.save()
+
+    return HttpResponse(status=200)
diff --git a/backend/api/quotas/submit_request.py b/backend/api/quotas/submit_request.py
deleted file mode 100644
index 667bbf40..00000000
--- a/backend/api/quotas/submit_request.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from dataclasses import dataclass
-from typing import Union
-
-from django.contrib import messages
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import redirect, render
-
-from backend.models import QuotaIncreaseRequest, QuotaLimit, QuotaUsage
-from backend.utils import quota_usage_check_under
-
-
-def submit_request(request: HttpRequest, slug) -> HttpResponse:
-    if not request.htmx:
-        return redirect("quotas")
-
-    new_value = request.POST.get("new_value")
-    reason = request.POST.get("reason")
-
-    try:
-        quota_limit = QuotaLimit.objects.get(slug=slug)
-    except QuotaLimit.DoesNotExist:
-        return error(request, "Failed to get the quota limit type")
-
-    check_usage = quota_usage_check_under(request, "quota_increase-request", extra_data=quota_limit.id, api=True, htmx=True)
-
-    if not isinstance(check_usage, bool):
-        return check_usage
-
-    current = quota_limit.get_quota_limit(request.user)
-
-    validate = validate_request(new_value, reason, current)
-
-    if isinstance(validate, Error):
-        return error(request, validate.message)
-
-    QuotaIncreaseRequest.objects.create(
-        user=request.user,
-        quota_limit=quota_limit,
-        new_value=new_value,
-        current_value=current
-    )
-
-    QuotaUsage.create_str(request.user, "quota_increase-request", quota_limit.id)
-
-    messages.success(request, "Successfully submitted a quota increase request")
-    return render(request, "partials/messages_list.html")
-
-
-@dataclass
-class Error:
-    message: str
-
-
-def error(request: HttpRequest, message: str) -> HttpResponse:
-    messages.error(request, message)
-    return render(request, "partials/messages_list.html")
-
-
-def validate_request(new_value, reason, current) -> Union[True, Error]:
-    if not new_value:
-        return Error("Please enter a valid increase value")
-
-    try:
-        new_value = int(new_value)
-        if new_value <= current:
-            raise ValueError
-    except ValueError:
-        return Error("Please enter a valid increase value that is above your current limit.")
-
-    if len(reason) < 25:
-        return Error("Please enter a valid reason for the increase.")
-
-    return True
diff --git a/backend/api/quotas/urls.py b/backend/api/quotas/urls.py
index 107877cd..d16b8986 100644
--- a/backend/api/quotas/urls.py
+++ b/backend/api/quotas/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
 
-from . import fetch, submit_request
+from . import fetch, requests
 
 urlpatterns = [
     path(
@@ -10,8 +10,18 @@
     ),
     path(
         "submit_request/<slug:slug>/",
-        submit_request.submit_request,
+        requests.submit_request,
         name="submit_request"
+    ),
+    path(
+        "request/<int:request_id>/approve/",
+        requests.approve_request,
+        name="approve request"
+    ),
+    path(
+        "request/<int:request_id>/decline/",
+        requests.decline_request,
+        name="decline request"
     )
 ]
 
diff --git a/backend/data/default_quota_limits.py b/backend/data/default_quota_limits.py
index adacc333..6e0f5dc7 100644
--- a/backend/data/default_quota_limits.py
+++ b/backend/data/default_quota_limits.py
@@ -95,10 +95,18 @@ class QuotaGroup:
         QuotaItem(
             slug="request",
             name="Quota Increase Request",
-            description="Amount of increase requests allowed PER quota",
+            description="Amount of increase requests allowed per quota",
             default_value=1,
             period="per_quota",
             adjustable=False
+        ),
+        QuotaItem(
+            slug="requests_per_month",
+            name="Quota Increase Requests per month",
+            description="Amount of increase requests allowed per month",
+            period="per_month",
+            default_value=1,
+            adjustable=False
         )
     ])
 ]
diff --git a/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py b/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
index e074936c..5f486f65 100644
--- a/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
+++ b/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-03-31 20:13
+# Generated by Django 5.0.3 on 2024-03-31 20:27
 
 import django.db.models.deletion
 from django.conf import settings
@@ -52,6 +52,14 @@ class Migration(migrations.Migration):
                 ("current_value", models.IntegerField()),
                 ("updated_at", models.DateTimeField(auto_now=True)),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "status",
+                    models.CharField(
+                        choices=[("pending", "Pending"), ("approved", "Approved"), ("rejected", "Rejected")],
+                        default="pending",
+                        max_length=20,
+                    ),
+                ),
                 ("user", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
                 (
                     "quota_limit",
diff --git a/backend/models.py b/backend/models.py
index b2c26ac8..dc03ffc5 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -713,6 +713,7 @@ class StatusTypes(models.TextChoices):
     current_value = models.IntegerField()
     updated_at = models.DateTimeField(auto_now=True)
     created_at = models.DateTimeField(auto_now_add=True)
+    status = models.CharField(max_length=20, choices=StatusTypes.choices, default=StatusTypes.PENDING)
 
     class Meta:
         verbose_name = "Quota Increase Request"
diff --git a/backend/signals.py b/backend/signals.py
index 20176e80..5e9e3ab2 100644
--- a/backend/signals.py
+++ b/backend/signals.py
@@ -1,3 +1,5 @@
+import logging
+
 from django.core.cache import cache
 from django.core.cache.backends.redis import RedisCacheClient
 
@@ -79,7 +81,7 @@ def insert_initial_data(**kwargs):
 
     for group in default_quota_limits:
         for item in group.items:
-            QuotaLimit.objects.get_or_create(
+            _, created = QuotaLimit.objects.get_or_create(
                 slug=f"{group.name}-{item.slug}",
                 defaults={
                     "name": f"{item.name}",
@@ -89,6 +91,8 @@ def insert_initial_data(**kwargs):
                     "limit_type": item.period
                 }
             )
+            if created:
+                logging.info(f"Added QuotaLimit {item.name}")
 
 
 post_migrate.connect(insert_initial_data)
diff --git a/backend/urls.py b/backend/urls.py
index 4b7c9e56..44b01a1e 100644
--- a/backend/urls.py
+++ b/backend/urls.py
@@ -14,7 +14,7 @@
 from backend.views.core.currency_converter import dashboard as cc_dashboard
 from backend.views.core.invoices.overview import manage_invoice
 from backend.views.core.other.index import index, dashboard
-from backend.views.core.quotas.view import quotas_page, quotas_list
+from backend.views.core.quotas.view import quotas_page, quotas_list, view_quota_increase_requests
 
 url(
     r"^frontend/static/(?P<path>.*)$",
@@ -30,6 +30,7 @@
     path("dashboard/invoices/", include("backend.views.core.invoices.urls")),
                   path("dashboard/quotas/", quotas_page, name="quotas"),
                   path("dashboard/quotas/<str:group>/", quotas_list, name="quotas group"),
+                  path("dashboard/admin/quota_requests/", view_quota_increase_requests, name="admin quota increase requests"),
     path(
         "dashboard/invoice/<str:invoice_id>/",
         manage_invoice,
diff --git a/backend/views/core/quotas/view.py b/backend/views/core/quotas/view.py
index 58ab1332..6ad4d2cd 100644
--- a/backend/views/core/quotas/view.py
+++ b/backend/views/core/quotas/view.py
@@ -1,7 +1,9 @@
 from django.http import HttpResponse, HttpRequest
-
 from django.shortcuts import render
 
+from backend.decorators import superuser_only
+from backend.models import QuotaIncreaseRequest
+
 
 def quotas_page(request: HttpRequest) -> HttpResponse:
     return render(request, "pages/quotas/dashboard.html")
@@ -9,3 +11,9 @@ def quotas_page(request: HttpRequest) -> HttpResponse:
 
 def quotas_list(request: HttpRequest, group: str) -> HttpResponse:
     return render(request, "pages/quotas/list.html", {"group": group})
+
+
+@superuser_only
+def view_quota_increase_requests(request: HttpRequest) -> HttpResponse:
+    requests = QuotaIncreaseRequest.objects.filter(status="pending").order_by("-created_at")
+    return render(request, "pages/quotas/view_requests.html", {"requests": requests})
diff --git a/frontend/templates/pages/quotas/dashboard.html b/frontend/templates/pages/quotas/dashboard.html
index 02d52526..eb8fafec 100644
--- a/frontend/templates/pages/quotas/dashboard.html
+++ b/frontend/templates/pages/quotas/dashboard.html
@@ -4,25 +4,28 @@
         <h2 class="text-xl">Service Quotas</h2>
 
         <div class="grid grid-cols-3 gap-4 mt-8">
-            <a href="{% url "quotas group" group="invoices" %}" class="card p-6 bg-base-300 shadow-xl">
-                <h2 class="text-xl text-center">
-                    Invoices
-                </h2>
+            {% if request.user.is_superuser %}
+                <a href="{% url "admin quota increase requests" %}"
+                   class="card p-6 bg-base-200 border border-warning text-center text-xl">
+                    View Requests
+                </a>
+            {% endif %}
+            <a href="{% url "quotas group" group="invoices" %}" class="card p-6 border bg-base-200 shadow-xl text-center text-xl">
+                Invoices
             </a>
-            <a href="{% url "quotas group" group="clients" %}" class="card p-6 bg-base-300 shadow-xl">
-                <h2 class="text-xl text-center">
-                    Clients
-                </h2>
+            <a href="{% url "quotas group" group="clients" %}" class="card p-6 border bg-base-200 shadow-xl text-center text-xl">
+                Clients
             </a>
-            <a href="{% url "quotas group" group="teams" %}" class="card p-6 bg-base-300 shadow-xl">
-                <h2 class="text-xl text-center">
-                    Teams
-                </h2>
+            <a href="{% url "quotas group" group="teams" %}" class="card p-6 border bg-base-200 shadow-xl text-center text-xl">
+                Teams
             </a>
-            <a href="{% url "quotas group" group="receipts" %}" class="card p-6 bg-base-300 shadow-xl">
-                <h2 class="text-xl text-center">
-                    Receipts
-                </h2>
+            <a href="{% url "quotas group" group="receipts" %}" class="card p-6 border bg-base-200 shadow-xl text-center
+            text-xl">
+                Receipts
+            </a>
+            <a href="{% url "quotas group" group="quota" %}" class="card p-6 border bg-base-200 shadow-xl text-center
+            text-xl">
+                Quotas
             </a>
         </div>
     </div>
diff --git a/frontend/templates/pages/quotas/view_requests.html b/frontend/templates/pages/quotas/view_requests.html
new file mode 100644
index 00000000..cce725a8
--- /dev/null
+++ b/frontend/templates/pages/quotas/view_requests.html
@@ -0,0 +1,50 @@
+{% extends 'base/base.html' %}
+{% block content %}
+    <div class="card w-full p-6 bg-base-100 shadow-xl mt-2">
+        <h2 class="text-xl">View Requests</h2>
+
+        <table class="mt-3 table w-full">
+            <thead>
+            <tr>
+                <th>ID</th>
+                <th>Quota Item</th>
+                <th>Current Value</th>
+                <th>New Value</th>
+                <th>User ID</th>
+                <th>Date</th>
+                <th>Actions</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for request in requests %}
+                <tr>
+                    <td>{{ request.id }}</td>
+                    <td>{{ request.quota_limit.name }}</td>
+                    <td>{{ request.current_value }}</td>
+                    <td>{{ request.new_value }}</td>
+                    <td>{{ request.user.id }}</td>
+                    <td>{{ request.created_at }}</td>
+                    <td>
+                        <button hx-target="closest tr"
+                                hx-confirm="Are you sure you'd like to ACCEPT request #{{ request.id }}"
+                                hx-delete="{% url "api:quotas:approve request" request_id=request.id %}"
+                                class="btn btn-success btn-sm">Approve
+                        </button>
+                        <button hx-target="closest tr"
+                                hx-confirm="Are you sure you'd like to DECLINE request #{{ request.id }}"
+                                hx-delete="{% url "api:quotas:decline request" request_id=request.id %}"
+                                class="btn btn-error btn-sm">Decline
+                        </button>
+                    </td>
+                </tr>
+            {% empty %}
+                <tr>
+                    <td class="text-center" colspan="100%">
+                        There are currently no submitted requests
+                    </td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+{% endblock content %}

From 419b213894051e7314292444670f3dd9f4a80931 Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 22:43:46 +0100
Subject: [PATCH 09/15] Improved speed of migration signal

---
 backend/signals.py | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/backend/signals.py b/backend/signals.py
index 5e9e3ab2..7869f836 100644
--- a/backend/signals.py
+++ b/backend/signals.py
@@ -81,17 +81,26 @@ def insert_initial_data(**kwargs):
 
     for group in default_quota_limits:
         for item in group.items:
-            _, created = QuotaLimit.objects.get_or_create(
-                slug=f"{group.name}-{item.slug}",
-                defaults={
-                    "name": f"{item.name}",
-                    "value": item.default_value,
-                    "adjustable": item.adjustable,
-                    "description": item.description,
-                    "limit_type": item.period
-                }
-            )
-            if created:
+            existing = QuotaLimit.objects.filter(slug=f"{group.name}-{item.slug}").first()
+            if existing:
+                name, value, adjustable, description, limit_type = existing.name, existing.value, existing.adjustable, existing.description, existing.limit_type
+                existing.name = item.name
+                existing.value = item.default_value
+                existing.adjustable = item.adjustable
+                existing.description = item.description
+                existing.limit_type = item.period
+                if item.name != name or item.default_value != value or item.adjustable != adjustable or item.description != description or item.period != limit_type:
+                    logging.info(f"Updated QuotaLimit {item.name}")
+                    existing.save()
+            else:
+                QuotaLimit.objects.create(
+                    name=item.name,
+                    slug=f"{group.name}-{item.slug}",
+                    value=item.default_value,
+                    adjustable=item.adjustable,
+                    description=item.description,
+                    limit_type=item.period
+                )
                 logging.info(f"Added QuotaLimit {item.name}")
 
 

From 691cb3f89c8e36b1fe2a9f21825510c591928656 Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Sun, 31 Mar 2024 22:47:38 +0100
Subject: [PATCH 10/15] WIP Feature: Button now closes modal if submit is valid

---
 frontend/templates/modals/view_quota_limit_info.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
index f337db2a..359915ec 100644
--- a/frontend/templates/modals/view_quota_limit_info.html
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -7,7 +7,7 @@ <h3 class="font-bold text-lg">
     {% endfill %}
     {% fill "content" %}
         <form class="py-4 group"
-              id="modal_invoices_edit_discount-form"
+              id="modal_view_quota_limit_info_{{ quota.id }}-form"
               hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
               hx-swap="none">
             {% csrf_token %}
@@ -73,7 +73,8 @@ <h2 class="text-xl mb-4">Description</h2>
                     Close
                 </button>
                 {% if quota.adjustable %}
-                    <button class="group-invalid:btn-disabled btn btn-outline btn-secondary">
+                    <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
+                            _="on click if #modal_view_quota_limit_info_{{ quota.id }}-form.checkValidity() call #modal_view_quota_limit_info_{{ quota.id }}.close() end">
                         Request quota increase at account-level
                     </button>
                 {% endif %}

From 148d35e25dbdebf6443d9fc808e7c28fcf34f41d Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:26:43 +0100
Subject: [PATCH 11/15] Feature: Added service quota limits

---
 backend/admin.py                              |   4 +-
 backend/api/quotas/requests.py                |   5 +-
 backend/api/quotas/urls.py                    |  18 +-
 backend/api/receipts/new.py                   |   1 -
 backend/api/teams/create.py                   |   1 -
 backend/api/teams/invites.py                  |  11 +-
 backend/data/default_quota_limits.py          | 195 ++++++++++--------
 backend/models.py                             |  11 +-
 backend/signals.py                            |  19 +-
 backend/views/core/settings/teams.py          |   3 +-
 components/+messages_list.html                |   4 +-
 frontend/templates/base/toast.html            |   2 +-
 .../modals/view_quota_limit_info.html         |  29 +--
 .../invoices/manage_access/_table_row.html    |   2 +-
 .../templates/pages/quotas/_fetch_body.html   |  12 +-
 .../templates/pages/quotas/dashboard.html     |  26 +--
 frontend/templates/pages/quotas/list.html     |   4 +-
 .../templates/pages/quotas/view_requests.html |   5 +-
 .../templates/partials/messages_list.html     |   6 +-
 19 files changed, 173 insertions(+), 185 deletions(-)

diff --git a/backend/admin.py b/backend/admin.py
index 1f599845..c0d7737c 100644
--- a/backend/admin.py
+++ b/backend/admin.py
@@ -26,7 +26,7 @@
     QuotaUsage,
     QuotaIncreaseRequest,
     Receipt,
-    ReceiptDownloadToken
+    ReceiptDownloadToken,
 )
 
 # from django.contrib.auth.models imp/ort User
@@ -55,7 +55,7 @@
         QuotaUsage,
         QuotaIncreaseRequest,
         Receipt,
-        ReceiptDownloadToken
+        ReceiptDownloadToken,
     ]
 )
 
diff --git a/backend/api/quotas/requests.py b/backend/api/quotas/requests.py
index 77ad1487..9bb593df 100644
--- a/backend/api/quotas/requests.py
+++ b/backend/api/quotas/requests.py
@@ -40,10 +40,7 @@ def submit_request(request: HttpRequest, slug) -> HttpResponse:
         return error(request, validate.message)
 
     quota_increase_request = QuotaIncreaseRequest.objects.create(
-        user=request.user,
-        quota_limit=quota_limit,
-        new_value=new_value,
-        current_value=current
+        user=request.user, quota_limit=quota_limit, new_value=new_value, current_value=current
     )
 
     QuotaUsage.create_str(request.user, "quota_increase-request", quota_increase_request.id)
diff --git a/backend/api/quotas/urls.py b/backend/api/quotas/urls.py
index d16b8986..373da4f9 100644
--- a/backend/api/quotas/urls.py
+++ b/backend/api/quotas/urls.py
@@ -8,21 +8,9 @@
         fetch.fetch_all_quotas,
         name="fetch",
     ),
-    path(
-        "submit_request/<slug:slug>/",
-        requests.submit_request,
-        name="submit_request"
-    ),
-    path(
-        "request/<int:request_id>/approve/",
-        requests.approve_request,
-        name="approve request"
-    ),
-    path(
-        "request/<int:request_id>/decline/",
-        requests.decline_request,
-        name="decline request"
-    )
+    path("submit_request/<slug:slug>/", requests.submit_request, name="submit_request"),
+    path("request/<int:request_id>/approve/", requests.approve_request, name="approve request"),
+    path("request/<int:request_id>/decline/", requests.decline_request, name="decline request"),
 ]
 
 app_name = "quotas"
diff --git a/backend/api/receipts/new.py b/backend/api/receipts/new.py
index 9c5df029..6bc41208 100644
--- a/backend/api/receipts/new.py
+++ b/backend/api/receipts/new.py
@@ -43,7 +43,6 @@ def receipt_create(request: HttpRequest):
         total_price=total_price,
     )
 
-
     if request.user.logged_in_as_team:
         receipt.organization = request.user.logged_in_as_team
     else:
diff --git a/backend/api/teams/create.py b/backend/api/teams/create.py
index 14a77c0e..9942dca1 100644
--- a/backend/api/teams/create.py
+++ b/backend/api/teams/create.py
@@ -19,7 +19,6 @@ def create_team(request: HttpRequest):
     QuotaUsage.create_str(request.user, "teams-count", team.id)
     QuotaUsage.create_str(request.user, "teams-joined", team.id)
 
-
     if not request.user.logged_in_as_team:
         request.user.logged_in_as_team = team
         request.user.save()
diff --git a/backend/api/teams/invites.py b/backend/api/teams/invites.py
index cf146970..4216ec34 100644
--- a/backend/api/teams/invites.py
+++ b/backend/api/teams/invites.py
@@ -55,7 +55,6 @@ def return_error_notif(request: HttpRequest, message: str, autohide=None):
         resp["HX-Trigger-After-Swap"] = "invite_user_error"
         return resp
 
-
     if not user_email:
         return return_error_notif(request, "Please enter a valid user email")
 
@@ -73,13 +72,15 @@ def return_error_notif(request: HttpRequest, message: str, autohide=None):
     try:
         quota_limit = QuotaLimit.objects.get(slug="teams-user_count")
         if team.members.count() >= quota_limit.get_quota_limit(team.leader):
-            return return_error_notif(request, "Unfortunately your team has reached the maximum members limit. Go to the service quotas "
-                                               "page to request a higher number or kick some users to make space.", autohide=False)
+            return return_error_notif(
+                request,
+                "Unfortunately your team has reached the maximum members limit. Go to the service quotas "
+                "page to request a higher number or kick some users to make space.",
+                autohide=False,
+            )
     except QuotaLimit.DoesNotExist:
         return return_error_notif(request, "Something went wrong with fetching the quota limit")
 
-
-
     invitation = TeamInvitation.objects.create(team=team, user=user, invited_by=request.user)
 
     # if EMAIL_SERVER_ENABLED and EMAIL_FROM_ADDRESS:
diff --git a/backend/data/default_quota_limits.py b/backend/data/default_quota_limits.py
index 6e0f5dc7..b26a797e 100644
--- a/backend/data/default_quota_limits.py
+++ b/backend/data/default_quota_limits.py
@@ -19,94 +19,109 @@ class QuotaGroup:
 
 
 default_quota_limits: List[QuotaGroup] = [
-    QuotaGroup("invoices", [
-        QuotaItem(
-            slug="count",
-            name="Creations per month",
-            description="Amount of invoices created per month",
-            default_value=100,
-            period="per_month",
-            adjustable=True
-        ),
-        QuotaItem(
-            slug="schedules",
-            name="Schedules per month",
-            description="Amount of invoice scheduled sends allowed per month",
-            default_value=100,
-            period="per_month",
-            adjustable=True
-        ),
-        QuotaItem(
-            slug="access_codes",
-            name="Created access codes",
-            description="Amount of invoice access codes allowed per invoice",
-            default_value=3,
-            period="per_invoice",
-            adjustable=True
-        )
-    ]),
-    QuotaGroup("receipts", [
-        QuotaItem(
-            slug="count",
-            name="Created receipts",
-            description="Amount of receipts stored per month",
-            default_value=100,
-            period="per_month",
-            adjustable=True
-        )
-    ]),
-    QuotaGroup("clients", [
-        QuotaItem(
-            slug="count",
-            name="Created clients",
-            description="Amount of clients stored in total",
-            default_value=40,
-            period="forever",
-            adjustable=True
-        )
-    ]),
-    QuotaGroup("teams", [
-        QuotaItem(
-            slug="count",
-            name="Created teams",
-            description="Amount of teams created in total",
-            default_value=3,
-            period="forever",
-            adjustable=True
-        ),
-        QuotaItem(
-            slug="joined",
-            name="Joined teams",
-            description="Amount of teams that you have joined in total",
-            default_value=5,
-            period="forever",
-            adjustable=True
-        ),
-        QuotaItem(
-            slug="user_count",
-            name="Users per team",
-            description="Amount of users per team",
-            default_value=10,
-            period="per_team",
-            adjustable=True
-        )
-    ]),
-    QuotaGroup("quota_increase", [
-        QuotaItem(
-            slug="request",
-            name="Quota Increase Request",
-            description="Amount of increase requests allowed per quota",
-            default_value=1,
-            period="per_quota",
-            adjustable=False
-        ),
-        QuotaItem(
-            slug="requests_per_month",
-            name="Quota Increase Requests per month",
-            description="Amount of increase requests allowed per month",
-            period="per_month",
-            default_value=1,
-            adjustable=False
-        )
-    ])
+    QuotaGroup(
+        "invoices",
+        [
+            QuotaItem(
+                slug="count",
+                name="Creations per month",
+                description="Amount of invoices created per month",
+                default_value=100,
+                period="per_month",
+                adjustable=True,
+            ),
+            QuotaItem(
+                slug="schedules",
+                name="Schedules per month",
+                description="Amount of invoice scheduled sends allowed per month",
+                default_value=100,
+                period="per_month",
+                adjustable=True,
+            ),
+            QuotaItem(
+                slug="access_codes",
+                name="Created access codes",
+                description="Amount of invoice access codes allowed per invoice",
+                default_value=3,
+                period="per_invoice",
+                adjustable=True,
+            ),
+        ],
+    ),
+    QuotaGroup(
+        "receipts",
+        [
+            QuotaItem(
+                slug="count",
+                name="Created receipts",
+                description="Amount of receipts stored per month",
+                default_value=100,
+                period="per_month",
+                adjustable=True,
+            )
+        ],
+    ),
+    QuotaGroup(
+        "clients",
+        [
+            QuotaItem(
+                slug="count",
+                name="Created clients",
+                description="Amount of clients stored in total",
+                default_value=40,
+                period="forever",
+                adjustable=True,
+            )
+        ],
+    ),
+    QuotaGroup(
+        "teams",
+        [
+            QuotaItem(
+                slug="count",
+                name="Created teams",
+                description="Amount of teams created in total",
+                default_value=3,
+                period="forever",
+                adjustable=True,
+            ),
+            QuotaItem(
+                slug="joined",
+                name="Joined teams",
+                description="Amount of teams that you have joined in total",
+                default_value=5,
+                period="forever",
+                adjustable=True,
+            ),
+            QuotaItem(
+                slug="user_count",
+                name="Users per team",
+                description="Amount of users per team",
+                default_value=10,
+                period="per_team",
+                adjustable=True,
+            ),
+        ],
+    ),
+    QuotaGroup(
+        "quota_increase",
+        [
+            QuotaItem(
+                slug="request",
+                name="Quota Increase Request",
+                description="Amount of increase requests allowed per quota",
+                default_value=1,
+                period="per_quota",
+                adjustable=False,
+            ),
+            QuotaItem(
+                slug="requests_per_month",
+                name="Quota Increase Requests per month",
+                description="Amount of increase requests allowed per month",
+                period="per_month",
+                default_value=1,
+                adjustable=False,
+            ),
+        ],
+    ),
 ]
diff --git a/backend/models.py b/backend/models.py
index dc03ffc5..4f90e4ba 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -613,8 +613,9 @@ def strict_get_quotas(self, user: User, extra: Optional[str | int] = None):
             current_day = timezone.now().day
             current_month = timezone.now().month
             current_year = timezone.now().year
-            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month,
-                                              created_at__day=current_day)
+            current = self.quota_usage.filter(
+                user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month, created_at__day=current_day
+            )
         elif self.limit_type in ["per_client", "per_invoice", "per_team", "per_receipt", "per_quota"]:
             current = self.quota_usage.filter(user=user, quota_limit=self, extra_data__exact=extra)
         return current
@@ -685,11 +686,7 @@ def create_str(cls, user: User, limit: str | QuotaLimit, extra_data: Optional[st
         except QuotaLimit.DoesNotExist:
             return "Not Found"
 
-        return cls.objects.create(
-            user=user,
-            quota_limit=quota_limit,
-            extra_data=extra_data
-        )
+        return cls.objects.create(user=user, quota_limit=quota_limit, extra_data=extra_data)
 
     @classmethod
     def get_usage(self, user: User, limit: str | QuotaLimit):
diff --git a/backend/signals.py b/backend/signals.py
index 7869f836..14af938a 100644
--- a/backend/signals.py
+++ b/backend/signals.py
@@ -69,6 +69,7 @@ def delete_receipt_image_on_delete(sender, instance: Receipt, **kwargs):
     {"name": "isInvoiceSchedulingEnabled", "default": False, "pk": 2},
 ]
 
+
 def insert_initial_data(**kwargs):
     for feature in feature_flags:
         try:
@@ -83,13 +84,25 @@ def insert_initial_data(**kwargs):
         for item in group.items:
             existing = QuotaLimit.objects.filter(slug=f"{group.name}-{item.slug}").first()
             if existing:
-                name, value, adjustable, description, limit_type = existing.name, existing.value, existing.adjustable, existing.description, existing.limit_type
+                name, value, adjustable, description, limit_type = (
+                    existing.name,
+                    existing.value,
+                    existing.adjustable,
+                    existing.description,
+                    existing.limit_type,
+                )
                 existing.name = item.name
                 existing.value = item.default_value
                 existing.adjustable = item.adjustable
                 existing.description = item.description
                 existing.limit_type = item.period
-                if item.name != name or item.default_value != value or item.adjustable != adjustable or item.description != description or item.period != limit_type:
+                if (
+                    item.name != name
+                    or item.default_value != value
+                    or item.adjustable != adjustable
+                    or item.description != description
+                    or item.period != limit_type
+                ):
                     logging.info(f"Updated QuotaLimit {item.name}")
                     existing.save()
             else:
@@ -99,7 +112,7 @@ def insert_initial_data(**kwargs):
                     value=item.default_value,
                     adjustable=item.adjustable,
                     description=item.description,
-                    limit_type=item.period
+                    limit_type=item.period,
                 )
                 logging.info(f"Added QuotaLimit {item.name}")
 
diff --git a/backend/views/core/settings/teams.py b/backend/views/core/settings/teams.py
index 49eb2135..ad7f90c5 100644
--- a/backend/views/core/settings/teams.py
+++ b/backend/views/core/settings/teams.py
@@ -10,8 +10,7 @@ def teams_dashboard(request: HttpRequest):
     users_team: Optional[Team] = request.user.logged_in_as_team
 
     if not users_team:
-        user_with_counts = User.objects.prefetch_related("teams_joined", "teams_leader_of").get(
-            pk=request.user.pk)
+        user_with_counts = User.objects.prefetch_related("teams_joined", "teams_leader_of").get(pk=request.user.pk)
         return render(
             request,
             "pages/settings/teams/main.html",
diff --git a/components/+messages_list.html b/components/+messages_list.html
index 17df1c57..96766ec2 100644
--- a/components/+messages_list.html
+++ b/components/+messages_list.html
@@ -13,13 +13,13 @@
                 {% endautoescape %}
             </div>
             {% if autohide != False %}
-            <script>
+                <script>
                 var scriptElement = document.currentScript;
                 var divElement = scriptElement.parentNode;
                 setTimeout(function () {
                     clicked_alert_to_close(divElement);
                 }, 7000);
-            </script>
+                </script>
             {% endif %}
         </div>
     {% endfor %}
diff --git a/frontend/templates/base/toast.html b/frontend/templates/base/toast.html
index 5c5a96fc..bb637a64 100644
--- a/frontend/templates/base/toast.html
+++ b/frontend/templates/base/toast.html
@@ -1 +1 @@
-{% component "messages_list" %}
\ No newline at end of file
+{% component "messages_list" %}
diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
index 359915ec..3902e5e0 100644
--- a/frontend/templates/modals/view_quota_limit_info.html
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -1,9 +1,7 @@
 {% component_block "modal" start_open="true" %}
     {% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
     {% fill "title" %}
-        <h3 class="font-bold text-lg">
-            {{ quota.name }} - ({{ quota.slug }})
-        </h3>
+        <h3 class="font-bold text-lg">{{ quota.name }} - ({{ quota.slug }})</h3>
     {% endfill %}
     {% fill "content" %}
         <form class="py-4 group"
@@ -14,7 +12,6 @@ <h3 class="font-bold text-lg">
             <div class="p-4">
                 <h2 class="text-xl mb-4">Description</h2>
                 <p class="">{{ quota.description }}</p>
-
                 <table class="w-full table my-8">
                     <thead>
                     <tr>
@@ -37,8 +34,6 @@ <h2 class="text-xl mb-4">Description</h2>
                     </tr>
                     </tbody>
                 </table>
-
-
                 {% if quota.adjustable %}
                     <div class="divider divider-info mt-4 mb-8">Submit Request</div>
                     <div class="form-control w-full">
@@ -46,31 +41,27 @@ <h2 class="text-xl mb-4">Description</h2>
                             New limit value
                             <span class="required_star">*</span>
                         </label>
-                        <input
-                            name="new_value"
-                            type="text"
-                            class="input input-block input-bordered"
-                            required>
+                        <input name="new_value"
+                               type="text"
+                               class="input input-block input-bordered"
+                               required>
                     </div>
                     <div class="form-control w-full">
                         <label class="label justify-start">
                             Reason for increased limit
                             <span class="required_star">*</span>
                         </label>
-                        <textarea
-                            name="reason"
-                            minlength="25"
-                            class="textarea textarea-block textarea-bordered"
-                            required></textarea>
+                        <textarea name="reason"
+                                  minlength="25"
+                                  class="textarea textarea-block textarea-bordered"
+                                  required></textarea>
                     </div>
                 {% endif %}
             </div>
-
             <div class="modal-action">
                 <button type="button"
                         _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
-                        class="btn btn-white">
-                    Close
+                        class="btn btn-white">Close
                 </button>
                 {% if quota.adjustable %}
                     <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
diff --git a/frontend/templates/pages/invoices/manage_access/_table_row.html b/frontend/templates/pages/invoices/manage_access/_table_row.html
index 55537985..4410c10a 100644
--- a/frontend/templates/pages/invoices/manage_access/_table_row.html
+++ b/frontend/templates/pages/invoices/manage_access/_table_row.html
@@ -18,4 +18,4 @@
         {% if added %}<script>navigator.clipboard.writeText("{{ code }}");</script>{% endif %}
     </tr>
 {% endif %}
-{% component "messages_list" %}
\ No newline at end of file
+{% component "messages_list" %}
diff --git a/frontend/templates/pages/quotas/_fetch_body.html b/frontend/templates/pages/quotas/_fetch_body.html
index 484b6250..9306fe9f 100644
--- a/frontend/templates/pages/quotas/_fetch_body.html
+++ b/frontend/templates/pages/quotas/_fetch_body.html
@@ -12,15 +12,9 @@
                 {{ quota.quota_object.name }}
             </button>
         </td>
-        <td class="text-right">
-            {{ quota.period_usage }}
-        </td>
-        <td class="text-right">
-            {{ quota.quota_limit }}
-        </td>
-        <td class="text-right">
-            {{ quota.quota_object.value }}
-        </td>
+        <td class="text-right">{{ quota.period_usage }}</td>
+        <td class="text-right">{{ quota.quota_limit }}</td>
+        <td class="text-right">{{ quota.quota_object.value }}</td>
         <td class="text-center">
             {% if quota.quota_object.adjustable %}
                 Account Level
diff --git a/frontend/templates/pages/quotas/dashboard.html b/frontend/templates/pages/quotas/dashboard.html
index eb8fafec..7e73e2f0 100644
--- a/frontend/templates/pages/quotas/dashboard.html
+++ b/frontend/templates/pages/quotas/dashboard.html
@@ -2,30 +2,26 @@
 {% block content %}
     <div class="card w-full p-6 bg-base-100 shadow-xl mt-2">
         <h2 class="text-xl">Service Quotas</h2>
-
         <div class="grid grid-cols-3 gap-4 mt-8">
             {% if request.user.is_superuser %}
                 <a href="{% url "admin quota increase requests" %}"
-                   class="card p-6 bg-base-200 border border-warning text-center text-xl">
-                    View Requests
+                   class="card p-6 bg-base-200 border border-warning text-center text-xl">View Requests
                 </a>
             {% endif %}
-            <a href="{% url "quotas group" group="invoices" %}" class="card p-6 border bg-base-200 shadow-xl text-center text-xl">
-                Invoices
+            <a href="{% url "quotas group" group="invoices" %}"
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Invoices
             </a>
-            <a href="{% url "quotas group" group="clients" %}" class="card p-6 border bg-base-200 shadow-xl text-center text-xl">
-                Clients
+            <a href="{% url "quotas group" group="clients" %}"
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Clients
             </a>
-            <a href="{% url "quotas group" group="teams" %}" class="card p-6 border bg-base-200 shadow-xl text-center text-xl">
-                Teams
+            <a href="{% url "quotas group" group="teams" %}"
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Teams
             </a>
-            <a href="{% url "quotas group" group="receipts" %}" class="card p-6 border bg-base-200 shadow-xl text-center
-            text-xl">
-                Receipts
+            <a href="{% url "quotas group" group="receipts" %}"
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Receipts
             </a>
-            <a href="{% url "quotas group" group="quota" %}" class="card p-6 border bg-base-200 shadow-xl text-center
-            text-xl">
-                Quotas
+            <a href="{% url "quotas group" group="quota" %}"
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Quotas
             </a>
         </div>
     </div>
diff --git a/frontend/templates/pages/quotas/list.html b/frontend/templates/pages/quotas/list.html
index a4a9beb6..3df0cc5d 100644
--- a/frontend/templates/pages/quotas/list.html
+++ b/frontend/templates/pages/quotas/list.html
@@ -8,10 +8,8 @@
                 </a>
             </div>
             <h1 class="text-center col-span-2">Service Quotas</h1>
-            <div>
-            </div>
+            <div></div>
         </div>
-
         <div class="flex w-full h-full overflow-x-hidden overflow-y-auto mt-8">
             <table class="table">
                 <thead>
diff --git a/frontend/templates/pages/quotas/view_requests.html b/frontend/templates/pages/quotas/view_requests.html
index cce725a8..5d33a96d 100644
--- a/frontend/templates/pages/quotas/view_requests.html
+++ b/frontend/templates/pages/quotas/view_requests.html
@@ -2,7 +2,6 @@
 {% block content %}
     <div class="card w-full p-6 bg-base-100 shadow-xl mt-2">
         <h2 class="text-xl">View Requests</h2>
-
         <table class="mt-3 table w-full">
             <thead>
             <tr>
@@ -39,9 +38,7 @@ <h2 class="text-xl">View Requests</h2>
                 </tr>
             {% empty %}
                 <tr>
-                    <td class="text-center" colspan="100%">
-                        There are currently no submitted requests
-                    </td>
+                    <td class="text-center" colspan="100%">There are currently no submitted requests</td>
                 </tr>
             {% endfor %}
             </tbody>
diff --git a/frontend/templates/partials/messages_list.html b/frontend/templates/partials/messages_list.html
index dd30e4e3..b943764b 100644
--- a/frontend/templates/partials/messages_list.html
+++ b/frontend/templates/partials/messages_list.html
@@ -1 +1,5 @@
-{% if autohide != False %}{% component "messages_list" %}{% else %}{% component "messages_list" autohide=False %}{% endif %}
\ No newline at end of file
+{% if autohide != False %}
+    {% component "messages_list" %}
+{% else %}
+    {% component "messages_list" autohide=False %}
+{% endif %}

From 8d24060345d1692ad360468448c140bf775da4bc Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:24:33 +0100
Subject: [PATCH 12/15] refactor: Ran formatters

---
 backend/urls.py                               |   6 +-
 .../modals/view_quota_limit_info.html         | 141 +++++++++---------
 .../templates/pages/quotas/_fetch_body.html   |  54 +++----
 .../templates/pages/quotas/dashboard.html     |  18 +--
 frontend/templates/pages/quotas/list.html     |  19 ++-
 .../templates/pages/quotas/view_requests.html |  68 ++++-----
 6 files changed, 148 insertions(+), 158 deletions(-)

diff --git a/backend/urls.py b/backend/urls.py
index 44b01a1e..d72e7593 100644
--- a/backend/urls.py
+++ b/backend/urls.py
@@ -28,9 +28,9 @@
     path("dashboard/", dashboard, name="dashboard"),
     path("dashboard/settings/", settings_v.view.settings_page, name="user settings"),
     path("dashboard/invoices/", include("backend.views.core.invoices.urls")),
-                  path("dashboard/quotas/", quotas_page, name="quotas"),
-                  path("dashboard/quotas/<str:group>/", quotas_list, name="quotas group"),
-                  path("dashboard/admin/quota_requests/", view_quota_increase_requests, name="admin quota increase requests"),
+    path("dashboard/quotas/", quotas_page, name="quotas"),
+    path("dashboard/quotas/<str:group>/", quotas_list, name="quotas group"),
+    path("dashboard/admin/quota_requests/", view_quota_increase_requests, name="admin quota increase requests"),
     path(
         "dashboard/invoice/<str:invoice_id>/",
         manage_invoice,
diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
index 3902e5e0..db3657a3 100644
--- a/frontend/templates/modals/view_quota_limit_info.html
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -1,75 +1,74 @@
 {% component_block "modal" start_open="true" %}
-    {% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
-    {% fill "title" %}
-        <h3 class="font-bold text-lg">{{ quota.name }} - ({{ quota.slug }})</h3>
-    {% endfill %}
-    {% fill "content" %}
-        <form class="py-4 group"
-              id="modal_view_quota_limit_info_{{ quota.id }}-form"
-              hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
-              hx-swap="none">
-            {% csrf_token %}
-            <div class="p-4">
-                <h2 class="text-xl mb-4">Description</h2>
-                <p class="">{{ quota.description }}</p>
-                <table class="w-full table my-8">
-                    <thead>
-                    <tr>
-                        <th class="px-4 py-2">Type</th>
-                        <th class="px-4 py-2">Value</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>Applied account-level quota value</td>
-                        <td>{{ current_limit }}</td>
-                    </tr>
-                    <tr>
-                        <td>Default quota value</td>
-                        <td>{{ quota.value }}</td>
-                    </tr>
-                    <tr>
-                        <td>Adjustable</td>
-                        <td>{{ quota.adjustable }}</td>
-                    </tr>
-                    </tbody>
-                </table>
-                {% if quota.adjustable %}
-                    <div class="divider divider-info mt-4 mb-8">Submit Request</div>
-                    <div class="form-control w-full">
-                        <label class="label justify-start">
-                            New limit value
-                            <span class="required_star">*</span>
-                        </label>
-                        <input name="new_value"
-                               type="text"
-                               class="input input-block input-bordered"
-                               required>
-                    </div>
-                    <div class="form-control w-full">
-                        <label class="label justify-start">
-                            Reason for increased limit
-                            <span class="required_star">*</span>
-                        </label>
-                        <textarea name="reason"
-                                  minlength="25"
-                                  class="textarea textarea-block textarea-bordered"
-                                  required></textarea>
-                    </div>
-                {% endif %}
+{% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
+{% fill "title" %}
+<h3 class="font-bold text-lg">{{ quota.name }} - ({{ quota.slug }})</h3>
+{% endfill %}
+{% fill "content" %}
+<form class="py-4 group"
+      id="modal_view_quota_limit_info_{{ quota.id }}-form"
+      hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
+      hx-swap="none">
+    {% csrf_token %}
+    <div class="p-4">
+        <h2 class="text-xl mb-4">Description</h2>
+        <p class="">{{ quota.description }}</p>
+        <table class="w-full table my-8">
+            <thead>
+                <tr>
+                    <th class="px-4 py-2">Type</th>
+                    <th class="px-4 py-2">Value</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>Applied account-level quota value</td>
+                    <td>{{ current_limit }}</td>
+                </tr>
+                <tr>
+                    <td>Default quota value</td>
+                    <td>{{ quota.value }}</td>
+                </tr>
+                <tr>
+                    <td>Adjustable</td>
+                    <td>{{ quota.adjustable }}</td>
+                </tr>
+            </tbody>
+        </table>
+        {% if quota.adjustable %}
+            <div class="divider divider-info mt-4 mb-8">Submit Request</div>
+            <div class="form-control w-full">
+                <label class="label justify-start">
+                    New limit value
+                    <span class="required_star">*</span>
+                </label>
+                <input name="new_value"
+                       type="text"
+                       class="input input-block input-bordered"
+                       required>
             </div>
-            <div class="modal-action">
-                <button type="button"
-                        _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
-                        class="btn btn-white">Close
-                </button>
-                {% if quota.adjustable %}
-                    <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
-                            _="on click if #modal_view_quota_limit_info_{{ quota.id }}-form.checkValidity() call #modal_view_quota_limit_info_{{ quota.id }}.close() end">
-                        Request quota increase at account-level
-                    </button>
-                {% endif %}
+            <div class="form-control w-full">
+                <label class="label justify-start">
+                    Reason for increased limit
+                    <span class="required_star">*</span>
+                </label>
+                <textarea name="reason"
+                          minlength="25"
+                          class="textarea textarea-block textarea-bordered"
+                          required></textarea>
             </div>
-        </form>
-    {% endfill %}
+        {% endif %}
+    </div>
+    <div class="modal-action">
+        <button type="button"
+                _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
+                class="btn btn-white">Close</button>
+        {% if quota.adjustable %}
+            <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
+                    _="on click if #modal_view_quota_limit_info_{{ quota.id }}-form.checkValidity() call #modal_view_quota_limit_info_{{ quota.id }}.close() end">
+                Request quota increase at account-level
+            </button>
+        {% endif %}
+    </div>
+</form>
+{% endfill %}
 {% endcomponent_block %}
diff --git a/frontend/templates/pages/quotas/_fetch_body.html b/frontend/templates/pages/quotas/_fetch_body.html
index 9306fe9f..4aff9499 100644
--- a/frontend/templates/pages/quotas/_fetch_body.html
+++ b/frontend/templates/pages/quotas/_fetch_body.html
@@ -1,30 +1,30 @@
 <tbody id="table_body">
-{% for quota in quotas %}
-    <tr>
-        <td>
-            <button hx-trigger="click once"
-                    hx-swap="beforeend"
-                    hx-target="#modal_container"
-                    class="link link-primary"
-                    title="{{ quota.quota_object.description }}"
-                    _="on click call modal_view_quota_limit_info_{{ quota.quota_object.id }}.showModal()"
-                    hx-get="{% url "api:base:modal retrieve with context" context_type="quota" context_value=quota.quota_object.slug modal_name="view_quota_limit_info" %}">
-                {{ quota.quota_object.name }}
-            </button>
-        </td>
-        <td class="text-right">{{ quota.period_usage }}</td>
-        <td class="text-right">{{ quota.quota_limit }}</td>
-        <td class="text-right">{{ quota.quota_object.value }}</td>
-        <td class="text-center">
-            {% if quota.quota_object.adjustable %}
-                Account Level
-            {% else %}
-                Not adjustable
-            {% endif %}
-        </td>
-    </tr>
-{% empty %}
-    <td colspan="100%" class="text-center">No Quotas Found</td>
-{% endfor %}
+    {% for quota in quotas %}
+        <tr>
+            <td>
+                <button hx-trigger="click once"
+                        hx-swap="beforeend"
+                        hx-target="#modal_container"
+                        class="link link-primary"
+                        title="{{ quota.quota_object.description }}"
+                        _="on click call modal_view_quota_limit_info_{{ quota.quota_object.id }}.showModal()"
+                        hx-get="{% url "api:base:modal retrieve with context" context_type="quota" context_value=quota.quota_object.slug modal_name="view_quota_limit_info" %}">
+                    {{ quota.quota_object.name }}
+                </button>
+            </td>
+            <td class="text-right">{{ quota.period_usage }}</td>
+            <td class="text-right">{{ quota.quota_limit }}</td>
+            <td class="text-right">{{ quota.quota_object.value }}</td>
+            <td class="text-center">
+                {% if quota.quota_object.adjustable %}
+                    Account Level
+                {% else %}
+                    Not adjustable
+                {% endif %}
+            </td>
+        </tr>
+    {% empty %}
+        <td colspan="100%" class="text-center">No Quotas Found</td>
+    {% endfor %}
 </tbody>
 {% component "messages_list" %}
diff --git a/frontend/templates/pages/quotas/dashboard.html b/frontend/templates/pages/quotas/dashboard.html
index 7e73e2f0..f5827ea2 100644
--- a/frontend/templates/pages/quotas/dashboard.html
+++ b/frontend/templates/pages/quotas/dashboard.html
@@ -5,24 +5,18 @@ <h2 class="text-xl">Service Quotas</h2>
         <div class="grid grid-cols-3 gap-4 mt-8">
             {% if request.user.is_superuser %}
                 <a href="{% url "admin quota increase requests" %}"
-                   class="card p-6 bg-base-200 border border-warning text-center text-xl">View Requests
-                </a>
+                   class="card p-6 bg-base-200 border border-warning text-center text-xl">View Requests</a>
             {% endif %}
             <a href="{% url "quotas group" group="invoices" %}"
-               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Invoices
-            </a>
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Invoices</a>
             <a href="{% url "quotas group" group="clients" %}"
-               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Clients
-            </a>
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Clients</a>
             <a href="{% url "quotas group" group="teams" %}"
-               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Teams
-            </a>
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Teams</a>
             <a href="{% url "quotas group" group="receipts" %}"
-               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Receipts
-            </a>
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Receipts</a>
             <a href="{% url "quotas group" group="quota" %}"
-               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Quotas
-            </a>
+               class="card p-6 border bg-base-200 shadow-xl text-center text-xl">Quotas</a>
         </div>
     </div>
 {% endblock content %}
diff --git a/frontend/templates/pages/quotas/list.html b/frontend/templates/pages/quotas/list.html
index 3df0cc5d..3b908332 100644
--- a/frontend/templates/pages/quotas/list.html
+++ b/frontend/templates/pages/quotas/list.html
@@ -4,8 +4,7 @@
         <div class=" text-3xl w-full grid grid-cols-4">
             <div>
                 <a href="{% url "quotas" %}"
-                   class="btn btn-sm btn-outline btn-secondary me-3 float-left">Back to list
-                </a>
+                   class="btn btn-sm btn-outline btn-secondary me-3 float-left">Back to list</a>
             </div>
             <h1 class="text-center col-span-2">Service Quotas</h1>
             <div></div>
@@ -13,19 +12,19 @@ <h1 class="text-center col-span-2">Service Quotas</h1>
         <div class="flex w-full h-full overflow-x-hidden overflow-y-auto mt-8">
             <table class="table">
                 <thead>
-                <tr>
-                    <th>Quota Name</th>
-                    <th class="text-right">Current usage</th>
-                    <th class="text-right">Applied account quota value</th>
-                    <th class="text-right">Default quota value</th>
-                    <th>Adjustability</th>
-                </tr>
+                    <tr>
+                        <th>Quota Name</th>
+                        <th class="text-right">Current usage</th>
+                        <th class="text-right">Applied account quota value</th>
+                        <th class="text-right">Default quota value</th>
+                        <th>Adjustability</th>
+                    </tr>
                 </thead>
                 <tbody id="table_body"
                        hx-swap="outerHTML"
                        hx-trigger="load"
                        hx-get="{% url 'api:quotas:fetch' group=group %}">
-                {% include 'components/table/skeleton_rows.html' with rows=3 cols=5 %}
+                    {% include 'components/table/skeleton_rows.html' with rows=3 cols=5 %}
                 </tbody>
             </table>
         </div>
diff --git a/frontend/templates/pages/quotas/view_requests.html b/frontend/templates/pages/quotas/view_requests.html
index 5d33a96d..23745ed7 100644
--- a/frontend/templates/pages/quotas/view_requests.html
+++ b/frontend/templates/pages/quotas/view_requests.html
@@ -4,43 +4,41 @@
         <h2 class="text-xl">View Requests</h2>
         <table class="mt-3 table w-full">
             <thead>
-            <tr>
-                <th>ID</th>
-                <th>Quota Item</th>
-                <th>Current Value</th>
-                <th>New Value</th>
-                <th>User ID</th>
-                <th>Date</th>
-                <th>Actions</th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for request in requests %}
-                <tr>
-                    <td>{{ request.id }}</td>
-                    <td>{{ request.quota_limit.name }}</td>
-                    <td>{{ request.current_value }}</td>
-                    <td>{{ request.new_value }}</td>
-                    <td>{{ request.user.id }}</td>
-                    <td>{{ request.created_at }}</td>
-                    <td>
-                        <button hx-target="closest tr"
-                                hx-confirm="Are you sure you'd like to ACCEPT request #{{ request.id }}"
-                                hx-delete="{% url "api:quotas:approve request" request_id=request.id %}"
-                                class="btn btn-success btn-sm">Approve
-                        </button>
-                        <button hx-target="closest tr"
-                                hx-confirm="Are you sure you'd like to DECLINE request #{{ request.id }}"
-                                hx-delete="{% url "api:quotas:decline request" request_id=request.id %}"
-                                class="btn btn-error btn-sm">Decline
-                        </button>
-                    </td>
-                </tr>
-            {% empty %}
                 <tr>
-                    <td class="text-center" colspan="100%">There are currently no submitted requests</td>
+                    <th>ID</th>
+                    <th>Quota Item</th>
+                    <th>Current Value</th>
+                    <th>New Value</th>
+                    <th>User ID</th>
+                    <th>Date</th>
+                    <th>Actions</th>
                 </tr>
-            {% endfor %}
+            </thead>
+            <tbody>
+                {% for request in requests %}
+                    <tr>
+                        <td>{{ request.id }}</td>
+                        <td>{{ request.quota_limit.name }}</td>
+                        <td>{{ request.current_value }}</td>
+                        <td>{{ request.new_value }}</td>
+                        <td>{{ request.user.id }}</td>
+                        <td>{{ request.created_at }}</td>
+                        <td>
+                            <button hx-target="closest tr"
+                                    hx-confirm="Are you sure you'd like to ACCEPT request #{{ request.id }}"
+                                    hx-delete="{% url "api:quotas:approve request" request_id=request.id %}"
+                                    class="btn btn-success btn-sm">Approve</button>
+                            <button hx-target="closest tr"
+                                    hx-confirm="Are you sure you'd like to DECLINE request #{{ request.id }}"
+                                    hx-delete="{% url "api:quotas:decline request" request_id=request.id %}"
+                                    class="btn btn-error btn-sm">Decline</button>
+                        </td>
+                    </tr>
+                {% empty %}
+                    <tr>
+                        <td class="text-center" colspan="100%">There are currently no submitted requests</td>
+                    </tr>
+                {% endfor %}
             </tbody>
         </table>
     </div>

From 7bcc5f818e8c3c8e640427e57197d26a8166ebf9 Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:53:57 +0100
Subject: [PATCH 13/15] Fixed migrations

---
 ...uotalimit_quotaincreaserequest_quotaoverrides_and_more.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename backend/migrations/{0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py => 0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py} (97%)

diff --git a/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py b/backend/migrations/0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
similarity index 97%
rename from backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
rename to backend/migrations/0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
index 5f486f65..a85c56bf 100644
--- a/backend/migrations/0027_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
+++ b/backend/migrations/0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-03-31 20:27
+# Generated by Django 5.0.3 on 2024-04-01 16:52
 
 import django.db.models.deletion
 from django.conf import settings
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("backend", "0026_invoice_discount_amount_invoice_discount_percentage"),
+        ("backend", "0027_invoice_currency"),
     ]
 
     operations = [

From 4653e5f186463b17086fb0f128eadd4431ac383a Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Mon, 1 Apr 2024 19:20:00 +0100
Subject: [PATCH 14/15] Fixed unique migration and fixed logic when checking
 quota requests

---
 backend/api/base/modal.py                     |   7 +-
 backend/api/quotas/requests.py                |   5 +-
 backend/data/default_quota_limits.py          |   6 +-
 ...increaserequest_quotaoverrides_and_more.py |   4 +-
 backend/models.py                             |  37 +++--
 .../modals/view_quota_limit_info.html         | 145 +++++++++---------
 6 files changed, 112 insertions(+), 92 deletions(-)

diff --git a/backend/api/base/modal.py b/backend/api/base/modal.py
index fdb4dc90..823ed93d 100644
--- a/backend/api/base/modal.py
+++ b/backend/api/base/modal.py
@@ -55,13 +55,16 @@ def open_modal(request: HttpRequest, modal_name, context_type=None, context_valu
                 try:
                     quota = QuotaLimit.objects.prefetch_related("quota_overrides").get(slug=context_value)
                     context["quota"] = quota
-                    context["current_limit"] = quota.get_quota_limit(user=request.user)
+                    context["current_limit"] = quota.get_quota_limit(user=request.user, quota_limit=quota)
+                    usage = quota.strict_get_quotas(user=request.user, quota_limit=quota)
+                    context["quota_usage"] = usage.count() if usage != "Not Available" else "Not available"
+                    print(context["quota_usage"])
                 except QuotaLimit.DoesNotExist:
                     ...
             else:
                 context[context_type] = context_value
 
         return render(request, template_name, context)
-    except Exception as e:
+    except ValueError as e:
         print(f"Something went wrong with loading modal {modal_name}. Error: {e}")
         return HttpResponseBadRequest("Something went wrong")
diff --git a/backend/api/quotas/requests.py b/backend/api/quotas/requests.py
index 9bb593df..f00eeba3 100644
--- a/backend/api/quotas/requests.py
+++ b/backend/api/quotas/requests.py
@@ -24,7 +24,8 @@ def submit_request(request: HttpRequest, slug) -> HttpResponse:
         return error(request, "Failed to get the quota limit type")
 
     usage_per_item = quota_usage_check_under(request, "quota_increase-request", extra_data=quota_limit.id, api=True, htmx=True)
-    usage_per_month = quota_usage_check_under(request, "quota_increase-requests_per_month", extra_data=quota_limit.id, api=True, htmx=True)
+    usage_per_month = quota_usage_check_under(request, "quota_increase-requests_per_month_per_quota", extra_data=quota_limit.id, api=True,
+                                              htmx=True)
 
     if not isinstance(usage_per_item, bool):
         return usage_per_item
@@ -44,7 +45,7 @@ def submit_request(request: HttpRequest, slug) -> HttpResponse:
     )
 
     QuotaUsage.create_str(request.user, "quota_increase-request", quota_increase_request.id)
-    QuotaUsage.create_str(request.user, "quota_increase-requests_per_month", quota_increase_request.id)
+    QuotaUsage.create_str(request.user, "quota_increase-requests_per_month_per_quota", quota_limit.id)
 
     messages.success(request, "Successfully submitted a quota increase request")
     return render(request, "partials/messages_list.html")
diff --git a/backend/data/default_quota_limits.py b/backend/data/default_quota_limits.py
index b26a797e..0ed8171b 100644
--- a/backend/data/default_quota_limits.py
+++ b/backend/data/default_quota_limits.py
@@ -115,10 +115,10 @@ class QuotaGroup:
                 adjustable=False,
             ),
             QuotaItem(
-                slug="requests_per_month",
+                slug="requests_per_month_per_quota",
                 name="Quota Increase Requests per month",
-                description="Amount of increase requests allowed per month",
-                period="per_month",
+                description="Amount of increase requests allowed per month per quota",
+                period="per_quota",
                 default_value=1,
                 adjustable=False,
             ),
diff --git a/backend/migrations/0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py b/backend/migrations/0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
index a85c56bf..ca011aa9 100644
--- a/backend/migrations/0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
+++ b/backend/migrations/0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-04-01 16:52
+# Generated by Django 5.0.3 on 2024-04-01 17:55
 
 import django.db.models.deletion
 from django.conf import settings
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
             fields=[
                 ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
                 ("slug", models.CharField(editable=False, max_length=100, unique=True)),
-                ("name", models.CharField(editable=False, max_length=100, unique=True)),
+                ("name", models.CharField(editable=False, max_length=100)),
                 ("description", models.TextField(blank=True, max_length=500, null=True)),
                 ("value", models.IntegerField()),
                 ("updated_at", models.DateTimeField(auto_now=True)),
diff --git a/backend/models.py b/backend/models.py
index beb4fc6c..bd482b82 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -1,13 +1,13 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Optional, NoReturn, Union
+from typing import Optional, NoReturn, Union, Literal
 from uuid import uuid4
 
 from django.contrib.auth.hashers import make_password, check_password
 from django.contrib.auth.models import UserManager, AbstractUser, AnonymousUser
 from django.core.validators import MaxValueValidator
 from django.db import models
-from django.db.models import Count
+from django.db.models import Count, QuerySet
 from django.utils import timezone
 from django.utils.crypto import get_random_string
 from shortuuid.django_fields import ShortUUIDField
@@ -573,7 +573,7 @@ class LimitTypes(models.TextChoices):
         FOREVER = "forever"
 
     slug = models.CharField(max_length=100, unique=True, editable=False)
-    name = models.CharField(max_length=100, unique=True, editable=False)
+    name = models.CharField(max_length=100, editable=False)
     description = models.TextField(max_length=500, null=True, blank=True)
     value = models.IntegerField()
     updated_at = models.DateTimeField(auto_now=True)
@@ -587,9 +587,12 @@ class Meta:
     def __str__(self):
         return self.name
 
-    def get_quota_limit(self, user: User):
+    def get_quota_limit(self, user: User, quota_limit: Optional["QuotaLimit"] = None):
         try:
-            user_quota_override = self.quota_overrides.get(user=user)
+            if quota_limit:
+                user_quota_override = quota_limit
+            else:
+                user_quota_override = self.quota_overrides.get(user=user)
             return user_quota_override.value
         except QuotaOverrides.DoesNotExist:
             return self.value
@@ -606,26 +609,34 @@ def get_period_usage(self, user: User):
 
     def strict_goes_above_limit(self, user: User, extra: Optional[str | int] = None) -> bool:
         current = self.strict_get_quotas(user, extra)
-        current = current.count() if current else None
+        current = current.count() if current != "Not Available" else None
         return current >= self.get_quota_limit(user) if current else False
 
-    def strict_get_quotas(self, user: User, extra: Optional[str | int] = None):
+    def strict_get_quotas(
+        self, user: User, extra: Optional[str | int] = None, quota_limit: Optional["QuotaLimit"] = None
+    ) -> Union['QuerySet["QuotaUsage"]', Literal["Not Available"]]:
+        """
+        Gets all usages of a quota
+        :return: QuerySet of quota usages OR "Not Available" if utilisation isn't available (e.g. per invoice you can't get in total)
+        """
         current = None
+        quota_limit = quota_limit.quota_usage if quota_limit else QuotaUsage.objects.filter(user=user, quota_limit=self)
+
         if self.limit_type == "forever":
             current = self.quota_usage.filter(user=user, quota_limit=self)
         elif self.limit_type == "per_month":
             current_month = timezone.now().month
             current_year = timezone.now().year
-            current = self.quota_usage.filter(user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month)
+            current = quota_limit.filter(created_at__year=current_year, created_at__month=current_month)
         elif self.limit_type == "per_day":
             current_day = timezone.now().day
             current_month = timezone.now().month
             current_year = timezone.now().year
-            current = self.quota_usage.filter(
-                user=user, quota_limit=self, created_at__year=current_year, created_at__month=current_month, created_at__day=current_day
-            )
-        elif self.limit_type in ["per_client", "per_invoice", "per_team", "per_receipt", "per_quota"]:
-            current = self.quota_usage.filter(user=user, quota_limit=self, extra_data__exact=extra)
+            current = quota_limit.filter(created_at__year=current_year, created_at__month=current_month, created_at__day=current_day)
+        elif self.limit_type in ["per_client", "per_invoice", "per_team", "per_receipt", "per_quota"] and extra:
+            current = quota_limit.filter(extra_data=extra)
+        else:
+            return "Not Available"
         return current
 
     @classmethod
diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
index db3657a3..75b5f131 100644
--- a/frontend/templates/modals/view_quota_limit_info.html
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -1,74 +1,79 @@
 {% component_block "modal" start_open="true" %}
-{% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
-{% fill "title" %}
-<h3 class="font-bold text-lg">{{ quota.name }} - ({{ quota.slug }})</h3>
-{% endfill %}
-{% fill "content" %}
-<form class="py-4 group"
-      id="modal_view_quota_limit_info_{{ quota.id }}-form"
-      hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
-      hx-swap="none">
-    {% csrf_token %}
-    <div class="p-4">
-        <h2 class="text-xl mb-4">Description</h2>
-        <p class="">{{ quota.description }}</p>
-        <table class="w-full table my-8">
-            <thead>
-                <tr>
-                    <th class="px-4 py-2">Type</th>
-                    <th class="px-4 py-2">Value</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>Applied account-level quota value</td>
-                    <td>{{ current_limit }}</td>
-                </tr>
-                <tr>
-                    <td>Default quota value</td>
-                    <td>{{ quota.value }}</td>
-                </tr>
-                <tr>
-                    <td>Adjustable</td>
-                    <td>{{ quota.adjustable }}</td>
-                </tr>
-            </tbody>
-        </table>
-        {% if quota.adjustable %}
-            <div class="divider divider-info mt-4 mb-8">Submit Request</div>
-            <div class="form-control w-full">
-                <label class="label justify-start">
-                    New limit value
-                    <span class="required_star">*</span>
-                </label>
-                <input name="new_value"
-                       type="text"
-                       class="input input-block input-bordered"
-                       required>
+    {% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
+    {% fill "title" %}
+        <h3 class="font-bold text-lg">{{ quota.name }} - ({{ quota.slug }})</h3>
+    {% endfill %}
+    {% fill "content" %}
+        <form class="py-4 group"
+              id="modal_view_quota_limit_info_{{ quota.id }}-form"
+              hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
+              hx-swap="none">
+            {% csrf_token %}
+            <div class="p-4">
+                <h2 class="text-xl mb-4">Description</h2>
+                <p class="">{{ quota.description }}</p>
+                <table class="w-full table my-8">
+                    <thead>
+                    <tr>
+                        <th class="px-4 py-2">Type</th>
+                        <th class="px-4 py-2">Value</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>Current Utilization</td>
+                        <td>{{ quota_usage }}</td>
+                    </tr>
+                    <tr>
+                        <td>Applied account-level quota value</td>
+                        <td>{{ current_limit }}</td>
+                    </tr>
+                    <tr>
+                        <td>Default quota value</td>
+                        <td>{{ quota.value }}</td>
+                    </tr>
+                    <tr>
+                        <td>Adjustable</td>
+                        <td>{{ quota.adjustable }}</td>
+                    </tr>
+                    </tbody>
+                </table>
+                {% if quota.adjustable %}
+                    <div class="divider divider-info mt-4 mb-8">Submit Request</div>
+                    <div class="form-control w-full">
+                        <label class="label justify-start">
+                            New limit value
+                            <span class="required_star">*</span>
+                        </label>
+                        <input name="new_value"
+                               type="text"
+                               class="input input-block input-bordered"
+                               required>
+                    </div>
+                    <div class="form-control w-full">
+                        <label class="label justify-start">
+                            Reason for increased limit
+                            <span class="required_star">*</span>
+                        </label>
+                        <textarea name="reason"
+                                  minlength="25"
+                                  class="textarea textarea-block textarea-bordered"
+                                  required></textarea>
+                    </div>
+                {% endif %}
             </div>
-            <div class="form-control w-full">
-                <label class="label justify-start">
-                    Reason for increased limit
-                    <span class="required_star">*</span>
-                </label>
-                <textarea name="reason"
-                          minlength="25"
-                          class="textarea textarea-block textarea-bordered"
-                          required></textarea>
+            <div class="modal-action">
+                <button type="button"
+                        _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
+                        class="btn btn-white">Close
+                </button>
+                {% if quota.adjustable %}
+                    <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
+                            _="on click if #modal_view_quota_limit_info_{{ quota.id }}-form.checkValidity() call #modal_view_quota_limit_info_{{ quota.id }}.close() end">
+                        Request quota increase at account-level
+                    </button>
+                {% endif %}
             </div>
-        {% endif %}
-    </div>
-    <div class="modal-action">
-        <button type="button"
-                _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
-                class="btn btn-white">Close</button>
-        {% if quota.adjustable %}
-            <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
-                    _="on click if #modal_view_quota_limit_info_{{ quota.id }}-form.checkValidity() call #modal_view_quota_limit_info_{{ quota.id }}.close() end">
-                Request quota increase at account-level
-            </button>
-        {% endif %}
-    </div>
-</form>
-{% endfill %}
+        </form>
+    {% endfill %}
 {% endcomponent_block %}

From 54f13eeb482c4b29c60527043bd0db3d43855ffc Mon Sep 17 00:00:00 2001
From: Trey <73353716+TreyWW@users.noreply.github.com>
Date: Mon, 1 Apr 2024 19:22:39 +0100
Subject: [PATCH 15/15] refactor: Reformatted files

---
 backend/api/quotas/requests.py                |   5 +-
 .../modals/view_quota_limit_info.html         | 149 +++++++++---------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/backend/api/quotas/requests.py b/backend/api/quotas/requests.py
index f00eeba3..4d6fcda4 100644
--- a/backend/api/quotas/requests.py
+++ b/backend/api/quotas/requests.py
@@ -24,8 +24,9 @@ def submit_request(request: HttpRequest, slug) -> HttpResponse:
         return error(request, "Failed to get the quota limit type")
 
     usage_per_item = quota_usage_check_under(request, "quota_increase-request", extra_data=quota_limit.id, api=True, htmx=True)
-    usage_per_month = quota_usage_check_under(request, "quota_increase-requests_per_month_per_quota", extra_data=quota_limit.id, api=True,
-                                              htmx=True)
+    usage_per_month = quota_usage_check_under(
+        request, "quota_increase-requests_per_month_per_quota", extra_data=quota_limit.id, api=True, htmx=True
+    )
 
     if not isinstance(usage_per_item, bool):
         return usage_per_item
diff --git a/frontend/templates/modals/view_quota_limit_info.html b/frontend/templates/modals/view_quota_limit_info.html
index 75b5f131..c4631152 100644
--- a/frontend/templates/modals/view_quota_limit_info.html
+++ b/frontend/templates/modals/view_quota_limit_info.html
@@ -1,79 +1,78 @@
 {% component_block "modal" start_open="true" %}
-    {% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
-    {% fill "title" %}
-        <h3 class="font-bold text-lg">{{ quota.name }} - ({{ quota.slug }})</h3>
-    {% endfill %}
-    {% fill "content" %}
-        <form class="py-4 group"
-              id="modal_view_quota_limit_info_{{ quota.id }}-form"
-              hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
-              hx-swap="none">
-            {% csrf_token %}
-            <div class="p-4">
-                <h2 class="text-xl mb-4">Description</h2>
-                <p class="">{{ quota.description }}</p>
-                <table class="w-full table my-8">
-                    <thead>
-                    <tr>
-                        <th class="px-4 py-2">Type</th>
-                        <th class="px-4 py-2">Value</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>Current Utilization</td>
-                        <td>{{ quota_usage }}</td>
-                    </tr>
-                    <tr>
-                        <td>Applied account-level quota value</td>
-                        <td>{{ current_limit }}</td>
-                    </tr>
-                    <tr>
-                        <td>Default quota value</td>
-                        <td>{{ quota.value }}</td>
-                    </tr>
-                    <tr>
-                        <td>Adjustable</td>
-                        <td>{{ quota.adjustable }}</td>
-                    </tr>
-                    </tbody>
-                </table>
-                {% if quota.adjustable %}
-                    <div class="divider divider-info mt-4 mb-8">Submit Request</div>
-                    <div class="form-control w-full">
-                        <label class="label justify-start">
-                            New limit value
-                            <span class="required_star">*</span>
-                        </label>
-                        <input name="new_value"
-                               type="text"
-                               class="input input-block input-bordered"
-                               required>
-                    </div>
-                    <div class="form-control w-full">
-                        <label class="label justify-start">
-                            Reason for increased limit
-                            <span class="required_star">*</span>
-                        </label>
-                        <textarea name="reason"
-                                  minlength="25"
-                                  class="textarea textarea-block textarea-bordered"
-                                  required></textarea>
-                    </div>
-                {% endif %}
+{% fill "id" %}modal_view_quota_limit_info_{{ quota.id }}{% endfill %}
+{% fill "title" %}
+<h3 class="font-bold text-lg">{{ quota.name }} - ({{ quota.slug }})</h3>
+{% endfill %}
+{% fill "content" %}
+<form class="py-4 group"
+      id="modal_view_quota_limit_info_{{ quota.id }}-form"
+      hx-post="{% url "api:quotas:submit_request" slug=quota.slug %}"
+      hx-swap="none">
+    {% csrf_token %}
+    <div class="p-4">
+        <h2 class="text-xl mb-4">Description</h2>
+        <p class="">{{ quota.description }}</p>
+        <table class="w-full table my-8">
+            <thead>
+                <tr>
+                    <th class="px-4 py-2">Type</th>
+                    <th class="px-4 py-2">Value</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>Current Utilization</td>
+                    <td>{{ quota_usage }}</td>
+                </tr>
+                <tr>
+                    <td>Applied account-level quota value</td>
+                    <td>{{ current_limit }}</td>
+                </tr>
+                <tr>
+                    <td>Default quota value</td>
+                    <td>{{ quota.value }}</td>
+                </tr>
+                <tr>
+                    <td>Adjustable</td>
+                    <td>{{ quota.adjustable }}</td>
+                </tr>
+            </tbody>
+        </table>
+        {% if quota.adjustable %}
+            <div class="divider divider-info mt-4 mb-8">Submit Request</div>
+            <div class="form-control w-full">
+                <label class="label justify-start">
+                    New limit value
+                    <span class="required_star">*</span>
+                </label>
+                <input name="new_value"
+                       type="text"
+                       class="input input-block input-bordered"
+                       required>
             </div>
-            <div class="modal-action">
-                <button type="button"
-                        _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
-                        class="btn btn-white">Close
-                </button>
-                {% if quota.adjustable %}
-                    <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
-                            _="on click if #modal_view_quota_limit_info_{{ quota.id }}-form.checkValidity() call #modal_view_quota_limit_info_{{ quota.id }}.close() end">
-                        Request quota increase at account-level
-                    </button>
-                {% endif %}
+            <div class="form-control w-full">
+                <label class="label justify-start">
+                    Reason for increased limit
+                    <span class="required_star">*</span>
+                </label>
+                <textarea name="reason"
+                          minlength="25"
+                          class="textarea textarea-block textarea-bordered"
+                          required></textarea>
             </div>
-        </form>
-    {% endfill %}
+        {% endif %}
+    </div>
+    <div class="modal-action">
+        <button type="button"
+                _="on click call #modal_view_quota_limit_info_{{ quota.id }}.close()"
+                class="btn btn-white">Close</button>
+        {% if quota.adjustable %}
+            <button class="group-invalid:btn-disabled btn btn-outline btn-secondary"
+                    _="on click if #modal_view_quota_limit_info_{{ quota.id }}-form.checkValidity() call #modal_view_quota_limit_info_{{ quota.id }}.close() end">
+                Request quota increase at account-level
+            </button>
+        {% endif %}
+    </div>
+</form>
+{% endfill %}
 {% endcomponent_block %}