@devlearning/swagger-generator 0.0.23 → 0.0.25

package/autogeneration/output/model.autogenerated.ts

@@ -40,7 +40,7 @@ export class AirlineCompanyInAirportCreateCommand {
 }
 
 export class AirlineCompanyListAirportsQueryResponse {
-  items: Airport[] | undefined;
+  items: AirportInAirlineCompany[] | undefined;
 }
 
 export class AirlineCompanyListQueryResponse {
@@ -72,6 +72,18 @@ export class Airport {
   timezone: string | undefined;
 }
 
+export class AirportInAirlineCompany {
+  idAirlineCompanyInAirport: number | undefined;
+  idAirport: number | undefined;
+  name: string | undefined;
+  iataCode: string | undefined;
+  cityCode: string | undefined;
+  cityName: string | undefined;
+  countryName: string | undefined;
+  countryCode: string | undefined;
+  timezone: string | undefined;
+}
+
 export class AirportListQueryResponse {
   items: Airport[] | undefined;
 }
@@ -127,6 +139,28 @@ export class CountryListQueryResponse {
   items: Country[] | undefined;
 }
 
+export class DashboardAdminDisponibilita {
+  idHotel: number | undefined;
+  data: moment.Moment | undefined;
+  singole: number | undefined;
+  doppie: number | undefined;
+  triple: number | undefined;
+  tariffaSingola: number | undefined;
+  tariffaDoppia: number | undefined;
+  tariffaTripla: number | undefined;
+}
+
+export class DashboardAdminRiga {
+  idHotel: number | undefined;
+  citta: string | undefined;
+  aeroporto: string | undefined;
+  hotel: string | undefined;
+  telefonoHotel: string | undefined;
+  disponibilitaOggi: DashboardAdminDisponibilita | undefined;
+  disponibilitaDomani: DashboardAdminDisponibilita | undefined;
+  disponibilitaDopodomani: DashboardAdminDisponibilita | undefined;
+}
+
 export class EnumListQueryResponse {
   hotelContactTypes: HotelContactType[] | undefined;
   hotelRateTypes: HotelRateType[] | undefined;
@@ -140,11 +174,6 @@ export class EnumListQueryResponse {
   userTypes: UserType[] | undefined;
 }
 
-export class FileUploadRequest {
-  file: File | undefined;
-  id: number | undefined;
-}
-
 export class Hotel {
   idHotel: number | undefined;
   idCountry: number | undefined;
@@ -192,7 +221,7 @@ export class HotelAvailabilityItem {
   idHotelRoom: number | undefined;
   idHotelRoomResult: number | undefined;
   hotelRoomResultType: HotelRoomResultTypeEnum | undefined;
-  hotelRateType: HotelRateTypeEnum | undefined;
+  hotelRateType: HotelRateType | undefined;
   aeroporto: string | undefined;
   hotel: string | undefined;
   prefissoHotel: string | undefined;
@@ -355,6 +384,13 @@ export class HotelGroupUpdateCommand {
   description: string | undefined;
 }
 
+export class HotelListDashboardResponse {
+  dataOggi: moment.Moment | undefined;
+  dataDomani: moment.Moment | undefined;
+  dataDopodomani: moment.Moment | undefined;
+  righe: DashboardAdminRiga[] | undefined;
+}
+
 export class HotelListSummaryQuery {
 }
 
@@ -433,7 +469,7 @@ export class HotelRoomResultDetails {
   idHotel: number | undefined;
   idHotelRoom: number | undefined;
   idHotelRoomResult: number | undefined;
-  idTipoCameraHotelEsito: number | undefined;
+  idTipoCameraHotelEsito: HotelRoomResultTypeEnum | undefined;
   nomeHotel: string | undefined;
   prefissoHotel: string | undefined;
   telefonoHotel: string | undefined;
@@ -456,6 +492,21 @@ export class HotelRoomResultDetails {
   note: string | undefined;
 }
 
+export class HotelRoomResultSaveCommand {
+  idHotel: number | undefined;
+  idHotelRoom: number | undefined;
+  idHotelRoomResult: number | undefined;
+  idHotelRoomResultType: HotelRoomResultTypeEnum | undefined;
+  data: moment.Moment | undefined;
+  note: string | undefined;
+  singole: number | undefined;
+  tariffaSingola: number | undefined;
+  doppie: number | undefined;
+  tariffaDoppia: number | undefined;
+  triple: number | undefined;
+  tariffaTripla: number | undefined;
+}
+
 export class HotelRoomResultType {
   idHotelRoomResultType: HotelRoomResultTypeEnum | undefined;
   name: string | undefined;
@@ -690,20 +741,6 @@ export enum PassengerRegistrationTypeEnum {
   WITHOUT_REGISTRATION = 2,
 }
 
-export class ReprotectionHotelRoomResultSaveCommand {
-  idHotel: number | undefined;
-  idHotelRoom: number | undefined;
-  hotelRoomResultTypeEnum: HotelRoomResultTypeEnum | undefined;
-  data: moment.Moment | undefined;
-  note: string | undefined;
-  singole: number | undefined;
-  tariffaSingola: number | undefined;
-  doppie: number | undefined;
-  tariffaDoppia: number | undefined;
-  triple: number | undefined;
-  tariffaTripla: number | undefined;
-}
-
 export class ReprotectionListQuery {
   idServiceRequestAirportToHotel: number | undefined;
   filter: string | undefined;
@@ -1346,4 +1383,9 @@ export class VoucherSnackResponse {
   idUserCreatedBy: number | undefined;
 }
 
+export class TicketFile_Create {
+File: File | undefined;
+Id: number | undefined;
+}
+
 

package/dist/generator.js

@@ -1,7 +1,8 @@
 import fs from 'fs';
 import { API_PRE, API_POST } from './api.constants.js';
 import { MODEL_POST, MODEL_PRE } from './model.constants.js';
-const contentType = 'application/json';
+const contentTypeApplicationJson = 'application/json';
+const contentTypeMultipartFormData = 'multipart/form-data';
 export class Generator {
     _swagger;
     _outputDirectory;
@@ -21,7 +22,7 @@ export class Generator {
             if (apiName == '/api/v{version}/TransportOrder/ListByServiceRequest') {
                 console.debug('');
             }
-            let parametersString = this.retrieveParameters(swaggerMethodInfo);
+            let parametersString = this.retrieveParameters(swaggerMethodInfo, apiName);
             let queryParametersDeclaration = this.retrieveQueryParametersDeclaration(swaggerMethodInfo);
             let queryParameters = this.retrieveQueryParameters(swaggerMethodInfo);
             let returnTypeString = this.retrieveReturnType(swaggerMethodInfo);
@@ -29,14 +30,21 @@ export class Generator {
                 returnTypeString = 'void';
             let prepareRequestString = ``; //request = this._handleRequest(request);
             let haveRequest = swaggerMethodInfo.requestBody != null;
-            if (haveRequest) {
-                prepareRequestString = `request = this._handleRequest(request);
+            let isMultiPart = haveRequest && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null;
+            let httpOptions = 'httpOptions';
+            if (haveRequest && !isMultiPart) {
+                prepareRequestString = `const wrappedRequest = this._handleRequest(request);
 	  `;
             }
+            else if (isMultiPart) {
+                prepareRequestString = ` const wrappedRequest = this._handleMultipart(request);
+	  `;
+                httpOptions = 'httpOptionsMultipart';
+            }
             apiMethods +=
                 `
   public ${apiName.replace('/api/v{version}/', '').replaceAll('/', '_')}(${parametersString}): Observable<${returnTypeString}> {
-    ${queryParametersDeclaration}${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', request' : ''}, httpOptions)
+    ${queryParametersDeclaration}${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
       .pipe(
         map(x => this._handleResponse(x)),
         catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
@@ -50,21 +58,25 @@ ${API_POST}`, { flag: 'w' });
     }
     generateModel() {
         let usedTypes = [];
+        let usedMultiPart = [];
         for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
             const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
             const swaggerMethod = this._swagger.paths[apiName];
             const method = Object.getOwnPropertyNames(swaggerMethod)[0];
             const swaggerMethodInfo = swaggerMethod[method];
-            // if(apiName == "/api/v{version}/Ticket/Create"){
-            // 	debugger
-            // }
+            if (apiName == "/api/v{version}/TicketFile/Create") {
+                debugger;
+            }
             let parametersRefType = swaggerMethodInfo.parameters.filter(x => x.in == 'query' && x.schema?.$ref != null).map(x => x.schema.$ref.replace('#/components/schemas/', ''));
             usedTypes = usedTypes.concat(parametersRefType);
-            if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null) {
-                usedTypes.push(swaggerMethodInfo.responses[200].content[contentType].schema.$ref.replace('#/components/schemas/', ''));
+            if (swaggerMethodInfo.responses[200].content[contentTypeApplicationJson]?.schema.$ref != null) {
+                usedTypes.push(swaggerMethodInfo.responses[200].content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', ''));
             }
-            if (swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref) {
-                usedTypes.push(swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref.replace('#/components/schemas/', ''));
+            if (swaggerMethodInfo.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref) {
+                usedTypes.push(swaggerMethodInfo.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref.replace('#/components/schemas/', ''));
+            }
+            if (swaggerMethodInfo.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
+                usedMultiPart.push(apiName);
             }
         }
         this.retrieveNestedObjects(usedTypes);
@@ -97,28 +109,47 @@ export ${type} ${modelName} {${content}
 }
 `;
         }
+        usedMultiPart.forEach(apiName => {
+            const swaggerMethod = this._swagger.paths[apiName];
+            const method = Object.getOwnPropertyNames(swaggerMethod)[0];
+            const swaggerMethodInfo = swaggerMethod[method];
+            let type = 'class';
+            let modelName = this.getModelNameByApi(apiName);
+            let content = this.retrieveSchemaProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema);
+            models +=
+                `
+export ${type} ${modelName} {${content}
+}
+`;
+        });
         fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts", `${MODEL_PRE}
 ${models}
 ${MODEL_POST}`, { flag: 'w' });
     }
-    retrieveParameters(swaggerMethodInfo) {
-        if (swaggerMethodInfo.requestBody != null) {
-            return `request: Models.${swaggerMethodInfo.requestBody.content[contentType].schema.$ref.replace('#/components/schemas/', '')}`;
+    retrieveParameters(swaggerMethodInfo, apiName) {
+        if (swaggerMethodInfo.requestBody != null && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null) {
+            var modelName = this.getModelNameByApi(apiName);
+            return `request: Models.${modelName}`;
         }
-        let parameters = ``;
-        swaggerMethodInfo.parameters.filter(x => x.in == 'query').forEach(parameter => {
-            if (parameter.schema.$ref != null) {
-                parameters += `${this.toFirstLetterLowercase(parameter.name)}: Models.${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
-            }
-            else {
-                const nativeType = this.getNativeType(parameter.schema);
-                const nullable = !parameter.required ? '?' : '';
-                parameters += `${this.toFirstLetterLowercase(parameter.name)}${nullable}: ${nativeType}, `;
+        else {
+            if (swaggerMethodInfo.requestBody != null) {
+                return `request: Models.${swaggerMethodInfo.requestBody.content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', '')}`;
             }
-        });
-        if (parameters.length > 2)
-            parameters = parameters.substring(0, parameters.length - 2);
-        return parameters;
+            let parameters = ``;
+            swaggerMethodInfo.parameters.filter(x => x.in == 'query').forEach(parameter => {
+                if (parameter.schema.$ref != null) {
+                    parameters += `${this.toFirstLetterLowercase(parameter.name)}: Models.${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
+                }
+                else {
+                    const nativeType = this.getNativeType(parameter.schema);
+                    const nullable = !parameter.required ? '?' : '';
+                    parameters += `${this.toFirstLetterLowercase(parameter.name)}${nullable}: ${nativeType}, `;
+                }
+            });
+            if (parameters.length > 2)
+                parameters = parameters.substring(0, parameters.length - 2);
+            return parameters;
+        }
     }
     retrieveQueryParametersDeclaration(swaggerMethodInfo) {
         if (swaggerMethodInfo.requestBody != null)
@@ -157,8 +188,14 @@ ${MODEL_POST}`, { flag: 'w' });
             }
         }
         else {
-            return `let ${paramName}Param: string = encodeURIComponent('' + ${paramName});
+            if (this.isDate(parameter.schema)) {
+                return `let ${paramName}Param: string = encodeURIComponent(this._momentToString(${paramName}));
+    `;
+            }
+            else {
+                return `let ${paramName}Param: string = encodeURIComponent('' + ${paramName});
     `;
+            }
         }
     }
     retrieveQueryParameters(swaggerMethodInfo) {
@@ -190,16 +227,16 @@ ${MODEL_POST}`, { flag: 'w' });
         if (swaggerMethodInfo.responses[200] == null)
             return 'void';
         try {
-            if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null)
-                return `Models.${this.getObjectName(swaggerMethodInfo.responses[200]?.content[contentType].schema.$ref)}`;
+            if (swaggerMethodInfo.responses[200].content[contentTypeApplicationJson].schema.$ref != null)
+                return `Models.${this.getObjectName(swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema.$ref)}`;
         }
         catch (error) {
             const errorMessage = "\t\tAttenzione forse hai dimenticato IActionResult e non hai tipizzato il tipo restituito dal servizio";
             console.error(`%c${errorMessage}`, 'color: red');
             throw new Error(errorMessage);
         }
-        if (swaggerMethodInfo.responses[200]?.content[contentType].schema.type != null)
-            return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentType].schema);
+        if (swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema.type != null)
+            return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema);
         console.error("unmanaged swaggerMethodInfo", swaggerMethodInfo);
         throw new Error("unmanaged swaggerMethodInfo");
     }
@@ -237,14 +274,13 @@ ${MODEL_POST}`, { flag: 'w' });
     }
     retrieveObjectContent(name, swaggerComponent) {
         if (swaggerComponent.type == 'object')
-            return this.retrieveObjectProperties(swaggerComponent);
+            return this.retrieveComponentProperties(swaggerComponent);
         else if (swaggerComponent.type == 'integer')
             return this.retrieveEnumValues(name, swaggerComponent);
     }
-    retrieveObjectProperties(swaggerCopmponent) {
+    retrieveComponentProperties(swaggerCopmponent) {
         if (swaggerCopmponent.properties == null)
             return ``;
-        // console.debug(`\t\t${Object.getOwnPropertyNames(swaggerCopmponent.properties).length}`);
         let properties = ``;
         for (let index = 0; index < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; index++) {
             const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[index];
@@ -254,6 +290,19 @@ ${MODEL_POST}`, { flag: 'w' });
         }
         return properties;
     }
+    retrieveSchemaProperties(schema) {
+        if (schema.properties == null)
+            return ``;
+        let properties = ``;
+        for (let j = 0; j < Object.getOwnPropertyNames(schema.properties).length; j++) {
+            let propertyName = Object.getOwnPropertyNames(schema.properties)[j];
+            propertyName = this.toFirstLetterLowercase(propertyName);
+            properties +=
+                `
+  ${propertyName}: ${this.retrieveType(schema.properties[propertyName])} | undefined;`;
+        }
+        return properties;
+    }
     retrieveEnumValues(name, swaggerCopmponent) {
         if (swaggerCopmponent.enum == null)
             return ``;
@@ -326,6 +375,9 @@ ${MODEL_POST}`, { flag: 'w' });
             throw new Error("unmanaged schema");
         }
     }
+    getModelNameByApi(apiName) {
+        return apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+    }
     toFirstLetterLowercase(value) {
         return value.charAt(0).toLowerCase() + value.slice(1);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devlearning/swagger-generator",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/generator.ts

@@ -7,7 +7,8 @@ import { SwaggerSchema } from './models/swagger-schema.js';
 import { API_PRE, API_POST } from './api.constants.js';
 import { MODEL_POST, MODEL_PRE } from './model.constants.js';
 
-const contentType = 'application/json';
+const contentTypeApplicationJson = 'application/json';
+const contentTypeMultipartFormData = 'multipart/form-data';
 
 export class Generator {
   private _swagger: Swagger;
@@ -33,23 +34,29 @@ export class Generator {
         console.debug('');
       }
 
-      let parametersString = this.retrieveParameters(swaggerMethodInfo);
+      let parametersString = this.retrieveParameters(swaggerMethodInfo, apiName);
       let queryParametersDeclaration = this.retrieveQueryParametersDeclaration(swaggerMethodInfo);
       let queryParameters = this.retrieveQueryParameters(swaggerMethodInfo);
       let returnTypeString = this.retrieveReturnType(swaggerMethodInfo);
       if (returnTypeString == null) returnTypeString = 'void';
       let prepareRequestString = ``; //request = this._handleRequest(request);
       let haveRequest = swaggerMethodInfo.requestBody != null;
+      let isMultiPart = haveRequest && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null;
+      let httpOptions = 'httpOptions';
 
-      if (haveRequest) {
-        prepareRequestString = `request = this._handleRequest(request);
+      if (haveRequest && !isMultiPart) {
+        prepareRequestString = `const wrappedRequest = this._handleRequest(request);
 	  `;
+      } else if (isMultiPart) {
+        prepareRequestString = ` const wrappedRequest = this._handleMultipart(request);
+	  `;
+        httpOptions = 'httpOptionsMultipart';
       }
 
       apiMethods +=
         `
   public ${apiName.replace('/api/v{version}/', '').replaceAll('/', '_')}(${parametersString}): Observable<${returnTypeString}> {
-    ${queryParametersDeclaration}${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', request' : ''}, httpOptions)
+    ${queryParametersDeclaration}${prepareRequestString}return this._http.${method}<${returnTypeString}>(\`\${this._baseUrl}${apiName.replace('{version}', '1')}${queryParameters}\`${haveRequest ? ', wrappedRequest' : ''}, ${httpOptions})
       .pipe(
         map(x => this._handleResponse(x)),
         catchError((err, obs) => this._handleError(err, <Observable<any>>obs))
@@ -67,6 +74,7 @@ ${API_POST}`,
 
   generateModel() {
     let usedTypes: string[] = [];
+    let usedMultiPart: string[] = [];
 
     for (let index = 0; index < Object.getOwnPropertyNames(this._swagger.paths).length; index++) {
       const apiName = Object.getOwnPropertyNames(this._swagger.paths)[index];
@@ -74,18 +82,22 @@ ${API_POST}`,
       const method = Object.getOwnPropertyNames(swaggerMethod)[0];
       const swaggerMethodInfo = swaggerMethod[method];
 
-      // if(apiName == "/api/v{version}/Ticket/Create"){
-      // 	debugger
-      // }
+      if(apiName == "/api/v{version}/TicketFile/Create"){
+      	debugger
+      }
       let parametersRefType = swaggerMethodInfo.parameters.filter(x => x.in == 'query' && x.schema?.$ref != null).map(x => x.schema.$ref.replace('#/components/schemas/', ''))
       usedTypes = usedTypes.concat(parametersRefType);
 
-      if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null) {
-        usedTypes.push(swaggerMethodInfo.responses[200].content[contentType].schema.$ref.replace('#/components/schemas/', ''));
+      if (swaggerMethodInfo.responses[200].content[contentTypeApplicationJson]?.schema.$ref != null) {
+        usedTypes.push(swaggerMethodInfo.responses[200].content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', ''));
+      }
+
+      if (swaggerMethodInfo.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref) {
+        usedTypes.push(swaggerMethodInfo.requestBody?.content[contentTypeApplicationJson]?.schema?.$ref.replace('#/components/schemas/', ''));
       }
 
-      if (swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref) {
-        usedTypes.push(swaggerMethodInfo.requestBody?.content[contentType]?.schema?.$ref.replace('#/components/schemas/', ''));
+      if (swaggerMethodInfo.requestBody?.content[contentTypeMultipartFormData]?.schema != null) {
+        usedMultiPart.push(apiName);
       }
     }
 
@@ -128,6 +140,21 @@ export ${type} ${modelName} {${content}
 `;
     }
 
+    usedMultiPart.forEach(apiName => {
+      const swaggerMethod = this._swagger.paths[apiName];
+      const method = Object.getOwnPropertyNames(swaggerMethod)[0];
+      const swaggerMethodInfo = swaggerMethod[method];
+
+      let type = 'class';
+      let modelName = this.getModelNameByApi(apiName);
+      let content = this.retrieveSchemaProperties(swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData].schema);
+      models +=
+        `
+export ${type} ${modelName} {${content}
+}
+`;
+    });
+
     fs.writeFileSync(this._outputDirectory + "/model.autogenerated.ts",
       `${MODEL_PRE}
 ${models}
@@ -135,26 +162,31 @@ ${MODEL_POST}`,
       { flag: 'w' });
   }
 
-  retrieveParameters(swaggerMethodInfo: SwaggerMethod) {
-    if (swaggerMethodInfo.requestBody != null) {
-      return `request: Models.${swaggerMethodInfo.requestBody.content[contentType].schema.$ref.replace('#/components/schemas/', '')}`
-    }
-
-    let parameters = ``;
-    swaggerMethodInfo.parameters.filter(x => x.in == 'query').forEach(parameter => {
-      if (parameter.schema.$ref != null) {
-        parameters += `${this.toFirstLetterLowercase(parameter.name)}: Models.${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
-      } else {
-        const nativeType = this.getNativeType(parameter.schema);
-        const nullable = !parameter.required ? '?' : '';
-        parameters += `${this.toFirstLetterLowercase(parameter.name)}${nullable}: ${nativeType}, `;
+  retrieveParameters(swaggerMethodInfo: SwaggerMethod, apiName: string) {
+    if (swaggerMethodInfo.requestBody != null && swaggerMethodInfo.requestBody.content[contentTypeMultipartFormData] != null) {
+      var modelName = this.getModelNameByApi(apiName);
+      return `request: Models.${modelName}`;
+    } else {
+      if (swaggerMethodInfo.requestBody != null) {
+        return `request: Models.${swaggerMethodInfo.requestBody.content[contentTypeApplicationJson].schema.$ref.replace('#/components/schemas/', '')}`
       }
-    });
 
-    if (parameters.length > 2)
-      parameters = parameters.substring(0, parameters.length - 2);
+      let parameters = ``;
+      swaggerMethodInfo.parameters.filter(x => x.in == 'query').forEach(parameter => {
+        if (parameter.schema.$ref != null) {
+          parameters += `${this.toFirstLetterLowercase(parameter.name)}: Models.${parameter.schema.$ref.replace('#/components/schemas/', '')}, `;
+        } else {
+          const nativeType = this.getNativeType(parameter.schema);
+          const nullable = !parameter.required ? '?' : '';
+          parameters += `${this.toFirstLetterLowercase(parameter.name)}${nullable}: ${nativeType}, `;
+        }
+      });
 
-    return parameters;
+      if (parameters.length > 2)
+        parameters = parameters.substring(0, parameters.length - 2);
+
+      return parameters;
+    }
   }
 
   retrieveQueryParametersDeclaration(swaggerMethodInfo: SwaggerMethod) {
@@ -193,8 +225,13 @@ ${MODEL_POST}`,
     `;
       }
     } else {
-      return `let ${paramName}Param: string = encodeURIComponent('' + ${paramName});
+      if (this.isDate(parameter.schema)) {
+        return `let ${paramName}Param: string = encodeURIComponent(this._momentToString(${paramName}));
     `;
+      } else {
+        return `let ${paramName}Param: string = encodeURIComponent('' + ${paramName});
+    `;
+      }
     }
   }
 
@@ -228,16 +265,16 @@ ${MODEL_POST}`,
       return 'void';
 
     try {
-      if (swaggerMethodInfo.responses[200].content[contentType].schema.$ref != null)
-        return `Models.${this.getObjectName(swaggerMethodInfo.responses[200]?.content[contentType].schema.$ref)}`;
+      if (swaggerMethodInfo.responses[200].content[contentTypeApplicationJson].schema.$ref != null)
+        return `Models.${this.getObjectName(swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema.$ref)}`;
     } catch (error) {
       const errorMessage = "\t\tAttenzione forse hai dimenticato IActionResult e non hai tipizzato il tipo restituito dal servizio";
       console.error(`%c${errorMessage}`, 'color: red');
       throw new Error(errorMessage);
     }
 
-    if (swaggerMethodInfo.responses[200]?.content[contentType].schema.type != null)
-      return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentType].schema);
+    if (swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema.type != null)
+      return this.getNativeType(swaggerMethodInfo.responses[200]?.content[contentTypeApplicationJson].schema);
 
     console.error("unmanaged swaggerMethodInfo", swaggerMethodInfo);
     throw new Error("unmanaged swaggerMethodInfo");
@@ -288,20 +325,17 @@ ${MODEL_POST}`,
 
   retrieveObjectContent(name: string, swaggerComponent: SwaggerComponent) {
     if (swaggerComponent.type == 'object')
-      return this.retrieveObjectProperties(swaggerComponent);
+      return this.retrieveComponentProperties(swaggerComponent);
     else if (swaggerComponent.type == 'integer')
       return this.retrieveEnumValues(name, swaggerComponent);
   }
 
-  retrieveObjectProperties(swaggerCopmponent: SwaggerComponent) {
+  retrieveComponentProperties(swaggerCopmponent: SwaggerComponent) {
     if (swaggerCopmponent.properties == null) return ``;
 
-    // console.debug(`\t\t${Object.getOwnPropertyNames(swaggerCopmponent.properties).length}`);
-
     let properties = ``;
     for (let index = 0; index < Object.getOwnPropertyNames(swaggerCopmponent.properties).length; index++) {
       const propertyName = Object.getOwnPropertyNames(swaggerCopmponent.properties)[index];
-
       properties +=
         `
   ${propertyName}: ${this.retrieveType(swaggerCopmponent.properties[propertyName])} | undefined;`
@@ -310,6 +344,21 @@ ${MODEL_POST}`,
     return properties;
   }
 
+  retrieveSchemaProperties(schema: SwaggerSchema) {
+    if (schema.properties == null) return ``;
+
+    let properties = ``;
+    for (let j = 0; j < Object.getOwnPropertyNames(schema.properties).length; j++) {
+      let propertyName = Object.getOwnPropertyNames(schema.properties)[j];
+      propertyName = this.toFirstLetterLowercase(propertyName)
+      properties +=
+        `
+  ${propertyName}: ${this.retrieveType(schema.properties[propertyName])} | undefined;`
+    }
+
+    return properties;
+  }
+
   retrieveEnumValues(name: string, swaggerCopmponent: SwaggerComponent) {
     if (swaggerCopmponent.enum == null) return ``;
 
@@ -379,6 +428,10 @@ ${MODEL_POST}`,
     }
   }
 
+  getModelNameByApi(apiName: string) {
+    return apiName.replace('/api/v{version}/', '').replaceAll('/', '_');
+  }
+
   toFirstLetterLowercase(value: string) {
     return value.charAt(0).toLowerCase() + value.slice(1);
   }

package/src/models/swagger-component-property.ts

@@ -5,4 +5,5 @@ export interface SwaggerComponentProperty {
     $ref: string;
     format: string;
     items: SwaggerSchema;
+    properties: { [key: string]: SwaggerComponentProperty; };
 }

package/src/models/swagger-schema.ts

@@ -1,6 +1,9 @@
+import { SwaggerComponentProperty } from "./swagger-component-property.js";
+
 export interface SwaggerSchema {
     type: string;
     $ref: string;
     format: string;
     items: SwaggerSchema;
+    properties: { [key: string]: SwaggerComponentProperty; };
 }

package/src/models/swagger.ts

@@ -20,6 +20,7 @@ export interface SwaggerParameter {
 
 export interface SwaggerRequestBody {
     content: { [key: string]: SwaggerContent; };
+    encoding : SwaggerEncoding;
 }
 
 export interface SwaggerResponses {
@@ -29,4 +30,9 @@ export interface SwaggerResponses {
 
 export interface SwaggerComponents {
     schemas: { [key: string]: SwaggerComponent; };
+}
+
+export interface SwaggerEncoding{
+    File: {style: 'form'},
+    Id: {style: 'form'},
 }