Merge pull request #46 from webstackdev/feature/messaging

Messaging and notification feature

Author: webstackdev

.vscode/settings.json

@@ -5,6 +5,7 @@
     "botocore",
     "bsky",
     "buildx",
+    "cbor",
     "cbranch",
     "cfgv",
     "cstat",
@@ -48,7 +49,9 @@
     "ormsgpack",
     "PRAW",
     "psycopg",
+    "pyasn",
     "pylint",
+    "pyopenssl",
     "PYTHONDONTWRITEBYTECODE",
     "PYTHONUNBUFFERED",
     "pytokens",
@@ -66,6 +69,8 @@
     "solomonstre",
     "svix",
     "topicv",
+    "txaio",
+    "ujson",
     "Unparseable",
     "unstub",
     "upserted",
@@ -76,6 +81,7 @@
     "vfarcic",
     "Viktor",
     "xrpc",
-    "xxhash"
+    "xxhash",
+    "zope"
   ]
 }

core/api_urls.py

@@ -11,9 +11,13 @@
 from ingestion.api_urls import (
     register_project_routes as register_ingestion_project_routes,
 )
+from messaging.api_urls import register_root_routes as register_messaging_root_routes
 from newsletters.api_urls import (
     register_project_routes as register_newsletters_project_routes,
 )
+from notifications.api_urls import (
+    register_root_routes as register_notifications_root_routes,
+)
 from pipeline.api_urls import (
     register_project_routes as register_pipeline_project_routes,
 )
@@ -30,6 +34,8 @@
 
 router = DefaultRouter()
 register_projects_root_routes(router)
+register_notifications_root_routes(router)
+register_messaging_root_routes(router)
 
 project_router = NestedSimpleRouter(router, r"projects", lookup="project")
 register_projects_project_routes(project_router)

core/tests/test_entrypoints.py

@@ -2,6 +2,8 @@
 import os
 import sys
 
+from channels.routing import ProtocolTypeRouter
+
 from newsletter_maker.celery import app
 
 
@@ -22,7 +24,10 @@ def test_asgi_module_sets_default_settings_and_builds_application(mocker):
         "DJANGO_SETTINGS_MODULE", "newsletter_maker.settings"
     )
     get_app_mock.assert_called_once_with()
-    assert module.application == "asgi-app"
+    assert module.django_asgi_application == "asgi-app"
+    assert isinstance(module.application, ProtocolTypeRouter)
+    assert module.application.application_mapping["http"] == "asgi-app"
+    assert "websocket" in module.application.application_mapping
 
 
 def test_wsgi_module_sets_default_settings_and_builds_application(mocker):

deploy/argocd/newsletter-maker-staging-application.yaml

@@ -20,4 +20,4 @@ spec:
       prune: true
       selfHeal: true
     syncOptions:
-      - CreateNamespace=true
+      - CreateNamespace=true

deploy/helm/newsletter-maker/templates/configmap.yaml

@@ -10,7 +10,9 @@ data:
   CSRF_TRUSTED_ORIGINS: {{ .Values.env.csrfTrustedOrigins | quote }}
   SITE_ID: {{ .Values.env.siteId | quote }}
   REDIS_URL: {{ include "newsletter-maker.redisUrl" . | quote }}
+  CHANNEL_LAYER_URL: {{ default (include "newsletter-maker.redisUrl" .) .Values.env.channelLayerUrl | quote }}
   QDRANT_URL: {{ include "newsletter-maker.qdrantUrl" . | quote }}
+  MESSAGING_ENABLED: {{ .Values.env.messagingEnabled | quote }}
   NEWSLETTER_API_BASE_URL: {{ .Values.env.newsletterApiBaseUrl | quote }}
   EMAIL_BACKEND: {{ .Values.env.emailBackend | quote }}
   DEFAULT_FROM_EMAIL: {{ .Values.env.defaultFromEmail | quote }}

deploy/helm/newsletter-maker/templates/service-monitor.yaml

@@ -20,4 +20,4 @@ spec:
       bearerTokenSecret:
         name: {{ include "newsletter-maker.secretName" . }}
         key: METRICS_TOKEN
-{{- end }}
+{{- end }}

deploy/helm/newsletter-maker/values-staging.yaml

@@ -7,6 +7,7 @@ env:
   debug: "false"
   allowedHosts: "staging.newsletter-maker.example.com"
   csrfTrustedOrigins: "https://staging.newsletter-maker.example.com"
+  messagingEnabled: "true"
   newsletterApiBaseUrl: "https://staging.newsletter-maker.example.com"
   logLevel: INFO
 
@@ -23,4 +24,4 @@ networkPolicy:
 serviceMonitor:
   enabled: true
   labels:
-    release: kube-prometheus-stack
+    release: kube-prometheus-stack

deploy/helm/newsletter-maker/values.yaml

@@ -11,6 +11,8 @@ env:
   allowedHosts: "localhost,127.0.0.1"
   csrfTrustedOrigins: "http://localhost,http://127.0.0.1"
   siteId: "1"
+  channelLayerUrl: ""
+  messagingEnabled: "true"
   newsletterApiBaseUrl: "http://newsletter-maker.local"
   emailBackend: anymail.backends.resend.EmailBackend
   defaultFromEmail: onboarding@resend.dev

frontend/src/app/(home)/_components/ContentFeed/index.stories.tsx

@@ -38,4 +38,4 @@ export const Empty: Story = {
     filteredContents: [],
     contentClusterLookup: new Map(),
   },
-}
+}

frontend/src/app/(home)/_components/ContentFeed/index.test.tsx

@@ -43,4 +43,4 @@ describe("ContentFeed", () => {
     expect(screen.getByText("reference")).toBeInTheDocument()
     expect(screen.getByRole("button", { name: "Upvote" })).toBeInTheDocument()
   })
-})
+})