feat: remember last consumed notification (#26)

src/api/notification/controllers/notification.ts

@@ -5,19 +5,58 @@
 import { factories } from '@strapi/strapi'
 
 const MODULE_ID = 'api::notification.notification'
+const GLOBAL_MODULE_ID = 'api::notifications-consumer.notifications-consumer'
+const SINGLETON_ID = 1
 
 export default factories.createCoreController(MODULE_ID, ({ strapi }) => {
  return {
  async getNotificationList(context) {
  const account = context.params.account
 
- return strapi.service(MODULE_ID).getNotificationList(account, false)
+ return strapi.service(MODULE_ID).getNotificationList(account)
  },
 
- async getPushNotifications(context) {
- const account = context.params.account
+ async getPushNotifications() {
+ const global = await strapi.entityService.findOne(GLOBAL_MODULE_ID, SINGLETON_ID, {
+ populate: ['id', 'lastConsumedNotificationDate']
+ })
+
+ const lastConsumedNotificationDate = global?.lastConsumedNotificationDate
+
+ const notifications = await strapi.entityService.findMany(
+ MODULE_ID,
+ {
+ limit: 200,
+ filters: {
+ notification_template: { push: true },
+ ...(lastConsumedNotificationDate ? {
+ createdAt: {$gt: lastConsumedNotificationDate}
+ } : undefined)
+ },
+ populate: {
+ notification_template: {
+ fields: ['id', 'title', 'description', 'url', 'push'],
+ populate: {
+ thumbnail: {
+ fields: ['url']
+ }
+ }
+ }
+ }
+ }
+ )
+
+ if (notifications.length) {
+ await strapi.entityService.update(
+ GLOBAL_MODULE_ID,
+ SINGLETON_ID,
+ {
+ data: { lastConsumedNotificationDate: new Date() }
+ }
+ )
+ }
 
- return strapi.service(MODULE_ID).getNotificationList(account, true)
+ return notifications
  },
  }
 });

src/api/notification/documentation/1.0.0/notification.json

@@ -586,7 +586,7 @@
  "operationId": "get/notification-list/{account}"
  }
  },
- "/push-notifications/{account}": {
+ "/push-notifications": {
  "get": {
  "responses": {
  "200": {
@@ -653,19 +653,8 @@
  "tags": [
  "Notification"
  ],
- "parameters": [
- {
- "name": "account",
- "in": "path",
- "description": "",
- "deprecated": false,
- "required": true,
- "schema": {
- "type": "number"
- }
- }
- ],
- "operationId": "get/push-notifications/{account}"
+ "parameters": [],
+ "operationId": "get/push-notifications"
  }
  }
 }

src/api/notification/routes/notification.ts

@@ -32,7 +32,7 @@ const myExtraRoutes = [
  },
  {
  method: 'GET',
- path: '/push-notifications/:account',
+ path: '/push-notifications',
  handler: 'notification.getPushNotifications',
  config: {
  policies: [],

src/api/notification/services/notification.ts

@@ -8,15 +8,15 @@ const MODULE_ID = 'api::notification.notification'
 
 export default factories.createCoreService(MODULE_ID, ({ strapi }) => {
  return {
- async getNotificationList(account: string, push: boolean) {
+ async getNotificationList(account: string) {
  const notifications = await strapi.entityService.findMany(
  MODULE_ID,
  {
  start: 0,
  limit: 50,
  filters: {
  account,
- notification_template: { push }
+ notification_template: { push: false }
  },
  populate: {
  notification_template: {

src/api/notifications-consumer/content-types/notifications-consumer/schema.json

@@ -0,0 +1,18 @@
+{
+ "kind": "singleType",
+ "collectionName": "notifications_consumers",
+ "info": {
+ "singularName": "notifications-consumer",
+ "pluralName": "notifications-consumers",
+ "displayName": "NotificationsConsumer"
+ },
+ "options": {
+ "draftAndPublish": false
+ },
+ "pluginOptions": {},
+ "attributes": {
+ "lastConsumedNotificationDate": {
+ "type": "datetime"
+ }
+ }
+}

src/api/notifications-consumer/controllers/notifications-consumer.ts

@@ -0,0 +1,7 @@
+/**
+ * notifications-consumer controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::notifications-consumer.notifications-consumer');