web push fixes

Author: robb-j

api-server/source/admin/admin-routes.ts

@@ -4,6 +4,7 @@ import { upsertContentRoute } from "./upsert-content.ts";
 import { upsertRegistrationsRoute } from "./upsert-registrations.ts";
 import { upsertScheduleRoute } from "./upsert-schedule.ts";
 import { getWebPushInfo } from "./web-push-info.ts";
+import { sendWebPushMessage } from "./web-push-send.ts";
 import { testWebPushMessage } from "./web-push-test.ts";
 
 export const adminRoutes = [
@@ -15,4 +16,5 @@ export const adminRoutes = [
 
   getWebPushInfo,
   testWebPushMessage,
+  sendWebPushMessage,
 ];

api-server/source/admin/web-push-info.ts

@@ -4,7 +4,7 @@ import { WebPushRepo } from "../notifications/web-push-repo.ts";
 
 export const getWebPushInfo = defineRoute({
   method: "GET",
-  pathname: "/admin/v1/conference/:conference/web-push",
+  pathname: "/admin/v1/conferences/:conference/web-push/info",
   dependencies: {
     authz: useAuthz,
     webPush: WebPushRepo.use,

api-server/source/admin/web-push-send.ts

@@ -11,7 +11,7 @@ const _Request = Structure.object({
 
 export const sendWebPushMessage = defineRoute({
   method: "POST",
-  pathname: "/admin/v1/conference/:conference/web-push-test",
+  pathname: "/admin/v1/conferences/:conference/web-push/send",
   dependencies: {
     authz: useAuthz,
     webPush: WebPushRepo.use,
@@ -30,7 +30,9 @@ export const sendWebPushMessage = defineRoute({
     const body = await assertRequestBody(_Request, request);
 
     // Get all of the web-push-devices for the conference
-    const devices = await webPush.listConferenceDevices(conference.id);
+    const devices = await webPush.listConferenceDevices(conference.id, [
+      "Special",
+    ]);
 
     // Send the message
     const stats = await _sendToDevices(devices, webPush, {

api-server/source/admin/web-push-test.ts

@@ -11,7 +11,7 @@ const _Request = Structure.object({
 
 export const testWebPushMessage = defineRoute({
   method: "POST",
-  pathname: "/admin/v1/conference/:conference/web-push-test",
+  pathname: "/admin/v1/conferences/:conference/web-push/test",
   dependencies: {
     authz: useAuthz,
     webPush: WebPushRepo.use,

api-server/source/notifications/web-push-repo.ts

@@ -192,7 +192,7 @@ export class WebPushRepo {
 
     const devices = await WebPushDeviceTable.select(
       this.sql,
-      this.sql`id IN ${this.sql(registrations.map((r) => r.id))}`,
+      this.sql`registration_id IN ${this.sql(registrations.map((r) => r.id))}`,
     );
 
     const categories = sumCategories(devices);
@@ -208,16 +208,19 @@ export class WebPushRepo {
     return { categories, messages };
   }
 
-  async listConferenceDevices(conferenceId: number) {
+  async listConferenceDevices(conferenceId: number, categories: string[]) {
     const registrations = await RegistrationTable.select(
       this.sql,
-      this.sql` conference_id = ${conferenceId} `,
+      this.sql`conference_id = ${conferenceId}`,
       ["id"],
     );
 
     return WebPushDeviceTable.select(
       this.sql,
-      this.sql`id IN ${this.sql(registrations.map((r) => r.id))}`,
+      this.sql`
+        registration_id IN ${this.sql(registrations.map((r) => r.id))}
+        AND categories ? ${this.sql(categories)}
+      `,
     );
   }
 }