@unchainedshop/core 5.0.0-alpha.4 → 5.0.0-alpha.5

package/lib/bulk-importer/handlers/product/create.d.ts

@@ -15,7 +15,7 @@ export declare const ProductCreateSpecificationSchema: z.ZodMiniObject<{
         readonly ACTIVE: "ACTIVE";
         readonly DELETED: "DELETED";
     }>>>;
-    published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
+    published: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
     tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
     commerce: z.ZodMiniOptional<z.ZodMiniObject<{
         pricing: z.ZodMiniArray<z.ZodMiniObject<{
@@ -76,7 +76,7 @@ export declare const ProductCreatePayloadSchema: z.ZodMiniObject<{
             readonly ACTIVE: "ACTIVE";
             readonly DELETED: "DELETED";
         }>>>;
-        published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
+        published: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
         tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
         commerce: z.ZodMiniOptional<z.ZodMiniObject<{
             pricing: z.ZodMiniArray<z.ZodMiniObject<{
@@ -183,7 +183,7 @@ declare namespace createProduct {
                 readonly ACTIVE: "ACTIVE";
                 readonly DELETED: "DELETED";
             }>>>;
-            published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
+            published: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
             tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
             commerce: z.ZodMiniOptional<z.ZodMiniObject<{
                 pricing: z.ZodMiniArray<z.ZodMiniObject<{

package/lib/bulk-importer/handlers/product/create.js

@@ -8,7 +8,7 @@ export const ProductCreateSpecificationSchema = z.object({
     type: z.enum(ProductType),
     sequence: z.optional(z.number()),
     status: z.nullish(z.enum(ProductStatus)),
-    published: z.nullish(z.iso.datetime()),
+    published: z.nullish(z.string().check(z.refine((value) => !Number.isNaN(new Date(value).getTime()), 'Invalid date'))),
     tags: z.optional(z.array(z.string())),
     commerce: z.optional(z.object({
         pricing: z.array(z.object({

package/lib/bulk-importer/handlers/product/update.d.ts

@@ -9,7 +9,7 @@ export declare const ProductUpdateSpecificationSchema: z.ZodMiniObject<{
         readonly ACTIVE: "ACTIVE";
         readonly DELETED: "DELETED";
     }>>>;
-    published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
+    published: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
     tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
     commerce: z.ZodMiniOptional<z.ZodMiniObject<{
         pricing: z.ZodMiniArray<z.ZodMiniObject<{
@@ -64,7 +64,7 @@ export declare const ProductUpdatePayloadSchema: z.ZodMiniObject<{
             readonly ACTIVE: "ACTIVE";
             readonly DELETED: "DELETED";
         }>>>;
-        published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
+        published: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
         tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
         commerce: z.ZodMiniOptional<z.ZodMiniObject<{
             pricing: z.ZodMiniArray<z.ZodMiniObject<{
@@ -165,7 +165,7 @@ declare namespace updateProduct {
                 readonly ACTIVE: "ACTIVE";
                 readonly DELETED: "DELETED";
             }>>>;
-            published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
+            published: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
             tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
             commerce: z.ZodMiniOptional<z.ZodMiniObject<{
                 pricing: z.ZodMiniArray<z.ZodMiniObject<{

package/lib/bulk-importer/handlers/product/update.js

@@ -8,7 +8,7 @@ export const ProductUpdateSpecificationSchema = z.object({
     type: z.optional(z.string()),
     sequence: z.optional(z.number()),
     status: z.nullish(z.enum(ProductStatus)),
-    published: z.nullish(z.iso.datetime()),
+    published: z.nullish(z.string().check(z.refine((value) => !Number.isNaN(new Date(value).getTime()), 'Invalid date'))),
     tags: z.optional(z.array(z.string())),
     commerce: z.optional(z.object({
         pricing: z.array(z.object({

package/lib/directors/BaseWorker.js

@@ -48,9 +48,10 @@ export const BaseWorker = {
                         retries: workConfig.retries || 0,
                     };
                     if (workConfig.input) {
-                        workData.input = (await workConfig.input(workData)) || {};
-                        if (!workData.input)
+                        const input = await workConfig.input(workData);
+                        if (!input)
                             return null;
+                        workData.input = input;
                     }
                     return unchainedAPI.modules.worker.ensureOneWork(workData);
                 }));

package/lib/directors/WorkerDirector.d.ts

@@ -18,6 +18,12 @@ export type IWorkerDirector = IBaseDirector<IWorkerAdapter<any, any>> & {
     configureAutoscheduling: (workScheduleConfiguration: WorkScheduleConfiguration) => void;
     getAutoSchedules: () => [string, WorkScheduleConfiguration][];
     doWork: (work: Work, unchainedAPI: any) => Promise<WorkResult>;
+    allocateWork: (unchainedAPI: {
+        modules: Modules;
+    }, options?: {
+        types?: string[] | null;
+        worker?: string;
+    }) => Promise<Work | null>;
     processNextWork: (unchainedAPI: {
         modules: Modules;
     }, workerId?: string) => Promise<Work | null>;

package/lib/directors/WorkerDirector.js

@@ -57,22 +57,34 @@ export const WorkerDirector = {
             return errorOutput;
         }
     },
+    allocateWork: async (unchainedAPI, { types: requestedTypes, worker = unchainedAPI.modules.worker.workerId } = {}) => {
+        const lock = await unchainedAPI.modules.orders.acquireLock('allocation', 'worker');
+        try {
+            const adapters = WorkerDirector.getAdapters();
+            const allocationMap = await unchainedAPI.modules.worker.allocationMap();
+            const types = adapters
+                .filter((adapter) => {
+                if (requestedTypes && !requestedTypes.includes(adapter.type))
+                    return false;
+                if (adapter.maxParallelAllocations &&
+                    adapter.maxParallelAllocations <= allocationMap[adapter.type])
+                    return false;
+                return true;
+            })
+                .map((adapter) => adapter.type);
+            return await unchainedAPI.modules.worker.allocateWork({
+                types,
+                worker,
+            });
+        }
+        finally {
+            await lock.release();
+        }
+    },
     processNextWork: async (unchainedAPI, workerId) => {
-        const adapters = WorkerDirector.getAdapters();
-        const allocationMap = await unchainedAPI.modules.worker.allocationMap();
-        const types = adapters
-            .filter((adapter) => {
-            if (adapter.external)
-                return false;
-            if (adapter.maxParallelAllocations &&
-                adapter.maxParallelAllocations <= allocationMap[adapter.type])
-                return false;
-            return true;
-        })
-            .map((adapter) => adapter.type);
         const worker = workerId ?? unchainedAPI.modules.worker.workerId;
-        const work = await unchainedAPI.modules.worker.allocateWork({
-            types,
+        const work = await WorkerDirector.allocateWork(unchainedAPI, {
+            types: WorkerDirector.getActivePluginTypes({ external: false }),
             worker,
         });
         if (work) {

package/lib/services/bulkAssignProductsToAssortment.d.ts

@@ -0,0 +1,8 @@
+import type { Modules } from '../modules.ts';
+export declare function bulkAssignProductsToAssortmentService(this: Modules, { assortmentId, productIds }: {
+    assortmentId: string;
+    productIds: string[];
+}): Promise<{
+    successIds: string[];
+    failedIds: string[];
+}>;

package/lib/services/bulkAssignProductsToAssortment.js

@@ -0,0 +1,11 @@
+import { executeBulkOperation } from '@unchainedshop/utils';
+export async function bulkAssignProductsToAssortmentService({ assortmentId, productIds }) {
+    const result = await executeBulkOperation(productIds, async (productId) => {
+        if (!(await this.products.productExists({ productId })))
+            throw new Error('not-found');
+        const assignment = await this.assortments.products.create({ assortmentId, productId });
+        if (!assignment)
+            throw new Error('create-failed');
+    });
+    return result;
+}

package/lib/services/bulkDeleteUsers.d.ts

@@ -0,0 +1,7 @@
+import type { Modules } from '../modules.ts';
+export declare function bulkDeleteUsersService(this: Modules, { userIds }: {
+    userIds: string[];
+}): Promise<{
+    successIds: string[];
+    failedIds: string[];
+}>;

package/lib/services/bulkDeleteUsers.js

@@ -0,0 +1,11 @@
+import { executeBulkOperation } from '@unchainedshop/utils';
+import { deleteUserService } from "./deleteUser.js";
+export async function bulkDeleteUsersService({ userIds }) {
+    return executeBulkOperation(userIds, async (userId) => {
+        if (!(await this.users.userExists({ userId })))
+            throw new Error('not-found');
+        const result = await deleteUserService.call(this, { userId });
+        if (!result)
+            throw new Error('delete-failed');
+    });
+}

package/lib/services/bulkRemoveFilters.d.ts

@@ -0,0 +1,7 @@
+import type { Modules } from '../modules.ts';
+export declare function bulkRemoveFiltersService(this: Modules, { filterIds }: {
+    filterIds: string[];
+}): Promise<{
+    successIds: string[];
+    failedIds: string[];
+}>;

package/lib/services/bulkRemoveFilters.js

@@ -0,0 +1,10 @@
+import { executeBulkOperation } from '@unchainedshop/utils';
+import { removeFilterService } from "./removeFilter.js";
+export async function bulkRemoveFiltersService({ filterIds }) {
+    return executeBulkOperation(filterIds, async (filterId) => {
+        const filter = await this.filters.findFilter({ filterId });
+        if (!filter)
+            throw new Error('not-found');
+        await removeFilterService.call(this, { filter });
+    });
+}

package/lib/services/bulkRemoveProducts.d.ts

@@ -0,0 +1,7 @@
+import type { Modules } from '../modules.ts';
+export declare function bulkRemoveProductsService(this: Modules, { productIds }: {
+    productIds: string[];
+}): Promise<{
+    successIds: string[];
+    failedIds: string[];
+}>;

package/lib/services/bulkRemoveProducts.js

@@ -0,0 +1,23 @@
+import { executeBulkOperation } from '@unchainedshop/utils';
+import { removeProductService } from "./removeProduct.js";
+export async function bulkRemoveProductsService({ productIds }) {
+    return executeBulkOperation(productIds, async (productId) => {
+        if (!(await this.products.productExists({ productId })))
+            throw new Error('not-found');
+        if (await this.products.firstActiveProductBundle(productId)) {
+            throw new Error('linked-to-active-bundle');
+        }
+        if (await this.products.firstActiveProductProxy(productId)) {
+            throw new Error('linked-to-active-variation');
+        }
+        if (await this.quotations.openQuotationWithProduct({ productId })) {
+            throw new Error('linked-to-quotation');
+        }
+        if (await this.enrollments.openEnrollmentWithProduct({ productId })) {
+            throw new Error('linked-to-enrollment');
+        }
+        const result = await removeProductService.call(this, { productId });
+        if (!result)
+            throw new Error('already-deleted');
+    });
+}

package/lib/services/bulkSetFilterActive.d.ts

@@ -0,0 +1,8 @@
+import type { Modules } from '../modules.ts';
+export declare function bulkSetFilterActiveService(this: Modules, { filterIds, isActive }: {
+    filterIds: string[];
+    isActive: boolean;
+}): Promise<{
+    successIds: string[];
+    failedIds: string[];
+}>;

package/lib/services/bulkSetFilterActive.js

@@ -0,0 +1,12 @@
+import { executeBulkOperation } from '@unchainedshop/utils';
+import { updateFilterService } from "./updateFilter.js";
+export async function bulkSetFilterActiveService({ filterIds, isActive }) {
+    return executeBulkOperation(filterIds, async (filterId) => {
+        const filter = await this.filters.findFilter({ filterId });
+        if (!filter)
+            throw new Error('not-found');
+        if (!(await updateFilterService.call(this, filterId, { isActive }))) {
+            throw new Error('update-failed');
+        }
+    });
+}

package/lib/services/index.d.ts

@@ -62,6 +62,11 @@ import { simulateConfigurablePriceRangeService } from './simulateConfigurablePri
 import { createFileDownloadURLService } from './createFileDownloadURL.ts';
 import { resolveTokenStatusService } from './resolveTokenStatus.ts';
 import { isTokenInvalidateableService } from './isTokenInvalidateable.ts';
+import { bulkRemoveProductsService } from './bulkRemoveProducts.ts';
+import { bulkRemoveFiltersService } from './bulkRemoveFilters.ts';
+import { bulkDeleteUsersService } from './bulkDeleteUsers.ts';
+import { bulkSetFilterActiveService } from './bulkSetFilterActive.ts';
+import { bulkAssignProductsToAssortmentService } from './bulkAssignProductsToAssortment.ts';
 export type ServiceInterface = (this: Modules, ...args: any[]) => Promise<any> | any;
 export type Bound<T extends ServiceInterface> = OmitThisParameter<T>;
 export type CustomServices = Record<string, ServiceInterface | Record<string, ServiceInterface>>;
@@ -105,13 +110,18 @@ export default function initServices(modules: Modules, customServices?: CustomSe
         simulateProductDispatching: Bound<typeof simulateProductDispatchingService>;
         simulateProductInventory: Bound<typeof simulateProductInventoryService>;
         removeProduct: Bound<typeof removeProductService>;
+        bulkRemoveProducts: Bound<typeof bulkRemoveProductsService>;
         findProductSiblings: Bound<typeof findProductSiblingsService>;
         simulateConfigurablePriceRange: Bound<typeof simulateConfigurablePriceRangeService>;
     };
+    assortments: {
+        bulkAssignProductsToAssortment: Bound<typeof bulkAssignProductsToAssortmentService>;
+    };
     users: {
         migrateUserData: Bound<typeof migrateUserDataService>;
         updateUserAvatarAfterUpload: Bound<typeof updateUserAvatarAfterUploadService>;
         deleteUser: Bound<typeof deleteUserService>;
+        bulkDeleteUsers: Bound<typeof bulkDeleteUsersService>;
     };
     enrollments: {
         createEnrollmentFromCheckout: Bound<typeof createEnrollmentFromCheckoutService>;
@@ -139,6 +149,8 @@ export default function initServices(modules: Modules, customServices?: CustomSe
         updateFilter: Bound<typeof updateFilterService>;
         createFilterOption: Bound<typeof createFilterOptionService>;
         removeFilterOption: Bound<typeof removeFilterOptionService>;
+        bulkRemoveFilters: Bound<typeof bulkRemoveFiltersService>;
+        bulkSetFilterActive: Bound<typeof bulkSetFilterActiveService>;
     };
     warehousing: {
         ercMetadata: Bound<typeof ercMetadataService>;

package/lib/services/index.js

@@ -61,6 +61,11 @@ import { simulateConfigurablePriceRangeService } from "./simulateConfigurablePri
 import { createFileDownloadURLService } from "./createFileDownloadURL.js";
 import { resolveTokenStatusService } from "./resolveTokenStatus.js";
 import { isTokenInvalidateableService } from "./isTokenInvalidateable.js";
+import { bulkRemoveProductsService } from "./bulkRemoveProducts.js";
+import { bulkRemoveFiltersService } from "./bulkRemoveFilters.js";
+import { bulkDeleteUsersService } from "./bulkDeleteUsers.js";
+import { bulkSetFilterActiveService } from "./bulkSetFilterActive.js";
+import { bulkAssignProductsToAssortmentService } from "./bulkAssignProductsToAssortment.js";
 function bindMethodsToModules(modules) {
     return {
         get(target, prop, receiver) {
@@ -116,13 +121,18 @@ export default function initServices(modules, customServices = {}) {
             simulateProductDispatching: simulateProductDispatchingService,
             simulateProductInventory: simulateProductInventoryService,
             removeProduct: removeProductService,
+            bulkRemoveProducts: bulkRemoveProductsService,
             findProductSiblings: findProductSiblingsService,
             simulateConfigurablePriceRange: simulateConfigurablePriceRangeService,
         },
+        assortments: {
+            bulkAssignProductsToAssortment: bulkAssignProductsToAssortmentService,
+        },
         users: {
             migrateUserData: migrateUserDataService,
             updateUserAvatarAfterUpload: updateUserAvatarAfterUploadService,
             deleteUser: deleteUserService,
+            bulkDeleteUsers: bulkDeleteUsersService,
         },
         enrollments: {
             createEnrollmentFromCheckout: createEnrollmentFromCheckoutService,
@@ -150,6 +160,8 @@ export default function initServices(modules, customServices = {}) {
             updateFilter: updateFilterService,
             createFilterOption: createFilterOptionService,
             removeFilterOption: removeFilterOptionService,
+            bulkRemoveFilters: bulkRemoveFiltersService,
+            bulkSetFilterActive: bulkSetFilterActiveService,
         },
         warehousing: {
             ercMetadata: ercMetadataService,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core",
   "description": "Core orchestration package for the Unchained Engine with business services and directors",
-  "version": "5.0.0-alpha.4",
+  "version": "5.0.0-alpha.5",
   "main": "lib/core-index.js",
   "types": "lib/core-index.d.ts",
   "type": "module",
@@ -35,27 +35,27 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/core-assortments": "^5.0.0-alpha.1",
-    "@unchainedshop/core-bookmarks": "^5.0.0-alpha.1",
-    "@unchainedshop/core-countries": "^5.0.0-alpha.1",
-    "@unchainedshop/core-currencies": "^5.0.0-alpha.1",
-    "@unchainedshop/core-delivery": "^5.0.0-alpha.1",
-    "@unchainedshop/core-enrollments": "^5.0.0-alpha.1",
-    "@unchainedshop/core-events": "^5.0.0-alpha.1",
-    "@unchainedshop/core-files": "^5.0.0-alpha.1",
-    "@unchainedshop/core-filters": "^5.0.0-alpha.1",
-    "@unchainedshop/core-languages": "^5.0.0-alpha.1",
-    "@unchainedshop/core-orders": "^5.0.0-alpha.1",
-    "@unchainedshop/core-payment": "^5.0.0-alpha.1",
-    "@unchainedshop/core-products": "^5.0.0-alpha.1",
-    "@unchainedshop/core-quotations": "^5.0.0-alpha.1",
-    "@unchainedshop/core-users": "^5.0.0-alpha.1",
-    "@unchainedshop/core-warehousing": "^5.0.0-alpha.1",
-    "@unchainedshop/core-worker": "^5.0.0-alpha.1",
-    "@unchainedshop/events": "^5.0.0-alpha.1",
-    "@unchainedshop/logger": "^5.0.0-alpha.1",
-    "@unchainedshop/mongodb": "^5.0.0-alpha.1",
-    "@unchainedshop/utils": "^5.0.0-alpha.1",
+    "@unchainedshop/core-assortments": "^5.0.0-alpha.5",
+    "@unchainedshop/core-bookmarks": "^5.0.0-alpha.5",
+    "@unchainedshop/core-countries": "^5.0.0-alpha.5",
+    "@unchainedshop/core-currencies": "^5.0.0-alpha.5",
+    "@unchainedshop/core-delivery": "^5.0.0-alpha.5",
+    "@unchainedshop/core-enrollments": "^5.0.0-alpha.5",
+    "@unchainedshop/core-events": "^5.0.0-alpha.5",
+    "@unchainedshop/core-files": "^5.0.0-alpha.5",
+    "@unchainedshop/core-filters": "^5.0.0-alpha.5",
+    "@unchainedshop/core-languages": "^5.0.0-alpha.5",
+    "@unchainedshop/core-orders": "^5.0.0-alpha.5",
+    "@unchainedshop/core-payment": "^5.0.0-alpha.5",
+    "@unchainedshop/core-products": "^5.0.0-alpha.5",
+    "@unchainedshop/core-quotations": "^5.0.0-alpha.5",
+    "@unchainedshop/core-users": "^5.0.0-alpha.5",
+    "@unchainedshop/core-warehousing": "^5.0.0-alpha.5",
+    "@unchainedshop/core-worker": "^5.0.0-alpha.5",
+    "@unchainedshop/events": "^5.0.0-alpha.5",
+    "@unchainedshop/logger": "^5.0.0-alpha.5",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.5",
+    "@unchainedshop/utils": "^5.0.0-alpha.5",
     "minipass-json-stream": "^1.0.2",
     "zod": "^4.2.0"
   },