Merge branch 'master' into anklimenko/oneof-support

Luxoft · May 10, 2024 · 155fff9 · 155fff9
2 parents 5e8a28d + 36a27ef
commit 155fff9
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.idea
 
 # code coverage
 /coverage

diff --git a/.snapshot/all/services.ts b/.snapshot/all/services.ts
@@ -32,6 +32,21 @@ export class CategoryService extends BaseHttpService {
     }
 }
 
+@Injectable({
+    providedIn: 'root'
+})
+export class FeedbackService extends BaseHttpService {
+    constructor(http: HttpClient) {
+        super(getBasePath('', '/api/feedback'), http);
+    }
+
+    public postFeedback(): Observable<void> {
+        return this.post<void>(
+            ``,
+        );
+    }
+}
+
 @Injectable({
     providedIn: 'root'
 })

diff --git a/.snapshot/withRequestOptions/services.ts b/.snapshot/withRequestOptions/services.ts
@@ -34,6 +34,22 @@ export class CategoryService extends BaseHttpService {
     }
 }
 
+@Injectable({
+    providedIn: 'root'
+})
+export class FeedbackService extends BaseHttpService {
+    constructor(http: HttpClient) {
+        super(getBasePath('', '/api/feedback'), http);
+    }
+
+    public postFeedback(options?: $types.TypeOrUndefined<IAngularHttpRequestOptions>): Observable<void> {
+        return this.post<void>(
+            ``,
+            options,
+        );
+    }
+}
+
 @Injectable({
     providedIn: 'root'
 })

diff --git a/__tests__/swagger/OpenAPIService.spec.ts b/__tests__/swagger/OpenAPIService.spec.ts
@@ -177,6 +177,28 @@ describe('OpenAPIService tests', () => {
             expect(service.getSchemasByEndpoints(new Set<string>())).toEqual({});
         });
 
+        test('response with not 200 code', () => {
+            const spec: IOpenAPI3 = {
+                ...defaultSpec,
+                openapi: '3.0.1',
+                paths: {
+                    '/product/test': {
+                        post: {
+                            responses: {
+                                201: {
+                                    description: 'Created'
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            const service = new OpenAPIService(spec, guard);
+            const endpoints = service.getEndpoints();
+            expect(service.getSchemasByEndpoints(new Set<string>(endpoints))).toEqual({});
+        });
+
         test('recursion', () => {
             const spec: IOpenAPI3 = {
                 openapi: '3.0.1',

diff --git a/src/services/ServiceMappingService.ts b/src/services/ServiceMappingService.ts
@@ -104,7 +104,7 @@ export class ServiceMappingService {
             name: lowerFirst(actionName),
             operation: method,
             parameters: this.getUriParameters(operation.parameters),
-            returnType: this.getTypeInfo(operation.responses[200].content?.['application/json']?.schema, modelFinder),
+            returnType: this.getTypeInfo(operation.responses[200]?.content?.['application/json']?.schema, modelFinder),
             originUri
         };
 
@@ -224,6 +224,6 @@ export class ServiceMappingService {
     }
 
     private hasDownloadResponse(operation: IOpenAPI3Operation): boolean {
-        return Boolean(operation.responses[200].content?.['application/octet-stream']);
+        return Boolean(operation.responses[200]?.content?.['application/octet-stream']);
     }
 }
diff --git a/src/swagger/OpenAPIService.ts b/src/swagger/OpenAPIService.ts
@@ -181,7 +181,7 @@ export class OpenAPIService {
         return [
             ...refs,
             ...this.getRefsFromSchema(operation.requestBody?.content['application/json']?.schema),
-            ...this.getRefsFromSchema(operation.responses[200].content?.['application/json']?.schema)
+            ...this.getRefsFromSchema(operation.responses[200]?.content?.['application/json']?.schema)
         ];
     }
 

diff --git a/src/swagger/v3/operation.ts b/src/swagger/v3/operation.ts
@@ -9,7 +9,7 @@ export interface IOpenAPI3Operation {
     tags?: string[];
     parameters?: IOpenAPI3Parameter[];
     responses: {
-        200: {
+        200?: {
             description?: 'Success';
             content?: {
                 'application/json'?: {
@@ -20,6 +20,9 @@ export interface IOpenAPI3Operation {
                 };
             };
         };
+        201?: {
+            description?: 'Created';
+        };
     };
     requestBody?: {
         content: {

diff --git a/swagger.json b/swagger.json
@@ -635,6 +635,24 @@
           }
         }
       }
+    },
+    "/api/feedback": {
+      "post": {
+        "tags": [
+          "feedback"
+        ],
+        "responses": {
+          "201": {
+            "description": "Created"
+          },
+          "400": {
+            "description": "Bad Request"
+          },
+          "500": {
+            "description": "Server Error"
+          }
+        }
+      }
     }
   },
   "components": {
@@ -791,4 +809,4 @@
       }
     }
   }
-}
+}