IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-01 12:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct result processing of execute method

Browse Source
This commit is contained in:
clauspeterhuebner 2026-02-19 01:32:54 +01:00
parent e67be63941
commit 365bc9b7ac
4 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/command/BaseCommand.ts
View File

@ -12,7 +12,7 @@ export abstract class BaseCommand<T = any> implements Command<T> {
// this.validateRequiredFields();
}
abstract execute(): Promise<Record<string, unknown> | boolean | null | Error>;
abstract execute(): Promise<string | boolean | null | Error>;
private validateRequiredFields(): void {
const methodLogger = createLogger(`validateRequiredFields`)

2
core/src/command/Command.ts
View File

@ -1,4 +1,4 @@
export interface Command<T = any> {
execute(): Promise<Record<string, unknown> | boolean | null | Error>;
execute(): Promise<string | boolean | null | Error>;
validate?(): boolean;
}

37
core/src/command/CommandExecutor.ts
View File

@ -23,9 +23,8 @@ export class CommandExecutor {
}
methodLogger.debug(`executeCommand() executing command=${command.constructor.name}`)
const result = await command.execute();
const resultMsg = this.getEmailResult(result);
methodLogger.debug(`executeCommand() executed email-result=${resultMsg}`)
return { success: true, data: resultMsg };
methodLogger.debug(`executeCommand() executed result=${result}`)
return { success: true, data: result };
} catch (error) {
methodLogger.error(`executeCommand() error=${error}`)
return {
@ -71,36 +70,4 @@ export class CommandExecutor {
return errorResult;
}
}
private getEmailResult(result: Record<string, unknown> | boolean | null | Error): string {
const methodLogger = createLogger(`getEmailResult`)
if (methodLogger.isDebugEnabled()) {
methodLogger.debug(`getEmailResult() result=${JSON.stringify(result)}`)
}
let emailResult: string;
if(result === null) {
emailResult = `getEmailResult() result is null`
}
else if(typeof result === 'boolean') {
emailResult = `getEmailResult() result is ${result}`
}
else if(result instanceof Error) {
emailResult = `getEmailResult() error-message is ${result.message}`
}
else if(typeof result === 'object') {
// "accepted":["stage5@gradido.net"],"rejected":[],"ehlo":["PIPELINING","SIZE 25600000","ETRN","AUTH DIGEST-MD5 CRAM-MD5 PLAIN LOGIN","ENHANCEDSTATUSCODES","8BITMIME","DSN","CHUNKING"],"envelopeTime":25,"messageTime":146,"messageSize":37478,"response":"250 2.0.0 Ok: queued as 14B46100B7F","envelope":{"from":"stage5@gradido.net","to":["stage5@gradido.net"]}
const accepted = (result as Record<string, unknown>).accepted;
const messageSize = (result as Record<string, unknown>).messageSize;
const response = (result as Record<string, unknown>).response;
const envelope = (result as Record<string, unknown>).envelope;
emailResult = `getEmailResult() accepted=${accepted}, messageSize=${messageSize}, response=${response}, envelope=${envelope}`
}
else {
emailResult = `getEmailResult() result is unknown type`
}
return emailResult;
}
}

38
core/src/command/commands/SendEmailCommand.ts
View File

@ -39,10 +39,10 @@ export class SendEmailCommand extends BaseCommand<Record<string, unknown> | bool
return true;
}
async execute(): Promise<Record<string, unknown> | boolean | null | Error> {
async execute(): Promise<string | boolean | null | Error> {
const methodLogger = createLogger(`execute`)
methodLogger.debug(`execute() sendEmailCommandParams=${JSON.stringify(this.sendEmailCommandParams)}`)
let result: Record<string, unknown> | boolean | null | Error;
let result: string;
if (!this.validate()) {
throw new Error('Invalid command parameters');
}
@ -79,7 +79,8 @@ export class SendEmailCommand extends BaseCommand<Record<string, unknown> | bool
methodLogger.debug(`emailParams=${JSON.stringify(emailParams)}`)
switch(this.sendEmailCommandParams.mailType) {
case 'sendTransactionReceivedEmail':
result = await sendTransactionReceivedEmail(emailParams);
const emailResult = await sendTransactionReceivedEmail(emailParams);
result = this.getEmailResult(emailResult);
break;
default:
throw new Error(`Unknown mail type: ${this.sendEmailCommandParams.mailType}`);
@ -93,4 +94,35 @@ export class SendEmailCommand extends BaseCommand<Record<string, unknown> | bool
throw error;
}
}
private getEmailResult(result: Record<string, unknown> | boolean | null | Error): string {
const methodLogger = createLogger(`getEmailResult`)
if (methodLogger.isDebugEnabled()) {
methodLogger.debug(`getEmailResult() result=${JSON.stringify(result)}`)
}
let emailResult: string;
if(result === null) {
emailResult = `getEmailResult() result is null`
}
else if(typeof result === 'boolean') {
emailResult = `getEmailResult() result is ${result}`
}
else if(result instanceof Error) {
emailResult = `getEmailResult() error-message is ${result.message}`
}
else if(typeof result === 'object') {
// {"accepted":["stage5@gradido.net"],"rejected":[],"ehlo":["PIPELINING","SIZE 25600000","ETRN","AUTH DIGEST-MD5 CRAM-MD5 PLAIN LOGIN","ENHANCEDSTATUSCODES","8BITMIME","DSN","CHUNKING"],"envelopeTime":23,"messageTime":135,"messageSize":37478,"response":"250 2.0.0 Ok: queued as C45C2100BD7","envelope":{"from":"stage5@gradido.net","to":["stage5@gradido.net"]},"messageId":"<d269161f-f3d2-2c96-49c0-58154366271b@gradido.net>"
const accepted = (result as Record<string, unknown>).accepted;
const messageSize = (result as Record<string, unknown>).messageSize;
const response = (result as Record<string, unknown>).response;
const envelope = JSON.stringify((result as Record<string, unknown>).envelope);
emailResult = `getEmailResult() accepted=${accepted}, messageSize=${messageSize}, response=${response}, envelope=${envelope}`
}
else {
emailResult = `getEmailResult() result is unknown type`
}
return emailResult;
}
}