Feature/uat notification recommendations

Dockerfile

@@ -11,7 +11,8 @@ RUN apt-get update --yes --quiet \
     libpq5 \
  && pip install --upgrade pip \
  && pip install pip-tools \
- && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/* \
+ && apt-get install -y git
 WORKDIR /opt
 RUN python -m venv venv
 ENV PATH="/opt/venv/bin:$PATH"

admin_notifications/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AdminNotificationsConfig(AppConfig):
+    name = 'admin_notifications'

notifications/migrations/0001_initial.py → admin_notifications/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.1.14 on 2022-07-29 13:17
+# Generated by Django 5.2.4 on 2025-09-04 11:37
 
 from django.db import migrations, models
 
@@ -13,13 +13,13 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Notification',
+            name='AdminNotification',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('head', models.CharField(max_length=255)),
                 ('body', models.TextField()),
                 ('url', models.URLField(blank=True, null=True)),
-                ('groups', models.ManyToManyField(related_name='notifications', to='auth.Group')),
+                ('groups', models.ManyToManyField(related_name='admin_notifications', to='auth.group')),
             ],
         ),
     ]

notifications/models.py → admin_notifications/models.py

@@ -1,12 +1,12 @@
 from django.db import models
 
-
-class Notification(models.Model):
+class AdminNotification(models.Model):
     head = models.CharField(max_length=255)
     body = models.TextField()
     url = models.URLField(null=True, blank=True)
 
-    groups = models.ManyToManyField(to='auth.Group', related_name='notifications')
+    groups = models.ManyToManyField(to='auth.Group', related_name='admin_notifications')
 
     def __str__(self):
         return self.head
+

admin_notifications/views.py

@@ -0,0 +1,61 @@
+import json
+from user_notifications.models import NotificationMeta, NotificationLog
+from wagtail_modeladmin.views import CreateView
+from webpush import send_user_notification
+from notifications.signals import notify
+from notifications.models import Notification
+from iogt_users.models import User
+
+
+class CreateNotificationView(CreateView):
+    def form_valid(self, form):
+        payload = form.cleaned_data.copy()
+        groups = payload.pop('groups')
+        users = User.objects.filter(groups__in=groups).distinct()
+        for user in users:
+            try:
+                # 1. Create Notification
+                notify.send(
+                    sender=self.request.user,
+                    recipient=user,
+                    verb=payload.get('head', 'New Notification'),
+                    description=payload.get('body', ''),
+                    url=payload.get("url", "/")
+                )
+
+                # 2. Get latest Notification for user (created just now)
+                notif_instance = Notification.objects.filter(recipient=user).order_by('-timestamp').first()
+                if not notif_instance:
+                    continue  # Shouldn't happen, but guard just in case
+
+                # 3. Avoid duplicate meta creation
+                NotificationMeta.objects.get_or_create(notification=notif_instance)
+
+                # 4. Send Web Push
+                send_user_notification(
+                    user=user, 
+                    payload={
+                        "title": payload.get("head", "IoGT Notification"),
+                        "body": payload.get("body", ""),
+                        "url": payload.get("url", "/"),
+                        "notification_id": notif_instance.id
+                    },
+                    ttl=1000)
+                NotificationLog.objects.create(
+                        user=user,
+                        notification_key=payload.get("head", "IoGT Notification"),
+                        tags='',
+                        state="sent",
+                        notification=notif_instance
+                    )
+            except Exception as e:
+                # Optional: log failure for user if user or template not found
+                NotificationLog.objects.create(
+                    user=user,
+                    notification_key=payload.get("head", "IoGT Notification"),
+                    tags='',
+                    state="failed",
+                    error_message=f"Task failure: {str(e)}",
+                    notification=None
+                )
+        return super().form_valid(form)

admin_notifications/wagtail_hooks.py

@@ -0,0 +1,16 @@
+from django.conf import settings
+from wagtail_modeladmin.options import ModelAdmin
+from admin_notifications.models import AdminNotification
+from admin_notifications.views import CreateNotificationView
+
+
+class NotificationModelAdmin(ModelAdmin):
+    model = AdminNotification
+    menu_label = 'Admin Notifications'
+    menu_icon = 'mail'
+    list_display = ('head', 'body', 'url',)
+    list_filter = ('groups',)
+    search_fields = ('head', 'body', 'url',)
+    menu_order = 601
+    create_view_class = CreateNotificationView
+

comments/button_helpers.py

@@ -1,5 +1,5 @@
 from django.urls import reverse
-from wagtail.contrib.modeladmin.helpers import ButtonHelper
+from wagtail_modeladmin.helpers import ButtonHelper
 
 
 class XtdCommentAdminButtonHelper(ButtonHelper):

comments/templates/comment_reply.html

@@ -6,7 +6,7 @@
         <div class="row nice-padding">
             <div class="left">
                 <div class="col header-title">
-                    <h1>{% icon name='openquote' class_name="header-title-icon" %}
+                    <h1>{% icon name='openquote' classname="header-title-icon" %}
                         Add reply for Page <span>{{ comment.content_object }}</span></h1>
                 </div>
             </div>

comments/views.py

@@ -8,7 +8,7 @@
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views import View
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.http import require_POST

comments/wagtail_hooks.py

@@ -4,8 +4,8 @@
 from django.utils import timezone
 from django.utils.html import format_html
 from django_comments_xtd.models import XtdComment
-from wagtail.contrib.modeladmin.options import ModelAdminGroup, ModelAdmin, modeladmin_register
-from wagtail.contrib.modeladmin.helpers.permission import PermissionHelper
+from wagtail_modeladmin.options import ModelAdminGroup, ModelAdmin, modeladmin_register
+from wagtail_modeladmin.helpers.permission import PermissionHelper
 
 from .button_helpers import XtdCommentAdminButtonHelper
 from .filters import FlaggedFilter, ModerationFilter, PublishedFilter

common/translation_utils/translation_status.csv

@@ -716,3 +716,7 @@ Custom permissions,,,,needs translation,,,
 Submit,,translate,,has partial translation,,,
 Farsi,,not needed,,not needed,,,
 Burmese,,not needed,,not needed,,,
+Hausa,,not needed,,not needed,,,
+Yoruba,,not needed,,not needed,,,
+Igbo,,not needed,,not needed,,,
+Pidgin,,not needed,,not needed,,,

common/translation_utils/translations.csv

@@ -1,7 +1,7 @@
-Row type,is in use,comment,English,Spanish,French,Portuguese,Arabic,Swahili,Chichewa,Kinyarwanda,Ndebele,Shona,Kirundi,Malagasy,Nepali,Urdu,Kichwa/Quichua,Russian,Zulu,Tigrinya,Tajik,Kurdish,Khmer,Uzbek,Karakalpak,Indonesian,Sinhala,Tamil,Bengali,Dari,Pashto,Hindi,Ukraine,Turkish,Farsi,Burmese
-Language,,,English,Spanish,French,Portuguese,Arabic,Swahili,Chichewa,Kinyarwanda,Ndebele,Shona,Kirundi,Malagasy,Nepali,Urdu,Kichwa/Quichua,Russian,Zulu,Tigrinya,Tajik,Kurdish,Khmer,Uzbek,Karakalpak,Indonesian,Sinhala,Tamil,Bengali,Dari,Pashto,Hindi,Ukraine,Turkish,Farsi,Burmese
-ll-LL,,,en,es,fr-CG,pt-MZ,ar-MA,sw-KE,ny-MW,rw-RW,nr-ZW,sn-ZW,rn-BI,mg-MG,ne-NP,ur-PK,qu-EC,ru-RU,zu-ZA,ti-ET,tg-TJ,ku,km-KH,uz-UZ,kaa,id,si,ta,bn-BN,prs,ps,hi,uk,tr,fa,my
-ll,,,en,es,fr,pt,ar,sw,ny,rw,nr,sn,rn,mg,ne,ur,qu,ru,zu,ti,tg,ku,km,uz,kaa,id,si,ta,bn,prs,ps,hi,uk,tr,fa,my
+Row type,is in use,comment,English,Spanish,French,Portuguese,Arabic,Swahili,Chichewa,Kinyarwanda,Ndebele,Shona,Kirundi,Malagasy,Nepali,Urdu,Kichwa/Quichua,Russian,Zulu,Tigrinya,Tajik,Kurdish,Khmer,Uzbek,Karakalpak,Indonesian,Sinhala,Tamil,Bengali,Dari,Pashto,Hindi,Ukraine,Turkish,Farsi,Burmese,Hausa,Yoruba,Igbo,Pidgin
+Language,,,English,Spanish,French,Portuguese,Arabic,Swahili,Chichewa,Kinyarwanda,Ndebele,Shona,Kirundi,Malagasy,Nepali,Urdu,Kichwa/Quichua,Russian,Zulu,Tigrinya,Tajik,Kurdish,Khmer,Uzbek,Karakalpak,Indonesian,Sinhala,Tamil,Bengali,Dari,Pashto,Hindi,Ukraine,Turkish,Farsi,Burmese,Hausa,Yoruba,Igbo,Pidgin
+ll-LL,,,en,es,fr-CG,pt-MZ,ar-MA,sw-KE,ny-MW,rw-RW,nr-ZW,sn-ZW,rn-BI,mg-MG,ne-NP,ur-PK,qu-EC,ru-RU,zu-ZA,ti-ET,tg-TJ,ku,km-KH,uz-UZ,kaa,id,si,ta,bn-BN,prs,ps,hi,uk,tr,fa,my,ha,yo,ig,pcm
+ll,,,en,es,fr,pt,ar,sw,ny,rw,nr,sn,rn,mg,ne,ur,qu,ru,zu,ti,tg,ku,km,uz,kaa,id,si,ta,bn,prs,ps,hi,uk,tr,fa,my,ha,yo,ig,pcm
 Region,,,English,Latin America,"West African, DRC","Angola, Mozambique",Morocco,Kenya,"Malawi, Zambia",Rwanda,Zimbabwe,Zimbabwe,Burundi,Madagascar,Nepal,Pakistan,Ecuador,Russia,South Africa,Ethiopia,Tajikistan,Sorani,Cambodia,Uzbekistan,Karakalpakstan,Indonesia,Sri Lanka,Sri Lanka,Bangladesh,Afghanistan,Afghanistan,India,Ukraine,Turkey,Iran,Myanmar
 Section,,,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Homepage,Головна,,,
 ,,,Polls,Encuestas,Sondages,Votações,استطلاعات الرأي,Utafiti,Kafukufuku ofunsa maganizo a anthu,Amatora,Ikhetho,Sarudzo,Amatora,Fitsapan-kevitra,चुनावहरू,پولز,Tapuykuna,Голосования,Ukuvota,መረጻታት,Назарсанҷиҳо,دەنگدانەکان,ការបោះឆ្នោតស្ទង់មតិ,Tanlovlar,Sorawnama,Jajak pendapat,,,,,,,Опитування,,,

docker-compose.test.yml

@@ -19,4 +19,4 @@ services:
     environment:
       POSTGRES_USER: iogt
       POSTGRES_PASSWORD: iogt
-      POSTGRES_DB: iogt
+      POSTGRES_DB: iogt

docker-compose.yml

@@ -5,10 +5,43 @@ services:
       target: dev
       args:
         requirements: requirements.dev.txt
-    environment:
-      DJANGO_SETTINGS_MODULE: iogt.settings.dev
+    env_file:
+      - .env
     image: iogt:latest
+
     ports:
       - "8000:8000"
+    depends_on:
+      - db
     volumes:
       - ./:/app/
+#  db:
+#    image: postgres:14-alpine
+#    environment:
+#      POSTGRES_USER: postgres
+#      POSTGRES_PASSWORD: postgresiogt
+#      POSTGRES_DB: iogt
+  celery:
+    build:
+      context: ./
+      target: dev
+      args:
+        requirements: requirements.dev.txt
+    command: celery -A iogt worker -l info
+    depends_on:
+      - django
+      - redis
+    env_file:
+      - .env
+    volumes:
+      - ./:/app/
+
+  redis:
+    image: redis:7
+
+  db:
+    image: postgres:14-alpine
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgresiogt
+      POSTGRES_DB: iogt

home/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
+from wagtail_modeladmin.options import ModelAdmin, modeladmin_register
 from django.db.models import Avg, Count
 from django.utils.html import format_html
 from django.urls import reverse

home/forms.py

@@ -15,4 +15,4 @@ def clean(self):
                     f'This section is not eligible for showing the progress bar. '
                     f'Disable "Show Progress Bar" on "{progress_bar_enabled_ancestor_title}" section first.')
 
-        return cleaned_data
+        return cleaned_data

home/management/commands/copy_page_revisions.py

@@ -0,0 +1,60 @@
+import logging
+from django.core.management.base import BaseCommand
+from django.contrib.contenttypes.models import ContentType
+from django.db import connection
+from wagtail.models import Page, Revision
+
+logger = logging.getLogger(__name__)
+
+class Command(BaseCommand):
+    help = "Copy missing revisions from wagtailcore_pagerevision to wagtail_revision"
+
+    def handle(self, *args, **options):
+        page_ct = ContentType.objects.get_for_model(Page)
+        copied, skipped, errors = 0, 0, 0
+
+        logger.info("Starting migration from wagtailcore_pagerevision → wagtail_revision")
+
+        with connection.cursor() as cursor:
+            cursor.execute("""
+                SELECT id, created_at, content, approved_go_live_at, page_id, user_id
+                FROM wagtailcore_pagerevision
+            """)
+            rows = cursor.fetchall()
+
+        for row in rows:
+            pr_id, created_at, content, approved_go_live_at, page_id, user_id = row
+
+            page = Page.objects.filter(id=page_id).first()
+            if not page:
+                logger.warning(f"Skipping orphaned revision {pr_id}, page_id={page_id} not found")
+                continue
+
+            # Deduplication check
+            if Revision.objects.filter(
+                content_type=page_ct,
+                object_id=str(page.id),
+                created_at=created_at,
+            ).exists():
+                skipped += 1
+                logger.debug(f"Skipped duplicate revision {pr_id} for page {page_id}")
+                continue
+
+            try:
+                Revision.objects.create(
+                    base_content_type=page_ct,
+                    content=content,
+                    approved_go_live_at=approved_go_live_at,
+                    created_at=created_at,
+                    user_id=user_id,
+                    content_type=page_ct,
+                    object_id=str(page.id),
+                    object_str=str(page),
+                )
+                copied += 1
+                logger.info(f"Copied revision {pr_id} → page {page_id}")
+            except Exception as e:
+                errors += 1
+                logger.error(f"Error copying revision {pr_id}: {e}")
+
+        logger.info(f"Migration completed. Copied={copied}, Skipped={skipped}, Errors={errors}")