From 22b8c47b93e64da7cbf5fd2d9b415775428b3284 Mon Sep 17 00:00:00 2001 From: Alex Wallen Date: Tue, 8 Oct 2024 19:38:22 -0700 Subject: [PATCH] feat: add middleware for create actions (#19793) * feat: add middleware for create actions * chore: update samples * chore: update typescript sample? --- .../src/main/resources/zapier/actions.mustache | 4 ++-- .../src/main/resources/zapier/utils.mustache | 5 +++++ samples/client/petstore/zapier/operations/actions.js | 4 ++-- samples/client/petstore/zapier/utils/utils.js | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/zapier/actions.mustache b/modules/openapi-generator/src/main/resources/zapier/actions.mustache index 294493c1242..ded4972c082 100644 --- a/modules/openapi-generator/src/main/resources/zapier/actions.mustache +++ b/modules/openapi-generator/src/main/resources/zapier/actions.mustache @@ -3,7 +3,7 @@ const {{classname}} = require('../{{apiPackage}}/{{classname}}'); {{/apis}} {{/apiInfo}} -const { triggerMiddleware, isTrigger, searchMiddleware, hasSearchRequisites, isSearchAction, isCreateAction } = require('../utils/utils'); +const { triggerMiddleware, isTrigger, searchMiddleware, hasSearchRequisites, isSearchAction, isCreateAction, createMiddleware } = require('../utils/utils'); const actions = { {{#apiInfo}} @@ -19,6 +19,6 @@ const actions = { module.exports = { searchActions: () => Object.entries(actions).reduce((actions, [key, value]) => isSearchAction(key) && hasSearchRequisites(value) ? {...actions, [key]: searchMiddleware(value)} : actions, {}), - createActions: () => Object.entries(actions).reduce((actions, [key, value]) => isCreateAction(key) ? {...actions, [key]: value} : actions, {}), + createActions: () => Object.entries(actions).reduce((actions, [key, value]) => isCreateAction(key) ? {...actions, [key]: createMiddleware(value)} : actions, {}), triggers: () => Object.entries(actions).reduce((actions, [key, value]) => isTrigger(key) ? {...actions, [key]: triggerMiddleware(value)} : actions, {}), } diff --git a/modules/openapi-generator/src/main/resources/zapier/utils.mustache b/modules/openapi-generator/src/main/resources/zapier/utils.mustache index 3c787e051e1..ae1ee6fd998 100644 --- a/modules/openapi-generator/src/main/resources/zapier/utils.mustache +++ b/modules/openapi-generator/src/main/resources/zapier/utils.mustache @@ -28,6 +28,10 @@ const isCreateAction = (key) => { return !isSearchAction(key); } +const createMiddleware = (action) => { + return action +} + const isTrigger = (key) => { // TODO: custom logic return false @@ -68,4 +72,5 @@ module.exports = { isTrigger: isTrigger, triggerMiddleware: triggerMiddleware, isCreateAction: isCreateAction, + createMiddleware: createMiddleware, } diff --git a/samples/client/petstore/zapier/operations/actions.js b/samples/client/petstore/zapier/operations/actions.js index c0bac3a264e..a4ac674285b 100644 --- a/samples/client/petstore/zapier/operations/actions.js +++ b/samples/client/petstore/zapier/operations/actions.js @@ -1,7 +1,7 @@ const PetApi = require('../apis/PetApi'); const StoreApi = require('../apis/StoreApi'); const UserApi = require('../apis/UserApi'); -const { triggerMiddleware, isTrigger, searchMiddleware, hasSearchRequisites, isSearchAction, isCreateAction } = require('../utils/utils'); +const { triggerMiddleware, isTrigger, searchMiddleware, hasSearchRequisites, isSearchAction, isCreateAction, createMiddleware } = require('../utils/utils'); const actions = { [PetApi.addPet.key]: PetApi.addPet, @@ -28,6 +28,6 @@ const actions = { module.exports = { searchActions: () => Object.entries(actions).reduce((actions, [key, value]) => isSearchAction(key) && hasSearchRequisites(value) ? {...actions, [key]: searchMiddleware(value)} : actions, {}), - createActions: () => Object.entries(actions).reduce((actions, [key, value]) => isCreateAction(key) ? {...actions, [key]: value} : actions, {}), + createActions: () => Object.entries(actions).reduce((actions, [key, value]) => isCreateAction(key) ? {...actions, [key]: createMiddleware(value)} : actions, {}), triggers: () => Object.entries(actions).reduce((actions, [key, value]) => isTrigger(key) ? {...actions, [key]: triggerMiddleware(value)} : actions, {}), } diff --git a/samples/client/petstore/zapier/utils/utils.js b/samples/client/petstore/zapier/utils/utils.js index 3c787e051e1..ae1ee6fd998 100644 --- a/samples/client/petstore/zapier/utils/utils.js +++ b/samples/client/petstore/zapier/utils/utils.js @@ -28,6 +28,10 @@ const isCreateAction = (key) => { return !isSearchAction(key); } +const createMiddleware = (action) => { + return action +} + const isTrigger = (key) => { // TODO: custom logic return false @@ -68,4 +72,5 @@ module.exports = { isTrigger: isTrigger, triggerMiddleware: triggerMiddleware, isCreateAction: isCreateAction, + createMiddleware: createMiddleware, }