Feature/merge notification and nigeria translations

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 3.2.25 on 2025-08-08 09:24
 
 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.contrib.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)

notifications/wagtail_hooks.py → admin_notifications/wagtail_hooks.py

@@ -1,20 +1,16 @@
 from django.conf import settings
 from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
-
-from notifications.models import Notification
-from notifications.views import CreateNotificationView
+from admin_notifications.models import AdminNotification
+from admin_notifications.views import CreateNotificationView
 
 
 class NotificationModelAdmin(ModelAdmin):
-    model = Notification
-    menu_label = 'Notifications'
+    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
 
-
-if settings.PUSH_NOTIFICATION:
-    modeladmin_register(NotificationModelAdmin)

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/migrations/0060_auto_20250703_0253.py

@@ -0,0 +1,88 @@
+# Generated by Django 3.2.25 on 2025-07-03 02:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0059_burmese_locale'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articlefeedback',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='articlerecommendation',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='articletaggeditem',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='featuredcontent',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='feedbacksettings',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='homepagebanner',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='iogtflatmenuitem',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='localedetail',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='manifestsettings',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='sectiontaggeditem',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='sitesettings',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='svgtopngmap',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='themesettings',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='v1pageurltov2pagemap',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='v1tov2objectmap',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

home/migrations/0061_article_notification_tags.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.25 on 2025-07-28 12:22
+
+from django.db import migrations
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_notifications', '0003_auto_20250728_1222'),
+        ('home', '0060_auto_20250703_0253'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='article',
+            name='notification_tags',
+            field=modelcluster.fields.ParentalManyToManyField(blank=True, to='user_notifications.NotificationTag'),
+        ),
+    ]

home/migrations/0062_alter_manifestsettings_language.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2025-08-18 10:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0061_article_notification_tags'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='manifestsettings',
+            name='language',
+            field=models.CharField(choices=[('ar', 'Arabic'), ('bn', 'Bengali'), ('ny', 'Chichewa'), ('prs', 'Dari'), ('en', 'English'), ('fa', 'Farsi'), ('fr', 'French'), ('hi', 'Hindi'), ('id', 'Indonesian'), ('kaa', 'Karakalpak'), ('km', 'Khmer'), ('rw', 'Kinyarwanda'), ('rn', 'Kirundi'), ('ku', 'Kurdish'), ('mg', 'Malagasy'), ('my', 'Burmese'), ('ne', 'Nepali'), ('nr', 'Ndebele'), ('ps', 'Pashto'), ('pt', 'Portuguese'), ('qu', 'Quechua'), ('ru', 'Russian'), ('sn', 'Shona'), ('si', 'Sinhala'), ('es', 'Spanish'), ('sw', 'Swahili'), ('tg', 'Tajik'), ('ta', 'Tamil'), ('ti', 'Tigrinya'), ('tr', 'Turkish'), ('uk', 'Ukraine'), ('ur', 'Urdu'), ('uz', 'Uzbek'), ('zu', 'Zulu'), ('xy', 'Testing'), ('ha', 'Hausa'), ('yo', 'Yoruba'), ('ig', 'Igbo'), ('pcm', 'Pidgin')], default='en', help_text='Choose language', max_length=3, verbose_name='Language'),
+        ),
+    ]

home/models.py

@@ -14,8 +14,8 @@
 from django.utils.encoding import force_str
 from django.utils.translation import gettext_lazy as _
 from modelcluster.contrib.taggit import ClusterTaggableManager
+from modelcluster.fields import ParentalKey, ParentalManyToManyField
 from iogt.settings.base import WAGTAIL_CONTENT_LANGUAGES
-from modelcluster.fields import ParentalKey
 from rest_framework import status
 from taggit.models import TaggedItemBase
 from wagtail.admin.panels import (
@@ -55,7 +55,7 @@
 )
 import iogt.iogt_globals as globals_
 from django.db.models import Avg, Count
-
+from user_notifications.models import NotificationTag, NotificationPreference
 User = get_user_model()
 logger = logging.getLogger(__name__)
 
@@ -125,8 +125,12 @@ def get_context(self, request):
                 ):
                     banners.append(banner_specific)
         context['banners'] = banners
+        show_notification_nudge = False
+        if request.user and request.user.is_authenticated:
+            pref = NotificationPreference.objects.filter(user=request.user).first()
+            context["notification_preference"] = pref
+            context['user'] = request.user
         return context
-
     @property
     def offline_urls(self):
         return [self.url] + collect_urls_from_streamfield(self.home_featured_content)
@@ -482,7 +486,7 @@ class Article(AbstractArticle):
     # New fields for precomputed values
     average_rating = models.FloatField(default=0.0, null=True)
     number_of_reviews = models.PositiveIntegerField(default=0, null=True)
-
+    notification_tags = ParentalManyToManyField(NotificationTag, blank=True)
     content_panels = AbstractArticle.content_panels + [
         MultiFieldPanel([
             InlinePanel('recommended_articles',
@@ -492,7 +496,7 @@ class Article(AbstractArticle):
     ]
 
     promote_panels = AbstractArticle.promote_panels + [
-        MultiFieldPanel([FieldPanel("tags"), ], heading='Metadata'),
+        MultiFieldPanel([FieldPanel("tags"),  FieldPanel("notification_tags"),], heading='Metadata'),
     ]
 
     edit_handler_list = [
@@ -573,7 +577,6 @@ class BannerIndexPage(Page):
     parent_page_types = ['home.HomePage']
     subpage_types = ['home.BannerPage']
 
-
 class BannerPage(Page, PageUtilsMixin):
     parent_page_types = ['home.BannerIndexPage']
     subpage_types = []