Merge pull request #166 from Cratis:fix/command-errors

If command fails during fetch - we now return a failed command
Cratis · Sep 1, 2024 · 74a42f5 · 74a42f5
2 parents 4e0b9af + 5d8ec87
commit 74a42f5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/Source/JavaScript/Applications/commands/Command.ts b/Source/JavaScript/Applications/commands/Command.ts
@@ -26,7 +26,7 @@ export abstract class Command<TCommandContent = {}, TCommandResponse = {}> imple
     private _initialValues: any = {};
     private _hasChanges = false;
     private _callbacks: Callback[] = [];
-    
+
     /**
      * Initializes a new instance of the {@link Command<,>} class.
      * @param _responseType Type of response.
@@ -62,18 +62,22 @@ export abstract class Command<TCommandContent = {}, TCommandResponse = {}> imple
             headers[Globals.microserviceHttpHeader] = Globals.microservice;
         }
 
-        const response = await fetch(actualRoute, {
-            method: 'POST',
-            headers,
-            body: JSON.stringify(payload)
-        });
-        this.setInitialValuesFromCurrentValues();
-
         try {
+            const response = await fetch(actualRoute, {
+                method: 'POST',
+                headers,
+                body: JSON.stringify(payload)
+            });
+            this.setInitialValuesFromCurrentValues();
+
+            if( response.status === 404) {
+                return CommandResult.failed([`Command not found at route '${actualRoute}'`]) as CommandResult<TCommandResponse>;
+            }
+
             const result = await response.json();
             return new CommandResult(result, this._responseType, this._isResponseTypeEnumerable);
         } catch (ex) {
-            return CommandResult.empty as CommandResult<TCommandResponse>;
+            return CommandResult.failed([`Error during server call: ${ex}`]) as CommandResult<TCommandResponse>;
         }
     }
 

diff --git a/Source/JavaScript/Applications/commands/CommandResult.ts b/Source/JavaScript/Applications/commands/CommandResult.ts
@@ -45,6 +45,20 @@ export class CommandResult<TResponse = {}> implements ICommandResult<TResponse>
         response: null
     }, Object, false);
 
+    static failed = (exceptionMessages: string[]): CommandResult => {
+        return new CommandResult({
+            correlationId: Guid.empty.toString(),
+            isSuccess: false,
+            isAuthorized: true,
+            isValid: true,
+            hasExceptions: true,
+            validationResults: [],
+            exceptionMessages: exceptionMessages,
+            exceptionStackTrace: '',
+            response: null
+        }, Object, false);
+    };
+
     /** @inheritdoc */
     readonly correlationId: Guid;