feat(condo): DOMA-13021 move work with push tokens to new model (#7370)

* feat(condo): DOMA-13051 add RemoteClientPushToken model

* feat(condo): DOMA-13021 make new model for tokens synchronization

* feat(condo): DOMA-13021 tokens synchronization seems complete

* feat(condo): DOMA-13021 using pushtokens to send push messages

* feat(condo): DOMA-13021 some more validation for pushTokens in sync

* fix(condo): DOMA-13021 more tests

* feat(condo): DOMA-13021 rebases

* fix(condo): DOMA-13021 after review fixes

* fix(condo): DOMA-13021 fix tests

* fix(condo): DOMA-13021 forgotten file

* fix(condo): DOMA-13021 after review fixes

* fix(condo): DOMA-13021 after review fixes

* test(condo): DOMA-13021 after review fixes

* fix(condo): DOMA-13021 fix some unused util

* fix(condo): DOMA-13021 fix linter

Author: YEgorLu

apps/condo/domains/notification/constants/constants.js

@@ -199,6 +199,9 @@ const DIRECTLY_AVAILABLE_TYPES = [
 
 const SMS_FORBIDDEN_SYMBOLS_REGEXP = /[&#|«»]+/gim
 
+const MAXIMUM_PUSH_TOKENS_COUNT_IN_SYNC_REMOTE_CLIENT = 50
+const MAXIMUM_RAW_PUSH_TOKENS_COUNT_IN_SYNC_REMOTE_CLIENT = 100
+
 const newsItemMessageMeta = {
     dv: { required: true },
     title: { required: true },
@@ -1276,5 +1279,7 @@ module.exports = {
     ONESIGNAL_CONFIG_ENV,
     PUSH_TRANSPORT_ONESIGNAL,
     REMOTE_CLIENT_GROUP_UNGROUPED,
+    MAXIMUM_PUSH_TOKENS_COUNT_IN_SYNC_REMOTE_CLIENT,
+    MAXIMUM_RAW_PUSH_TOKENS_COUNT_IN_SYNC_REMOTE_CLIENT,
 }
 

apps/condo/domains/notification/constants/errors.js

@@ -20,6 +20,7 @@ const EMPTY_ONESIGNAL_CONFIG_ERROR = `Valid ${ONESIGNAL_CONFIG_ENV} should be pr
 const UNUSABLE_TOKEN_PROVIDED = 'UNUSABLE_TOKEN_PROVIDED'
 const INVALID_PUSH_TOKEN = 'INVALID_PUSH_TOKEN'
 const TOO_MANY_TOKENS_FOR_TRANSPORT = 'TOO_MANY_TOKENS_FOR_TRANSPORT'
+const TOO_MANY_TOKENS = 'TOO_MANY_TOKENS'
 const DEVICE_KEY_VALIDATION_ERROR = 'DEVICE_KEY_VALIDATION_ERROR'
 const INVALID_DEVICE_KEY = 'INVALID_DEVICE_KEY'
 
@@ -50,6 +51,7 @@ module.exports = {
     UNUSABLE_TOKEN_PROVIDED,
     INVALID_PUSH_TOKEN,
     TOO_MANY_TOKENS_FOR_TRANSPORT,
+    TOO_MANY_TOKENS,
     DEVICE_KEY_VALIDATION_ERROR,
     INVALID_DEVICE_KEY,
 }

apps/condo/domains/notification/helpers/sendRemoteClientsUpgradeAppNotifications.js

@@ -3,15 +3,15 @@
  */
 
 const dayjs = require('dayjs')
-const { isEmpty } = require('lodash')
+const isEmpty = require('lodash/isEmpty')
 
 const conf = require('@open-condo/config')
 const { getLogger } = require('@open-condo/keystone/logging')
 const { getSchemaCtx } = require('@open-condo/keystone/schema')
 
 const { DATE_FORMAT } = require('@condo/domains/common/utils/date')
 const { RESIDENT_UPGRADE_APP_TYPE, STAFF_UPGRADE_APP_TYPE, PUSH_TRANSPORT_FIREBASE } = require('@condo/domains/notification/constants/constants')
-const { sendMessage, RemoteClient } = require('@condo/domains/notification/utils/serverSchema')
+const { sendMessage, RemoteClientPushToken } = require('@condo/domains/notification/utils/serverSchema')
 
 const TODAY = dayjs().format(DATE_FORMAT)
 const CHUNK_SIZE = 50
@@ -50,36 +50,38 @@ const prepareAndSendNotification = async (context, remoteClient) => {
 
 const sendRemoteClientsUpgradeAppNotifications = async (where = {}) => {
     const { keystone: context } = getSchemaCtx('RemoteClient')
-    const remoteClientWhere = { ...where, appId: 'unknown', owner: { id_not: null }, pushToken_not: null, pushTransport: PUSH_TRANSPORT_FIREBASE }
-    const remoteClientsCount = await RemoteClient.count(context, remoteClientWhere)
+    const remoteClientPushTokensWhere = { remoteClient: { ...where, appId: 'unknown', owner: { id_not: null } }, isPush: true, provider: PUSH_TRANSPORT_FIREBASE, deletedAt: null }
+    const remoteClientPushTokensCount = await RemoteClientPushToken.count(context, remoteClientPushTokensWhere)
+    //const remoteClientWhere = { ...where, appId: 'unknown', owner: { id_not: null }, pushToken_not: null, pushTransport: PUSH_TRANSPORT_FIREBASE }
+    //const remoteClientsCount = await RemoteClient.count(context, remoteClientWhere)
     let skip = 0, successCnt = 0
 
     logger.info({
-        msg: 'available obsolete remote clients',
-        count: remoteClientsCount,
-        data: remoteClientWhere,
+        msg: 'available obsolete remote clients push tokens',
+        count: remoteClientPushTokensCount,
+        data: remoteClientPushTokensWhere,
     })
 
-    if (!remoteClientsCount) return
+    if (!remoteClientPushTokensCount) return
 
-    while (skip < remoteClientsCount) {
-        const remoteClients = await RemoteClient.getAll(context,
-            remoteClientWhere,
-            'id owner { id type }',
+    while (skip < remoteClientPushTokensCount) {
+        const remoteClientsPushTokens = await RemoteClientPushToken.getAll(context,
+            remoteClientPushTokensWhere,
+            'remoteClient { id owner { id type } }',
             { sortBy: ['createdAt_ASC'], first: CHUNK_SIZE, skip }
         )
 
-        if (isEmpty(remoteClients)) break
+        if (isEmpty(remoteClientsPushTokens)) break
 
-        skip += remoteClients.length
+        skip += remoteClientsPushTokens.length
 
-        for (const remoteClient of remoteClients) {
-            const success = await prepareAndSendNotification(context, remoteClient)
+        for (const remoteClientPushToken of remoteClientsPushTokens) {
+            const success = await prepareAndSendNotification(context, remoteClientPushToken.remoteClient)
             successCnt += success
         }
     }
 
-    logger.info({ msg: 'notifications sent', data: { successCnt, attempts: remoteClientsCount } })
+    logger.info({ msg: 'notifications sent', data: { successCnt, attempts: remoteClientPushTokensCount } })
 }
 
 module.exports = {

apps/condo/domains/notification/helpers/sendRemoteClientsUpgradeAppNotifications.spec.js

@@ -41,6 +41,8 @@ describe('sendResidentsNoAccountNotifications', () => {
             type: RESIDENT_UPGRADE_APP_TYPE,
             uniqKey: notificationKey,
         }
+        const lastMessages = await Message.getAll(admin, {}, { first: 2 })
+        console.error(JSON.stringify(lastMessages, null, 2))
         const message = await Message.getOne(admin, messageWhere)
 
         expect(message).toBeDefined()