From b1c7f792ded83e74fa10ad8a4284181a2c1ad59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20Ko=C5=BAmi=C5=84ski?= Date: Tue, 28 Jul 2026 12:03:48 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20manifest=20module.json=20i=20kod=20modu?= =?UTF-8?q?=C5=82u=20z=20getModuleInfo=20zamiast=20hardcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - module.json: name/version/dependsOn (core/orders, core/products); package.json name -> core.prestashop - hardcode'y 'core/prestashop' (source.moduleCode w pullerze/imporcie) zastąpione Core.getModuleInfo().code; w orders-api stałe top-level zamienione na leniwe funkcje, legacy alias 'prestashop' wyliczany z kodu - make-zip.sh pakuje module.json Co-Authored-By: Claude Fable 5 --- index.js | 3 ++- make-zip.sh | 1 + methods/testPull.js | 3 ++- module.json | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- src/OrderImporter.js | 6 ++++-- src/orders-api.js | 24 ++++++++++++++++++------ 8 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 module.json diff --git a/index.js b/index.js index ebbc1af..14f95d5 100644 --- a/index.js +++ b/index.js @@ -95,7 +95,8 @@ const ordersPuller = new CronJob("0 */5 * * * *", async () => { try { const searchResult = await Core.callModule( 'core/orders', 'search', { source: { - moduleCode: 'core/prestashop', + // własny kod modułu bierzemy z core (po rejestracji), nie z hardcode'u + moduleCode: Core.getModuleInfo().code, uniqueId: order.reference + ':' + order.id } }); diff --git a/make-zip.sh b/make-zip.sh index fb2f000..858f6a7 100755 --- a/make-zip.sh +++ b/make-zip.sh @@ -19,6 +19,7 @@ fi echo "Tworzenie archiwum: $ZIP_FILE" zip -r "$ZIP_FILE" \ package.json \ + module.json \ index.js \ .npmrc \ src/ \ diff --git a/methods/testPull.js b/methods/testPull.js index f53eb40..53bb554 100644 --- a/methods/testPull.js +++ b/methods/testPull.js @@ -30,7 +30,8 @@ module.exports = async function(params, ctx) { for (const order of orders) { const uniqueId = order.reference + ':' + order.id; const searchResult = await Core.callModule( 'core/orders', 'search', { - source: { moduleCode: 'core/prestashop', uniqueId } + // własny kod modułu bierzemy z core (po rejestracji), nie z hardcode'u + source: { moduleCode: Core.getModuleInfo().code, uniqueId } }); if (searchResult?.data?.length > 0) { imported.push({ id: order.id, status: 'already_exists' }); diff --git a/module.json b/module.json new file mode 100644 index 0000000..d69b616 --- /dev/null +++ b/module.json @@ -0,0 +1,8 @@ +{ + "name": "prestashop", + "version": "1.0.0", + "dependsOn": [ + "core/orders", + "core/products" + ] +} diff --git a/package-lock.json b/package-lock.json index 92e13af..a4b3b73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "prestashop-module", + "name": "core.prestashop", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "prestashop-module", + "name": "core.prestashop", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 2cbd123..efe8d71 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "prestashop-module", + "name": "core.prestashop", "version": "1.0.0", "description": "Sample orbito module", "main": "index.js", diff --git a/src/OrderImporter.js b/src/OrderImporter.js index 856f67e..419254f 100644 --- a/src/OrderImporter.js +++ b/src/OrderImporter.js @@ -123,7 +123,8 @@ async function importFromPSOrder(orderId, api, config) { products .filter(p => p.sourceId && p.name) .map(p => Core.callModule( 'core/products', 'upsert', { - sourceModule: 'core/prestashop', + // własny kod modułu bierzemy z core (po rejestracji), nie z hardcode'u + sourceModule: Core.getModuleInfo().code, sourceId: String(p.sourceId), sku: p.sku || '', name: p.name, @@ -259,7 +260,8 @@ async function importFromPSOrder(orderId, api, config) { source: { name: "Prestashop", - moduleCode: 'core/prestashop', + // własny kod modułu bierzemy z core (po rejestracji), nie z hardcode'u + moduleCode: Core.getModuleInfo().code, sourceId: order.id, uniqueId: order.reference + ':' + order.id, }, diff --git a/src/orders-api.js b/src/orders-api.js index b97be68..f6efbb5 100644 --- a/src/orders-api.js +++ b/src/orders-api.js @@ -3,10 +3,22 @@ const { Core } = require('@orbito/api-lib'); // Helper proxy do modułu zamówień. Widoki PrestaShop (orders.search, // status.get_with_counts) nie trzymają własnych zamówień — odpytują core/orders. -const MODULE_CODE = 'core/prestashop'; -const MODULE_CODES = ['core/prestashop', 'prestashop']; const ORDERS_MODULE_ID = 'core/orders'; +// Własny kod modułu znamy dopiero po rejestracji w core, więc czytamy go leniwie +// (moduł jest ładowany zanim połączenie zostanie nawiązane). +function getModuleCode() { + return Core.getModuleInfo().code; +} + +// Zamówienia zaimportowane przed wprowadzeniem prefiksowanych kodów mają w bazie +// krótki kod (bez `core/`), dlatego szukamy po obu wariantach. +function getModuleCodes() { + const code = getModuleCode(); + const legacyCode = code.split('/').pop(); + return code === legacyCode ? [code] : [code, legacyCode]; +} + async function callOrdersModule(method, params) { return Core.callModule(ORDERS_MODULE_ID, method, params); } @@ -92,8 +104,8 @@ function buildSearchParams(params = {}) { page: parseInt(cleanParams.page, 10) || 1, perPage: parseInt(cleanParams.perPage, 10) || 20, source: { - moduleCode: MODULE_CODE, - _moduleCodes: MODULE_CODES + moduleCode: getModuleCode(), + _moduleCodes: getModuleCodes() } }; @@ -143,8 +155,8 @@ async function getOrderStatuses() { } module.exports = { - MODULE_CODE, - MODULE_CODES, + getModuleCode, + getModuleCodes, ORDERS_MODULE_ID, callOrdersModule, normalizeSearchResult,