From d9013c5d664bb022cd0b33936da9941195424c7b Mon Sep 17 00:00:00 2001
From: Vasiliy Kislov <64303474+VKislov@users.noreply.github.com>
Date: Fri, 11 Aug 2023 12:54:27 +0500
Subject: [PATCH] feat(condo): DOMA-6331 push notification about the need to
 send meter readings (#3612)

* feat(condo): DOMA-6331 push notification about the need to send meter readings

* feat(condo): DOMA-6331 make push uniq by pattern userId, start or end period and current month

* feat(condo): DOMA-6331 added push notification translates

* feat(condo): DOMA-6331 change pattern of uniqKey to userId_startPeriodDay-endPeriodDay_(start/end). fix tests

* feat(condo): DOMA-6330 added routing on index meter page

* fix(condo): DOMA-6331 fix cron task config

* fix(condo): DOMA-6633 fix text of btn on create period page

* fix(condo): DOMA-6631 fix rerender of selects start and end of period

* fix(condo): DOMA-6630 add placeholder if chosen period for all organization

* fix(condo): DOMA-6331 disable isOrganization checkbox when org period has already been created

* fix(condo): DOMA-6331 makemigrations and types

* fix(condo): DOMA-6330 fix formValuesToMutationDataPreprocessor on update action

* fix(condo): DOMA-6331 try to fix error

* fix(condo): DOMA-6331 fix checkIsDateInPeriod util

* fix(condo): DOMA-6331 fix dayjs locale

* fix(condo): DOMA-6816 fix METER_SUBMIT_READINGS_REMINDER_END_PERIOD and push by deleted meters and periods

* fix(condo): DOMA-6815 fix connect deleted meter from deleted resident to not deleted resident with same accountNumber

* fix(condo): DOMA-6331 some code improvements

* chore(condo): DOMA-6331 rebase & regenerate migration
---
 .../components/CreateMeterReadingsForm.tsx    |   2 +-
 .../components/MeterReportingPeriodForm.tsx   |  25 ++--
 apps/condo/domains/meter/hooks/useFilters.tsx |   4 +-
 ...endSubmitMeterReadingsPushNotifications.js | 114 +++++++++++++-----
 ...bmitMeterReadingsPushNotifications.spec.js |  94 ++++++++++++++-
 ...ubmitMeterReadingsPushNotificationsTask.js |   2 +-
 .../tasks/sendVerificationDateReminder.js     |   8 +-
 .../notification/constants/constants.js       |  24 ++++
 apps/condo/lang/en/en.json                    |   9 +-
 .../default.njk                               |   1 +
 .../push.njk                                  |   1 +
 .../sms.njk                                   |   1 +
 .../default.njk                               |   1 +
 .../push.njk                                  |   1 +
 .../sms.njk                                   |   1 +
 .../default.njk                               |   1 +
 .../push.njk                                  |   1 +
 .../sms.njk                                   |   1 +
 .../default.njk                               |   1 +
 .../push.njk                                  |   1 +
 .../sms.njk                                   |   1 +
 apps/condo/lang/ru/ru.json                    |   7 ++
 ...ter_notificationusersetting_messagetype.js |  26 ++++
 apps/condo/pages/meter/index.tsx              |  29 ++++-
 .../meter/reportingPeriod/[id]/update.tsx     |   4 +-
 .../pages/meter/reportingPeriod/create.tsx    |   4 +-
 apps/condo/schema.graphql                     |  54 ++++++++-
 apps/condo/schema.ts                          |  54 ++++++++-
 28 files changed, 417 insertions(+), 55 deletions(-)
 create mode 100644 apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk
 create mode 100644 apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk
 create mode 100644 apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk
 create mode 100644 apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk
 create mode 100644 apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk
 create mode 100644 apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk
 create mode 100644 apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk
 create mode 100644 apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk
 create mode 100644 apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk
 create mode 100644 apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk
 create mode 100644 apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk
 create mode 100644 apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk
 create mode 100644 apps/condo/migrations/20230810172249-0306_alter_notificationusersetting_messagetype.js

diff --git a/apps/condo/domains/meter/components/CreateMeterReadingsForm.tsx b/apps/condo/domains/meter/components/CreateMeterReadingsForm.tsx
index 6433038099b..ce80aadabca 100644
--- a/apps/condo/domains/meter/components/CreateMeterReadingsForm.tsx
+++ b/apps/condo/domains/meter/components/CreateMeterReadingsForm.tsx
@@ -493,7 +493,7 @@ export const CreatePropertyMeterReadingsForm = ({ organization, role }) => {
     const createMeterReadingAction = PropertyMeterReading.useCreate({
         source: { connect: { id: CRM_METER_READING_SOURCE_ID } },
     }, async () => {
-        await router.push(`/meter?meterType=${METER_PAGE_TYPES.propertyMeter}`)
+        await router.push(`/meter?tab=${METER_PAGE_TYPES.propertyMeter}`)
     })
 
     const handleSubmit = useCallback(async (values) => {
diff --git a/apps/condo/domains/meter/components/MeterReportingPeriodForm.tsx b/apps/condo/domains/meter/components/MeterReportingPeriodForm.tsx
index 9bfba2cf567..4bf8d86c784 100644
--- a/apps/condo/domains/meter/components/MeterReportingPeriodForm.tsx
+++ b/apps/condo/domains/meter/components/MeterReportingPeriodForm.tsx
@@ -4,6 +4,7 @@ import { jsx } from '@emotion/react'
 import { Col, Form, Row, Typography } from 'antd'
 import get from 'lodash/get'
 import isEmpty from 'lodash/isEmpty'
+import isNil from 'lodash/isNil'
 import { useRouter } from 'next/router'
 import { Rule } from 'rc-field-form/lib/interface'
 import React, { CSSProperties, useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -60,11 +61,14 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
     const OrMessage = intl.formatMessage({ id: 'Or' })
     const DeleteButtonLabel = intl.formatMessage({ id: 'Delete' })
     const AddressLabel = intl.formatMessage({ id: 'field.Address' })
-    const SubmitButtonLabel = intl.formatMessage({ id: 'ApplyChanges' })
+    const SubmitButtonApplyLabel = intl.formatMessage({ id: 'ApplyChanges' })
+    const SubmitButtonCreateLabel = intl.formatMessage({ id: 'Create' })
     const AddressPlaceholderMessage = intl.formatMessage({ id: 'placeholder.Address' })
     const ErrorsContainerTitle = intl.formatMessage({ id: 'errorsContainer.requiredErrors' })
     const StartLabel = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.create.start' })
     const FinishLabel = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.create.finish' })
+    const AddressPlaceholderLabel = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.create.addressPlaceholder' })
+    const AddressPlaceholderDefaultPeriodLabel = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.create.addressPlaceholderIfDefaultPeriod' })
     const IncorrectPeriodLabel = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.create.incorrectPeriod' })
     const OrganizationLabel = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.create.organizationPeriod' })
     const OrganizationTooltipMessage = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.create.organizationTooltip' })
@@ -91,6 +95,7 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
 
     const startNumberRef = useRef<number>(formInitialValues.notifyStartDay)
     const finishNumberRef = useRef<number>(formInitialValues.notifyEndDay)
+    const [selectRerender, execSelectRerender] = useState()
     const selectedPropertyIdRef = useRef(selectedPropertyId)
 
     useEffect(() => {
@@ -135,11 +140,13 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
 
     const handleStartChange = useCallback((value) => {
         startNumberRef.current = value
+        execSelectRerender(value)
         handleDayChange()
     }, [])
 
     const handleFinishChange = useCallback((value) => {
         finishNumberRef.current = value
+        execSelectRerender(value)
         handleDayChange()
     }, [])
 
@@ -153,7 +160,6 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
         error: periodsLoadingError,
     } = MeterReportingPeriod.useObjects({
         where: {
-            property_is_null: false,
             organization: { id: organizationId },
         },
     },
@@ -161,7 +167,11 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
         fetchPolicy: 'network-only',
     })
 
-    const search = useMemo(() => searchOrganizationPropertyWithoutPropertyHint(organizationId, reportingPeriods.map(period => period.property.id)),
+    const hasOrganizationPeriod = Boolean(reportingPeriods.find(period => isNil(period.property) && !isNil(period.organization)))
+
+    const periodsWithProperty = reportingPeriods.filter(period => !isNil(period.property))
+
+    const search = useMemo(() => searchOrganizationPropertyWithoutPropertyHint(organizationId, periodsWithProperty.map(period => period.property.id)),
         [organization, isPeriodsLoading])
 
     const handelGQLInputChange = () => {
@@ -189,8 +199,8 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
                     values.property = { connect: { id: selectedPropertyIdRef.current } }
                 }
                 values.isOrganizationPeriod = undefined
-                values.notifyStartDay = parseInt(values.notifyStartDay)
-                values.notifyEndDay = parseInt(values.notifyEndDay)
+                values.notifyStartDay = startNumberRef.current
+                values.notifyEndDay = finishNumberRef.current
 
                 if (isCreateMode) {
                     values.organization = { connect: { id: organizationId } }
@@ -224,6 +234,7 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
                                                 <GraphQlSearchInput
                                                     label={AddressPlaceholderMessage}
                                                     showArrow={false}
+                                                    placeholder={isOrganizationPeriod ? AddressPlaceholderDefaultPeriodLabel : AddressPlaceholderLabel}
                                                     disabled={isOrganizationPeriod}
                                                     onChange={handelGQLInputChange}
                                                     initialValue={isCreateMode ? undefined : selectedPropertyId}
@@ -243,6 +254,7 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
                                         >
                                             <Checkbox
                                                 checked={isOrganizationPeriod}
+                                                disabled={hasOrganizationPeriod}
                                                 eventName='OrganizationReportingPeriodCheckbox'
                                                 style={CHECKBOX_STYLE}
                                                 onChange={handleCheckboxChange}
@@ -257,7 +269,6 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
                                             {...INPUT_LAYOUT_PROPS}
                                             labelAlign='left'
                                             required
-                                            shouldUpdate
                                             validateFirst
                                         >
                                             <Select
@@ -326,7 +337,7 @@ export const MeterReportingPeriodForm: React.FC<IMeterReportingPeriodForm> = ({
                                                                     onClick={handleSave}
                                                                     loading={isLoading}
                                                                 >
-                                                                    {SubmitButtonLabel}
+                                                                    {isCreateMode ? SubmitButtonCreateLabel : SubmitButtonApplyLabel}
                                                                 </ButtonWithDisabledTooltip>,
                                                                 isCreateMode ? <></> : <DeleteButtonWithConfirmModal
                                                                     key='delete'
diff --git a/apps/condo/domains/meter/hooks/useFilters.tsx b/apps/condo/domains/meter/hooks/useFilters.tsx
index 230f50f7bde..c74c25b1bb5 100644
--- a/apps/condo/domains/meter/hooks/useFilters.tsx
+++ b/apps/condo/domains/meter/hooks/useFilters.tsx
@@ -111,7 +111,7 @@ export function useFilters (meterPageType: MeterPageTypes): Array<FiltersMeta<Me
                     },
                 ]
             }
-            case METER_PAGE_TYPES.meter || METER_PAGE_TYPES.propertyMeter: {
+            default: {
                 return compact([
                     {
                         keyword: 'address',
@@ -341,5 +341,5 @@ export function useFilters (meterPageType: MeterPageTypes): Array<FiltersMeta<Me
             }
         }
 
-    }, [sources, resources])
+    }, [sources, resources, isPropertyMeter, meterPageType])
 }
\ No newline at end of file
diff --git a/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.js b/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.js
index 8095d70b77a..12b995e277b 100644
--- a/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.js
+++ b/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.js
@@ -1,5 +1,7 @@
 const dayjs = require('dayjs')
-const { get, uniq, isNull } = require('lodash')
+const locale_ru = require('dayjs/locale/ru')
+const isBetween = require('dayjs/plugin/isBetween')
+const { get, uniq, isNull, isEmpty, isNil } = require('lodash')
 
 const conf = require('@open-condo/config')
 const { getLogger } = require('@open-condo/keystone/logging')
@@ -7,22 +9,32 @@ const { getSchemaCtx } = require('@open-condo/keystone/schema')
 const { getLocalized } = require('@open-condo/locales/loader')
 
 const { COUNTRIES } = require('@condo/domains/common/constants/countries')
+const { RU_LOCALE } = require('@condo/domains/common/constants/locale')
 const { loadListByChunks } = require('@condo/domains/common/utils/serverSchema')
 const { rightJoin, joinResidentsToMeters } = require('@condo/domains/meter/tasks/sendVerificationDateReminder')
-const { Meter, MeterReading } = require('@condo/domains/meter/utils/serverSchema')
+const { Meter, MeterReading, MeterReportingPeriod } = require('@condo/domains/meter/utils/serverSchema')
 const {
-    METER_SUBMIT_READINGS_REMINDER_TYPE,
-    METER_VERIFICATION_DATE_EXPIRED_TYPE,
+    METER_VERIFICATION_DATE_EXPIRED_TYPE, METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE, METER_SUBMIT_READINGS_REMINDER_START_PERIOD_TYPE,
 } = require('@condo/domains/notification/constants/constants')
 const { sendMessage } = require('@condo/domains/notification/utils/serverSchema')
 const { Organization } = require('@condo/domains/organization/utils/serverSchema')
 
 
+dayjs.extend(isBetween)
 const logger = getLogger('meter/sendSubmitMeterReadingsPushNotifications')
 
 const readMetersPage = async ({ context, offset, pageSize }) => {
     return await Meter.getAll(
-        context, { isAutomatic: false }, {
+        context, {
+            isAutomatic: false,
+            deletedAt: null,
+            organization: {
+                deletedAt: null,
+            },
+            property: {
+                deletedAt: null,
+            },
+        }, {
             sortBy: 'id_ASC',
             first: pageSize,
             skip: offset,
@@ -48,7 +60,9 @@ const readMeterReadings = async ({ context, meters }) => {
             date_lte: endWindowDate,
             meter: {
                 id_in: meterIds,
+                deletedAt: null,
             },
+            deletedAt: null,
         },
     })
 }
@@ -64,9 +78,29 @@ const readOrganizations = async ({ context, meters }) => {
         where: {
             id_in: organizationIds,
         },
+        deletedAt: null,
     })
 }
 
+const readMeterReportingPeriods = async ({ context, organizations }) => {
+    const organizationIds = organizations.map(org => org.id)
+    return await loadListByChunks({
+        context,
+        list: MeterReportingPeriod,
+        where: {
+            organization: {
+                id_in: organizationIds,
+            },
+            deletedAt: null,
+        },
+    })
+}
+
+const checkIsDateStartOrEndOfPeriod = (date, today, start, end) => {
+    return dayjs(date).format('YYYY-MM-DD') === dayjs(today).set('date', start).format('YYYY-MM-DD') ||
+        dayjs(date).format('YYYY-MM-DD') === dayjs(today).set('date', end).format('YYYY-MM-DD')
+}
+
 const sendSubmitMeterReadingsPushNotifications = async () => {
     // task implementation algorithm
     // * Read all meter resources for all supported languages
@@ -112,40 +146,62 @@ const sendSubmitMeterReadingsPushNotifications = async () => {
             offset: state.offset,
             pageSize: state.pageSize,
         })
-        const meterReadings = await readMeterReadings({ context, meters })
         const organizations = await readOrganizations({ context, meters })
+        const reportingPeriods = await readMeterReportingPeriods({ context, organizations })
+        const meterReadings = await readMeterReadings({ context, meters, reportingPeriods })
+
+        const metersWithoutReadings = []
+        const periodsByProperty = []
+        const periodsByOrganization = []
+        let defaultPeriod = null
+
+        for (let period of reportingPeriods) {
+            if (isNil(period.organization) && isNil(period.property)) defaultPeriod = period
+            else if (!isNil(period.organization) && isNil(period.property)) periodsByOrganization.push(period)
+            else periodsByProperty.push(period)
+        }
 
-        // right join data to metersPage
-        const metersWithoutReadings = rightJoin(
-            meters,
-            meterReadings,
-            (meter, item) => meter.id === item.meter.id,
-            (meter, readings) => ({ meter, readings })
-        )
-            .filter(({ readings }) => readings.length === 0)
-            .map(({ meter }) => meter)
+        for (const meter of meters) {
+            const period = periodsByProperty.find(({ property }) => property.id === meter.property.id) ??
+                periodsByOrganization.find(({ organization }) => organization.id === meter.organization.id) ??
+                defaultPeriod
+
+            if (isNil(period)) continue
+
+            const notifyStartDay = get(period, 'notifyStartDay')
+            const notifyEndDay = get(period, 'notifyEndDay')
+
+            const readingsOfCurrentMeter = meterReadings.filter(reading => (
+                reading.meter.id === meter.id &&
+                checkIsDateStartOrEndOfPeriod(reading.date, state.startTime, notifyStartDay, notifyEndDay)
+            ))
+
+            const isTodayStartOrEndOfPeriod = checkIsDateStartOrEndOfPeriod(state.startTime, state.startTime, notifyStartDay, notifyEndDay)
+            const isEndPeriodNotification = dayjs(state.startTime).format('YYYY-MM-DD') === dayjs(state.startTime).set('date', notifyEndDay).format('YYYY-MM-DD')
+            const periodKey = `${dayjs(state.startTime).set('date', notifyStartDay).format('YYYY-MM-DD')}-${dayjs(state.startTime).set('date', notifyEndDay).format('YYYY-MM-DD')}`
+
+            if (isTodayStartOrEndOfPeriod) metersWithoutReadings.push({ meter, periodKey, isEndPeriodNotification, isEmptyReadings: isEmpty(readingsOfCurrentMeter) })
+        }
 
         // right join organizations
-        const metersWithoutPeriod = rightJoin(
+        const metersToSendNotification = rightJoin(
             metersWithoutReadings,
             organizations,
-            (meter, organization) => meter.organization.id === organization.id,
-            (meter, organization) => {
+            ({ meter }, organization) => meter.organization.id === organization.id,
+            ({ meter, isEndPeriodNotification, isEmptyReadings, periodKey }, organization) => {
                 /**
                  * Detect message language
                  * Use DEFAULT_LOCALE if organization.country is unknown
                  * (not defined within @condo/domains/common/constants/countries)
                  */
                 const lang = get(COUNTRIES, [get(organization, 'country', conf.DEFAULT_LOCALE), 'locale'], conf.DEFAULT_LOCALE)
-                const period = null // TODO calculate this prop after implementation submit period in organisation
-                return { ...meter, period, lang }
+                return { ...meter, isEndPeriodNotification, isEmptyReadings, periodKey, lang }
             }
         )
-            .filter(({ period }) => period == null) // pick meters without organisation default period
-        state.metersWithoutReadings += metersWithoutPeriod.length
+        state.metersWithoutReadings += metersToSendNotification.length
 
         // Join residents
-        const metersWithResident = await joinResidentsToMeters({ context, meters: metersWithoutPeriod })
+        const metersWithResident = await joinResidentsToMeters({ context, meters: metersToSendNotification })
         state.metersWithoutReadingsAndWithResidents += metersWithResident.length
 
         // Send message with specific unique key for set up readings
@@ -195,18 +251,20 @@ const sendMessageSafely = async ({ context, message }) => {
 const sendMessagesForSetUpReadings = async ({ context, metersWithResident }) => {
     await Promise.all(metersWithResident.map(async ({ meter, residents }) => {
         await Promise.all(residents.map(async (resident) => {
-            const { lang } = meter
-            const uniqKey = `${meter.id}_${resident.id}_${dayjs().format('YYYY-MM')}`
+            const { lang, periodKey } = meter
+            const now = dayjs()
+            const uniqKey = `${resident.user.id}_${periodKey}_${meter.isEndPeriodNotification ? 'end' : 'start'}`
 
             const message = {
                 sender: { dv: 1, fingerprint: 'meters-readings-submit-reminder-cron-push' },
                 to: { user: { id: resident.user.id } },
-                type: METER_SUBMIT_READINGS_REMINDER_TYPE,
+                type: meter.isEndPeriodNotification ? METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE : METER_SUBMIT_READINGS_REMINDER_START_PERIOD_TYPE,
                 lang,
                 uniqKey,
                 meta: {
                     dv: 1,
                     data: {
+                        monthName: lang === RU_LOCALE ? now.locale('ru').format('MMMM') : now.format('MMMM'),
                         meterId: meter.id,
                         userId: resident.user.id,
                         residentId: resident.id,
@@ -216,7 +274,7 @@ const sendMessagesForSetUpReadings = async ({ context, metersWithResident }) =>
                 organization: { id: meter.organization.id },
             }
 
-            await sendMessageSafely({ context, message })
+            if (meter.isEmptyReadings) await sendMessageSafely({ context, message })
         }))
     }))
 }
@@ -248,7 +306,7 @@ const sendMessagesForExpiredMeterVerificationDate = async ({ context, metersWith
                 organization: meter.organization && { id: meter.organization.id },
             }
 
-            await sendMessageSafely({ context, message })
+            if (meter.isEmptyReadings) await sendMessageSafely({ context, message })
         }))
     }))
 }
diff --git a/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.spec.js b/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.spec.js
index b46aa171a12..995dfe093ab 100644
--- a/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.spec.js
+++ b/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications.spec.js
@@ -5,30 +5,49 @@
 const index = require('@app/condo/index')
 const dayjs = require('dayjs')
 
-const { setFakeClientMode } = require('@open-condo/keystone/test.utils')
+const { setFakeClientMode, makeLoggedInAdminClient } = require('@open-condo/keystone/test.utils')
 
 const { sendSubmitMeterReadingsPushNotifications } = require('@condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotifications')
 const {
     MeterReadingSource,
-    makeClientWithResidentAndMeter,
     createTestMeterReading,
+    createTestMeterReportingPeriod, createTestMeter, MeterResource, Meter,
 } = require('@condo/domains/meter/utils/testSchema')
 const {
     METER_SUBMIT_READINGS_REMINDER_TYPE,
+    METER_SUBMIT_READINGS_REMINDER_START_PERIOD_TYPE,
+    METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE,
     METER_VERIFICATION_DATE_EXPIRED_TYPE,
     CALL_METER_READING_SOURCE_ID,
 } = require('@condo/domains/notification/constants/constants')
 const { Message: MessageApi } = require('@condo/domains/notification/utils/serverSchema')
+const { makeClientWithServiceConsumer } = require('@condo/domains/resident/utils/testSchema')
 
 
 
 const { keystone } = index
 
 const prepareUserAndMeter = async ({ nextVerificationDate }) => {
-    return await makeClientWithResidentAndMeter({
+    const client = await makeClientWithServiceConsumer()
+    const adminClient = await makeLoggedInAdminClient()
+    const { property, organization, serviceConsumer, resident } = client
+    const [resource] = await MeterResource.getAll(adminClient, {})
+    client.resource = resource
+    const [meter, attrs] = await createTestMeter(adminClient, organization, property, resource, {
+        accountNumber: serviceConsumer.accountNumber,
+        unitName: resident.unitName,
         verificationDate: dayjs().add(-1, 'year').toISOString(),
         nextVerificationDate,
     })
+    client.meterAttrs = attrs
+    client.meter = meter
+
+    client.reportingPeriod = await createTestMeterReportingPeriod(adminClient, client.meter.organization, {
+        notifyStartDay: Number(dayjs().format('DD')),
+        notifyEndDay: 31,
+    })
+
+    return client
 }
 
 const prepareReadings = async (client) => {
@@ -47,7 +66,12 @@ const prepareReadings = async (client) => {
 const getNewMessages = async ({ userId, meterId }) => {
     const messages = await MessageApi.getAll(keystone, {
         user: { id: userId },
-        type_in: [METER_SUBMIT_READINGS_REMINDER_TYPE, METER_VERIFICATION_DATE_EXPIRED_TYPE],
+        type_in: [
+            METER_SUBMIT_READINGS_REMINDER_TYPE,
+            METER_SUBMIT_READINGS_REMINDER_START_PERIOD_TYPE,
+            METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE,
+            METER_VERIFICATION_DATE_EXPIRED_TYPE,
+        ],
     })
     return messages.filter(message => message.meta.data.meterId === meterId)
 }
@@ -91,6 +115,37 @@ describe('Submit meter readings push notification', () => {
         expect(messages).toHaveLength(0)
     })
 
+    it('should not send messages for deleted meters', async () => {
+        // arrange
+        const client = await makeClientWithServiceConsumer()
+        const adminClient = await makeLoggedInAdminClient()
+        const { property, organization, serviceConsumer, resident } = client
+        const [resource] = await MeterResource.getAll(adminClient, {})
+
+        const [meter, attrs] = await createTestMeter(adminClient, organization, property, resource, {
+            accountNumber: serviceConsumer.accountNumber,
+            unitName: resident.unitName,
+            verificationDate: dayjs().add(-1, 'year').toISOString(),
+            nextVerificationDate: undefined,
+        })
+
+        await Meter.softDelete(adminClient, meter.id)
+
+        await createTestMeterReportingPeriod(adminClient, organization, {
+            notifyStartDay: 1,
+            notifyEndDay: Number(dayjs().format('DD')),
+        })
+        // act
+        await sendSubmitMeterReadingsPushNotifications()
+
+        // assert
+        const messages = await getNewMessages({
+            userId: client.user.id,
+            meterId: meter.id,
+        })
+        expect(messages).toHaveLength(0)
+    })
+
     it('should send messages for empty readings and valid nextVerificationDate', async () => {
         // arrange
         const { user, meter } = await prepareUserAndMeter({
@@ -145,4 +200,35 @@ describe('Submit meter readings push notification', () => {
         expect(messages).toHaveLength(1)
         expect(messages[0].organization.id).toEqual(meter.organization.id)
     })
+
+    it('should send messages for empty readings and undefined nextVerificationDate with type METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE', async () => {
+        // arrange
+        const client = await makeClientWithServiceConsumer()
+        const adminClient = await makeLoggedInAdminClient()
+        const { property, organization, serviceConsumer, resident } = client
+        const [resource] = await MeterResource.getAll(adminClient, {})
+
+        const [meter, attrs] = await createTestMeter(adminClient, organization, property, resource, {
+            accountNumber: serviceConsumer.accountNumber,
+            unitName: resident.unitName,
+            verificationDate: dayjs().add(-1, 'year').toISOString(),
+            nextVerificationDate: undefined,
+        })
+
+        await createTestMeterReportingPeriod(adminClient, organization, {
+            notifyStartDay: 1,
+            notifyEndDay: Number(dayjs().format('DD')),
+        })
+        // act
+        await sendSubmitMeterReadingsPushNotifications()
+
+        // assert
+        const messages = await getNewMessages({
+            userId: client.user.id,
+            meterId: meter.id,
+        })
+        expect(messages).toHaveLength(1)
+        expect(messages[0].type).toEqual(METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE)
+        expect(messages[0].organization.id).toEqual(meter.organization.id)
+    })
 })
\ No newline at end of file
diff --git a/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotificationsTask.js b/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotificationsTask.js
index ca957d9509e..3173165b4d8 100644
--- a/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotificationsTask.js
+++ b/apps/condo/domains/meter/tasks/sendSubmitMeterReadingsPushNotificationsTask.js
@@ -24,6 +24,6 @@ const sendSubmitMeterReadingsPushNotificationsTaskFn = async (context = null) =>
 /**
  * Syncs new and cancelled subscriptions
  */
-const sendSubmitMeterReadingsPushNotificationsTask = createCronTask('sendSubmitMeterReadingsPushNotifications', '0 14 21 * *', sendSubmitMeterReadingsPushNotificationsTaskFn)
+const sendSubmitMeterReadingsPushNotificationsTask = createCronTask('sendSubmitMeterReadingsPushNotifications', '0 14 * * *', sendSubmitMeterReadingsPushNotificationsTaskFn)
 
 module.exports = sendSubmitMeterReadingsPushNotificationsTask
diff --git a/apps/condo/domains/meter/tasks/sendVerificationDateReminder.js b/apps/condo/domains/meter/tasks/sendVerificationDateReminder.js
index f0d994ce834..8e30d89f2a1 100644
--- a/apps/condo/domains/meter/tasks/sendVerificationDateReminder.js
+++ b/apps/condo/domains/meter/tasks/sendVerificationDateReminder.js
@@ -57,6 +57,7 @@ const joinResidentsToMeters = async ({ context, meters }) => {
         list: ServiceConsumer,
         where: {
             accountNumber_in: accountNumbers,
+            deletedAt: null,
         },
     })
 
@@ -69,6 +70,7 @@ const joinResidentsToMeters = async ({ context, meters }) => {
         list: Resident,
         where: {
             id_in: residentsIds,
+            deletedAt: null,
         },
     })
 
@@ -84,7 +86,10 @@ const joinResidentsToMeters = async ({ context, meters }) => {
     const metersWithServiceConsumers = rightJoin(
         meters,
         servicesConsumerWithConnectedResidents,
-        (meter, item) => item.servicesConsumer.accountNumber === meter.accountNumber,
+        (meter, item) => (
+            item.servicesConsumer.accountNumber === meter.accountNumber &&
+            item.servicesConsumer.organization.id === meter.organization.id
+        ),
         (meter, servicesConsumers) => ({ meter, servicesConsumers })
     )
         .filter(item => item.servicesConsumers != null && item.servicesConsumers.length > 0)
@@ -122,6 +127,7 @@ const filterSentReminders = async ({ context, date, reminderWindowSize, metersCo
                 id_in: users,
             },
             createdAt_gte: dayjs(date).add(-2, 'month').format('YYYY-MM-DD'),
+            deletedAt: null,
         },
     })
 
diff --git a/apps/condo/domains/notification/constants/constants.js b/apps/condo/domains/notification/constants/constants.js
index ac0ff1ecd42..dc9b8824a70 100644
--- a/apps/condo/domains/notification/constants/constants.js
+++ b/apps/condo/domains/notification/constants/constants.js
@@ -39,6 +39,8 @@ const TICKET_STATUS_DECLINED_TYPE = 'TICKET_STATUS_DECLINED'
 const TICKET_COMMENT_ADDED_TYPE = 'TICKET_COMMENT_ADDED'
 const METER_VERIFICATION_DATE_REMINDER_TYPE = 'METER_VERIFICATION_DATE_REMINDER'
 const METER_SUBMIT_READINGS_REMINDER_TYPE = 'METER_SUBMIT_READINGS_REMINDER'
+const METER_SUBMIT_READINGS_REMINDER_START_PERIOD_TYPE = 'METER_SUBMIT_READINGS_REMINDER_START_PERIOD'
+const METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE = 'METER_SUBMIT_READINGS_REMINDER_END_PERIOD'
 const METER_VERIFICATION_DATE_EXPIRED_TYPE = 'METER_VERIFICATION_DATE_EXPIRED'
 const RESIDENT_ADD_BILLING_ACCOUNT_TYPE = 'RESIDENT_ADD_BILLING_ACCOUNT'
 const BILLING_RECEIPT_AVAILABLE_TYPE = 'BILLING_RECEIPT_AVAILABLE'
@@ -350,6 +352,26 @@ const MESSAGE_META = {
             url: { defaultValue: '', required: true },
         },
     },
+    [METER_SUBMIT_READINGS_REMINDER_START_PERIOD_TYPE]: {
+        dv: { required: true },
+        data: {
+            monthName: { defaultValue: '', required: true },
+            meterId: { required: true },
+            userId: { required: true },
+            residentId: { required: true },
+            url: { defaultValue: '', required: true },
+        },
+    },
+    [METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE]: {
+        dv: { required: true },
+        data: {
+            monthName: { defaultValue: '', required: true },
+            meterId: { required: true },
+            userId: { required: true },
+            residentId: { required: true },
+            url: { defaultValue: '', required: true },
+        },
+    },
     [METER_VERIFICATION_DATE_EXPIRED_TYPE]: {
         dv: { required: true },
         data: {
@@ -814,6 +836,8 @@ module.exports = {
     SMS_FORBIDDEN_SYMBOLS_REGEXP,
     METER_VERIFICATION_DATE_REMINDER_TYPE,
     METER_SUBMIT_READINGS_REMINDER_TYPE,
+    METER_SUBMIT_READINGS_REMINDER_START_PERIOD_TYPE,
+    METER_SUBMIT_READINGS_REMINDER_END_PERIOD_TYPE,
     METER_VERIFICATION_DATE_EXPIRED_TYPE,
     BILLING_RECEIPT_AVAILABLE_TYPE,
     BILLING_RECEIPT_AVAILABLE_NO_ACCOUNT_TYPE,
diff --git a/apps/condo/lang/en/en.json b/apps/condo/lang/en/en.json
index c794e78aefb..11a0a7eee7b 100644
--- a/apps/condo/lang/en/en.json
+++ b/apps/condo/lang/en/en.json
@@ -888,7 +888,10 @@
   "pages.condo.meter.reportingPeriod.create.incorrectPeriod": "Finish must be greater than start",
   "pages.condo.meter.reportingPeriod.create.organizationTooltip": "This period will apply to all properties that do not have a period with a specific address",
   "pages.condo.meter.reportingPeriod.create.descriptionMessage": "Select all properties or a specific property. Indicate the days of the month on which you accept meter readings against the current period.",
-  "pages.condo.meter.reportingPeriod.create.inputPostfix": "числа каждого месяца включительно",
+  "pages.condo.meter.reportingPeriod.create.inputPostfix": "date of each month inclusive",
+  "pages.condo.meter.reportingPeriod.create.addressPlaceholderIfDefaultPeriod": "Applies to all properties without a special period",
+  "pages.condo.meter.reportingPeriod.create.addressPlaceholder": "Select property",
+  "pages.condo.meter.reportingPeriod.EmptyList.header": "Submission period not yet added",
   "pages.condo.settings.hint.organization": "Organization",
   "pages.condo.settings.hint.ticketPropertyHint": "Property hint",
   "pages.condo.settings.hint.createTicketPropertyHint": "Create ticket hint",
@@ -1362,6 +1365,10 @@
   "notification.messages.METER_VERIFICATION_DATE_REMINDER.push.title": "Doma ⏰",
   "notification.messages.METER_SUBMIT_READINGS_REMINDER.email.subject": "Let's submit meter readings?",
   "notification.messages.METER_SUBMIT_READINGS_REMINDER.push.title": "Doma ⏰",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_START_PERIOD.email.subject": "It's time to submit your meter readings! The period for submitting meter readings for {data.monthName} has begun",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_START_PERIOD.push.title": "Remind ⏰",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_END_PERIOD.email.subject": "Submit your meter readings! Today is the last day to submit meter readings for {data.monthName}.",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_END_PERIOD.push.title": "Remind ⏰",
   "notification.messages.METER_VERIFICATION_DATE_EXPIRED.email.subject": "Time to submit meter readings",
   "notification.messages.METER_VERIFICATION_DATE_EXPIRED.push.title": "Time to submit meter readings ⏰",
   "notification.messages.BILLING_RECEIPT_ADDED.email.subject": "Check out your utility bill",
diff --git a/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk
new file mode 100644
index 00000000000..d78d8691873
--- /dev/null
+++ b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk
@@ -0,0 +1 @@
+Submit your meter readings! Today is the last day to submit meter readings for {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk
new file mode 100644
index 00000000000..d78d8691873
--- /dev/null
+++ b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk
@@ -0,0 +1 @@
+Submit your meter readings! Today is the last day to submit meter readings for {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk
new file mode 100644
index 00000000000..d78d8691873
--- /dev/null
+++ b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk
@@ -0,0 +1 @@
+Submit your meter readings! Today is the last day to submit meter readings for {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk
new file mode 100644
index 00000000000..525f51d47ed
--- /dev/null
+++ b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk
@@ -0,0 +1 @@
+It's time to submit your meter readings! The period for submitting meter readings for {{message.meta.data.monthName}} has begun.
\ No newline at end of file
diff --git a/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk
new file mode 100644
index 00000000000..525f51d47ed
--- /dev/null
+++ b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk
@@ -0,0 +1 @@
+It's time to submit your meter readings! The period for submitting meter readings for {{message.meta.data.monthName}} has begun.
\ No newline at end of file
diff --git a/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk
new file mode 100644
index 00000000000..525f51d47ed
--- /dev/null
+++ b/apps/condo/lang/en/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk
@@ -0,0 +1 @@
+It's time to submit your meter readings! The period for submitting meter readings for {{message.meta.data.monthName}} has begun.
\ No newline at end of file
diff --git a/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk
new file mode 100644
index 00000000000..4bfc440794c
--- /dev/null
+++ b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/default.njk
@@ -0,0 +1 @@
+Передайте показания счетчиков! Сегодня последний день подачи показаний за {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk
new file mode 100644
index 00000000000..4bfc440794c
--- /dev/null
+++ b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/push.njk
@@ -0,0 +1 @@
+Передайте показания счетчиков! Сегодня последний день подачи показаний за {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk
new file mode 100644
index 00000000000..4bfc440794c
--- /dev/null
+++ b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_END_PERIOD/sms.njk
@@ -0,0 +1 @@
+Передайте показания счетчиков! Сегодня последний день подачи показаний за {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk
new file mode 100644
index 00000000000..58a23ce07a1
--- /dev/null
+++ b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/default.njk
@@ -0,0 +1 @@
+Пора передать показания счетчиков! Начался период подачи показаний за {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk
new file mode 100644
index 00000000000..58a23ce07a1
--- /dev/null
+++ b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/push.njk
@@ -0,0 +1 @@
+Пора передать показания счетчиков! Начался период подачи показаний за {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk
new file mode 100644
index 00000000000..58a23ce07a1
--- /dev/null
+++ b/apps/condo/lang/ru/messages/METER_SUBMIT_READINGS_REMINDER_START_PERIOD/sms.njk
@@ -0,0 +1 @@
+Пора передать показания счетчиков! Начался период подачи показаний за {{message.meta.data.monthName}}.
\ No newline at end of file
diff --git a/apps/condo/lang/ru/ru.json b/apps/condo/lang/ru/ru.json
index 79ccc718376..7e93d1cac90 100644
--- a/apps/condo/lang/ru/ru.json
+++ b/apps/condo/lang/ru/ru.json
@@ -889,6 +889,9 @@
   "pages.condo.meter.reportingPeriod.create.organizationTooltip": "Этот период будет действовать для всех домов, у которых нет периода с определенным адресом",
   "pages.condo.meter.reportingPeriod.create.descriptionMessage": "Выберите все дома или конкретный дом. Укажите числа месяца, в которые вы принимаете показания ИПУ в счет текущего периода.",
   "pages.condo.meter.reportingPeriod.create.inputPostfix": "числа каждого месяца включительно",
+  "pages.condo.meter.reportingPeriod.create.addressPlaceholderIfDefaultPeriod": "Распрастраняется на все дома без специального периода",
+  "pages.condo.meter.reportingPeriod.create.addressPlaceholder": "Выберите дом",
+  "pages.condo.meter.reportingPeriod.EmptyList.header": "Период подачи показаний пока не добавлен",
   "pages.condo.settings.hint.organization": "УК",
   "pages.condo.settings.hint.ticketPropertyHint": "Справка по дому",
   "pages.condo.settings.hint.createTicketPropertyHint": "Создать справку",
@@ -1362,6 +1365,10 @@
   "notification.messages.METER_VERIFICATION_DATE_REMINDER.push.title": "Doma ⏰",
   "notification.messages.METER_SUBMIT_READINGS_REMINDER.email.subject": "Пора передать показания счетчиков!",
   "notification.messages.METER_SUBMIT_READINGS_REMINDER.push.title": "Doma ⏰",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_START_PERIOD.email.subject": "Пора передать показания счетчиков! Начался период подачи показаний за {data.monthName}.",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_START_PERIOD.push.title": "Напоминаем ⏰",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_END_PERIOD.email.subject": "Передайте показания счетчиков! Сегодня последний день подачи показаний за {data.monthName}.",
+  "notification.messages.METER_SUBMIT_READINGS_REMINDER_END_PERIOD.push.title": "Напоминаем ⏰",
   "notification.messages.METER_VERIFICATION_DATE_EXPIRED.email.subject": "Внимание! У счетчика [#{data.resource}] закончился период поверки",
   "notification.messages.METER_VERIFICATION_DATE_EXPIRED.push.title": "Пора передать показания счетчиков ⏰",
   "notification.messages.BILLING_RECEIPT_ADDED.email.subject": "Вам квитанция!",
diff --git a/apps/condo/migrations/20230810172249-0306_alter_notificationusersetting_messagetype.js b/apps/condo/migrations/20230810172249-0306_alter_notificationusersetting_messagetype.js
new file mode 100644
index 00000000000..899fb074e91
--- /dev/null
+++ b/apps/condo/migrations/20230810172249-0306_alter_notificationusersetting_messagetype.js
@@ -0,0 +1,26 @@
+// auto generated by kmigrator
+// KMIGRATOR:0306_alter_notificationusersetting_messagetype:IyBHZW5lcmF0ZWQgYnkgRGphbmdvIDQuMi4zIG9uIDIwMjMtMDgtMTAgMTI6MjIKCmZyb20gZGphbmdvLmRiIGltcG9ydCBtaWdyYXRpb25zLCBtb2RlbHMKCgpjbGFzcyBNaWdyYXRpb24obWlncmF0aW9ucy5NaWdyYXRpb24pOgoKICAgIGRlcGVuZGVuY2llcyA9IFsKICAgICAgICAoJ19kamFuZ29fc2NoZW1hJywgJzAzMDVfdGlja2V0Y2hhbmdlX2FjdHVhbGNyZWF0aW9uZGF0ZScpLAogICAgXQoKICAgIG9wZXJhdGlvbnMgPSBbCiAgICAgICAgbWlncmF0aW9ucy5BbHRlckZpZWxkKAogICAgICAgICAgICBtb2RlbF9uYW1lPSdub3RpZmljYXRpb251c2Vyc2V0dGluZycsCiAgICAgICAgICAgIG5hbWU9J21lc3NhZ2VUeXBlJywKICAgICAgICAgICAgZmllbGQ9bW9kZWxzLkNoYXJGaWVsZChibGFuaz1UcnVlLCBjaG9pY2VzPVsoJ0lOVklURV9ORVdfRU1QTE9ZRUUnLCAnSU5WSVRFX05FV19FTVBMT1lFRScpLCAoJ1NIQVJFX1RJQ0tFVCcsICdTSEFSRV9USUNLRVQnKSwgKCdCQU5LX0FDQ09VTlRfQ1JFQVRJT05fUkVRVUVTVCcsICdCQU5LX0FDQ09VTlRfQ1JFQVRJT05fUkVRVUVTVCcpLCAoJ0RJUlRZX0lOVklURV9ORVdfRU1QTE9ZRUVfU01TJywgJ0RJUlRZX0lOVklURV9ORVdfRU1QTE9ZRUVfU01TJyksICgnRElSVFlfSU5WSVRFX05FV19FTVBMT1lFRV9FTUFJTCcsICdESVJUWV9JTlZJVEVfTkVXX0VNUExPWUVFX0VNQUlMJyksICgnUkVHSVNURVJfTkVXX1VTRVInLCAnUkVHSVNURVJfTkVXX1VTRVInKSwgKCdSRVNFVF9QQVNTV09SRCcsICdSRVNFVF9QQVNTV09SRCcpLCAoJ1NNU19WRVJJRlknLCAnU01TX1ZFUklGWScpLCAoJ0RFVkVMT1BFUl9JTVBPUlRBTlRfTk9URV9UWVBFJywgJ0RFVkVMT1BFUl9JTVBPUlRBTlRfTk9URV9UWVBFJyksICgnQ1VTVE9NRVJfSU1QT1JUQU5UX05PVEVfVFlQRScsICdDVVNUT01FUl9JTVBPUlRBTlRfTk9URV9UWVBFJyksICgnTUVTU0FHRV9GT1JXQVJERURfVE9fU1VQUE9SVCcsICdNRVNTQUdFX0ZPUldBUkRFRF9UT19TVVBQT1JUJyksICgnVElDS0VUX0FTU0lHTkVFX0NPTk5FQ1RFRCcsICdUSUNLRVRfQVNTSUdORUVfQ09OTkVDVEVEJyksICgnVElDS0VUX0VYRUNVVE9SX0NPTk5FQ1RFRCcsICdUSUNLRVRfRVhFQ1VUT1JfQ09OTkVDVEVEJyksICgnVFJBQ0tfVElDS0VUX0lOX0RPTUFfQVBQJywgJ1RSQUNLX1RJQ0tFVF9JTl9ET01BX0FQUCcpLCAoJ1RJQ0tFVF9TVEFUVVNfT1BFTkVEJywgJ1RJQ0tFVF9TVEFUVVNfT1BFTkVEJyksICgnVElDS0VUX1NUQVRVU19JTl9QUk9HUkVTUycsICdUSUNLRVRfU1RBVFVTX0lOX1BST0dSRVNTJyksICgnVElDS0VUX1NUQVRVU19DT01QTEVURUQnLCAnVElDS0VUX1NUQVRVU19DT01QTEVURUQnKSwgKCdUSUNLRVRfU1RBVFVTX1JFVFVSTkVEJywgJ1RJQ0tFVF9TVEFUVVNfUkVUVVJORUQnKSwgKCdUSUNLRVRfU1RBVFVTX0RFQ0xJTkVEJywgJ1RJQ0tFVF9TVEFUVVNfREVDTElORUQnKSwgKCdUSUNLRVRfQ09NTUVOVF9BRERFRCcsICdUSUNLRVRfQ09NTUVOVF9BRERFRCcpLCAoJ01FVEVSX1ZFUklGSUNBVElPTl9EQVRFX1JFTUlOREVSJywgJ01FVEVSX1ZFUklGSUNBVElPTl9EQVRFX1JFTUlOREVSJyksICgnUkVTSURFTlRfQUREX0JJTExJTkdfQUNDT1VOVCcsICdSRVNJREVOVF9BRERfQklMTElOR19BQ0NPVU5UJyksICgnQklMTElOR19SRUNFSVBUX0FWQUlMQUJMRScsICdCSUxMSU5HX1JFQ0VJUFRfQVZBSUxBQkxFJyksICgnQklMTElOR19SRUNFSVBUX0FWQUlMQUJMRV9OT19BQ0NPVU5UJywgJ0JJTExJTkdfUkVDRUlQVF9BVkFJTEFCTEVfTk9fQUNDT1VOVCcpLCAoJ0JJTExJTkdfUkVDRUlQVF9DQVRFR09SWV9BVkFJTEFCTEUnLCAnQklMTElOR19SRUNFSVBUX0NBVEVHT1JZX0FWQUlMQUJMRScpLCAoJ0JJTExJTkdfUkVDRUlQVF9BRERFRCcsICdCSUxMSU5HX1JFQ0VJUFRfQURERUQnKSwgKCdCSUxMSU5HX1JFQ0VJUFRfQURERURfV0lUSF9ERUJUJywgJ0JJTExJTkdfUkVDRUlQVF9BRERFRF9XSVRIX0RFQlQnKSwgKCdCSUxMSU5HX1JFQ0VJUFRfQURERURfV0lUSF9OT19ERUJUJywgJ0JJTExJTkdfUkVDRUlQVF9BRERFRF9XSVRIX05PX0RFQlQnKSwgKCdNRVRFUl9TVUJNSVRfUkVBRElOR1NfUkVNSU5ERVInLCAnTUVURVJfU1VCTUlUX1JFQURJTkdTX1JFTUlOREVSJyksICgnTUVURVJfU1VCTUlUX1JFQURJTkdTX1JFTUlOREVSX1NUQVJUX1BFUklPRCcsICdNRVRFUl9TVUJNSVRfUkVBRElOR1NfUkVNSU5ERVJfU1RBUlRfUEVSSU9EJyksICgnTUVURVJfU1VCTUlUX1JFQURJTkdTX1JFTUlOREVSX0VORF9QRVJJT0QnLCAnTUVURVJfU1VCTUlUX1JFQURJTkdTX1JFTUlOREVSX0VORF9QRVJJT0QnKSwgKCdNRVRFUl9WRVJJRklDQVRJT05fREFURV9FWFBJUkVEJywgJ01FVEVSX1ZFUklGSUNBVElPTl9EQVRFX0VYUElSRUQnKSwgKCdSRVNJREVOVF9VUEdSQURFX0FQUCcsICdSRVNJREVOVF9VUEdSQURFX0FQUCcpLCAoJ1NUQUZGX1VQR1JBREVfQVBQJywgJ1NUQUZGX1VQR1JBREVfQVBQJyksICgnQ1VTVE9NX0NPTlRFTlRfTUVTU0FHRV9QVVNIJywgJ0NVU1RPTV9DT05URU5UX01FU1NBR0VfUFVTSCcpLCAoJ0NVU1RPTV9DT05URU5UX01FU1NBR0VfRU1BSUwnLCAnQ1VTVE9NX0NPTlRFTlRfTUVTU0FHRV9FTUFJTCcpLCAoJ0NVU1RPTV9DT05URU5UX01FU1NBR0VfU01TJywgJ0NVU1RPTV9DT05URU5UX01FU1NBR0VfU01TJyksICgnVk9JUF9JTkNPTUlOR19DQUxMX01FU1NBR0UnLCAnVk9JUF9JTkNPTUlOR19DQUxMX01FU1NBR0UnKSwgKCdCMkNfQVBQX01FU1NBR0VfUFVTSCcsICdCMkNfQVBQX01FU1NBR0VfUFVTSCcpLCAoJ1JFQ1VSUkVOVF9QQVlNRU5UX1BST0NFRURJTkdfU1VDQ0VTU19SRVNVTFRfTUVTU0FHRScsICdSRUNVUlJFTlRfUEFZTUVOVF9QUk9DRUVESU5HX1NVQ0NFU1NfUkVTVUxUX01FU1NBR0UnKSwgKCdSRUNVUlJFTlRfUEFZTUVOVF9QUk9DRUVESU5HX1VOS05PV05fRVJST1JfTUVTU0FHRScsICdSRUNVUlJFTlRfUEFZTUVOVF9QUk9DRUVESU5HX1VOS05PV05fRVJST1JfTUVTU0FHRScpLCAoJ1JFQ1VSUkVOVF9QQVlNRU5UX1BST0NFRURJTkdfQUNRVUlSSU5HX1BBWU1FTlRfUFJPQ0VFRF9FUlJPUl9NRVNTQUdFJywgJ1JFQ1VSUkVOVF9QQVlNRU5UX1BST0NFRURJTkdfQUNRVUlSSU5HX1BBWU1FTlRfUFJPQ0VFRF9FUlJPUl9NRVNTQUdFJyksICgnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19TRVJWSUNFX0NPTlNVTUVSX05PVF9GT1VORF9FUlJPUl9NRVNTQUdFJywgJ1JFQ1VSUkVOVF9QQVlNRU5UX1BST0NFRURJTkdfU0VSVklDRV9DT05TVU1FUl9OT1RfRk9VTkRfRVJST1JfTUVTU0FHRScpLCAoJ1JFQ1VSUkVOVF9QQVlNRU5UX1BST0NFRURJTkdfTElNSVRfRVhDRUVERURfRVJST1JfTUVTU0FHRScsICdSRUNVUlJFTlRfUEFZTUVOVF9QUk9DRUVESU5HX0xJTUlUX0VYQ0VFREVEX0VSUk9SX01FU1NBR0UnKSwgKCdSRUNVUlJFTlRfUEFZTUVOVF9QUk9DRUVESU5HX0NPTlRFWFRfTk9UX0ZPVU5EX0VSUk9SX01FU1NBR0UnLCAnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19DT05URVhUX05PVF9GT1VORF9FUlJPUl9NRVNTQUdFJyksICgnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19DT05URVhUX0RJU0FCTEVEX0VSUk9SX01FU1NBR0UnLCAnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19DT05URVhUX0RJU0FCTEVEX0VSUk9SX01FU1NBR0UnKSwgKCdSRUNVUlJFTlRfUEFZTUVOVF9QUk9DRUVESU5HX0NBUkRfVE9LRU5fTk9UX1ZBTElEX0VSUk9SX01FU1NBR0UnLCAnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19DQVJEX1RPS0VOX05PVF9WQUxJRF9FUlJPUl9NRVNTQUdFJyksICgnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19DQU5fTk9UX1JFR0lTVEVSX01VTFRJX1BBWU1FTlRfRVJST1JfTUVTU0FHRScsICdSRUNVUlJFTlRfUEFZTUVOVF9QUk9DRUVESU5HX0NBTl9OT1RfUkVHSVNURVJfTVVMVElfUEFZTUVOVF9FUlJPUl9NRVNTQUdFJyksICgnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19OT19SRUNFSVBUU19UT19QUk9DRUVEX0VSUk9SX01FU1NBR0UnLCAnUkVDVVJSRU5UX1BBWU1FTlRfUFJPQ0VFRElOR19OT19SRUNFSVBUU19UT19QUk9DRUVEX0VSUk9SX01FU1NBR0UnKSwgKCdSRUNVUlJFTlRfUEFZTUVOVF9UT01PUlJPV19QQVlNRU5UX01FU1NBR0UnLCAnUkVDVVJSRU5UX1BBWU1FTlRfVE9NT1JST1dfUEFZTUVOVF9NRVNTQUdFJyksICgnUkVDVVJSRU5UX1BBWU1FTlRfVE9NT1JST1dfUEFZTUVOVF9OT19SRUNFSVBUU19NRVNTQUdFJywgJ1JFQ1VSUkVOVF9QQVlNRU5UX1RPTU9SUk9XX1BBWU1FTlRfTk9fUkVDRUlQVFNfTUVTU0FHRScpLCAoJ1JFQ1VSUkVOVF9QQVlNRU5UX1RPTU9SUk9XX1BBWU1FTlRfTElNSVRfRVhDRUVEX01FU1NBR0UnLCAnUkVDVVJSRU5UX1BBWU1FTlRfVE9NT1JST1dfUEFZTUVOVF9MSU1JVF9FWENFRURfTUVTU0FHRScpLCAoJ05FV1NfSVRFTV9DT01NT05fTUVTU0FHRV9UWVBFJywgJ05FV1NfSVRFTV9DT01NT05fTUVTU0FHRV9UWVBFJyksICgnTkVXU19JVEVNX0VNRVJHRU5DWV9NRVNTQUdFX1RZUEUnLCAnTkVXU19JVEVNX0VNRVJHRU5DWV9NRVNTQUdFX1RZUEUnKV0sIG1heF9sZW5ndGg9MTAwLCBudWxsPVRydWUpLAogICAgICAgICksCiAgICBdCg==
+
+exports.up = async (knex) => {
+    await knex.raw(`
+    BEGIN;
+--
+-- Alter field messageType on notificationusersetting
+--
+-- (no-op)
+COMMIT;
+
+    `)
+}
+
+exports.down = async (knex) => {
+    await knex.raw(`
+    BEGIN;
+--
+-- Alter field messageType on notificationusersetting
+--
+-- (no-op)
+COMMIT;
+
+    `)
+}
diff --git a/apps/condo/pages/meter/index.tsx b/apps/condo/pages/meter/index.tsx
index d1592c3d761..4d4ef3263c7 100644
--- a/apps/condo/pages/meter/index.tsx
+++ b/apps/condo/pages/meter/index.tsx
@@ -14,7 +14,7 @@ import isEmpty from 'lodash/isEmpty'
 import uniqBy from 'lodash/uniqBy'
 import Head from 'next/head'
 import { useRouter } from 'next/router'
-import React, { CSSProperties, useCallback, useMemo, useRef, useState } from 'react'
+import React, { CSSProperties, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import { getClientSideSenderInfo } from '@open-condo/codegen/utils/userId'
 import { useFeatureFlags } from '@open-condo/featureflags/FeatureFlagsContext'
@@ -408,7 +408,7 @@ export const MeterReportingPeriodPageContent = ({
     loading,
 }) => {
     const intl = useIntl()
-    const EmptyListLabel = intl.formatMessage({ id: 'pages.condo.meter.index.EmptyList.header' })
+    const EmptyListLabel = intl.formatMessage({ id: 'pages.condo.meter.reportingPeriod.EmptyList.header' })
     const CreateReportingPeriodLabel = intl.formatMessage({ id: 'pages.condo.meter.index.reportingPeriod.EmptyList.create' })
     const DeleteLabel = intl.formatMessage({ id: 'Delete' })
     const SearchPlaceholder = intl.formatMessage({ id: 'filters.FullSearch' })
@@ -596,6 +596,19 @@ interface IMeterIndexPage extends React.FC {
 
 const sortableProperties = ['date', 'clientName', 'source']
 
+function MeterPageTypeFromQuery (tabFromQuery) {
+    switch (tabFromQuery) {
+        case METER_PAGE_TYPES.meter:
+            return METER_PAGE_TYPES.meter
+        case METER_PAGE_TYPES.propertyMeter:
+            return METER_PAGE_TYPES.propertyMeter
+        case METER_PAGE_TYPES.reportingPeriod:
+            return METER_PAGE_TYPES.reportingPeriod
+        default:
+            return undefined
+    }
+}
+
 const MetersPage: IMeterIndexPage = () => {
     const intl = useIntl()
     const PageTitleMessage = intl.formatMessage({ id: 'pages.condo.meter.index.PageTitle' })
@@ -606,6 +619,7 @@ const MetersPage: IMeterIndexPage = () => {
     const { organization, link, isLoading } = useOrganization()
     const userOrganizationId = get(organization, 'id')
     const role = get(link, 'role')
+    const router = useRouter()
 
     const { useFlag } = useFeatureFlags()
     const isMeterReportingPeriodEnabled = useFlag(METER_REPORTING_PERIOD_FRONTEND_FEATURE_FLAG)
@@ -613,10 +627,16 @@ const MetersPage: IMeterIndexPage = () => {
     const { GlobalHints } = useGlobalHints()
 
     const [tab, setTab] = useState<MeterPageTypes>(METER_PAGE_TYPES.meter)
+    useEffect(() => {
+        const tabFromRoute = MeterPageTypeFromQuery(router.query.tab ? router.query.tab : METER_PAGE_TYPES.meter)
+        if (tabFromRoute) {
+            setTab(tabFromRoute)
+            router.replace({ query: { ...router.query, tab: tabFromRoute } })
+        }
+    }, [])
 
     const filterMetas = useFilters(tab)
     const { filtersToWhere, sortersToSortBy } = useQueryMappers(filterMetas, sortableProperties)
-    const router = useRouter()
     const { filters, sorters } = parseQuery(router.query)
     const tableColumns = useTableColumns(filterMetas, tab)
     const searchMeterReadingsQuery = useMemo(() => ({
@@ -642,7 +662,8 @@ const MetersPage: IMeterIndexPage = () => {
 
     const handleTabChange = useCallback((tab: MeterPageTypes) => {
         setTab(tab)
-    }, [])
+        router.replace({ query: { ...router.query, tab } })
+    }, [tab])
 
     return (
         <MultipleFilterContextProvider>
diff --git a/apps/condo/pages/meter/reportingPeriod/[id]/update.tsx b/apps/condo/pages/meter/reportingPeriod/[id]/update.tsx
index 1dc536dc8c2..2abce6af0f4 100644
--- a/apps/condo/pages/meter/reportingPeriod/[id]/update.tsx
+++ b/apps/condo/pages/meter/reportingPeriod/[id]/update.tsx
@@ -8,7 +8,7 @@ import { useIntl } from 'react-intl'
 import { PageContent, PageWrapper } from '@condo/domains/common/components/containers/BaseLayout'
 import LoadingOrErrorPage from '@condo/domains/common/components/containers/LoadingOrErrorPage'
 import { MeterReportingPeriodForm } from '@condo/domains/meter/components/MeterReportingPeriodForm'
-import { MeterReportingPeriod } from '@condo/domains/meter/utils/clientSchema'
+import { METER_PAGE_TYPES, MeterReportingPeriod } from '@condo/domains/meter/utils/clientSchema'
 
 const CREATE_REPORTING_PERIOD_PAGE_GUTTER: RowProps['gutter'] = [0, 40]
 const TITLE_MARGIN = { marginBottom: '20px' }
@@ -39,7 +39,7 @@ const MeterReportingPeriodUpdatePage = () => {
     const action = MeterReportingPeriod.useUpdate({})
     const submitAction = async (data) => {
         await action(data, reportingPeriod)
-        await push('/meter')
+        await push(`/meter?tab=${METER_PAGE_TYPES.reportingPeriod}`)
     }
     
     const isNotFound = !reportingPeriodLoading && (!reportingPeriod)
diff --git a/apps/condo/pages/meter/reportingPeriod/create.tsx b/apps/condo/pages/meter/reportingPeriod/create.tsx
index 23289ed7aac..fc78d239d54 100644
--- a/apps/condo/pages/meter/reportingPeriod/create.tsx
+++ b/apps/condo/pages/meter/reportingPeriod/create.tsx
@@ -6,7 +6,7 @@ import { useIntl } from 'react-intl'
 
 import { PageContent, PageWrapper } from '@condo/domains/common/components/containers/BaseLayout'
 import { MeterReportingPeriodForm } from '@condo/domains/meter/components/MeterReportingPeriodForm'
-import { MeterReportingPeriod } from '@condo/domains/meter/utils/clientSchema'
+import { METER_PAGE_TYPES, MeterReportingPeriod } from '@condo/domains/meter/utils/clientSchema'
 
 const CREATE_REPORTING_PERIOD_PAGE_GUTTER: RowProps['gutter'] = [0, 40]
 const TITLE_MARGIN = { marginBottom: '20px' }
@@ -18,7 +18,7 @@ const MeterReportingPeriodCreatePage = () => {
 
     const router = useRouter()
     
-    const action = MeterReportingPeriod.useCreate({}, () => router.push('/meter'))
+    const action = MeterReportingPeriod.useCreate({}, () => router.push(`/meter?tab=${METER_PAGE_TYPES.reportingPeriod}`))
 
     return <>
         <Head>
diff --git a/apps/condo/schema.graphql b/apps/condo/schema.graphql
index 00ca032d1a2..f4a652ef33b 100644
--- a/apps/condo/schema.graphql
+++ b/apps/condo/schema.graphql
@@ -38313,6 +38313,8 @@ enum NotificationUserSettingMessageTypeType {
   BILLING_RECEIPT_ADDED_WITH_DEBT
   BILLING_RECEIPT_ADDED_WITH_NO_DEBT
   METER_SUBMIT_READINGS_REMINDER
+  METER_SUBMIT_READINGS_REMINDER_START_PERIOD
+  METER_SUBMIT_READINGS_REMINDER_END_PERIOD
   METER_VERIFICATION_DATE_EXPIRED
   RESIDENT_UPGRADE_APP
   STAFF_UPGRADE_APP
@@ -38359,7 +38361,7 @@ type NotificationUserSetting {
   """ The user the settings will apply for """
   user: User
 
-  """ Affected message type. Possible values are: INVITE_NEW_EMPLOYEE,SHARE_TICKET,BANK_ACCOUNT_CREATION_REQUEST,DIRTY_INVITE_NEW_EMPLOYEE_SMS,DIRTY_INVITE_NEW_EMPLOYEE_EMAIL,REGISTER_NEW_USER,RESET_PASSWORD,SMS_VERIFY,DEVELOPER_IMPORTANT_NOTE_TYPE,CUSTOMER_IMPORTANT_NOTE_TYPE,MESSAGE_FORWARDED_TO_SUPPORT,TICKET_ASSIGNEE_CONNECTED,TICKET_EXECUTOR_CONNECTED,TRACK_TICKET_IN_DOMA_APP,TICKET_STATUS_OPENED,TICKET_STATUS_IN_PROGRESS,TICKET_STATUS_COMPLETED,TICKET_STATUS_RETURNED,TICKET_STATUS_DECLINED,TICKET_COMMENT_ADDED,METER_VERIFICATION_DATE_REMINDER,RESIDENT_ADD_BILLING_ACCOUNT,BILLING_RECEIPT_AVAILABLE,BILLING_RECEIPT_AVAILABLE_NO_ACCOUNT,BILLING_RECEIPT_CATEGORY_AVAILABLE,BILLING_RECEIPT_ADDED,BILLING_RECEIPT_ADDED_WITH_DEBT,BILLING_RECEIPT_ADDED_WITH_NO_DEBT,METER_SUBMIT_READINGS_REMINDER,METER_VERIFICATION_DATE_EXPIRED,RESIDENT_UPGRADE_APP,STAFF_UPGRADE_APP,CUSTOM_CONTENT_MESSAGE_PUSH,CUSTOM_CONTENT_MESSAGE_EMAIL,CUSTOM_CONTENT_MESSAGE_SMS,VOIP_INCOMING_CALL_MESSAGE,B2C_APP_MESSAGE_PUSH,RECURRENT_PAYMENT_PROCEEDING_SUCCESS_RESULT_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_UNKNOWN_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_ACQUIRING_PAYMENT_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_SERVICE_CONSUMER_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_LIMIT_EXCEEDED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_DISABLED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CARD_TOKEN_NOT_VALID_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CAN_NOT_REGISTER_MULTI_PAYMENT_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_NO_RECEIPTS_TO_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_NO_RECEIPTS_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_LIMIT_EXCEED_MESSAGE,NEWS_ITEM_COMMON_MESSAGE_TYPE,NEWS_ITEM_EMERGENCY_MESSAGE_TYPE 
+  """ Affected message type. Possible values are: INVITE_NEW_EMPLOYEE,SHARE_TICKET,BANK_ACCOUNT_CREATION_REQUEST,DIRTY_INVITE_NEW_EMPLOYEE_SMS,DIRTY_INVITE_NEW_EMPLOYEE_EMAIL,REGISTER_NEW_USER,RESET_PASSWORD,SMS_VERIFY,DEVELOPER_IMPORTANT_NOTE_TYPE,CUSTOMER_IMPORTANT_NOTE_TYPE,MESSAGE_FORWARDED_TO_SUPPORT,TICKET_ASSIGNEE_CONNECTED,TICKET_EXECUTOR_CONNECTED,TRACK_TICKET_IN_DOMA_APP,TICKET_STATUS_OPENED,TICKET_STATUS_IN_PROGRESS,TICKET_STATUS_COMPLETED,TICKET_STATUS_RETURNED,TICKET_STATUS_DECLINED,TICKET_COMMENT_ADDED,METER_VERIFICATION_DATE_REMINDER,RESIDENT_ADD_BILLING_ACCOUNT,BILLING_RECEIPT_AVAILABLE,BILLING_RECEIPT_AVAILABLE_NO_ACCOUNT,BILLING_RECEIPT_CATEGORY_AVAILABLE,BILLING_RECEIPT_ADDED,BILLING_RECEIPT_ADDED_WITH_DEBT,BILLING_RECEIPT_ADDED_WITH_NO_DEBT,METER_SUBMIT_READINGS_REMINDER,METER_SUBMIT_READINGS_REMINDER_START_PERIOD,METER_SUBMIT_READINGS_REMINDER_END_PERIOD,METER_VERIFICATION_DATE_EXPIRED,RESIDENT_UPGRADE_APP,STAFF_UPGRADE_APP,CUSTOM_CONTENT_MESSAGE_PUSH,CUSTOM_CONTENT_MESSAGE_EMAIL,CUSTOM_CONTENT_MESSAGE_SMS,VOIP_INCOMING_CALL_MESSAGE,B2C_APP_MESSAGE_PUSH,RECURRENT_PAYMENT_PROCEEDING_SUCCESS_RESULT_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_UNKNOWN_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_ACQUIRING_PAYMENT_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_SERVICE_CONSUMER_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_LIMIT_EXCEEDED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_DISABLED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CARD_TOKEN_NOT_VALID_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CAN_NOT_REGISTER_MULTI_PAYMENT_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_NO_RECEIPTS_TO_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_NO_RECEIPTS_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_LIMIT_EXCEED_MESSAGE,NEWS_ITEM_COMMON_MESSAGE_TYPE,NEWS_ITEM_EMERGENCY_MESSAGE_TYPE 
   """
   messageType: NotificationUserSettingMessageTypeType
 
@@ -64362,6 +64364,8 @@ enum SendMessageType {
   BILLING_RECEIPT_ADDED_WITH_DEBT
   BILLING_RECEIPT_ADDED_WITH_NO_DEBT
   METER_SUBMIT_READINGS_REMINDER
+  METER_SUBMIT_READINGS_REMINDER_START_PERIOD
+  METER_SUBMIT_READINGS_REMINDER_END_PERIOD
   METER_VERIFICATION_DATE_EXPIRED
   RESIDENT_UPGRADE_APP
   STAFF_UPGRADE_APP
@@ -73954,6 +73958,54 @@ type Mutation {
   			}
   		}
   	},
+  	"METER_SUBMIT_READINGS_REMINDER_START_PERIOD": {
+  		"dv": {
+  			"required": true
+  		},
+  		"data": {
+  			"monthName": {
+  				"defaultValue": "",
+  				"required": true
+  			},
+  			"meterId": {
+  				"required": true
+  			},
+  			"userId": {
+  				"required": true
+  			},
+  			"residentId": {
+  				"required": true
+  			},
+  			"url": {
+  				"defaultValue": "",
+  				"required": true
+  			}
+  		}
+  	},
+  	"METER_SUBMIT_READINGS_REMINDER_END_PERIOD": {
+  		"dv": {
+  			"required": true
+  		},
+  		"data": {
+  			"monthName": {
+  				"defaultValue": "",
+  				"required": true
+  			},
+  			"meterId": {
+  				"required": true
+  			},
+  			"userId": {
+  				"required": true
+  			},
+  			"residentId": {
+  				"required": true
+  			},
+  			"url": {
+  				"defaultValue": "",
+  				"required": true
+  			}
+  		}
+  	},
   	"METER_VERIFICATION_DATE_EXPIRED": {
   		"dv": {
   			"required": true
diff --git a/apps/condo/schema.ts b/apps/condo/schema.ts
index 4bd3c2ab78d..2c47a4b26f4 100644
--- a/apps/condo/schema.ts
+++ b/apps/condo/schema.ts
@@ -34681,6 +34681,54 @@ export type Mutation = {
    * 			}
    * 		}
    * 	},
+   * 	"METER_SUBMIT_READINGS_REMINDER_START_PERIOD": {
+   * 		"dv": {
+   * 			"required": true
+   * 		},
+   * 		"data": {
+   * 			"monthName": {
+   * 				"defaultValue": "",
+   * 				"required": true
+   * 			},
+   * 			"meterId": {
+   * 				"required": true
+   * 			},
+   * 			"userId": {
+   * 				"required": true
+   * 			},
+   * 			"residentId": {
+   * 				"required": true
+   * 			},
+   * 			"url": {
+   * 				"defaultValue": "",
+   * 				"required": true
+   * 			}
+   * 		}
+   * 	},
+   * 	"METER_SUBMIT_READINGS_REMINDER_END_PERIOD": {
+   * 		"dv": {
+   * 			"required": true
+   * 		},
+   * 		"data": {
+   * 			"monthName": {
+   * 				"defaultValue": "",
+   * 				"required": true
+   * 			},
+   * 			"meterId": {
+   * 				"required": true
+   * 			},
+   * 			"userId": {
+   * 				"required": true
+   * 			},
+   * 			"residentId": {
+   * 				"required": true
+   * 			},
+   * 			"url": {
+   * 				"defaultValue": "",
+   * 				"required": true
+   * 			}
+   * 		}
+   * 	},
    * 	"METER_VERIFICATION_DATE_EXPIRED": {
    * 		"dv": {
    * 			"required": true
@@ -44825,7 +44873,7 @@ export type NotificationUserSetting = {
   _label_?: Maybe<Scalars['String']>;
   /**  The user the settings will apply for  */
   user?: Maybe<User>;
-  /**  Affected message type. Possible values are: INVITE_NEW_EMPLOYEE,SHARE_TICKET,BANK_ACCOUNT_CREATION_REQUEST,DIRTY_INVITE_NEW_EMPLOYEE_SMS,DIRTY_INVITE_NEW_EMPLOYEE_EMAIL,REGISTER_NEW_USER,RESET_PASSWORD,SMS_VERIFY,DEVELOPER_IMPORTANT_NOTE_TYPE,CUSTOMER_IMPORTANT_NOTE_TYPE,MESSAGE_FORWARDED_TO_SUPPORT,TICKET_ASSIGNEE_CONNECTED,TICKET_EXECUTOR_CONNECTED,TRACK_TICKET_IN_DOMA_APP,TICKET_STATUS_OPENED,TICKET_STATUS_IN_PROGRESS,TICKET_STATUS_COMPLETED,TICKET_STATUS_RETURNED,TICKET_STATUS_DECLINED,TICKET_COMMENT_ADDED,METER_VERIFICATION_DATE_REMINDER,RESIDENT_ADD_BILLING_ACCOUNT,BILLING_RECEIPT_AVAILABLE,BILLING_RECEIPT_AVAILABLE_NO_ACCOUNT,BILLING_RECEIPT_CATEGORY_AVAILABLE,BILLING_RECEIPT_ADDED,BILLING_RECEIPT_ADDED_WITH_DEBT,BILLING_RECEIPT_ADDED_WITH_NO_DEBT,METER_SUBMIT_READINGS_REMINDER,METER_VERIFICATION_DATE_EXPIRED,RESIDENT_UPGRADE_APP,STAFF_UPGRADE_APP,CUSTOM_CONTENT_MESSAGE_PUSH,CUSTOM_CONTENT_MESSAGE_EMAIL,CUSTOM_CONTENT_MESSAGE_SMS,VOIP_INCOMING_CALL_MESSAGE,B2C_APP_MESSAGE_PUSH,RECURRENT_PAYMENT_PROCEEDING_SUCCESS_RESULT_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_UNKNOWN_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_ACQUIRING_PAYMENT_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_SERVICE_CONSUMER_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_LIMIT_EXCEEDED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_DISABLED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CARD_TOKEN_NOT_VALID_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CAN_NOT_REGISTER_MULTI_PAYMENT_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_NO_RECEIPTS_TO_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_NO_RECEIPTS_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_LIMIT_EXCEED_MESSAGE,NEWS_ITEM_COMMON_MESSAGE_TYPE,NEWS_ITEM_EMERGENCY_MESSAGE_TYPE  */
+  /**  Affected message type. Possible values are: INVITE_NEW_EMPLOYEE,SHARE_TICKET,BANK_ACCOUNT_CREATION_REQUEST,DIRTY_INVITE_NEW_EMPLOYEE_SMS,DIRTY_INVITE_NEW_EMPLOYEE_EMAIL,REGISTER_NEW_USER,RESET_PASSWORD,SMS_VERIFY,DEVELOPER_IMPORTANT_NOTE_TYPE,CUSTOMER_IMPORTANT_NOTE_TYPE,MESSAGE_FORWARDED_TO_SUPPORT,TICKET_ASSIGNEE_CONNECTED,TICKET_EXECUTOR_CONNECTED,TRACK_TICKET_IN_DOMA_APP,TICKET_STATUS_OPENED,TICKET_STATUS_IN_PROGRESS,TICKET_STATUS_COMPLETED,TICKET_STATUS_RETURNED,TICKET_STATUS_DECLINED,TICKET_COMMENT_ADDED,METER_VERIFICATION_DATE_REMINDER,RESIDENT_ADD_BILLING_ACCOUNT,BILLING_RECEIPT_AVAILABLE,BILLING_RECEIPT_AVAILABLE_NO_ACCOUNT,BILLING_RECEIPT_CATEGORY_AVAILABLE,BILLING_RECEIPT_ADDED,BILLING_RECEIPT_ADDED_WITH_DEBT,BILLING_RECEIPT_ADDED_WITH_NO_DEBT,METER_SUBMIT_READINGS_REMINDER,METER_SUBMIT_READINGS_REMINDER_START_PERIOD,METER_SUBMIT_READINGS_REMINDER_END_PERIOD,METER_VERIFICATION_DATE_EXPIRED,RESIDENT_UPGRADE_APP,STAFF_UPGRADE_APP,CUSTOM_CONTENT_MESSAGE_PUSH,CUSTOM_CONTENT_MESSAGE_EMAIL,CUSTOM_CONTENT_MESSAGE_SMS,VOIP_INCOMING_CALL_MESSAGE,B2C_APP_MESSAGE_PUSH,RECURRENT_PAYMENT_PROCEEDING_SUCCESS_RESULT_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_UNKNOWN_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_ACQUIRING_PAYMENT_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_SERVICE_CONSUMER_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_LIMIT_EXCEEDED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_NOT_FOUND_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CONTEXT_DISABLED_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CARD_TOKEN_NOT_VALID_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_CAN_NOT_REGISTER_MULTI_PAYMENT_ERROR_MESSAGE,RECURRENT_PAYMENT_PROCEEDING_NO_RECEIPTS_TO_PROCEED_ERROR_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_NO_RECEIPTS_MESSAGE,RECURRENT_PAYMENT_TOMORROW_PAYMENT_LIMIT_EXCEED_MESSAGE,NEWS_ITEM_COMMON_MESSAGE_TYPE,NEWS_ITEM_EMERGENCY_MESSAGE_TYPE  */
   messageType?: Maybe<NotificationUserSettingMessageTypeType>;
   /**  Affected message transport. Possible values are: sms,email,telegram,push  */
   messageTransport?: Maybe<NotificationUserSettingMessageTransportType>;
@@ -45110,6 +45158,8 @@ export enum NotificationUserSettingMessageTypeType {
   BillingReceiptAddedWithDebt = 'BILLING_RECEIPT_ADDED_WITH_DEBT',
   BillingReceiptAddedWithNoDebt = 'BILLING_RECEIPT_ADDED_WITH_NO_DEBT',
   MeterSubmitReadingsReminder = 'METER_SUBMIT_READINGS_REMINDER',
+  MeterSubmitReadingsReminderStartPeriod = 'METER_SUBMIT_READINGS_REMINDER_START_PERIOD',
+  MeterSubmitReadingsReminderEndPeriod = 'METER_SUBMIT_READINGS_REMINDER_END_PERIOD',
   MeterVerificationDateExpired = 'METER_VERIFICATION_DATE_EXPIRED',
   ResidentUpgradeApp = 'RESIDENT_UPGRADE_APP',
   StaffUpgradeApp = 'STAFF_UPGRADE_APP',
@@ -63391,6 +63441,8 @@ export enum SendMessageType {
   BillingReceiptAddedWithDebt = 'BILLING_RECEIPT_ADDED_WITH_DEBT',
   BillingReceiptAddedWithNoDebt = 'BILLING_RECEIPT_ADDED_WITH_NO_DEBT',
   MeterSubmitReadingsReminder = 'METER_SUBMIT_READINGS_REMINDER',
+  MeterSubmitReadingsReminderStartPeriod = 'METER_SUBMIT_READINGS_REMINDER_START_PERIOD',
+  MeterSubmitReadingsReminderEndPeriod = 'METER_SUBMIT_READINGS_REMINDER_END_PERIOD',
   MeterVerificationDateExpired = 'METER_VERIFICATION_DATE_EXPIRED',
   ResidentUpgradeApp = 'RESIDENT_UPGRADE_APP',
   StaffUpgradeApp = 'STAFF_UPGRADE_APP',