Committee Leaders Group Form Fix

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@ jobs:
     steps:
 
       - name: Checkout Code Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
@@ -35,7 +35,7 @@ jobs:
     steps:
 
       - name: Checkout Code Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up .env file
         run: |  
@@ -44,35 +44,35 @@ jobs:
           echo "VIPPS_MERCHANT_SERIAL_NUMBER=${{ secrets.VIPPS_MERCHANT_SERIAL_NUMBER }}" >> .env
 
       - name: Build the Stack
-        run:  docker-compose build
+        run:  docker compose build
 
       - name: Run the Stack
-        run:  docker-compose up -d
+        run:  docker compose up -d
 
       - name: Make DB Migrations
-        run:  docker-compose run --rm web python manage.py migrate
+        run:  docker compose run --rm web python manage.py migrate
 
       - name: Run Django Tests
-        run:  docker-compose run --rm web pytest --cov=app
+        run:  docker compose run --rm web pytest --cov=app
 
       - name: Tear down the Stack
-        run:  docker-compose down
+        run:  docker compose down
 
   check-migrations:
     runs-on: ubuntu-latest
     steps:
 
       - name: Checkout Code Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build the Stack
-        run:  docker-compose build
+        run:  docker compose build
 
       - name: Run the Stack
-        run:  docker-compose up -d
+        run:  docker compose up -d
 
       - name: Check for unstaged migrations
-        run:  docker-compose run --rm web python manage.py makemigrations --check --no-input
+        run:  docker compose run --rm web python manage.py makemigrations --check --no-input
 
       - name: Tear down the Stack
-        run:  docker-compose down
+        run:  docker compose down

.gitignore

@@ -29,3 +29,4 @@ celerybeat-schedule
 
 .terraform
 *.tfvars
+.terraform.lock.hcl

CHANGELOG.md

@@ -16,6 +16,7 @@
 
 ## Versjon 2024.07.30
 - ✨ **Feide**. Man kan nå registrere bruker automatisk med Feide.
+- ✨ **Fillagring**. Man kan nå slette en fil fra Azure basert på container navn og fil navn.
 
 ## Versjon 2024.05.01
 - ⚡**Arrangement**. Et arrangement vil nå få kategori sendt som navn på kategori istedenfor kun id.

app/common/file_handler.py

@@ -21,7 +21,7 @@ def getContainerNameFromBlob(self):
         return (
             "".join(e for e in self.blob.content_type if e.isalnum())
             if self.blob.content_type
-            else None
+            else "default"
         )
 
     def checkBlobSize(self):

app/content/models/user.py

@@ -154,6 +154,12 @@ def is_leader_of(self, group):
             group=group, membership_type=MembershipType.LEADER
         ).exists()
 
+    @property
+    def is_leader_of_committee(self):
+        return self.memberships.filter(
+            group__type=GroupType.COMMITTEE, membership_type=MembershipType.LEADER
+        ).exists()
+
     def has_unanswered_evaluations(self):
         return self.get_unanswered_evaluations().exists()
 

app/content/serializers/user.py

@@ -1,26 +1,25 @@
+from django.contrib.auth.hashers import make_password
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
-from django.contrib.auth.hashers import make_password
-
 from dry_rest_permissions.generics import DRYGlobalPermissionsField
 
-from app.communication.notifier import Notify
-from app.communication.enums import UserNotificationSettingType
-from app.common.enums import GroupType, Groups
+from app.common.enums import Groups, GroupType
 from app.common.serializers import BaseModelSerializer
+from app.communication.enums import UserNotificationSettingType
+from app.communication.notifier import Notify
+from app.content.exceptions import FeideUserExistsError
 from app.content.models import User
 from app.content.serializers.user_bio import UserBioSerializer
-from app.group.models import Group, Membership
 from app.content.util.feide_utils import (
+    generate_random_password,
     get_feide_tokens,
     get_feide_user_groups,
-    parse_feide_groups,
-    generate_random_password,
-    get_study_year,
     get_feide_user_info_from_jwt,
+    get_study_year,
+    parse_feide_groups,
 )
-from app.content.exceptions import FeideUserExistsError
+from app.group.models import Group, Membership
 
 
 class DefaultUserSerializer(BaseModelSerializer):
@@ -168,9 +167,7 @@ def add_user_to_study(self, user, slug):
         study = Group.objects.filter(type=GroupType.STUDY, slug=slug).first()
         study_year = get_study_year(slug)
         class_ = Group.objects.get_or_create(
-            name=study_year,
-            type=GroupType.STUDYYEAR,
-            slug=study_year
+            name=study_year, type=GroupType.STUDYYEAR, slug=study_year
         )
 
         if not study or not class_:

app/content/urls.py

@@ -18,8 +18,9 @@
     UserCalendarEvents,
     UserViewSet,
     accept_form,
-    upload,
+    delete,
     register_with_feide,
+    upload,
 )
 
 router = routers.DefaultRouter()
@@ -52,6 +53,7 @@
     re_path(r"", include(router.urls)),
     path("accept-form/", accept_form),
     path("upload/", upload),
+    path("delete-file/<str:container_name>/<str:blob_name>/", delete),
     path("feide/", register_with_feide),
     re_path(r"users/(?P<user_id>[^/.]+)/events.ics", UserCalendarEvents()),
 ]

app/content/util/feide_utils.py

@@ -1,11 +1,21 @@
-import jwt
-import requests
 import secrets
 import string
+from datetime import datetime
 
+import jwt
+import requests
 from requests.auth import HTTPBasicAuth
-from datetime import datetime
 
+from app.content.exceptions import (
+    FeideGetTokenError,
+    FeideGetUserGroupsError,
+    FeideParseGroupsError,
+    FeideTokenNotFoundError,
+    FeideUsedUserCode,
+    FeideUserGroupsNotFoundError,
+    FeideUserInfoNotFoundError,
+    FeideUsernameNotFoundError,
+)
 from app.settings import (
     FEIDE_CLIENT_ID,
     FEIDE_CLIENT_SECRET,
@@ -14,17 +24,6 @@
     FEIDE_USER_GROUPS_INFO_URL,
 )
 
-from app.content.exceptions import (
-    FeideTokenNotFoundError,
-    FeideGetTokenError,
-    FeideUserInfoNotFoundError,
-    FeideUsernameNotFoundError,
-    FeideUserGroupsNotFoundError,
-    FeideParseGroupsError,
-    FeideGetUserGroupsError,
-    FeideUsedUserCode,
-)
-
 
 def get_feide_tokens(code: str) -> tuple[str, str]:
     """Get access and JWT tokens for signed in Feide user"""

app/content/views/__init__.py

@@ -8,7 +8,7 @@
 from app.content.views.news import NewsViewSet
 from app.content.views.page import PageViewSet
 from app.content.views.short_link import ShortLinkViewSet
-from app.content.views.upload import upload
+from app.content.views.upload import upload, delete
 from app.content.views.strike import StrikeViewSet
 from app.content.views.toddel import ToddelViewSet
 from app.content.views.qr_code import QRCodeViewSet

app/content/views/feide.py

@@ -1,9 +1,12 @@
-from rest_framework.decorators import api_view
 from rest_framework import status
+from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from app.content.serializers import FeideUserCreateSerializer, DefaultUserSerializer
 from app.content.exceptions import FeideError
+from app.content.serializers import (
+    DefaultUserSerializer,
+    FeideUserCreateSerializer,
+)
 
 
 @api_view(["POST"])

app/content/views/upload.py

@@ -38,3 +38,25 @@
             {"detail": str(value_error)},
             status=status.HTTP_400_BAD_REQUEST,
         )
+
+
+@api_view(["DELETE"])
+@permission_classes([IsMember])
+def delete(request, container_name, blob_name):
+    """Method for deleting files from Azure Blob Storage, only allowed for members"""
+    try:
+        handler = AzureFileHandler()
+        handler.blobName = blob_name
+        handler.containerName = container_name
+
+        handler.deleteBlob()
+        return Response(
+            {"detail": "Filen ble slettet"},
+            status=status.HTTP_200_OK,
+        )
+
+    except ValueError as value_error:
+        return Response(
+            {"detail": str(value_error)},
+            status=status.HTTP_400_BAD_REQUEST,
+        )

app/forms/models/forms.py

@@ -179,8 +179,10 @@ def has_write_permission(cls, request):
             form = GroupForm.objects.filter(id=form_id).first()
             group = form.group if form else None
         return (
-            group and group.has_object_group_form_permission(request)
-        ) or check_has_access(cls.write_access, request)
+            (group and group.has_object_group_form_permission(request))
+            or check_has_access(cls.write_access, request)
+            or request.user.is_leader_of_committee
+        )
 
     @classmethod
     def has_list_permission(cls, request):

app/tests/kontres/test_reservation_integration.py

@@ -82,7 +82,6 @@ def test_reservation_creation_fails_without_sober_watch(member, bookable_item):
     )
 
     assert response.status_code == 400
-    print(response.data)
     expected_error_message = "Du må velge en edruvakt for reservasjonen."
     actual_error_messages = response.data.get("non_field_errors", [])
     assert any(

infrastructure/containers.tf

@@ -164,6 +164,26 @@ resource "azurerm_container_app" "lepton-api" {
         name  = "VIPPS_ORDER_URL"
         value = var.vipps_order_url
       }
+      env {
+        name  = "FEIDE_CLIENT_ID"
+        value = var.feide_client_id
+      }
+      env {
+        name  = "FEIDE_CLIENT_SECRET"
+        value = var.feide_client_secret
+      }
+      env {
+        name  = "FEIDE_TOKEN_URL"
+        value = var.feide_token_url
+      }
+      env {
+        name  = "FEIDE_USER_GROUPS_INFO_URL"
+        value = var.feide_user_groups_info_url
+      }
+      env {
+        name  = "FEIDE_REDIRECT_URL"
+        value = var.feide_redirect_url
+      }
       env {
         name  = var.enviroment == "pro" ? "PROD" : "DEV"
         value = "true"
@@ -337,6 +357,26 @@ resource "azurerm_container_app" "celery" {
         name  = "VIPPS_ORDER_URL"
         value = var.vipps_order_url
       }
+      env {
+        name  = "FEIDE_CLIENT_ID"
+        value = var.feide_client_id
+      }
+      env {
+        name  = "FEIDE_CLIENT_SECRET"
+        value = var.feide_client_secret
+      }
+      env {
+        name  = "FEIDE_TOKEN_URL"
+        value = var.feide_token_url
+      }
+      env {
+        name  = "FEIDE_USER_GROUPS_INFO_URL"
+        value = var.feide_user_groups_info_url
+      }
+      env {
+        name  = "FEIDE_REDIRECT_URL"
+        value = var.feide_redirect_url
+      }
     }
   }
 

infrastructure/inputs.tf

@@ -64,6 +64,30 @@ variable "lepton_api_max_replicas" {
   default = 1
 }
 
+variable "feide_client_id" {
+  type      = string
+  sensitive = true
+}
+
+variable "feide_client_secret" {
+  type      = string
+  sensitive = true
+}
+
+variable "feide_token_url" {
+  type      = string
+  default = "https://auth.dataporten.no/oauth/token"
+}
+
+variable "feide_user_groups_info_url" {
+  type = string
+  default = "https://groups-api.dataporten.no/groups/me/groups"
+}
+
+variable "feide_redirect_url" {
+  type = string
+}
+
 variable "enviroment" {
   type        = string
   description = "value is either dev or pro"

main.tf

@@ -39,4 +39,10 @@ module "infrastructure" {
 
   lepton_api_min_replicas = var.lepton_api_min_replicas
   lepton_api_max_replicas = var.lepton_api_max_replicas
+
+  feide_client_id            = var.feide_client_id
+  feide_client_secret        = var.feide_client_secret
+  feide_token_url            = var.feide_token_url
+  feide_user_groups_info_url = var.feide_user_groups_info_url
+  feide_redirect_url         = var.feide_redirect_url
 }