diff --git a/libs/event-emitter/src/users/users.service.ts b/libs/event-emitter/src/users/users.service.ts index cdc34b7..a4c7667 100644 --- a/libs/event-emitter/src/users/users.service.ts +++ b/libs/event-emitter/src/users/users.service.ts @@ -64,7 +64,7 @@ export class UsersService { }, limit: 1, }); - if (!res && !res.docs && !res.docs[0]) { + if (!res || !res.docs || !res.docs[0]) { return null; } const userFromDb = res.docs[0]; diff --git a/src/reports/daily-eccm.report.service.ts b/src/reports/daily-eccm.report.service.ts index 0c5315a..f249cd8 100644 --- a/src/reports/daily-eccm.report.service.ts +++ b/src/reports/daily-eccm.report.service.ts @@ -141,6 +141,10 @@ export namespace DailyEccmReport { private issuesService: IssuesService, ) { const users: Models.UserReport[] = this.eccmUsers.map((user) => { + if (!user) { + this.logger.error(`Not found user data`); + return; + } const u: Models.User = { id: user.id, lastname: user.lastname, @@ -151,7 +155,7 @@ export namespace DailyEccmReport { activities: [], issuesGroupedByStatus: [], } as Models.UserReport; - }); + }).filter((user) => Boolean(user)); this.report = { byUsers: users, params: { @@ -456,6 +460,9 @@ export class DailyEccmReportService { this.logger.debug(`Loaded data for uniq issues - count = ${issues.length}`); const issuesMap: Record = {}; issues.forEach((issue) => { + if (!issue || !issue.fixed_version) { + return; + } const version = issue.fixed_version.name; if (this.eccmConfig.currentVersions.includes(version)) { issuesMap[issue.id] = issue;