@solidxai/core 0.1.10-beta.25 → 0.1.10-beta.27

package/dist/services/model-metadata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/model-metadata.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/model-metadata.service.ts"],"names":[],"mappings":"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"}

package/dist/services/model-metadata.service.js

@@ -62,7 +62,11 @@ const field_metadata_repository_1 = require("../repository/field-metadata.reposi
 const model_metadata_repository_1 = require("../repository/model-metadata.repository");
 const action_metadata_entity_1 = require("../entities/action-metadata.entity");
 const field_metadata_entity_1 = require("../entities/field-metadata.entity");
+const import_transaction_error_log_entity_1 = require("../entities/import-transaction-error-log.entity");
+const import_transaction_entity_1 = require("../entities/import-transaction.entity");
 const menu_item_metadata_entity_1 = require("../entities/menu-item-metadata.entity");
+const user_view_metadata_entity_1 = require("../entities/user-view-metadata.entity");
+const permission_metadata_entity_1 = require("../entities/permission-metadata.entity");
 const view_metadata_entity_1 = require("../entities/view-metadata.entity");
 const command_service_1 = require("../helpers/command.service");
 const schematic_service_1 = require("../helpers/schematic.service");
@@ -94,26 +98,15 @@ let ModelMetadataService = class ModelMetadataService {
     }
     async findMany(basicFilterDto) {
         const alias = 'modelMetadata';
-        let { limit, offset } = basicFilterDto;
-        var qb = await this.modelMetadataRepo.createSecurityRuleAwareQueryBuilder(alias);
-        qb = await this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
-        const [entities, count] = await qb.getManyAndCount();
-        const currentPage = Math.floor(offset / limit) + 1;
-        const totalPages = Math.ceil(count / limit);
-        const nextPage = currentPage < totalPages ? currentPage + 1 : null;
-        const prevPage = currentPage > 1 ? currentPage - 1 : null;
-        const r = {
-            meta: {
-                totalRecords: count,
-                currentPage: currentPage,
-                nextPage: nextPage,
-                prevPage: prevPage,
-                totalPages: totalPages,
-                perPage: +limit,
-            },
-            records: entities
-        };
-        return r;
+        const { limit, offset } = basicFilterDto;
+        const qb = await this.modelMetadataRepo.createSecurityRuleAwareQueryBuilder(alias);
+        if (basicFilterDto.groupBy?.length) {
+            const groupFilterQb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias, undefined, undefined, undefined, crud_helper_service_1.FilterCombinator.AND, false, false);
+            return this.crudHelperService.executeGroupPipeline(groupFilterQb, basicFilterDto, alias, () => this.modelMetadataRepo.createSecurityRuleAwareQueryBuilder(alias));
+        }
+        const filteredQb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
+        const [entities, count] = await filteredQb.getManyAndCount();
+        return this.crudHelperService.pagedResponse(offset, limit, count, entities);
     }
     async findOne(id, query) {
         const entity = await this.modelMetadataRepo.findOne({
@@ -471,7 +464,7 @@ let ModelMetadataService = class ModelMetadataService {
             where: {
                 id: modelEntityId,
             },
-            relations: ['module']
+            relations: ['module', 'fields']
         });
         if (!modelEntity) {
             this.logger.log(`Invalid modelEntityId: ${modelEntityId} unable to resolve model metadata`);
@@ -511,21 +504,67 @@ let ModelMetadataService = class ModelMetadataService {
                     this.logger.log(`Deleted file: ${fileToDelete}`);
                 }
                 catch (error) {
+                    if (error?.code === 'ENOENT') {
+                        this.logger.warn(`File already absent, skipping delete: ${fileToDelete}`);
+                        continue;
+                    }
                     this.logger.error(`Error deleting file: ${fileToDelete}`, error);
                 }
             }
         }
-        await this.dataSource.query(`CALL cleanup_model_metadata($1, $2)`, [modelEntity.singularName, true]);
+        const { removedActionNames, removedMenuNames, removedViewNames } = await this.cleanupAssociatedViewsActionsAndMenus(modelEntity.id);
+        await this.cleanupAssociatedImports(modelEntity.id);
+        await this.cleanupAssociatedPermissions(modelEntity.singularName);
+        await this.clearModelReferencesBeforeDelete(modelEntity);
         const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(modelEntity.module?.name);
         const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
         if (metaData) {
+            const moduleMetadata = metaData?.moduleMetadata ?? metaData;
+            const removedActionNameSet = new Set(removedActionNames);
+            const removedMenuNameSet = new Set(removedMenuNames);
+            const removedViewNameSet = new Set(removedViewNames);
             const existingModelIndex = metaData.moduleMetadata.models.findIndex((existingModel) => existingModel.singularName === modelEntity.singularName);
             if (existingModelIndex !== -1) {
                 metaData.moduleMetadata.models.splice(existingModelIndex, 1);
             }
-            metaData.moduleMetadata.menus = metaData.moduleMetadata?.menus?.filter((menu) => menu.modelUserKey !== modelEntity.singularName);
-            metaData.moduleMetadata.actions = metaData.moduleMetadata?.actions?.filter((action) => action.modelUserKey !== modelEntity.singularName);
-            metaData.moduleMetadata.views = metaData.moduleMetadata?.views?.filter((view) => view.modelUserKey !== modelEntity.singularName);
+            const existingViews = Array.isArray(moduleMetadata?.views) ? moduleMetadata.views : [];
+            moduleMetadata.views = existingViews.filter((view) => {
+                const shouldRemove = view?.modelUserKey === modelEntity.singularName || removedViewNameSet.has(view?.name);
+                if (shouldRemove && view?.name) {
+                    removedViewNameSet.add(view.name);
+                }
+                return !shouldRemove;
+            });
+            const existingActions = Array.isArray(moduleMetadata?.actions) ? moduleMetadata.actions : [];
+            moduleMetadata.actions = existingActions.filter((action) => {
+                const shouldRemove = action?.modelUserKey === modelEntity.singularName ||
+                    removedActionNameSet.has(action?.name) ||
+                    removedViewNameSet.has(action?.viewUserKey);
+                if (shouldRemove && action?.name) {
+                    removedActionNameSet.add(action.name);
+                }
+                return !shouldRemove;
+            });
+            let pendingMenus = Array.isArray(moduleMetadata?.menus) ? [...moduleMetadata.menus] : [];
+            let menuRemovedOnPass = true;
+            while (menuRemovedOnPass) {
+                menuRemovedOnPass = false;
+                pendingMenus = pendingMenus.filter((menu) => {
+                    const shouldRemove = menu?.modelUserKey === modelEntity.singularName ||
+                        removedMenuNameSet.has(menu?.name) ||
+                        removedActionNameSet.has(menu?.actionUserKey) ||
+                        removedMenuNameSet.has(menu?.parentMenuItemUserKey);
+                    if (shouldRemove) {
+                        if (menu?.name) {
+                            removedMenuNameSet.add(menu.name);
+                        }
+                        menuRemovedOnPass = true;
+                        return false;
+                    }
+                    return true;
+                });
+            }
+            moduleMetadata.menus = pendingMenus;
             const updatedContent = JSON.stringify(metaData, null, 2);
             await fs.writeFile(filePath, updatedContent);
         }
@@ -545,11 +584,192 @@ let ModelMetadataService = class ModelMetadataService {
             }
         }
     }
+    async cleanupAssociatedViewsActionsAndMenus(modelId) {
+        const viewRepo = this.dataSource.getRepository(view_metadata_entity_1.ViewMetadata);
+        const actionRepo = this.dataSource.getRepository(action_metadata_entity_1.ActionMetadata);
+        const menuRepo = this.dataSource.getRepository(menu_item_metadata_entity_1.MenuItemMetadata);
+        const userViewRepo = this.dataSource.getRepository(user_view_metadata_entity_1.UserViewMetadata);
+        const views = await viewRepo.find({
+            where: {
+                model: { id: modelId },
+            },
+        });
+        const viewIds = views.map((view) => view.id);
+        const removedViewNames = views.map((view) => view.name).filter(Boolean);
+        const actions = await actionRepo.find({
+            where: [
+                {
+                    model: { id: modelId },
+                },
+                ...(viewIds.length > 0
+                    ? [
+                        {
+                            view: { id: (0, typeorm_2.In)(viewIds) },
+                        },
+                    ]
+                    : []),
+            ],
+            relations: ['view'],
+        });
+        const uniqueActions = Array.from(new Map(actions.map((action) => [action.id, action])).values());
+        const actionIds = uniqueActions.map((action) => action.id);
+        const removedActionNames = uniqueActions.map((action) => action.name).filter(Boolean);
+        const menus = await this.findMenusForActionIds(actionIds);
+        const removedMenuNames = menus.map((menu) => menu.name).filter(Boolean);
+        if (menus.length > 0) {
+            const menuIds = menus.map((menu) => menu.id).filter(Boolean);
+            for (const menu of menus) {
+                if (menu.roles?.length) {
+                    await this.dataSource
+                        .createQueryBuilder()
+                        .relation(menu_item_metadata_entity_1.MenuItemMetadata, 'roles')
+                        .of(menu.id)
+                        .remove(menu.roles.map((role) => role.id));
+                }
+            }
+            if (menuIds.length > 0) {
+                await menuRepo
+                    .createQueryBuilder()
+                    .update(menu_item_metadata_entity_1.MenuItemMetadata)
+                    .set({ parentMenuItem: null })
+                    .where('id IN (:...menuIds)', { menuIds })
+                    .execute();
+                await menuRepo
+                    .createQueryBuilder()
+                    .delete()
+                    .from(menu_item_metadata_entity_1.MenuItemMetadata)
+                    .where('id IN (:...menuIds)', { menuIds })
+                    .execute();
+            }
+            this.logger.log(`Deleted ${menus.length} menu metadata record(s) for model id ${modelId}`);
+        }
+        if (uniqueActions.length > 0) {
+            await actionRepo.remove(uniqueActions);
+            this.logger.log(`Deleted ${uniqueActions.length} action metadata record(s) for model id ${modelId}`);
+        }
+        if (viewIds.length > 0) {
+            const userViews = await userViewRepo.find({
+                where: {
+                    viewMetadata: { id: (0, typeorm_2.In)(viewIds) },
+                },
+                relations: ['viewMetadata'],
+            });
+            if (userViews.length > 0) {
+                await userViewRepo.remove(userViews);
+                this.logger.log(`Deleted ${userViews.length} user view metadata record(s) for model id ${modelId}`);
+            }
+            await viewRepo.remove(views);
+            this.logger.log(`Deleted ${views.length} view metadata record(s) for model id ${modelId}`);
+        }
+        return {
+            removedActionNames,
+            removedMenuNames,
+            removedViewNames,
+        };
+    }
+    async cleanupAssociatedImports(modelId) {
+        const importTransactionRepo = this.dataSource.getRepository(import_transaction_entity_1.ImportTransaction);
+        const importTransactionErrorLogRepo = this.dataSource.getRepository(import_transaction_error_log_entity_1.ImportTransactionErrorLog);
+        const importTransactions = await importTransactionRepo.find({
+            where: {
+                modelMetadata: { id: modelId },
+            },
+        });
+        if (importTransactions.length === 0) {
+            return;
+        }
+        const importTransactionIds = importTransactions.map((transaction) => transaction.id);
+        const importTransactionErrorLogs = await importTransactionErrorLogRepo.find({
+            where: {
+                importTransaction: { id: (0, typeorm_2.In)(importTransactionIds) },
+            },
+            relations: ['importTransaction'],
+        });
+        if (importTransactionErrorLogs.length > 0) {
+            await importTransactionErrorLogRepo.remove(importTransactionErrorLogs);
+            this.logger.log(`Deleted ${importTransactionErrorLogs.length} import transaction error log record(s) for model id ${modelId}`);
+        }
+        await importTransactionRepo.remove(importTransactions);
+        this.logger.log(`Deleted ${importTransactions.length} import transaction record(s) for model id ${modelId}`);
+    }
+    async cleanupAssociatedPermissions(modelSingularName) {
+        const permissionsRepo = this.dataSource.getRepository(permission_metadata_entity_1.PermissionMetadata);
+        const controllerName = `${(0, string_helper_1.classify)(modelSingularName)}Controller`;
+        const permissions = await permissionsRepo
+            .createQueryBuilder('permission')
+            .leftJoinAndSelect('permission.roles', 'role')
+            .where('permission.name LIKE :pattern', { pattern: `${controllerName}.%` })
+            .getMany();
+        if (permissions.length === 0) {
+            return;
+        }
+        for (const permission of permissions) {
+            if (permission.roles?.length) {
+                await this.dataSource
+                    .createQueryBuilder()
+                    .relation(permission_metadata_entity_1.PermissionMetadata, 'roles')
+                    .of(permission.id)
+                    .remove(permission.roles.map((role) => role.id));
+            }
+        }
+        await permissionsRepo.remove(permissions);
+        this.logger.log(`Deleted ${permissions.length} permission metadata record(s) for model '${modelSingularName}'`);
+    }
+    async clearModelReferencesBeforeDelete(modelEntity) {
+        const modelRepo = this.dataSource.getRepository(model_metadata_entity_1.ModelMetadata);
+        const fieldIds = (modelEntity.fields ?? []).map((field) => field.id).filter(Boolean);
+        if (fieldIds.length > 0) {
+            await modelRepo
+                .createQueryBuilder()
+                .update(model_metadata_entity_1.ModelMetadata)
+                .set({ userKeyField: null })
+                .where('user_key_field_id IN (:...fieldIds)', { fieldIds })
+                .execute();
+        }
+        await modelRepo
+            .createQueryBuilder()
+            .update(model_metadata_entity_1.ModelMetadata)
+            .set({ parentModel: null })
+            .where('parent_model_id = :modelId', { modelId: modelEntity.id })
+            .execute();
+    }
+    async findMenusForActionIds(actionIds) {
+        if (!actionIds?.length) {
+            return [];
+        }
+        const menuRepo = this.dataSource.getRepository(menu_item_metadata_entity_1.MenuItemMetadata);
+        const menusById = new Map();
+        const rootMenus = await menuRepo.find({
+            where: {
+                action: { id: (0, typeorm_2.In)(actionIds) },
+            },
+            relations: ['roles', 'action', 'parentMenuItem'],
+        });
+        rootMenus.forEach((menu) => menusById.set(menu.id, menu));
+        let parentIds = rootMenus.map((menu) => menu.id);
+        while (parentIds.length > 0) {
+            const childMenus = await menuRepo.find({
+                where: {
+                    parentMenuItem: { id: (0, typeorm_2.In)(parentIds) },
+                },
+                relations: ['roles', 'action', 'parentMenuItem'],
+            });
+            const nextParentIds = [];
+            for (const childMenu of childMenus) {
+                if (!menusById.has(childMenu.id)) {
+                    menusById.set(childMenu.id, childMenu);
+                    nextParentIds.push(childMenu.id);
+                }
+            }
+            parentIds = nextParentIds;
+        }
+        return Array.from(menusById.values());
+    }
     async generateCodeViaCtl(modelId) {
         const model = await this.findOne(modelId);
         return this.commandService.executeCommandWithArgs({
             command: 'npx',
-            args: ['@solixai/solidctl@latest', 'generate', 'model', `--name=${model.singularName}`],
+            args: ['@solidxai/solidctl@latest', 'generate', 'model', `--name=${model.singularName}`],
             cwd: path.join(process.cwd(), '..'),
         });
     }
@@ -967,11 +1187,11 @@ let ModelMetadataService = class ModelMetadataService {
         const model = options.modelId ? await this.findOne(options.modelId, query) : await this.findOneByUserKey(options.modelUserKey, query.populate);
         const fieldsForRemoval = model.fields.filter((field) => options.fieldIdsForRemoval.includes(+field.id));
         const removeOutput = await this.executeRemoveFieldsCommand(model, fieldsForRemoval, options.dryRun);
-        fieldsForRemoval.forEach((field) => {
+        for (const field of fieldsForRemoval) {
             if (field.isMarkedForRemoval) {
-                this.fieldMetadataService.delete(field.id);
+                await this.fieldMetadataService.delete(field.id);
             }
-        });
+        }
         const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
         const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
         const existingModelIndex = metaData.moduleMetadata.models.findIndex((existingModel) => existingModel.singularName === model.singularName);