Migrate PrestaShop config to Config API blocks and add permissions.
Replace custom ShopConfig pages/models with registerConfigBlocks, load config from Config store, and enforce RBAC on methods. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,19 +1,26 @@
|
||||
const { Log, Core, Utils, Pages, DB } = require('@orbito/api-lib');
|
||||
const { Log, Core, Utils } = require('@orbito/api-lib');
|
||||
const CronJob = require('cron').CronJob;
|
||||
const ShopConfigSchema = require('./src/models/ShopConfig');
|
||||
const PsOrder = require('./src/models/PsOrder');
|
||||
const PrestashopApi = require('./src/PrestaApi');
|
||||
const { importFromPSOrder } = require('./src/OrderImporter');
|
||||
const { isLegacyApi } = require('./src/utils');
|
||||
const { loadEnabledConfigs, setLastOrderId } = require('./src/module-config');
|
||||
const { registerPrestashopConfigBlocks } = require('./src/register-config');
|
||||
const { registerPrestashopPermissions } = require('./src/register-permissions');
|
||||
|
||||
const NEW_ORDERS_WINDOW_MS = 20 * 60 * 1000;
|
||||
const OLDER_ORDERS_WINDOW_MS = 5 * 24 * 60 * 60 * 1000;
|
||||
const unpaidFilter = { $or: [{ paymentSyncedAt: { $exists: false } }, { paymentSyncedAt: null }] };
|
||||
|
||||
Utils.loadMethods(__dirname + '/methods');
|
||||
const configPage = require('./pages/config');
|
||||
Pages.registerPage('/config', { en: "Configuration", pl: "Konfiguracja" }, configPage);
|
||||
Pages.registerPage('/config/:_t', { en: "Configuration", pl: "Konfiguracja" }, configPage);
|
||||
|
||||
registerPrestashopConfigBlocks().catch(err => {
|
||||
Log.error('PrestaShop: nie udało się zarejestrować bloków Config', { error: err?.message });
|
||||
});
|
||||
|
||||
registerPrestashopPermissions().catch(err => {
|
||||
Log.error('PrestaShop: nie udało się zarejestrować uprawnień', { error: err?.message });
|
||||
});
|
||||
|
||||
const ordersPuller = new CronJob("0 */5 * * * *", async () => {
|
||||
const lockId = await Core.getLock('prestashop-orders-puller', 290000);
|
||||
@@ -22,8 +29,7 @@ const ordersPuller = new CronJob("0 */5 * * * *", async () => {
|
||||
try {
|
||||
let enabledShops = [];
|
||||
try {
|
||||
let shopConfigs = await ShopConfigSchema.find({ isRemoved: { $ne: true } });
|
||||
enabledShops = shopConfigs.filter(config => config.apiUrl && config.apiKey);
|
||||
enabledShops = await loadEnabledConfigs();
|
||||
} catch (error) {
|
||||
Log.error( 'Error fetching shop configs', { error: error.message });
|
||||
}
|
||||
@@ -41,7 +47,8 @@ const ordersPuller = new CronJob("0 */5 * * * *", async () => {
|
||||
|
||||
if (res.orders && res.orders.length > 0) {
|
||||
const lastOrderId = parseInt(res.orders[0].id);
|
||||
await ShopConfigSchema.update({ _id: config._id }, { lastOrderId: lastOrderId });
|
||||
await setLastOrderId(lastOrderId);
|
||||
config.lastOrderId = lastOrderId;
|
||||
}
|
||||
|
||||
continue;
|
||||
@@ -106,7 +113,9 @@ const ordersPuller = new CronJob("0 */5 * * * *", async () => {
|
||||
}
|
||||
}
|
||||
|
||||
await ShopConfigSchema.update({ _id: config._id }, { lastOrderId: config.lastProcessedId });
|
||||
if (config.lastProcessedId) {
|
||||
await setLastOrderId(config.lastProcessedId);
|
||||
}
|
||||
} catch (error) {
|
||||
Log.error( 'Error pulling orders for shop config', { shopConfigId: config._id, error: error.message });
|
||||
}
|
||||
@@ -175,7 +184,7 @@ const paymentsSyncNew = new CronJob('0 */3 * * * *', async () => {
|
||||
const lockId = await Core.getLock('prestashop-payments-new', 120000);
|
||||
if (!lockId) return;
|
||||
try {
|
||||
const configs = (await ShopConfigSchema.find({ isRemoved: { $ne: true } })).filter(c => c.apiUrl && c.apiKey);
|
||||
const configs = await loadEnabledConfigs();
|
||||
const since = new Date(Date.now() - NEW_ORDERS_WINDOW_MS);
|
||||
for (const config of configs) {
|
||||
try {
|
||||
@@ -195,7 +204,7 @@ const paymentsSyncOlder = new CronJob('0 */30 * * * *', async () => {
|
||||
const lockId = await Core.getLock('prestashop-payments-older', 300000);
|
||||
if (!lockId) return;
|
||||
try {
|
||||
const configs = (await ShopConfigSchema.find({ isRemoved: { $ne: true } })).filter(c => c.apiUrl && c.apiKey);
|
||||
const configs = await loadEnabledConfigs();
|
||||
const now = Date.now();
|
||||
const since = new Date(now - OLDER_ORDERS_WINDOW_MS);
|
||||
const until = new Date(now - NEW_ORDERS_WINDOW_MS);
|
||||
|
||||
Reference in New Issue
Block a user