Fix/validation errors openapi and re comments

forward_engineering/helpers/componentsHelpers/parametersHelper.js

@@ -99,16 +99,21 @@ function getContent(data, isParentActivated) {
         return;
     }
 
-    return Object.keys(data.properties).reduce((acc, key) => {
+    const result = Object.keys(data.properties).reduce((acc, key) => {
 		const properties = get(data, `properties[${key}].properties`);
         if (!properties) {
-            return;
+            return acc;
 		}
 		const schemaKeyword = getSchemaKeyword(properties);
+
+		if (!schemaKeyword) {
+			return acc;
+		}
+
 		const isSchemaEmpty = properties[schemaKeyword] && get(properties, [schemaKeyword, 'type']) === 'object' && !get(properties, [schemaKeyword, 'properties']);
 		const isExamplesEmpty = !get(properties, 'examples.properties');
 		if (isSchemaEmpty && isExamplesEmpty) {
-			return;
+			return acc;
 		}
 		const isActivated = data.properties[key].isActivated;
         acc[key] = commentDeactivatedItemInner(
@@ -121,6 +126,12 @@ function getContent(data, isParentActivated) {
 		);
         return acc;
     }, {});
+
+	if (!Object.keys(result).length) {
+		return;
+	}
+
+	return result;
 }
 
 function mapMediaTypeObject(data, isParentActivated = false) {

forward_engineering/helpers/pathHelper.js

@@ -49,7 +49,7 @@ function getRequestData(collections, containers, containerId, containersPath = [
 		.map(data => {
 			const isRequestActivated = data.isActivated && isPathActivated;
 			const requestBodyPropKeyword = getRequestBodyPropKeyword(data.properties);
-			const request = {
+			let request = {
 				tags: commonHelper.mapArrayFieldByName(data.tags, 'tag'),
 				summary: data.summary,
 				description: data.description,
@@ -58,12 +58,20 @@ function getRequestData(collections, containers, containerId, containersPath = [
 				parameters: mapRequestParameters(
 					get(data, 'properties.parameters'),
 					isRequestActivated
-				),
-				requestBody: mapRequestBody(
+				)
+			};
+			const extensions = getExtensions(data.scopesExtensions);
+
+			if (!['get', 'delete'].includes(String(data.collectionName).toLowerCase())) {
+				request.requestBody = mapRequestBody(
 					get(data.properties, requestBodyPropKeyword),
 					get(data, 'required', []).includes(requestBodyPropKeyword),
 					isRequestActivated
-				),
+				);
+			}
+
+			request = {
+				...request,
 				responses: mapResponses(
 					collections,
 					data.GUID,
@@ -81,7 +89,6 @@ function getRequestData(collections, containers, containerId, containersPath = [
 				methodName: data.collectionName,
 				isActivated: data.isActivated,
 			};
-			const extensions = getExtensions(data.scopesExtensions);
 
 			return Object.assign({}, request, extensions);
 		})

reverse_engineering/helpers/dataHelper.js

@@ -1,6 +1,7 @@
 
 const commonHelper = require('./commonHelper');
 const propertiesConfig = require('../propertiesConfig');
+const jsonComment = require('comment-json');
 
 const REQUEST = 'request';
 const RESPONSE = 'response';
@@ -868,7 +869,7 @@ const getModelContent = (pathData, fieldOrder, callbacksComponent) => {
 
 const getOpenAPIJsonSchema = (data, fileName, extension) => {
 	const schema = extension !== '.json' ? commonHelper.convertYamlToJson(data) : data;
-	const openAPISchema = typeof schema === 'string' ? JSON.parse(schema) : schema;
+	const openAPISchema = typeof schema === 'string' ? jsonComment.parse(schema.replace(/^\s*#.+$/mg, '')) : schema;
 	const updatedOpenApiSchema = copyPathItemLevelParametersToOperationObject(openAPISchema);
 	const openAPISchemaWithModelName = Object.assign({}, updatedOpenApiSchema, {
 		modelName: fileName