Merge branch 'main' into dependabot/npm_and_yarn/frontend/eslint-plugin-cypress-2.15.1

Author: MagnusHafstad

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9.7"
 
@@ -340,7 +340,7 @@ jobs:
           wait-for-service-stability: true
 
       - name: Sentry release
-        uses: getsentry/action-release@v1.4.1
+        uses: getsentry/action-release@v1.7.0
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ env.SENTRY_ORG }}

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

backend/.env.development

@@ -10,21 +10,21 @@ AWS_SES_REGION_ENDPOINT=email.eu-north-1.amazonaws.com
 AWS_SES_REGION_NAME=eu-north-1
 CONTACT_EMAIL=[email protected]
 CORS_ALLOW_CREDENTIALS=true
-CORS_ALLOWED_ORIGINS=http://localhost:3000,http://frontend:3000
+CORS_ALLOWED_ORIGINS=http://localhost:3000,http://frontend:3000,http://127.0.0.1:3000
 CSRF_COOKIE_DOMAIN=localhost
 CSRF_COOKIE_NAME=csrf
 CSRF_FAILURE_VIEW=config.views.csrf.csrf_failure
-CSRF_TRUSTED_ORIGINS=http://localhost:3000,http://frontend:3000
+CSRF_TRUSTED_ORIGINS=http://localhost:3000,http://frontend:3000,http://127.0.0.1:3000
 DATAPORTEN_ID=fcaa9e30-a6d3-4809-8fea-cdd7b3de1c98
 DATAPORTEN_REDIRECT_URI=http://localhost:3000/authCallback
 DATAPORTEN_SECRET=<INSERT DATAPORTEN SECRET>
-DJANGO_ALLOWED_HOSTS=0.0.0.0,localhost,backend,127.0.0.1
+DJANGO_ALLOWED_HOSTS=0.0.0.0,localhost,backend,127.0.0.1,http://127.0.0.1:3000
 DJANGO_DEFAULT_FROM_EMAIL=Indøk <[email protected]>
 DJANGO_EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend
 DJANGO_ENVIRONMENT=development
 DJANGO_SETTINGS_MODULE=config.settings.local
 EMAIL_MAX_RECIPIENTS=50
-FRONTEND_BASE_URL=http://localhost:3000
+FRONTEND_BASE_URL=http://localhost:3000,http://127.0.0.1:3000
 GOOGLE_DRIVE_API_KEY=<INSERT GOOGLE API KEY>
 POSTMARK_SERVER_TOKEN=<INSERT POSTMARK SERVER TOKEN>
 ROOT_URLCONF=config.urls.local

backend/apps/cabins/migrations/0029_auto_20240226_1815.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.22 on 2024-02-26 17:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cabins", "0028_auto_20231113_2045"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="booking",
+            name="phone",
+            field=models.CharField(max_length=15),
+        ),
+        migrations.AlterField(
+            model_name="bookingresponsible",
+            name="phone",
+            field=models.CharField(max_length=15),
+        ),
+    ]

backend/apps/ecommerce/migrations/0003_product_shop_item.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.22 on 2024-02-15 17:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ecommerce", "0002_auto_20220120_1911"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="product",
+            name="shop_item",
+            field=models.BooleanField(default=False),
+        ),
+    ]

backend/apps/ecommerce/migrations/0004_order_delivered.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.22 on 2024-02-26 17:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ecommerce", "0003_product_shop_item"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="order",
+            name="delivered",
+            field=models.BooleanField(default=False),
+        ),
+    ]

backend/apps/ecommerce/migrations/0005_rename_delivered_order_delivered_product.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.22 on 2024-02-29 18:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ecommerce", "0004_order_delivered"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="order",
+            old_name="delivered",
+            new_name="delivered_product",
+        ),
+    ]

backend/apps/ecommerce/models.py

@@ -6,19 +6,25 @@
 from django.db import models, transaction
 from django.db.models import F, Sum
 from django.db.models.fields import DateTimeField, UUIDField
+from apps.ecommerce.mixins import Sellable
+from django.contrib.contenttypes.fields import GenericRelation
+
+# from django.contrib.postgres.fields import ArrayField
 
 from apps.organizations.models import Organization
 from apps.users.models import User
 
 
-class Product(models.Model):
+class Product(models.Model, Sellable):
     name = models.CharField(max_length=200)
     price = models.DecimalField(max_digits=11, decimal_places=2)
     description = models.TextField()
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="products")
     total_quantity = models.PositiveIntegerField()
     current_quantity = models.PositiveIntegerField(null=True)  # Set to total_quantity upon initialization
     max_buyable_quantity = models.PositiveIntegerField(default=1)
+    shop_item = models.BooleanField(default=False)
+    products = GenericRelation("ecommerce.Product")
 
     # Generic foreign key to related product model instance (e.g event model)
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, null=True, blank=True)
@@ -110,6 +116,7 @@ class PaymentStatus(models.TextChoices):
     timestamp = DateTimeField(auto_now_add=True)
     auth_token = models.CharField(max_length=32, default=get_auth_token)  # For authenticating Vipps callback
     payment_attempt = models.PositiveIntegerField(default=1)
+    delivered_product = models.BooleanField(default=False)
 
     def __str__(self):
         return f"Order(product={self.product}, user={self.user})"

backend/apps/ecommerce/mutations.py

@@ -170,3 +170,26 @@ def mutate(self, info, product_data):
         ok = True
 
         return CreateProduct(product=product, ok=ok)
+
+
+class DeliveredProduct(graphene.Mutation):
+    ok = graphene.Boolean()
+    order = graphene.Field(OrderType)
+
+    class Arguments:
+        order_id = graphene.ID(required=True)
+
+    @staff_member_required
+    def mutate(self, info, order_id):
+        try:
+            order = Order.objects.get(id=order_id)
+            if order.delivered_product is False:
+                order.delivered_product = True
+            elif order.delivered_product is True:
+                order.delivered_product = False
+            order.save()
+            ok = True
+        except Order.DoesNotExist:
+            raise ValueError("Cannot identify order.")
+
+        return DeliveredProduct(order=order, ok=ok)

backend/apps/ecommerce/resolvers.py

@@ -14,7 +14,7 @@ def resolve_product(self, info: "ResolveInfo", product_id: int):
         except Product.DoesNotExist:
             return None
 
-    @staff_member_required
+    @login_required
     def resolve_products(self, info):
         return Product.objects.all()
 
@@ -34,6 +34,10 @@ def get_products(self, info):
     def resolve_user_orders(self, info):
         return Order.objects.filter(user=info.context.user)
 
+    @staff_member_required
+    def resolve_all_user_orders(self, info):
+        return Order.objects.all()
+
     @staff_member_required
     def resolve_orders_by_status(self, info: "ResolveInfo", product_id, status):
         orders = Order.objects.filter(product_id=product_id, payment_status=status)