Merge branch 'develop'

mhieta · mhieta · commit 8401c2ea8ab3 · 2024-12-19T10:41:30.000+02:00
diff --git a/.env.template b/.env.template
@@ -129,6 +129,7 @@ EMAIL_HOST_PASSWORD=
 EMAIL_PORT=25
 EMAIL_TIMEOUT=15
 DEFAULT_FROM_EMAIL=
+DEBUG_MAILPIT=
 
 # Sentry configuration
 SENTRY_DSN=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.6.0] - 2024-12-19
+
+### Added
+
+- Add emails_handled-flag to AnnouncementAdmin ([39e0b0c](https://github.com/City-of-Helsinki/parking-permits/commit/39e0b0cdfe55fae55ec2aef7707ba01ad0f3bf83))
+- Add more logging to Talpa PaymentView ([7e7b612](https://github.com/City-of-Helsinki/parking-permits/commit/7e7b6123cc7ff4d149b5c03bf55c8ad57fd218b0))
+- Improve permit automatic expiration tests ([e4f3334](https://github.com/City-of-Helsinki/parking-permits/commit/e4f3334e43a93b349ef0429ab50e25f5864da886))
+
+### Changed
+
+- Handle announcement emails from management command ([337b3a4](https://github.com/City-of-Helsinki/parking-permits/commit/337b3a4ddc15516c751dd72a512f70322d73d6ab))
+
+### Fixed
+
+- Fix issue with low emission consent command ([6a1e816](https://github.com/City-of-Helsinki/parking-permits/commit/6a1e81645c83d62c1786e1c8da000e3b786b17bf))
+- Mark open-ended order items as refunded first time ([97e17bb](https://github.com/City-of-Helsinki/parking-permits/commit/97e17bbeaab16cf200d385f3e3f4a3160486a63c))
+- Update to use next vehicle in new order ([b3ed47a](https://github.com/City-of-Helsinki/parking-permits/commit/b3ed47ae6526c2004acf175c42d1dd88c6c792fb))
+
 ## [1.5.0] - 2024-12-09
 
 ### Added
diff --git a/README.md b/README.md
@@ -73,3 +73,8 @@ pip-sync requirements.txt requirements-dev.txt
     ```bash
     fd --extension py | entr -c docker-compose exec graphql-api pytest
     ```
+
+## Testing emails locally with [Mailpit](https://github.com/axllent/mailpit)
+- Start Mailpit with `docker compose up mailpit`
+- In your `.env` file, set `EMAIL_HOST=0.0.0.0`, `EMAIL_PORT=1025` and `DEBUG_MAILPIT=True`
+- Emails sent by the application will be visible in Mailpit's web interface at [localhost:8025](http://localhost:8025)
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,6 +26,23 @@ services:
       - "127.0.0.1:8888:8888"
     container_name: parking-permits-api
 
+
+  mailpit:
+      image: axllent/mailpit
+      container_name: mailpit
+      restart: unless-stopped
+      volumes:
+          - ./data:/data
+      ports:
+          - 8025:8025
+          - 1025:1025
+      environment:
+          MP_MAX_MESSAGES: 5000
+          MP_DATABASE: /data/mailpit.db
+          MP_SMTP_AUTH_ACCEPT_ANY: 1
+          MP_SMTP_AUTH_ALLOW_INSECURE: 1
+
+
 volumes:
   database-volume: {}
 
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-22 08:50+0200\n"
+"POT-Creation-Date: 2024-12-13 08:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -407,6 +407,9 @@ msgstr "Otsikko (SV)"
 msgid "Content (SV)"
 msgstr "Sisältö (SV)"
 
+msgid "Emails handled"
+msgstr "Sähköpostit käsitelty"
+
 msgid "Company name"
 msgstr "Yrityksen nimi"
 
@@ -591,11 +594,14 @@ msgid "Unit price"
 msgstr "Tuotteen hinta"
 
 msgid "Payment unit price"
-msgstr "Maksun tuotteen hinta"
+msgstr "Maksun hinta"
 
 msgid "Quantity"
 msgstr "Määrä"
 
+msgid "Is refunded"
+msgstr "Palautettu"
+
 msgid "Order item"
 msgstr "Tilausrivi"
 
diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-22 08:50+0200\n"
+"POT-Creation-Date: 2024-12-13 08:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -403,6 +403,9 @@ msgstr "Ämne (SV)"
 msgid "Content (SV)"
 msgstr "Innehåll (SV)"
 
+msgid "Emails handled"
+msgstr "E-post hanterad"
+
 msgid "Company name"
 msgstr "Företagets namn"
 
@@ -592,6 +595,9 @@ msgstr "Pris"
 msgid "Quantity"
 msgstr "Antal"
 
+msgid "Is refunded"
+msgstr "Återbetalad"
+
 msgid "Order item"
 msgstr "Beställningsrad"
 
diff --git a/parking_permits/admin.py b/parking_permits/admin.py
@@ -64,6 +64,7 @@ class AnnouncementAdmin(admin.ModelAdmin):
         "subject_sv",
         "created_at",
         "created_by",
+        "emails_handled",
     )
     ordering = ("-created_at",)
 
diff --git a/parking_permits/admin_resolvers.py b/parking_permits/admin_resolvers.py
@@ -88,7 +88,7 @@
 from .services.mail import (
     PermitEmailType,
     RefundEmailType,
-    send_announcement_email,
+    send_announcement_emails,
     send_permit_email,
     send_refund_email,
     send_vehicle_low_emission_discount_email,
@@ -1428,7 +1428,7 @@ def post_create_announcement(announcement: Announcement):
         .distinct()
     )
     customers = Customer.objects.filter(id__in=customer_ids)
-    send_announcement_email(customers, announcement)
+    send_announcement_emails(customers, announcement)
 
 
 @mutation.field("createAnnouncement")
@@ -1451,8 +1451,6 @@ def resolve_create_announcement(obj, info, announcement):
             ParkingZone.objects.filter(name__in=announcement["parking_zones"])
         )
 
-    post_create_announcement(new_announcement)
-
     return {"success": True}
 
 
diff --git a/parking_permits/cron.py b/parking_permits/cron.py
@@ -5,20 +5,41 @@
 from django.utils import timezone as tz
 
 from parking_permits.customer_permit import CustomerPermit
-from parking_permits.models import Customer, ParkingPermit
+from parking_permits.models import Announcement, Customer, ParkingPermit
 from parking_permits.models.order import SubscriptionCancelReason
 from parking_permits.models.parking_permit import (
     ContractType,
     ParkingPermitEndType,
     ParkingPermitStatus,
 )
-from parking_permits.services.mail import PermitEmailType, send_permit_email
+from parking_permits.services.mail import (
+    PermitEmailType,
+    send_announcement_emails,
+    send_permit_email,
+)
 from parking_permits.services.parkkihubi import sync_with_parkkihubi
 
 logger = logging.getLogger("django")
 db_logger = logging.getLogger("db")
 
 
+def handle_announcement_emails():
+    announcements = Announcement.objects.filter(emails_handled=False)
+    logger.info(f"Found unhandled announcements: {announcements.count()}")
+    for announcement in announcements:
+        customers = Customer.objects.filter(
+            permits__parking_zone__in=announcement.parking_zones.all(),
+            permits__status=ParkingPermitStatus.VALID,
+        ).distinct()
+        logger.info(
+            f"Found {customers.count()} customers for announcement {announcement.pk}"
+        )
+        send_announcement_emails(customers, announcement)
+        announcement.emails_handled = True
+        announcement.save()
+        logger.info(f"Announcement {announcement.pk} emails handled")
+
+
 def automatic_expiration_of_permits():
     logger.info("Automatically ending permits started...")
     now = tz.localtime(tz.now())
diff --git a/parking_permits/management/commands/disable_consent_low_emission.py b/parking_permits/management/commands/disable_consent_low_emission.py
@@ -18,7 +18,7 @@ def handle(self, *args, **options):
         ).select_related("power_type")
         i = 0
         for vehicle in vehicles:
-            if not vehicle.power_type.is_electric():
+            if not vehicle.power_type.is_electric:
                 vehicle.consent_low_emission_accepted = False
                 if not dry_run:
                     vehicle.save()
diff --git a/parking_permits/management/commands/handle_announcement_emails.py b/parking_permits/management/commands/handle_announcement_emails.py
@@ -0,0 +1,12 @@
+from django.core.management.base import BaseCommand
+
+from parking_permits.cron import handle_announcement_emails
+
+
+class Command(BaseCommand):
+    help = "Handle unhandled announcement emails."
+
+    def handle(self, *args, **options):
+        self.stdout.write(self.style.SUCCESS("Handling announcement emails."))
+        handle_announcement_emails()
+        self.stdout.write(self.style.SUCCESS("Handled all announcement emails."))
diff --git a/parking_permits/migrations/0070_announcement_emails_handled.py b/parking_permits/migrations/0070_announcement_emails_handled.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2024-12-10 09:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("parking_permits", "0069_orderitem_is_refunded"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="announcement",
+            name="emails_handled",
+            field=models.BooleanField(default=False, verbose_name="Emails handled"),
+        ),
+    ]
diff --git a/parking_permits/models/announcement.py b/parking_permits/models/announcement.py
@@ -13,6 +13,7 @@ class Announcement(UserStampedModelMixin, TimestampedModelMixin):
     subject_sv = models.CharField(_("Subject (SV)"), max_length=255)
     content_sv = models.TextField(_("Content (SV)"))
     _parking_zones = models.ManyToManyField(ParkingZone, "announcements")
+    emails_handled = models.BooleanField(_("Emails handled"), default=False)
 
     @property
     def parking_zones(self):
diff --git a/parking_permits/models/order.py b/parking_permits/models/order.py
@@ -317,7 +317,8 @@ def create_renewal_order(
             new_order.save()
 
         for permit in customer_permits:
-            new_order.vehicles.append(permit.vehicle.registration_number)
+            vehicle = permit.next_vehicle if permit.next_vehicle else permit.vehicle
+            new_order.vehicles.append(vehicle.registration_number)
             new_order.save()
             start_date = tz.localdate(permit.next_period_start_time)
             end_date = tz.localdate(permit.end_time)
@@ -354,7 +355,6 @@ def create_renewal_order(
                         "Error on product date ranges or order item date ranges"
                     )
 
-                vehicle = permit.next_vehicle if permit.next_vehicle else permit.vehicle
                 is_low_emission = vehicle.is_low_emission
                 unit_price = product.get_modified_unit_price(
                     is_low_emission, permit.is_secondary_vehicle
@@ -684,6 +684,9 @@ def cancel(self, cancel_reason, cancel_from_talpa=True, iban=""):
                 vat=(order.vat if order.vat else DEFAULT_VAT),
                 description=f"Refund for ending permit {str(permit.id)}",
             )
+            # Mark the order item as refunded
+            order_item.is_refunded = True
+            order_item.save()
             send_refund_email(RefundEmailType.CREATED, permit.customer, [refund])
             logger.info(f"Refund for permit {str(permit.id)} created successfully")
 
diff --git a/parking_permits/services/mail.py b/parking_permits/services/mail.py
@@ -146,7 +146,7 @@ def send_refund_email(action, customer, refunds):
             logger.error("Could not send refund email", exc_info=e)
 
 
-def send_announcement_email(customers, announcement):
+def send_announcement_emails(customers, announcement):
     subject = f"{announcement.subject_fi} | {announcement.subject_sv} | {announcement.subject_en}"
     template = "emails/announcement.html"
 
diff --git a/parking_permits/tests/test_announcement.py b/parking_permits/tests/test_announcement.py
diff --git a/parking_permits/tests/test_cron.py b/parking_permits/tests/test_cron.py
diff --git a/parking_permits/views.py b/parking_permits/views.py
diff --git a/project/settings.py b/project/settings.py

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ class AnnouncementAdmin(admin.ModelAdmin):`
`64`	`64`	`"subject_sv",`
`65`	`65`	`"created_at",`
`66`	`66`	`"created_by",`
	`67`	`+ "emails_handled",`
`67`	`68`	`)`
`68`	`69`	`ordering = ("-created_at",)`
`69`	`70`