From 3d1e21610166b54966eb4d7d9e7a74632511ef25 Mon Sep 17 00:00:00 2001 From: nshandra <34254522+nshandra@users.noreply.github.com> Date: Tue, 24 Sep 2024 21:30:05 +0200 Subject: [PATCH] fix: address PR#52 comments round 4 Simplify getLogFormatDate, naming and casing. Fix userRoles repeating in userCredentials. --- .../common/MessageMSTeamsRepository.ts | 6 ++--- .../entities/MSTeamsWebhookOptions.ts | 4 ++-- .../UserD2Repository.ts | 22 ++++++++++------- .../user-monitoring/GetLogFormatDate.ts | 19 +++++++-------- ...se.ts => CheckUserByAuthoritiesChanges.ts} | 2 +- .../MonitorUsersByAuthorityUseCase.ts | 6 ++--- .../SaveAuthoritiesMonitoringConfigUseCase.ts | 8 +++---- ...=> CheckUserByAuthoritiesChanges.specs.ts} | 24 +++++++++---------- .../MonitorUserGroupsUseCase.ts | 4 ++-- .../SaveUserGroupsMonitoringConfigUseCase.ts | 8 +++---- ...Case.data.ts => CompareUserGroups.data.ts} | 0 ...se.specs.ts => CompareUserGroups.specs.ts} | 14 +++++------ .../MonitorUserTemplatesUseCase.ts | 6 ++--- ...aveUserTemplatesMonitoringConfigUseCase.ts | 8 +++---- ...e.data.ts => CompareUserTemplates.data.ts} | 0 ...specs.ts => CompareUserTemplates.specs.ts} | 12 +++++----- src/scripts/commands/userMonitoring.ts | 8 +++---- 17 files changed, 77 insertions(+), 74 deletions(-) rename src/domain/usecases/user-monitoring/authorities-monitoring/{CheckUserByAuthoritiesChangesUseCase.ts => CheckUserByAuthoritiesChanges.ts} (97%) rename src/domain/usecases/user-monitoring/authorities-monitoring/__tests__/{CheckUserByAuthoritiesChangesUseCase.specs.ts => CheckUserByAuthoritiesChanges.specs.ts} (57%) rename src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/{CompareUserGroupsUseCase.data.ts => CompareUserGroups.data.ts} (100%) rename src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/{CompareUserGroupsUseCase.specs.ts => CompareUserGroups.specs.ts} (60%) rename src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/{CompareUserTemplatesUseCase.data.ts => CompareUserTemplates.data.ts} (100%) rename src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/{CompareUserTemplatesUseCase.specs.ts => CompareUserTemplates.specs.ts} (60%) diff --git a/src/data/user-monitoring/common/MessageMSTeamsRepository.ts b/src/data/user-monitoring/common/MessageMSTeamsRepository.ts index 1538103..a04ccd5 100644 --- a/src/data/user-monitoring/common/MessageMSTeamsRepository.ts +++ b/src/data/user-monitoring/common/MessageMSTeamsRepository.ts @@ -9,8 +9,8 @@ export class MessageMSTeamsRepository implements MessageRepository { async sendMessage(messageType: string, message: string): Async { const httpProxy = this.webhook.proxy; - const url = this.webhook.ms_url; - const server_name = this.webhook.server_name; + const url = this.webhook.msUrl; + const serverName = this.webhook.serverName; if (!isEmpty(httpProxy)) { process.env["http_proxy"] = httpProxy; @@ -18,7 +18,7 @@ export class MessageMSTeamsRepository implements MessageRepository { } const postData = JSON.stringify({ - text: `[*${messageType}* - ${server_name}] - ${message}`, + text: `[*${messageType}* - ${serverName}] - ${message}`, }); const requestOptions = { diff --git a/src/data/user-monitoring/entities/MSTeamsWebhookOptions.ts b/src/data/user-monitoring/entities/MSTeamsWebhookOptions.ts index 0c1e295..5a760e1 100644 --- a/src/data/user-monitoring/entities/MSTeamsWebhookOptions.ts +++ b/src/data/user-monitoring/entities/MSTeamsWebhookOptions.ts @@ -1,5 +1,5 @@ export interface MSTeamsWebhookOptions { - ms_url: string; + msUrl: string; proxy: string; - server_name: string; + serverName: string; } diff --git a/src/data/user-monitoring/user-templates-monitoring/UserD2Repository.ts b/src/data/user-monitoring/user-templates-monitoring/UserD2Repository.ts index d0730cc..836e9b2 100644 --- a/src/data/user-monitoring/user-templates-monitoring/UserD2Repository.ts +++ b/src/data/user-monitoring/user-templates-monitoring/UserD2Repository.ts @@ -17,21 +17,25 @@ export class UserD2Repository implements UserRepository { .getData(); return users.objects.map((user): User => { + // used to avoid repeating userRoles in userCredentials + const { userRoles, ...userCredentials } = user.userCredentials; + return { ...user, - username: user.userCredentials.username, - disabled: user.userCredentials.disabled, - twoFA: user.userCredentials.twoFA, - userRoles: user.userCredentials.userRoles, - invitation: user.userCredentials.invitation, - externalAuth: user.userCredentials.externalAuth, - selfRegistered: user.userCredentials.selfRegistered, - catDimensionConstraints: user.userCredentials.catDimensionConstraints, - cogsDimensionConstraints: user.userCredentials.cogsDimensionConstraints, + username: userCredentials.username, + disabled: userCredentials.disabled, + twoFA: userCredentials.twoFA, + userRoles: userRoles, + invitation: userCredentials.invitation, + externalAuth: userCredentials.externalAuth, + selfRegistered: userCredentials.selfRegistered, + catDimensionConstraints: userCredentials.catDimensionConstraints, + cogsDimensionConstraints: userCredentials.cogsDimensionConstraints, attributeValues: user.attributeValues.map(attributeValue => ({ attribute: attributeValue.attribute.name, value: attributeValue.value, })), + userCredentials: userCredentials, }; }); } diff --git a/src/domain/usecases/user-monitoring/GetLogFormatDate.ts b/src/domain/usecases/user-monitoring/GetLogFormatDate.ts index a95b488..92665d2 100644 --- a/src/domain/usecases/user-monitoring/GetLogFormatDate.ts +++ b/src/domain/usecases/user-monitoring/GetLogFormatDate.ts @@ -1,13 +1,12 @@ -export class GetLogFormatDate { - private logFormatDate(date: Date): string { - const isoString = date.toISOString(); +/** + * Formats a given date into a DHIS2 log timestamp. + * + * @param date - The date to be formatted. + * @returns The timestamp as a string. + */ - return isoString.replace("Z", ""); - } +export function getLogFormatDate(date: Date): string { + const isoString = date.toISOString(); - constructor() {} - - execute(date: Date): string { - return this.logFormatDate(date); - } + return isoString.replace("Z", "").replace(".", ","); } diff --git a/src/domain/usecases/user-monitoring/authorities-monitoring/CheckUserByAuthoritiesChangesUseCase.ts b/src/domain/usecases/user-monitoring/authorities-monitoring/CheckUserByAuthoritiesChanges.ts similarity index 97% rename from src/domain/usecases/user-monitoring/authorities-monitoring/CheckUserByAuthoritiesChangesUseCase.ts rename to src/domain/usecases/user-monitoring/authorities-monitoring/CheckUserByAuthoritiesChanges.ts index c00684a..8ab3c03 100644 --- a/src/domain/usecases/user-monitoring/authorities-monitoring/CheckUserByAuthoritiesChangesUseCase.ts +++ b/src/domain/usecases/user-monitoring/authorities-monitoring/CheckUserByAuthoritiesChanges.ts @@ -2,7 +2,7 @@ import _ from "lodash"; import { Async } from "../../../entities/Async"; import { UsersByAuthority } from "../../../entities/user-monitoring/authorities-monitoring/AuthoritiesMonitoringOptions"; -export class CheckUserByAuthoritiesChangesUseCase { +export class CheckUserByAuthoritiesChanges { constructor() {} private compareDicts(dict1: UsersByAuthority, dict2: UsersByAuthority) { diff --git a/src/domain/usecases/user-monitoring/authorities-monitoring/MonitorUsersByAuthorityUseCase.ts b/src/domain/usecases/user-monitoring/authorities-monitoring/MonitorUsersByAuthorityUseCase.ts index 9a7c4ab..b4e728d 100644 --- a/src/domain/usecases/user-monitoring/authorities-monitoring/MonitorUsersByAuthorityUseCase.ts +++ b/src/domain/usecases/user-monitoring/authorities-monitoring/MonitorUsersByAuthorityUseCase.ts @@ -10,7 +10,7 @@ import { User } from "domain/entities/user-monitoring/authorities-monitoring/Use import { AuthoritiesMonitoringOptions } from "domain/entities/user-monitoring/authorities-monitoring/AuthoritiesMonitoringOptions"; import { GetUsersByAuthoritiesUseCase } from "./GetUsersByAuthoritiesUseCase"; -import { CheckUserByAuthoritiesChangesUseCase } from "./CheckUserByAuthoritiesChangesUseCase"; +import { CheckUserByAuthoritiesChanges } from "./CheckUserByAuthoritiesChanges"; import { GetAuthoritiesMonitoringConfigUseCase } from "./GetAuthoritiesMonitoringConfigUseCase"; import { SaveAuthoritiesMonitoringConfigUseCase } from "./SaveAuthoritiesMonitoringConfigUseCase"; @@ -61,8 +61,8 @@ export class MonitorUsersByAuthorityUseCase { this.debugJSON("Users by authority:", usersByAuthority); if (!setDataStore) { - const checkUsersChangesUseCase = new CheckUserByAuthoritiesChangesUseCase(); - const { newUsers, usersLosingAuth } = await checkUsersChangesUseCase.execute( + const checkUsersChanges = new CheckUserByAuthoritiesChanges(); + const { newUsers, usersLosingAuth } = await checkUsersChanges.execute( options.usersByAuthority, usersByAuthority ); diff --git a/src/domain/usecases/user-monitoring/authorities-monitoring/SaveAuthoritiesMonitoringConfigUseCase.ts b/src/domain/usecases/user-monitoring/authorities-monitoring/SaveAuthoritiesMonitoringConfigUseCase.ts index 0cb9a57..b52c2e9 100644 --- a/src/domain/usecases/user-monitoring/authorities-monitoring/SaveAuthoritiesMonitoringConfigUseCase.ts +++ b/src/domain/usecases/user-monitoring/authorities-monitoring/SaveAuthoritiesMonitoringConfigUseCase.ts @@ -6,18 +6,18 @@ import { UsersByAuthority, } from "domain/entities/user-monitoring/authorities-monitoring/AuthoritiesMonitoringOptions"; -import { GetLogFormatDate } from "../GetLogFormatDate"; +import { getLogFormatDate } from "../GetLogFormatDate"; export class SaveAuthoritiesMonitoringConfigUseCase { constructor(private configRepository: AuthoritiesMonitoringConfigRepository) {} async execute(options: AuthoritiesMonitoringOptions, usersByAuthority: UsersByAuthority): Async { - const new_options = { + const newOptions = { ...options, - lastExecution: new GetLogFormatDate().execute(new Date()), + lastExecution: getLogFormatDate(new Date()), usersByAuthority: usersByAuthority, }; - await this.configRepository.save(new_options); + await this.configRepository.save(newOptions); } } diff --git a/src/domain/usecases/user-monitoring/authorities-monitoring/__tests__/CheckUserByAuthoritiesChangesUseCase.specs.ts b/src/domain/usecases/user-monitoring/authorities-monitoring/__tests__/CheckUserByAuthoritiesChanges.specs.ts similarity index 57% rename from src/domain/usecases/user-monitoring/authorities-monitoring/__tests__/CheckUserByAuthoritiesChangesUseCase.specs.ts rename to src/domain/usecases/user-monitoring/authorities-monitoring/__tests__/CheckUserByAuthoritiesChanges.specs.ts index 5b0d87a..86a29dc 100644 --- a/src/domain/usecases/user-monitoring/authorities-monitoring/__tests__/CheckUserByAuthoritiesChangesUseCase.specs.ts +++ b/src/domain/usecases/user-monitoring/authorities-monitoring/__tests__/CheckUserByAuthoritiesChanges.specs.ts @@ -8,49 +8,49 @@ import { noneUsers, } from "./AuthoritiesMonitoringTests.data"; -import { CheckUserByAuthoritiesChangesUseCase } from "../CheckUserByAuthoritiesChangesUseCase"; +import { CheckUserByAuthoritiesChanges } from "../CheckUserByAuthoritiesChanges"; -describe("CheckUserByAuthoritiesChangesUseCase", () => { +describe("CheckUserByAuthoritiesChanges", () => { it("Should find no changes in the same UsersByAuthority object", async () => { - const useCase = new CheckUserByAuthoritiesChangesUseCase(); + const checkChanges = new CheckUserByAuthoritiesChanges(); - const { newUsers, usersLosingAuth } = await useCase.execute(allAuthUsers, allAuthUsers); + const { newUsers, usersLosingAuth } = await checkChanges.execute(allAuthUsers, allAuthUsers); expect(newUsers).toEqual(noChanges); expect(usersLosingAuth).toEqual(noChanges); }); it("Should find users with new authorities", async () => { - const useCase = new CheckUserByAuthoritiesChangesUseCase(); + const checkChanges = new CheckUserByAuthoritiesChanges(); - const { newUsers, usersLosingAuth } = await useCase.execute(noneUsers, allAuthUsers); + const { newUsers, usersLosingAuth } = await checkChanges.execute(noneUsers, allAuthUsers); expect(newUsers).toEqual(allAuthUsers); expect(usersLosingAuth).toEqual(noChanges); }); it("Should find users losing authorities", async () => { - const useCase = new CheckUserByAuthoritiesChangesUseCase(); + const checkChanges = new CheckUserByAuthoritiesChanges(); - const { newUsers, usersLosingAuth } = await useCase.execute(auth2Users, noneUsers); + const { newUsers, usersLosingAuth } = await checkChanges.execute(auth2Users, noneUsers); expect(newUsers).toEqual(noChanges); expect(usersLosingAuth).toEqual(auth2Users); }); it("Should find new and losing types of changes", async () => { - const useCase = new CheckUserByAuthoritiesChangesUseCase(); + const checkChanges = new CheckUserByAuthoritiesChanges(); - const { newUsers, usersLosingAuth } = await useCase.execute(auth2Users, auth1Users); + const { newUsers, usersLosingAuth } = await checkChanges.execute(auth2Users, auth1Users); expect(newUsers).toEqual(auth1Users); expect(usersLosingAuth).toEqual(auth2Users); }); it("Should find new, no change and losing types of changes", async () => { - const useCase = new CheckUserByAuthoritiesChangesUseCase(); + const checkChanges = new CheckUserByAuthoritiesChanges(); - const { newUsers, usersLosingAuth } = await useCase.execute(twoAuthUsers, auth1and2Users); + const { newUsers, usersLosingAuth } = await checkChanges.execute(twoAuthUsers, auth1and2Users); expect(newUsers).toEqual(auth1Users); expect(usersLosingAuth).toEqual(auth3Users); diff --git a/src/domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase.ts index 78fe48e..ddcc674 100644 --- a/src/domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase.ts +++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/MonitorUserGroupsUseCase.ts @@ -73,7 +73,7 @@ export class MonitorUserGroupsUseCase { log.info(`Get user groups with ids: ${options.groupsToMonitor.join(", ")}`); const getGroupsUseCase = new GetUserGroupsUseCase(this.userGroupRepository); - const compareUserGroupsUseCase = new CompareUserGroups(); + const compareUserGroups = new CompareUserGroups(); const userGroups: UserGroup[] = await getGroupsUseCase.execute(options.groupsToMonitor); log.info(`Retrieved user groups: ${userGroups.map(g => g.id).join(", ")}`); @@ -86,7 +86,7 @@ export class MonitorUserGroupsUseCase { return []; } - const changes = compareUserGroupsUseCase.execute(orig, group); + const changes = compareUserGroups.execute(orig, group); if ( _.isEmpty(changes.changedPropsAdded) && diff --git a/src/domain/usecases/user-monitoring/user-groups-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts index 3d86973..4cb720d 100644 --- a/src/domain/usecases/user-monitoring/user-groups-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts +++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/SaveUserGroupsMonitoringConfigUseCase.ts @@ -4,18 +4,18 @@ import { Async } from "domain/entities/Async"; import { UserGroupsMonitoringOptions } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroupsMonitoringOptions"; import { UserGroup } from "domain/entities/user-monitoring/user-groups-monitoring/UserGroups"; -import { GetLogFormatDate } from "../GetLogFormatDate"; +import { getLogFormatDate } from "../GetLogFormatDate"; export class SaveUserGroupsMonitoringConfigUseCase { constructor(private configRepository: UserGroupsMonitoringConfigRepository) {} async execute(options: UserGroupsMonitoringOptions, monitoredUserGroups: UserGroup[]): Async { - const new_options = { + const newOptions = { ...options, - lastExecution: new GetLogFormatDate().execute(new Date()), + lastExecution: getLogFormatDate(new Date()), monitoredUserGroups: monitoredUserGroups, }; - await this.configRepository.save(new_options); + await this.configRepository.save(newOptions); } } diff --git a/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.data.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroups.data.ts similarity index 100% rename from src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.data.ts rename to src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroups.data.ts diff --git a/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.specs.ts b/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroups.specs.ts similarity index 60% rename from src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.specs.ts rename to src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroups.specs.ts index 6485c1d..a6c631b 100644 --- a/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroupsUseCase.specs.ts +++ b/src/domain/usecases/user-monitoring/user-groups-monitoring/__tests__/CompareUserGroups.specs.ts @@ -8,28 +8,28 @@ import { minimalUserGroup, userGroup1, userGroup1Updated, -} from "./CompareUserGroupsUseCase.data"; +} from "./CompareUserGroups.data"; -describe("CompareUserGroupsUseCase", () => { +describe("CompareUserGroups", () => { it("Should return empty array when comparing the same objects", () => { - const useCase = new CompareUserGroups(); + const compareUserGroups = new CompareUserGroups(); const minUserGroup2 = _.cloneDeep(minimalUserGroup); - const result = useCase.execute(minimalUserGroup, minUserGroup2); + const result = compareUserGroups.execute(minimalUserGroup, minUserGroup2); const userGroup2 = _.cloneDeep(userGroup1); - const result2 = useCase.execute(userGroup1, userGroup2); + const result2 = compareUserGroups.execute(userGroup1, userGroup2); expect(result).toEqual(emptyDiff); expect(result2).toEqual(emptyDiff); }); it("Should return the differences between two user groups", () => { - const useCase = new CompareUserGroups(); + const compareUserGroups = new CompareUserGroups(); - const result = useCase.execute(userGroup1, userGroup1Updated); + const result = compareUserGroups.execute(userGroup1, userGroup1Updated); expect(result).toEqual(userGroup1Diff); }); diff --git a/src/domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase.ts index 4e12002..ad70cb0 100644 --- a/src/domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase.ts +++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/MonitorUserTemplatesUseCase.ts @@ -97,7 +97,7 @@ export class MonitorUserTemplatesUseCase { log.info(`Get user groups with usernames: ${options.templatesToMonitor.join(", ")}`); const getTemplatesUseCase = new GetUserTemplatesUseCase(this.usersRepository); - const compareUserTemplatesUseCase = new CompareUserTemplates(); + const compareUserTemplates = new CompareUserTemplates(); const userTemplates: User[] = await getTemplatesUseCase.execute(options.templatesToMonitor); log.info(`Retrieved user templates: ${userTemplates.map(g => g.username).join(", ")}`); @@ -111,7 +111,7 @@ export class MonitorUserTemplatesUseCase { return []; } - const changes = compareUserTemplatesUseCase.execute(orig, user); + const changes = compareUserTemplates.execute(orig, user); if ( _.isEmpty(changes.changedPropsAdded) && @@ -128,7 +128,7 @@ export class MonitorUserTemplatesUseCase { return changes; }); - log.info(`userGroupsChanges: ${this.stringifyObject(userGroupsChanges)}`); + log.debug(`userGroupsChanges: ${this.stringifyObject(userGroupsChanges)}`); if (_.isEmpty(userGroupsChanges)) { log.info("Report: No changes."); diff --git a/src/domain/usecases/user-monitoring/user-templates-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts index e9bcfdc..726b110 100644 --- a/src/domain/usecases/user-monitoring/user-templates-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts +++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/SaveUserTemplatesMonitoringConfigUseCase.ts @@ -4,18 +4,18 @@ import { Async } from "domain/entities/Async"; import { UserTemplatesMonitoringOptions } from "domain/entities/user-monitoring/user-templates-monitoring/UserTemplatesMonitoringOptions"; import { User } from "domain/entities/user-monitoring/user-templates-monitoring/Users"; -import { GetLogFormatDate } from "../GetLogFormatDate"; +import { getLogFormatDate } from "../GetLogFormatDate"; export class SaveUserTemplatesMonitoringConfigUseCase { constructor(private configRepository: UserTemplatesMonitoringConfigRepository) {} async execute(options: UserTemplatesMonitoringOptions, monitoredUserTemplates: User[]): Async { - const new_options = { + const newOptions = { ...options, - lastExecution: new GetLogFormatDate().execute(new Date()), + lastExecution: getLogFormatDate(new Date()), monitoredUserTemplates: monitoredUserTemplates, }; - await this.configRepository.save(new_options); + await this.configRepository.save(newOptions); } } diff --git a/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplates.data.ts similarity index 100% rename from src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.data.ts rename to src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplates.data.ts diff --git a/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts b/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplates.specs.ts similarity index 60% rename from src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts rename to src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplates.specs.ts index 0905802..3681324 100644 --- a/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplatesUseCase.specs.ts +++ b/src/domain/usecases/user-monitoring/user-templates-monitoring/__tests__/CompareUserTemplates.specs.ts @@ -1,24 +1,24 @@ import { describe, it, expect, beforeEach } from "vitest"; -import { user1, user1Updated, noChangesDiff, expectedDiff } from "./CompareUserTemplatesUseCase.data"; +import { user1, user1Updated, noChangesDiff, expectedDiff } from "./CompareUserTemplates.data"; import { CompareUserTemplates } from "../CompareUserTemplates"; -describe("CompareUserTemplatesUseCase", () => { - let useCase: CompareUserTemplates; +describe("CompareUserTemplates", () => { + let compareUserTemplates: CompareUserTemplates; beforeEach(() => { - useCase = new CompareUserTemplates(); + compareUserTemplates = new CompareUserTemplates(); }); it("should not fild differences between the same user templates", () => { - const diff = useCase.execute(user1, user1); + const diff = compareUserTemplates.execute(user1, user1); expect(diff).toEqual(noChangesDiff); }); it("should compare user templates and return the differences", () => { - const diff = useCase.execute(user1, user1Updated); + const diff = compareUserTemplates.execute(user1, user1Updated); expect(diff).toEqual(expectedDiff); }); diff --git a/src/scripts/commands/userMonitoring.ts b/src/scripts/commands/userMonitoring.ts index 717a6ff..d038704 100644 --- a/src/scripts/commands/userMonitoring.ts +++ b/src/scripts/commands/userMonitoring.ts @@ -232,14 +232,14 @@ function getAuthFromFile(configFile: string): UserMonitoringAuth { function getWebhookConfFromFile(configFile: string): MSTeamsWebhookOptions { const fs = require("fs"); const configJSON = JSON.parse(fs.readFileSync("./" + configFile, "utf8")); - const ms_url = configJSON["WEBHOOK"]["ms_url"]; + const msUrl = configJSON["WEBHOOK"]["ms_url"]; const proxy = configJSON["WEBHOOK"]["proxy"]; - const server_name = configJSON["WEBHOOK"]["server_name"]; + const serverName = configJSON["WEBHOOK"]["server_name"]; return { - ms_url: ms_url, + msUrl: msUrl, proxy: proxy, - server_name: server_name, + serverName: serverName, }; }