From df7e54eb6f23f0277966dbfb327031e686136691 Mon Sep 17 00:00:00 2001
From: Pavel Gnedov <pavel@gnedov.info>
Date: Fri, 11 Nov 2022 09:50:01 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D1=83=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Отфильтровываются давно созданные уведомления
---
 configs/main-config.jsonc.dist                |  3 ++-
 src/models/app-config.model.ts                |  1 +
 .../adapters/status-change.adapter.service.ts | 25 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/configs/main-config.jsonc.dist b/configs/main-config.jsonc.dist
index e558201..a42a743 100644
--- a/configs/main-config.jsonc.dist
+++ b/configs/main-config.jsonc.dist
@@ -6,5 +6,6 @@
     }  
   },
   "telegramBotToken": "",
-  "personalMessageTemplate": ""
+  "personalMessageTemplate": "",
+  "periodValidityNotification": 43200 // 12h
 }
\ No newline at end of file
diff --git a/src/models/app-config.model.ts b/src/models/app-config.model.ts
index be968a9..2f04e56 100644
--- a/src/models/app-config.model.ts
+++ b/src/models/app-config.model.ts
@@ -16,4 +16,5 @@ export type AppConfig = {
     };
   };
   telegramBotToken: string;
+  periodValidityNotification: number;
 };
diff --git a/src/notifications/adapters/status-change.adapter.service.ts b/src/notifications/adapters/status-change.adapter.service.ts
index dcdba57..68ba715 100644
--- a/src/notifications/adapters/status-change.adapter.service.ts
+++ b/src/notifications/adapters/status-change.adapter.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import TelegramBot from 'node-telegram-bot-api';
 import { Change } from 'src/models/change.model';
 import { TelegramBotService } from 'src/telegram-bot/telegram-bot.service';
@@ -17,8 +18,23 @@ namespace StatusChangeAdapter {
 
 @Injectable()
 export class StatusChangeAdapterService {
-  constructor(private telegramBotService: TelegramBotService) {}
+  private periodValidityNotification: number;
 
+  constructor(
+    private telegramBotService: TelegramBotService,
+    private configService: ConfigService,
+  ) {
+    this.periodValidityNotification = this.configService.get<number>(
+      'periodValidityNotification',
+    );
+  }
+
+  // TODO: Удалить устаревший метод send
+
+  /**
+   * @deprecated
+   * @see StatusChangeAdapterService.batchSend
+   */
   async send(change: Change): Promise<boolean[]> {
     const promises = change.messages.map((m) => {
       if (!m || !m.recipient || !m.recipient.id || !m.notification_message) {
@@ -51,8 +67,15 @@ export class StatusChangeAdapterService {
   private getMessages(changes: Change[]): StatusChangeAdapter.MsgFromBatch[] {
     const res: StatusChangeAdapter.MsgFromBatch[] = [];
     const store: Record<string, StatusChangeAdapter.MsgFromBatch> = {};
+    const nowTimestamp = new Date().getTime();
     for (let i = 0; i < changes.length; i++) {
       const change = changes[i];
+      if (
+        nowTimestamp - change.created_on_timestamp >
+        this.periodValidityNotification
+      ) {
+        continue;
+      }
       for (let j = 0; j < change.messages.length; j++) {
         const message = change.messages[j];
         if (!message.change_message) continue;