Merge pull request #172 from sebgroup/develop

fix open api inconsistent handling of mocks

Author: kherP

src/openapiGenerator/mockGenerator/formatResponse.ts

@@ -28,15 +28,17 @@ export const extractResponses = (obj: OpenAPI.Document): ResponsesType => {
                 const response: OpenAPIV3.ParameterObject | OpenAPIV2.ParameterObject = responses[statusCode];
                 const defaultReturn: string = response.description;
                 let mock: any = response.schema || defaultReturn;
+                let isExample: boolean = false;
                 if (response.content && response.content[APPLICATION_JSON]?.example) {
                     mock = response.content[APPLICATION_JSON].example;
+                    isExample = true;
                 } else if (response.content && response.content[APPLICATION_JSON]?.schema) {
                     mock = response.content[APPLICATION_JSON].schema;
-                    mock = typeof(mock) === "string" ? mock : generateData("", mock, modelSchemas);
                 }
+                mock = typeof(mock) === "string" || isExample ? mock : generateData("", mock, modelSchemas);
                 extracted[key][statusCode] = mock;
             });
         });
     });
     return extracted;
-};
+};

src/openapiGenerator/templates/ts-angular/apiInner.mustache

@@ -34,7 +34,7 @@ export class {{classname}} extends APIHandler {
         const formData: FormData = new FormData();
         formData.append("file", params.{{paramName}} as any);{{/isFile}}{{/formParams}}
         const body: any = {{#formParams}}{{#-first}}{ {{/-first}}{{#isFile}}formData{{/isFile}}{{^isFile}}{{paramName}}: params.{{paramName}}{{/isFile}}{{#-last}} }{{/-last}}{{^-last}}, {{/-last}}{{/formParams}}{{^formParams}}{{#bodyParam}}params.{{paramName}}{{/bodyParam}}{{/formParams}}{{^formParams}}{{^bodyParam}}null{{/bodyParam}}{{/formParams}};
-        return this.makeCall<{{#imports}}{{#.}}{{.}}{{^-last}} | {{/-last}}{{/.}}{{/imports}}{{^imports}}any{{/imports}}>("{{httpMethod}}".toLowerCase(), apiURL, options, body);
+        return this.makeCall<{{#imports}}{{#.}}{{.}}{{^-last}} | {{/-last}}{{/.}}{{/imports}}{{^imports}}any{{/imports}}>("{{httpMethod}}".toLowerCase(), apiURL, "{{nickname}}", options, body);
     }
 
 {{/operation}}

src/openapiGenerator/templates/ts-angular/baseApi.mustache

@@ -175,7 +175,10 @@ export class VoidAuth implements Authentication {
 * simulate data from mock
 */
 export function simulateData<T>(subscriber: Subscriber<HttpResponse<T>>, body: T, status: number, timeout: number): NodeJS.Timeout {
-    return setTimeout(() => { subscriber.next(new HttpResponse<T>({ status, body })); }, timeout);
+    return setTimeout(() => {
+        subscriber.next(new HttpResponse<T>({ status, body }));
+        subscriber.complete();
+    }, timeout);
 }
 
 export class APIHandler {
@@ -342,11 +345,16 @@ export class APIHandler {
      * @param options The http options to be sent
      * @param body The body of the request, if any
      */
-    protected makeCall<T>(method: string, url: string, options: HttpOptions, body?: any): Observable<any> {
+    protected makeCall<T>(method: string, url: string, operationId: string, options: HttpOptions, body?: any): Observable<any> {
         if (configs.useMock) {
             return new Observable((subscriber: Subscriber<HttpResponse<T>>) => {
-                simulateData(subscriber, mocks[this.className][method][200] || mocks[this.className][method]["default"] || mocks[this.className][method], 200, configs.delay)
-                subscriber.complete();
+                let mockedData: any = {};
+                try {
+                    mockedData = mocks[operationId][200] || mocks[operationId]["default"] || mocks[operationId];
+                } catch (error) {
+                    console.error(error);
+                }
+                simulateData(subscriber, mockedData, 200, configs.delay)
             });
         } else {
             switch (method) {

src/openapiGenerator/templates/typescript-axios/apiInner.mustache

@@ -79,7 +79,7 @@ export class {{classname}} extends APIHandler {
         const formData: FormData = new FormData();
         formData.append("file", params.{{paramName}} as any);{{/isFile}}{{/formParams}}
         const body: any = {{#formParams}}{{#-first}}{ {{/-first}}{{#isFile}}formData{{/isFile}}{{^isFile}}{{paramName}}: params.{{paramName}}{{/isFile}}{{#-last}} }{{/-last}}{{^-last}}, {{/-last}}{{/formParams}}{{^formParams}}{{#bodyParam}}params.{{paramName}}{{/bodyParam}}{{/formParams}}{{^formParams}}{{^bodyParam}}null{{/bodyParam}}{{/formParams}};
-        return this.makeCall<{{#imports}}{{#.}}{{.}}{{^-last}} | {{/-last}}{{/.}}{{/imports}}>("{{httpMethod}}".toLowerCase(), apiURL, params.options, body, "{{nickname}}");
+        return this.makeCall<{{#imports}}{{#.}}{{.}}{{^-last}} | {{/-last}}{{/.}}{{/imports}}>("{{httpMethod}}".toLowerCase(), apiURL, "{{nickname}}", params.options, body, "{{nickname}}");
     }
 
 {{/operation}}

src/openapiGenerator/templates/typescript-axios/baseApi.mustache

@@ -192,9 +192,15 @@ export class APIHandler {
      * @param body The body of the request, if any
      * @param methodName The name of the api method making this call
      */
-    protected makeCall<T>(method: string, url: string, options: AxiosRequestConfig, body: any = null, methodName: string): AxiosPromise<T> {
+    protected makeCall<T>(method: string, url: string, operationId: string, options: AxiosRequestConfig, body: any = null, methodName: string): AxiosPromise<T> {
         if (configs.useMock) {
-            return new Promise((resolve) => { simulateData(resolve, mocks[this.className][methodName][200] || mocks[this.className][methodName]["default"] || mocks[this.className][methodName], 200, {{#configPath}}{{configName}}{{/configPath}}{{^configPath}}configs{{/configPath}}.delay); });
+            let mockedData: any = {};
+            try {
+                mockedData = mocks[operationId][200] || mocks[operationId]["default"] || mocks[operationId];
+            } catch (error) {
+                console.error(error);
+            }
+            return new Promise((resolve) => { simulateData(resolve, mockedData, 200, {{#configPath}}{{configName}}{{/configPath}}{{^configPath}}configs{{/configPath}}.delay); });
         } else {
             switch (method) {
                 case "get": return this.axiosInstance.get<T>(url, options);