@acorex/platform 21.0.0-next.2 → 21.0.0-next.3

package/fesm2022/acorex-platform-domain.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, makeEnvironmentProviders, inject, NgModule, Injectable } from '@angular/core';
-import { AXMEntityCrudServiceImpl } from '@acorex/platform/layout/entity';
+import { AXPEntityService } from '@acorex/platform/layout/entity';
 import { AXPCommandRegistry, AXPQueryRegistry, AXPRuntimeModule } from '@acorex/platform/runtime';
 
 const AXP_ENTITY_CRUD_SETUP = new InjectionToken('AXP_ENTITY_CRUD_SETUP');
@@ -12,14 +12,18 @@ function provideEntity(entityKeys) {
             useFactory: () => {
                 const commandRegistry = inject(AXPCommandRegistry);
                 const queryRegistry = inject(AXPQueryRegistry);
+                const entityService = inject(AXPEntityService);
                 for (const entityKey of entityKeys) {
-                    const service = new AXMEntityCrudServiceImpl(entityKey);
+                    const dataAccessor = entityService.withEntity(entityKey).data();
                     // Register Commands
                     commandRegistry.register(`${entityKey}:Create`, async () => ({
                         execute: async (input) => {
                             try {
-                                const id = await service.insertOne(input);
-                                const entity = await service.getOne(id);
+                                const id = await dataAccessor.create(input);
+                                const entity = await dataAccessor.byKey(id);
+                                if (!entity) {
+                                    throw new Error('Entity not found after creation');
+                                }
                                 return {
                                     success: true,
                                     data: entity,
@@ -38,7 +42,7 @@ function provideEntity(entityKeys) {
                     commandRegistry.register(`${entityKey}:Update`, async () => ({
                         execute: async ({ id, ...rest }) => {
                             try {
-                                const updated = await service.updateOne(id, rest);
+                                const updated = await dataAccessor.update(id, rest);
                                 return {
                                     success: true,
                                     data: updated,
@@ -57,7 +61,7 @@ function provideEntity(entityKeys) {
                     commandRegistry.register(`${entityKey}:Delete`, async () => ({
                         execute: async (id) => {
                             try {
-                                await service.deleteOne(id);
+                                await dataAccessor.delete(id);
                                 return {
                                     success: true,
                                 };
@@ -74,19 +78,58 @@ function provideEntity(entityKeys) {
                     }));
                     // Register Queries
                     queryRegistry.register(`${entityKey}:GetById`, async () => ({
-                        fetch: (id) => service.getOne(id)
+                        fetch: (id) => dataAccessor.byKey(id)
                     }));
                     queryRegistry.register(`${entityKey}:GetList`, async () => ({
-                        fetch: (request) => service.query(request)
+                        fetch: (request) => dataAccessor.query(request)
                     }));
+                    // Implement getRoots, getChildren, and getByCategory using query with appropriate filters
                     queryRegistry.register(`${entityKey}:GetRoots`, async () => ({
-                        fetch: (request) => service.getRoots(request)
+                        fetch: async (request) => {
+                            return await dataAccessor.query({
+                                skip: 0,
+                                take: 1000,
+                                filter: {
+                                    field: 'parentId',
+                                    operator: {
+                                        type: 'isEmpty',
+                                    },
+                                    value: true,
+                                },
+                            });
+                        }
                     }));
                     queryRegistry.register(`${entityKey}:GetChildren`, async () => ({
-                        fetch: (request) => service.getChildren(request)
+                        fetch: async (request) => {
+                            const parentKey = request.parentKey ?? 'parentId';
+                            return await dataAccessor.query({
+                                skip: 0,
+                                take: 1000,
+                                filter: {
+                                    field: parentKey,
+                                    operator: {
+                                        type: 'equal',
+                                    },
+                                    value: request.parentId,
+                                },
+                            });
+                        }
                     }));
                     queryRegistry.register(`${entityKey}:GetByCategory`, async () => ({
-                        fetch: (request) => service.getByCategory(request)
+                        fetch: async (request) => {
+                            const categoryKey = request.categoryKey ?? 'categoryIds';
+                            return await dataAccessor.query({
+                                skip: 0,
+                                take: 1000,
+                                filter: {
+                                    field: categoryKey,
+                                    operator: {
+                                        type: 'contains',
+                                    },
+                                    value: request.categoryId,
+                                },
+                            });
+                        }
                     }));
                 }
                 return true;