From 55960b7f1cff7721e58d12fec62e0653b4319072 Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Tue, 3 Dec 2024 20:05:59 +0200 Subject: [PATCH 1/3] HCK-8865: implemented schema version change for OpenAPI Schema FE --- forward_engineering/api.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forward_engineering/api.js b/forward_engineering/api.js index 4247b48..8401a4b 100644 --- a/forward_engineering/api.js +++ b/forward_engineering/api.js @@ -15,13 +15,15 @@ module.exports = { generateModelScript(data, logger, cb) { try { const { - dbVersion: specVersion, + dbVersion, externalDocs: modelExternalDocs, tags: modelTags, security: modelSecurity, servers: modelServers, jsonSchemaDialect, } = data.modelData[0]; + const appTargetVersion = data?.options?.appTargetVersion; + const specVersion = appTargetVersion ?? dbVersion; const containersIdsFromCallbacks = commonHelper.getContainersIdsForCallbacks(data); From cc0c134249b323a616e88c4ffc3074190b019055 Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Thu, 5 Dec 2024 14:08:45 +0200 Subject: [PATCH 2/3] HCK-8865: renamed appTargetVersion to apiTargetVersion --- forward_engineering/api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forward_engineering/api.js b/forward_engineering/api.js index 8401a4b..87bf989 100644 --- a/forward_engineering/api.js +++ b/forward_engineering/api.js @@ -22,8 +22,8 @@ module.exports = { servers: modelServers, jsonSchemaDialect, } = data.modelData[0]; - const appTargetVersion = data?.options?.appTargetVersion; - const specVersion = appTargetVersion ?? dbVersion; + const apiTargetVersion = data?.options?.apiTargetVersion; + const specVersion = apiTargetVersion ?? dbVersion; const containersIdsFromCallbacks = commonHelper.getContainersIdsForCallbacks(data); From 94929f37ac5dd0fa0135a6e380f5addc178d1a4d Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Thu, 5 Dec 2024 15:03:13 +0200 Subject: [PATCH 3/3] HCK-8865: added versions check --- forward_engineering/api.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forward_engineering/api.js b/forward_engineering/api.js index 87bf989..9e43ad6 100644 --- a/forward_engineering/api.js +++ b/forward_engineering/api.js @@ -10,6 +10,7 @@ const getExtensions = require('./helpers/extensionsHelper'); const handleReferencePath = require('./helpers/handleReferencePath'); const mapJsonSchema = require('../reverse_engineering/helpers/adaptJsonSchema/mapJsonSchema'); const path = require('path'); +const versions = require('../package.json').contributes.target.versions; module.exports = { generateModelScript(data, logger, cb) { @@ -23,7 +24,7 @@ module.exports = { jsonSchemaDialect, } = data.modelData[0]; const apiTargetVersion = data?.options?.apiTargetVersion; - const specVersion = apiTargetVersion ?? dbVersion; + const specVersion = apiTargetVersion && versions.includes(apiTargetVersion) ? apiTargetVersion : dbVersion; const containersIdsFromCallbacks = commonHelper.getContainersIdsForCallbacks(data);