chore: skipping optional part when param not in responseModel

twilio · Aug 12, 2024 · 1c20550 · 1c20550
1 parent 1749980
commit 1c20550
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/src/main/java/com/twilio/oai/api/FluentApiResourceBuilder.java b/src/main/java/com/twilio/oai/api/FluentApiResourceBuilder.java
@@ -92,11 +92,13 @@ public ApiResourceBuilder updateOperations(final Resolver<CodegenParameter> code
 
             // Fill out the list path params with any "parent params".
             listPathParams = resourcePathParams.stream().filter(PathUtils::isParentParam).collect(Collectors.toList());
-            for(CodegenParameter param: instancePathParams)
-                if((boolean) param.vendorExtensions.getOrDefault(ACCOUNT_SID_VEND_EXT, false))
-                    param.vendorExtensions.put(IS_PARENT_PARAM_EXTENSION_NAME, true);
         }
 
+        if(instancePath != null && listPath == null && listPathParams.isEmpty()) {
+            for(CodegenParameter param: instancePathParams) {
+                param.vendorExtensions.put(IS_PARENT_PARAM_EXTENSION_NAME, false);
+            }
+        }
         return this;
     }
 

diff --git a/src/main/java/com/twilio/oai/api/NodeApiResourceBuilder.java b/src/main/java/com/twilio/oai/api/NodeApiResourceBuilder.java
@@ -17,8 +17,7 @@
 import org.openapitools.codegen.CodegenParameter;
 import org.openapitools.codegen.CodegenProperty;
 
-import static com.twilio.oai.common.ApplicationConstants.HTTP_METHOD;
-import static com.twilio.oai.common.ApplicationConstants.STRING;
+import static com.twilio.oai.common.ApplicationConstants.*;
 
 public class NodeApiResourceBuilder extends FluentApiResourceBuilder {
     public NodeApiResourceBuilder(final IApiActionTemplate template,
@@ -118,7 +117,18 @@ public ApiResourceBuilder updateResponseModel(Resolver<CodegenProperty> codegenP
                     variable.datatypeWithEnum = dataTypeWithEnum;
                     variable.baseType = dataType;
                 });
+
+            instancePathParams.forEach(param -> param.vendorExtensions.put("x-is-response-param", param.vendorExtensions.get(IS_PARENT_PARAM_EXTENSION_NAME)));
+
             });
+
+            if(instancePath != null) {
+                for(CodegenParameter param: instancePathParams) {
+                    if((!(boolean) param.vendorExtensions.getOrDefault(IS_PARENT_PARAM_EXTENSION_NAME, false)) &&
+                    (responseModel.getVars().stream().noneMatch(variable -> variable.name.equals(param.paramName))))
+                            param.vendorExtensions.put("x-is-response-param", true);
+                }
+            }
         });
 
         modelTree.values().forEach(model -> model.setName(getModelName(model.getClassname())));

diff --git a/src/main/resources/twilio-node/api-single.mustache b/src/main/resources/twilio-node/api-single.mustache
@@ -145,27 +145,14 @@ export interface {{apiName}}ListInstance {
   [inspect.custom](_depth: any, options: InspectOptions): any;
 }
 
-export function {{apiName}}ListInstance(version: {{apiVersionClass}}{{#listPathParams}}{{^vendorExtensions.x-is-account-sid}}, {{paramName}}: {{{dataType}}}{{/vendorExtensions.x-is-account-sid}}{{/listPathParams}}{{#listPathParams}}{{#vendorExtensions.x-is-account-sid}}, {{paramName}}?: {{{dataType}}}{{/vendorExtensions.x-is-account-sid}}{{/listPathParams}}): {{apiName}}ListInstance {
+export function {{apiName}}ListInstance(version: {{apiVersionClass}}{{#listPathParams}}, {{paramName}}: {{{dataType}}}{{/listPathParams}}): {{apiName}}ListInstance {
   {{#listPathParams}}
-  {{#vendorExtensions.x-is-account-sid}}
-  accountSid = accountSid || version.domain.twilio.accountSid;
-  {{/vendorExtensions.x-is-account-sid}}
   if (!isValidPathParam({{paramName}})) {
     throw new Error('Parameter \'{{paramName}}\' is not valid.');
   }
 
   {{/listPathParams}}
-
   {{#instancePath}}
-  {{^listPath}}
-  {{^listPathParams}}
-  {{#instancePathParams}}
-  {{#vendorExtensions.x-is-account-sid}}
-  const accountSid = version.domain.twilio.accountSid;
-  {{/vendorExtensions.x-is-account-sid}}
-  {{/instancePathParams}}
-  {{/listPathParams}}
-  {{/listPath}}
   const instance = (({{#instancePathParams}}{{^vendorExtensions.x-is-parent-param}}{{paramName}}, {{/vendorExtensions.x-is-parent-param}}{{/instancePathParams}}) => instance.get({{#instancePathParams}}{{^vendorExtensions.x-is-parent-param}}{{paramName}}, {{/vendorExtensions.x-is-parent-param}}{{/instancePathParams}})) as {{apiName}}ListInstance;
 
   instance.get = function get({{#instancePathParams}}{{^vendorExtensions.x-is-parent-param}}{{paramName}}, {{/vendorExtensions.x-is-parent-param}}{{/instancePathParams}}): {{apiName}}Context {

diff --git a/src/main/resources/twilio-node/responseModel.mustache b/src/main/resources/twilio-node/responseModel.mustache
@@ -21,13 +21,13 @@ export class {{instanceName}} {
   protected _context?: {{apiName}}Context;
   {{/instancePath}}
 
-  constructor(protected _version: {{apiVersionClass}}, payload: {{apiName}}Resource{{#instancePathParams}}, {{paramName}}{{^vendorExtensions.x-is-parent-param}}?{{/vendorExtensions.x-is-parent-param}}: {{{dataType}}}{{/instancePathParams}}) {
+  constructor(protected _version: {{apiVersionClass}}, payload: {{apiName}}Resource{{#instancePathParams}}, {{paramName}}{{^vendorExtensions.x-is-response-param}}?{{/vendorExtensions.x-is-response-param}}: {{{dataType}}}{{/instancePathParams}}) {
     {{#vars}}
     this.{{name}} = {{vendorExtensions.x-deserialize}}(payload.{{baseName}});
     {{/vars}}
 
     {{#instancePath}}
-    this._solution = { {{#instancePathParams}}{{paramName}}{{^vendorExtensions.x-is-parent-param}}: {{paramName}} || this.{{paramName}}{{#vendorExtensions.x-stringify}}.toString(){{/vendorExtensions.x-stringify}}{{/vendorExtensions.x-is-parent-param}}, {{/instancePathParams}} };
+    this._solution = { {{#instancePathParams}}{{paramName}}{{^vendorExtensions.x-is-response-param}}: {{paramName}} || this.{{paramName}}{{#vendorExtensions.x-stringify}}.toString(){{/vendorExtensions.x-stringify}}{{/vendorExtensions.x-is-response-param}}, {{/instancePathParams}} };
     {{/instancePath}}
   }