From 6df04c8e6d6bb17ebab086d8a15ff0b3e3495e9b Mon Sep 17 00:00:00 2001
From: Pavel Gnedov <gnedovpv@gmail.com>
Date: Thu, 29 Feb 2024 07:12:16 +0700
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D1=81=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=BE=D0=BC=20=D0=B2=20?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B3=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libs/event-emitter/src/event-emitter.module.ts          | 8 +++++++-
 libs/event-emitter/src/events/redmine-events.gateway.ts | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libs/event-emitter/src/event-emitter.module.ts b/libs/event-emitter/src/event-emitter.module.ts
index 0ddf58e..ecdf887 100644
--- a/libs/event-emitter/src/event-emitter.module.ts
+++ b/libs/event-emitter/src/event-emitter.module.ts
@@ -183,7 +183,13 @@ export class EventEmitterModule implements OnModuleInit {
     subj.subscribe(async (issues: RedmineTypes.Issue[]) => {
       this.logger.debug(
         `Changed issues - ` +
-          issues.map((i) => `#${i.id} (${i.subject})`).join(', '),
+          issues.map(
+            (i) => {
+              return (i && i.id && i.subject)
+                ? `#${i.id} (${i.subject})`
+                : '';
+            }
+          ).join(', '),
       );
 
       for (let i = 0; i < issues.length; i++) {
diff --git a/libs/event-emitter/src/events/redmine-events.gateway.ts b/libs/event-emitter/src/events/redmine-events.gateway.ts
index 932bfbb..ff7dff3 100644
--- a/libs/event-emitter/src/events/redmine-events.gateway.ts
+++ b/libs/event-emitter/src/events/redmine-events.gateway.ts
@@ -177,7 +177,9 @@ export class RedmineEventsGateway {
     if (this.listeners && this.listeners.length > 0) {
       this.getIssuesChangesQueue().queue.subscribe((data) => {
         const issues = data.map((issue) => {
-          return `${issue['id']} - ${issue['subject']}`;
+          return (issue && issue.id && issue.subject)
+            ? `${issue['id']} - ${issue['subject']}`
+            : '';
         });
         this.logger.debug('Changed issues: ' + JSON.stringify(issues));
       });