@solidxai/core 0.1.2 → 0.1.5-beta.0

package/src/repository/solid-base.repository.ts

@@ -13,9 +13,11 @@ import {
     FindOptionsWhere,
     QueryRunner,
     Repository,
-    SelectQueryBuilder
+    SelectQueryBuilder,
+    UpdateResult
 } from 'typeorm';
 import { SecurityRuleRepository } from './security-rule.repository';
+import { PickKeysByType } from 'typeorm/common/PickKeysByType';
 
 export class SolidBaseRepository<T extends CommonEntity> extends Repository<T> {
     protected readonly logger: Logger;
@@ -132,4 +134,173 @@ export class SolidBaseRepository<T extends CommonEntity> extends Repository<T> {
 
         return qb.getManyAndCount();
     }
+
+    /**
+ * Security-aware count(): applies security rules before counting.
+ */
+    override async count(options?: FindManyOptions<T>): Promise<number> {
+        const alias = this.modelSingularName();
+        const qb = await this.createSecurityRuleAwareQueryBuilder(alias);
+
+        if (options) {
+            qb.setFindOptions(options);
+        }
+
+        return qb.getCount();
+    }
+
+    /**
+     * Security-aware countBy(): convenience wrapper routed through count().
+     */
+    override async countBy(where: FindOptionsWhere<T> | FindOptionsWhere<T>[]): Promise<number> {
+        return this.count({ where });
+    }
+
+    /**
+ * Security-aware average(): applies security rules before computing the average.
+ */
+    override async average(columnName: PickKeysByType<T, number>, where?: FindOptionsWhere<T> | FindOptionsWhere<T>[]): Promise<number | null> {
+        const alias = this.modelSingularName();
+        const qb = await this.createSecurityRuleAwareQueryBuilder(alias);
+
+        if (where) {
+            qb.setFindOptions({ where });
+        }
+
+        const result = await qb
+            .select(`AVG(CAST(${alias}.${String(columnName)} AS FLOAT))`, 'avg')
+            .getRawOne<{ avg: string | number | null }>();
+
+        if (result?.avg === null || result?.avg === undefined) {
+            return null;
+        }
+
+        return typeof result.avg === 'number'
+            ? result.avg
+            : parseFloat(result.avg);
+    }
+
+    /**
+ * Security-aware sum(): applies security rules before computing the sum.
+ */
+    override async sum(columnName: PickKeysByType<T, number>, where?: FindOptionsWhere<T> | FindOptionsWhere<T>[]): Promise<number | null> {
+        const alias = this.modelSingularName();
+        const qb = await this.createSecurityRuleAwareQueryBuilder(alias);
+
+        if (where) {
+            qb.setFindOptions({ where });
+        }
+
+        const result = await qb
+            .select(`SUM(CAST(${alias}.${String(columnName)} AS FLOAT))`, 'sum')
+            .getRawOne<{ sum: string | number | null }>();
+
+        if (result?.sum === null || result?.sum === undefined) {
+            return null;
+        }
+
+        return typeof result.sum === 'number'
+            ? result.sum
+            : parseFloat(result.sum);
+    }
+
+    /**
+     * Security-aware minimum(): applies security rules before computing the minimum.
+     */
+    override async minimum(columnName: PickKeysByType<T, number>, where?: FindOptionsWhere<T> | FindOptionsWhere<T>[]): Promise<number | null> {
+        const alias = this.modelSingularName();
+        const qb = await this.createSecurityRuleAwareQueryBuilder(alias);
+
+        if (where) {
+            qb.setFindOptions({ where });
+        }
+
+        const result = await qb
+            .select(`MIN(CAST(${alias}.${String(columnName)} AS FLOAT))`, 'min')
+            .getRawOne<{ min: string | number | null }>();
+
+        if (result?.min === null || result?.min === undefined) {
+            return null;
+        }
+
+        return typeof result.min === 'number'
+            ? result.min
+            : parseFloat(result.min);
+    }
+
+    /**
+     * Security-aware maximum(): applies security rules before computing the maximum.
+     */
+    override async maximum(columnName: PickKeysByType<T, number>, where?: FindOptionsWhere<T> | FindOptionsWhere<T>[]): Promise<number | null> {
+        const alias = this.modelSingularName();
+        const qb = await this.createSecurityRuleAwareQueryBuilder(alias);
+
+        if (where) {
+            qb.setFindOptions({ where });
+        }
+
+        const result = await qb
+            .select(`MAX(CAST(${alias}.${String(columnName)} AS FLOAT))`, 'max')
+            .getRawOne<{ max: string | number | null }>();
+
+        if (result?.max === null || result?.max === undefined) {
+            return null;
+        }
+
+        return typeof result.max === 'number'
+            ? result.max
+            : parseFloat(result.max);
+    }
+
+    /**
+     * Security-aware increment(): increments a column by a given value for all matching rows.
+     * Security rules are applied to determine which rows the user is allowed to modify.
+     */
+    override async increment(where: FindOptionsWhere<T>, propertyPath: string, value: string | number,): Promise<UpdateResult> {
+        const alias = this.modelSingularName();
+        const qb = await this.createSecurityRuleAwareQueryBuilder(alias);
+
+        qb.setFindOptions({ where });
+
+        const rows = await qb.select(`${alias}.id`).getMany();
+        const ids = rows.map((r) => (r as any).id);
+
+        if (ids.length === 0) {
+            return { raw: [], affected: 0, generatedMaps: [] };
+        }
+
+        return this.manager
+            .createQueryBuilder()
+            .update(this.metadata.target)
+            .set({ [propertyPath]: () => `${propertyPath} + :value` } as any)
+            .whereInIds(ids)
+            .setParameter('value', value)
+            .execute();
+    }
+
+    /**
+     * Security-aware decrement(): decrements a column by a given value for all matching rows.
+     * Security rules are applied to determine which rows the user is allowed to modify.
+     */
+    override async decrement(where: FindOptionsWhere<T>, propertyPath: string, value: string | number,): Promise<UpdateResult> {
+        const alias = this.modelSingularName();
+        const qb = await this.createSecurityRuleAwareQueryBuilder(alias);
+
+        qb.setFindOptions({ where });
+
+        const rows = await qb.select(`${alias}.id`).getMany();
+        const ids = rows.map((r) => (r as any).id);
+
+        if (ids.length === 0) {
+            return { raw: [], affected: 0, generatedMaps: [] };
+        }
+
+        return this.manager
+            .createQueryBuilder()
+            .update(this.metadata.target)
+            .set({ [propertyPath]: () => `${propertyPath} - :value` } as any)
+            .whereInIds(ids)
+            .setParameter('value', value)
+            .execute();
+    }
 }

package/src/seeders/module-metadata-seeder.service.ts

@@ -31,8 +31,8 @@ import { ViewMetadataService } from '../services/view-metadata.service';
 import solidCoreMetadata from './seed-data/solid-core-metadata.json';
 import { SystemFieldsSeederService } from './system-fields-seeder.service';
 // import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
-import { ActionMetadata, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata, SignUpDto } from 'src';
-import { ADMIN_ROLE_NAME } from 'src/dtos/create-role-metadata.dto';
+import { ActionMetadata, DEFAULT_SA_PASSWORD, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata, SignUpDto } from 'src';
+import { ADMIN_ROLE_NAME, CreateRoleMetadataDto } from 'src/dtos/create-role-metadata.dto';
 import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
 import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
@@ -90,134 +90,152 @@ export class ModuleMetadataSeederService {
     ) { }
 
     async seed(conf?: any) {
-        this.enablePruning = Boolean(conf?.pruneMetadata);
-        console.log(this.enablePruning ? '▶ Pruning enabled: metadata not present in JSON will be removed.' : '▶ Pruning disabled: existing metadata will be kept.');
-
-        // Global seeding steps i.e across all modules
-        await this.seedGlobalMetadata();
-
-        // Module specific seeding steps.
-        // Get all the module metadata files which needs to be seeded.
-        const seedDataFiles = this.seedDataFiles;
-        this.logger.debug(`Found seed data for modules: ${seedDataFiles.map(s => s.moduleMetadata?.name)}`);
-
-        /** 
-         * -------------------------------------------------------------
-         * Selective module seeding via: solid seed --modules-to-seed onboarding,reports 
-         * -------------------------------------------------------------
-         */
+        let currentModule = 'global';
+        let currentStep = 'bootstrap';
         let modulesToSeed: string[] | null = null;
 
-        if (conf && Array.isArray(conf.modulesToSeed)) {
-            modulesToSeed = conf.modulesToSeed;
-            console.log(`▶ Selective seeding enabled. Modules to seed: ${modulesToSeed.join(', ')}`);
-            this.logger.log(`Selective seeding enabled. Modules to seed: ${modulesToSeed.join(', ')}`);
-        } else {
-            console.log(`▶ No modulesToSeed provided. Seeding ALL modules.`);
-            this.logger.log(`No modulesToSeed provided. Seeding ALL modules.`);
-        }
+        try {
+            this.enablePruning = Boolean(conf?.pruneMetadata);
+            console.log(this.enablePruning ? '▶ Pruning enabled: metadata not present in JSON will be removed.' : '▶ Pruning disabled: existing metadata will be kept.');
+
+            // Global seeding steps i.e across all modules
+            currentStep = 'seedGlobalMetadata';
+            await this.seedGlobalMetadata();
+
+            // Module specific seeding steps.
+            // Get all the module metadata files which needs to be seeded.
+            const seedDataFiles = this.seedDataFiles;
+            this.logger.debug(`Found seed data for modules: ${seedDataFiles.map(s => s.moduleMetadata?.name)}`);
+
+            /** 
+             * -------------------------------------------------------------
+             * Selective module seeding via: solid seed --modules-to-seed onboarding,reports 
+             * -------------------------------------------------------------
+             */
+            currentStep = 'resolveModulesToSeed';
+            if (conf && Array.isArray(conf.modulesToSeed)) {
+                modulesToSeed = conf.modulesToSeed;
+                console.log(`▶ Selective seeding enabled. Modules to seed: ${modulesToSeed.join(', ')}`);
+                this.logger.log(`Selective seeding enabled. Modules to seed: ${modulesToSeed.join(', ')}`);
+            } else {
+                console.log(`▶ No modulesToSeed provided. Seeding ALL modules.`);
+                this.logger.log(`No modulesToSeed provided. Seeding ALL modules.`);
+            }
 
-        // Filter modules if needed
-        const filteredSeedDataFiles = modulesToSeed ? seedDataFiles.filter((file) => modulesToSeed.includes(file.moduleMetadata?.name)) : seedDataFiles;
+            // Filter modules if needed
+            const filteredSeedDataFiles = modulesToSeed ? seedDataFiles.filter((file) => modulesToSeed.includes(file.moduleMetadata?.name)) : seedDataFiles;
 
-        if (filteredSeedDataFiles.length === 0) {
-            this.logger.warn(`No modules matched the provided modulesToSeed list.`);
-            return;
-        }
+            if (filteredSeedDataFiles.length === 0) {
+                this.logger.warn(`No modules matched the provided modulesToSeed list.`);
+                return;
+            }
+
+            // let usersDetail;
+            // For each module metadata file, we will process the seeding steps one by one.
+            for (let i = 0; i < filteredSeedDataFiles.length; i++) {
+                const overallMetadata = filteredSeedDataFiles[i];
+                const moduleMetadata: CreateModuleMetadataDto = overallMetadata.moduleMetadata;
+                currentModule = moduleMetadata?.name ?? 'unknown';
+
+                console.log(`▶ Seeding Metadata for Module: ${moduleMetadata.name}`);
+                this.logger.log(`Seeding Metadata for Module: ${moduleMetadata.name}`);
+
+                // Process module metadata first.
+                currentStep = 'seedModuleModelFields';
+                this.logger.log(`Seeding Module / Model / Fields`);
+                const moduleModelFieldCounts = await this.seedModuleModelFields(moduleMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Module/Model/Fields', moduleModelFieldCounts)}`);
+
+                currentStep = 'seedMediaStorageProviders';
+                this.logger.log(`Seeding Media Storage Providers`);
+                const mediaStorageCounts = await this.seedMediaStorageProviders(overallMetadata.mediaStorageProviders);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Media Storage Providers', mediaStorageCounts)}`);
+
+                currentStep = 'seedRoles';
+                this.logger.log(`Seeding Roles`);
+                const roleCounts = await this.seedRoles(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Roles', roleCounts)}`);
+
+                currentStep = 'seedUsers';
+                this.logger.log(`Seeding Users`);
+                const userCounts = await this.seedUsers(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Users', userCounts)}`);
+
+                currentStep = 'seedViews';
+                this.logger.log(`Seeding Views`);
+                const viewCounts = await this.seedViews(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Views', viewCounts)}`);
+
+                currentStep = 'seedActions';
+                this.logger.log(`Seeding Actions`);
+                const actionCounts = await this.seedActions(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Actions', actionCounts)}`);
+
+                currentStep = 'seedMenus';
+                this.logger.log(`Seeding Menus`);
+                const menuCounts = await this.seedMenus(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Menus', menuCounts)}`);
+
+                currentStep = 'seedEmailTemplates';
+                this.logger.log(`Seeding Email Templates`);
+                const emailTemplateCounts = await this.seedEmailTemplates(overallMetadata, moduleMetadata.name);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Email Templates', emailTemplateCounts)}`);
+
+                currentStep = 'seedSmsTemplates';
+                this.logger.log(`Seeding Sms Templates`);
+                const smsTemplateCounts = await this.seedSmsTemplates(overallMetadata, moduleMetadata.name);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Sms Templates', smsTemplateCounts)}`);
+
+                currentStep = 'seedSecurityRules';
+                this.logger.log(`Seeding Security Rules`);
+                const securityRuleCounts = await this.seedSecurityRules(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Security Rules', securityRuleCounts)}`);
+
+                currentStep = 'seedListOfValues';
+                this.logger.log(`Seeding List Of Values`);
+                const lovCounts = await this.seedListOfValues(moduleMetadata, overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'List Of Values', lovCounts)}`);
+
+                currentStep = 'seedDashboards';
+                this.logger.log(`Seeding Dashboards`);
+                const dashboardCounts = await this.seedDashboards(moduleMetadata, overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Dashboards', dashboardCounts)}`);
+
+                currentStep = 'seedScheduledJobs';
+                this.logger.log(`Seeding Scheduled Jobs`);
+                const scheduledJobCounts = await this.seedScheduledJobs(moduleMetadata, overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Scheduled Jobs', scheduledJobCounts)}`);
+
+                currentStep = 'seedSavedFilters';
+                this.logger.log(`Seeding Saved Filters`);
+                const savedFilterCounts = await this.seedSavedFilters(moduleMetadata, overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Saved Filters', savedFilterCounts)}`);
+
+                currentStep = 'seedModelSequences';
+                this.logger.log(`Seeding Model Sequences`);
+                const modelSequenceCounts = await this.seedModelSequences(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Model Sequences', modelSequenceCounts)}`);
+            }
 
-        // let usersDetail;
-        // For each module metadata file, we will process the seeding steps one by one.
-        for (let i = 0; i < filteredSeedDataFiles.length; i++) {
-            const overallMetadata = filteredSeedDataFiles[i];
-            const moduleMetadata: CreateModuleMetadataDto = overallMetadata.moduleMetadata;
-            console.log(`▶ Seeding Metadata for Module: ${moduleMetadata.name}`);
-            this.logger.log(`Seeding Metadata for Module: ${moduleMetadata.name}`);
-
-            // Process module metadata first. 
-            this.logger.log(`Seeding Module / Model / Fields`);
-            const moduleModelFieldCounts = await this.seedModuleModelFields(moduleMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Module/Model/Fields', moduleModelFieldCounts)}`);
-
-            // Media Storage provider templates
-            this.logger.log(`Seeding Media Storage Providers`);
-            const mediaStorageCounts = await this.seedMediaStorageProviders(overallMetadata.mediaStorageProviders);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Media Storage Providers', mediaStorageCounts)}`);
-
-            // Custom role handling
-            this.logger.log(`Seeding Roles`);
-            const roleCounts = await this.seedRoles(overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Roles', roleCounts)}`);
-
-            // Custom user handling
-            this.logger.log(`Seeding Users`);
-            const userCounts = await this.seedUsers(overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Users', userCounts)}`);
-
-            // Application Module View handling 
-            this.logger.log(`Seeding Views`);
-            const viewCounts = await this.seedViews(overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Views', viewCounts)}`);
-
-            // Application Module Action handling
-            this.logger.log(`Seeding Actions`);
-            const actionCounts = await this.seedActions(overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Actions', actionCounts)}`);
-
-            // Application Module Menu handling 
-            this.logger.log(`Seeding Menus`);
-            const menuCounts = await this.seedMenus(overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Menus', menuCounts)}`);
-
-            // Email templates 
-            this.logger.log(`Seeding Email Templates`);
-            const emailTemplateCounts = await this.seedEmailTemplates(overallMetadata, moduleMetadata.name);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Email Templates', emailTemplateCounts)}`);
-
-            // Sms templates
-            this.logger.log(`Seeding Sms Templates`);
-            const smsTemplateCounts = await this.seedSmsTemplates(overallMetadata, moduleMetadata.name);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Sms Templates', smsTemplateCounts)}`);
-
-            // Security rules
-            this.logger.log(`Seeding Security Rules`);
-            const securityRuleCounts = await this.seedSecurityRules(overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Security Rules', securityRuleCounts)}`);
-
-            // List Of Values
-            this.logger.log(`Seeding List Of Values`);
-            const lovCounts = await this.seedListOfValues(moduleMetadata, overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'List Of Values', lovCounts)}`);
-
-            // Dashboards
-            this.logger.log(`Seeding Dashboards`);
-            const dashboardCounts = await this.seedDashboards(moduleMetadata, overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Dashboards', dashboardCounts)}`);
-
-            // Scheduled Jobs
-            this.logger.log(`Seeding Scheduled Jobs`);
-            const scheduledJobCounts = await this.seedScheduledJobs(moduleMetadata, overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Scheduled Jobs', scheduledJobCounts)}`);
-
-            // Saved Filters
-            this.logger.log(`Seeding Saved Filters`);
-            const savedFilterCounts = await this.seedSavedFilters(moduleMetadata, overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Saved Filters', savedFilterCounts)}`);
-
-            // Model Sequences
-            this.logger.log(`Seeding Model Sequences`);
-            const modelSequenceCounts = await this.seedModelSequences(overallMetadata);
-            console.log(`${this.formatSeedResult(moduleMetadata.name, 'Model Sequences', modelSequenceCounts)}`);
-        }
-
-        // Setup default roles with permissions.
-        await this.setupDefaultRolesWithPermissions();
-
-        // Add a console log indicating seeding is finished. This needs to be console.log so that it looks proper when this code is run via CLI.
-        console.log(`✔ Seeding completed.`);
-        //this.logger.log(`All Seeders finished`);
-
-        //FIXME: Handle displaying the created users credentials in a better way.
-        // this.logger.log(`Newly created username is: ${usersDetail?.length > 0 ? usersDetail[0]?.username : ''} and password is ${usersDetail?.length > 0 ? usersDetail[0]?.password : ''}`);
+            currentModule = 'global';
+            currentStep = 'setupDefaultRolesWithPermissions';
+            await this.setupDefaultRolesWithPermissions();
+
+            // Add a console log indicating seeding is finished. This needs to be console.log so that it looks proper when this code is run via CLI.
+            console.log(`✔ Seeding completed.`);
+            //this.logger.log(`All Seeders finished`);
+
+            //FIXME: Handle displaying the created users credentials in a better way.
+            // this.logger.log(`Newly created username is: ${usersDetail?.length > 0 ? usersDetail[0]?.username : ''} and password is ${usersDetail?.length > 0 ? usersDetail[0]?.password : ''}`);
+        } catch (error) {
+            this.logSeedFailureForCli(error, {
+                moduleName: currentModule,
+                step: currentStep,
+                pruneEnabled: this.enablePruning,
+                modulesToSeed,
+            });
+            throw error;
+        }
     }
 
     private async seedScheduledJobs(moduleMetadata: CreateModuleMetadataDto, overallMetadata: any): Promise<{ pruned: number; upserted: number }> {
@@ -403,7 +421,6 @@ export class ModuleMetadataSeederService {
         await this.systemFieldsSeederService.seed();
     }
 
-
     // OK
     private async seedPermissions() {
 
@@ -768,7 +785,7 @@ export class ModuleMetadataSeederService {
     }
 
     // OK
-    private async handleSeedUsers(users) {
+    private async handleSeedUsers(users: SignUpDto[]) {
         if (!users) {
             return;
         }
@@ -777,33 +794,12 @@ export class ModuleMetadataSeederService {
             const user: SignUpDto = users[l];
             let exisitingUser = await this.userService.findOneByUsername(user.username);
             if (!exisitingUser) {
-                let generatedAdminPassword: string | null = null;
                 if (user.username === 'sa') {
-                    generatedAdminPassword = uuidv4();
-                    user.password = generatedAdminPassword;
+                    user.password = DEFAULT_SA_PASSWORD;
                 }
 
                 exisitingUser = await this.authenticationService.signUp(user);
                 this.logger.log(`Newly created user ${user.username}`);
-
-                // Surface the generated SA password clearly to the operator.
-                if (generatedAdminPassword) {
-                    const banner = [
-                        '',
-                        '============================================================',
-                        '  SYSTEM ADMIN USER CREATED',
-                        '------------------------------------------------------------',
-                        '  Username : sa',
-                        `  Password : ${generatedAdminPassword}`,
-                        '',
-                        '  Copy and store this password securely now.',
-                        '  It is shown only once during seeding.',
-                        '============================================================',
-                        ''
-                    ].join('\n');
-                    // Use console.log to ensure visibility even if logger formatting changes.
-                    console.log(banner);
-                }
             }
             //FIXME: Create the user roles assignment logic here.
             // now add Roles to user.
@@ -879,7 +875,6 @@ export class ModuleMetadataSeederService {
         return { pruned, upserted };
     }
 
-
     private async handleSeedSecurityRules(rulesDto: CreateSecurityRuleDto[]) {
         if (!rulesDto || rulesDto.length === 0) {
             this.logger.debug(`No security rules found to seed`);
@@ -929,10 +924,30 @@ export class ModuleMetadataSeederService {
             return;
         }
         for (const dto of createSavedFilterDto) {
+            this.validateSavedFilterQueryJsonWrapper(dto);
             await this.savedFiltersRepo.upsertWithDto({ ...dto, filterQueryJson: JSON.stringify(dto.filterQueryJson) });
         }
     }
 
+    private validateSavedFilterQueryJsonWrapper(dto: CreateSavedFiltersDto): void {
+        const filterName = dto?.name ?? '<unnamed>';
+        const filterQueryJson = dto?.filterQueryJson;
+        const baseErrorMessage =
+            `Invalid saved filter "${filterName}": filterQueryJson must be wrapped with a top-level "$or" or "$and". ` +
+            `Example: {"$or":[{"employeeStatus":{"$eq":"Active"}}]}`;
+
+        if (!filterQueryJson || typeof filterQueryJson !== 'object' || Array.isArray(filterQueryJson)) {
+            throw new Error(baseErrorMessage);
+        }
+
+        const topLevelKeys = Object.keys(filterQueryJson);
+        const hasLogicalWrapper = topLevelKeys.includes('$or') || topLevelKeys.includes('$and');
+        if (!hasLogicalWrapper) {
+            const receivedKeys = topLevelKeys.length > 0 ? topLevelKeys.join(', ') : '(none)';
+            throw new Error(`${baseErrorMessage}. Received top-level keys: ${receivedKeys}`);
+        }
+    }
+
     private async handleSeedModelSequences(modelSequencesDto: CreateModelSequenceDto[]) {
         if (!modelSequencesDto || modelSequencesDto.length === 0) {
             this.logger.debug(`No Model Sequences found to seed`);
@@ -1515,6 +1530,32 @@ export class ModuleMetadataSeederService {
     //     return answer.trim().toLowerCase().startsWith('y');
     // }
 
+    private logSeedFailureForCli(
+        error: unknown,
+        context: { moduleName: string; step: string; pruneEnabled: boolean; modulesToSeed: string[] | null }
+    ): void {
+        const err = error instanceof Error ? error : new Error(String(error));
+        const stackLines = (err.stack ?? '')
+            .split('\n')
+            .slice(0, 8)
+            .map((line) => line.trim())
+            .filter(Boolean);
+        const logPayload = {
+            module: context.moduleName,
+            step: context.step,
+            pruneEnabled: context.pruneEnabled,
+            modulesToSeed: context.modulesToSeed?.length ? context.modulesToSeed : 'ALL',
+            error: {
+                name: err.name,
+                message: err.message,
+                stackPreview: stackLines.length > 0 ? stackLines : undefined,
+            },
+        };
+
+        console.log('✖ Seeding failed');
+        console.log(JSON.stringify(logPayload, null, 2));
+    }
+
     private formatSeedResult(moduleName: string, label: string, counts: { pruned: number; upserted: number }): string {
         if (this.enablePruning) {
             return `✔ [${moduleName}] ${label} seeded (pruned ${counts.pruned}, upserted ${counts.upserted})`;

package/src/seeders/module-test-data.service.ts

@@ -185,8 +185,10 @@ export class ModuleTestDataService {
       throw new Error('Module metadata missing from test data payload.');
     }
 
-    const testData: Array<{ modelUserKey: string; data: Record<string, any> }> = overallMetadata.testData ?? [];
-    if (testData.length === 0) {
+    // console.log(JSON.stringify(moduleMetadata, null, 2));    
+
+    const testingData: Array<{ modelUserKey: string; data: Record<string, any> }> = overallMetadata?.testing?.data ?? [];
+    if (testingData.length === 0) {
       this.logger.debug(`No test data found for ${moduleMetadata.name}`);
       return;
     }
@@ -195,7 +197,7 @@ export class ModuleTestDataService {
       (moduleMetadata.models ?? []).map((m) => [m.singularName, m]),
     );
 
-    for (const entry of testData) {
+    for (const entry of testingData) {
       const modelUserKey = entry.modelUserKey;
       const modelDef = modelsByName.get(modelUserKey);
       if (!modelDef) {

package/src/seeders/permission-metadata-seeder.service.ts

@@ -1,10 +1,7 @@
 import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
 import { SolidRegistry } from 'src/helpers/solid-registry';
-import { PermissionMetadata } from '../entities/permission-metadata.entity';
-import { RoleMetadataService } from '../services/role-metadata.service';
 import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
+import { RoleMetadataService } from '../services/role-metadata.service';
 
 @Injectable()
 export class PermissionMetadataSeederService {