@solidstarters/solid-core 1.2.200 → 1.2.201

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

@@ -1,18 +1,13 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
+import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import * as fs from 'fs';
 import * as path from 'path';
 
-import { ConfigType } from '@nestjs/config';
-import { InjectRepository } from '@nestjs/typeorm';
-import commonConfig from 'src/config/common.config';
-import { iamConfig } from 'src/config/iam.config';
 import { CreateDashboardDto } from 'src/dtos/create-dashboard.dto';
 import { CreateEmailTemplateDto } from 'src/dtos/create-email-template.dto';
 import { CreateListOfValuesDto } from 'src/dtos/create-list-of-values.dto';
 import { CreateSecurityRuleDto } from 'src/dtos/create-security-rule.dto';
 import { CreateSettingDto } from 'src/dtos/create-setting.dto';
 import { CreateSmsTemplateDto } from 'src/dtos/create-sms-template.dto';
-import { Setting } from 'src/entities/setting.entity';
 import { DashboardRepository } from 'src/repository/dashboard.repository';
 import { SecurityRuleRepository } from 'src/repository/security-rule.repository';
 import { AuthenticationService } from 'src/services/authentication.service';
@@ -25,14 +20,12 @@ import { DataSource, In, Repository } from 'typeorm';
 import appBuilderConfig from '../config/app-builder.config';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { CreateModuleMetadataDto } from '../dtos/create-module-metadata.dto';
-import { PermissionMetadata } from '../entities/permission-metadata.entity';
-import { getDynamicModuleNames } from '../helpers/module.helper';
+import { getDynamicModuleNames, getDynamicModuleNamesBasedOnMetadata } from '../helpers/module.helper';
 import { SolidRegistry } from '../helpers/solid-registry';
 import { ActionMetadataService } from '../services/action-metadata.service';
 import { FieldMetadataService } from '../services/field-metadata.service';
 import { MediaStorageProviderMetadataSeederService } from '../services/media-storage-provider-metadata-seeder.service';
 import { MediaStorageProviderMetadataService } from '../services/media-storage-provider-metadata.service';
-import { MenuItemMetadataService } from '../services/menu-item-metadata.service';
 import { ModelMetadataService } from '../services/model-metadata.service';
 import { ModuleMetadataService } from '../services/module-metadata.service';
 import { RoleMetadataService } from '../services/role-metadata.service';
@@ -42,12 +35,14 @@ 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 } from 'src';
 import { ADMIN_ROLE_NAME, INTERNAL_ROLE_NAME, INTERNAL_ROLE_PERMISSIONS, PUBLIC_ROLE_NAME } 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 { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
-import { SettingRepository } from 'src/repository/setting.repository';
-import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
+import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
+import { SettingRepository } from 'src/repository/setting.repository';
+import { CreateModelSequenceDto } from 'src/dtos/create-model-sequence.dto';
+import { ModelSequenceRepository } from 'src/repository/model-sequence.repository';
 
 
 @Injectable()
@@ -57,6 +52,7 @@ export class ModuleMetadataSeederService {
 
     constructor(
         private readonly moduleMetadataService: ModuleMetadataService,
+        @Inject(forwardRef(() => ModelMetadataService))
         private readonly modelMetadataService: ModelMetadataService,
         private readonly fieldMetadataService: FieldMetadataService,
         private readonly mediaStorageProviderMetadataService: MediaStorageProviderMetadataService,
@@ -64,7 +60,6 @@ export class ModuleMetadataSeederService {
         private readonly userService: UserService,
         private readonly authenticationService: AuthenticationService,
         private readonly solidActionService: ActionMetadataService,
-        private readonly solidMenuItemService: MenuItemMetadataService,
         private readonly solidViewService: ViewMetadataService,
         private readonly mediaStorageProviderSeederService: MediaStorageProviderMetadataSeederService,
         private readonly emailTemplateService: EmailTemplateService,
@@ -74,11 +69,6 @@ export class ModuleMetadataSeederService {
         // private readonly permissionRepo: Repository<PermissionMetadata>,
         private readonly permissionRepo: PermissionMetadataRepository,
         private readonly solidRegistry: SolidRegistry,
-        @Inject(appBuilderConfig.KEY)
-        private readonly appBuilderConfiguration: ConfigType<typeof appBuilderConfig>,
-        @Inject(iamConfig.KEY) private readonly iamConfiguration: ConfigType<typeof iamConfig>,
-        @Inject(commonConfig.KEY)
-        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
         private readonly settingService: SettingService,
         // @InjectRepository(Setting, 'default')
         // readonly settingsRepo: Repository<Setting>,
@@ -89,12 +79,14 @@ export class ModuleMetadataSeederService {
         readonly scheduledJobRepository: ScheduledJobRepository,
         readonly savedFiltersRepo: SavedFiltersRepository,
         readonly dataSource: DataSource,
+        readonly modelSequenceRepo: ModelSequenceRepository,
     ) { }
 
     async seed(conf?: any) {
         // 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;
@@ -193,6 +185,10 @@ export class ModuleMetadataSeederService {
             this.logger.log(`Seeding Saved Filters`);
             await this.seedSavedFilters(moduleMetadata, overallMetadata);
 
+            // Model Sequences
+            this.logger.log(`Seeding Model Sequences`);
+            await this.seedModelSequences(overallMetadata);
+
             this.logger.debug(`[End] module seed data: ${overallMetadata}`);
         }
 
@@ -328,7 +324,8 @@ export class ModuleMetadataSeederService {
     private get seedDataFiles(): any[] {
         const typedSolidCoreMetadata = structuredClone(solidCoreMetadata);
         const seedDataFiles = [typedSolidCoreMetadata];
-        const enabledModules = getDynamicModuleNames();
+        // const enabledModules = getDynamicModuleNames();
+        const enabledModules = getDynamicModuleNamesBasedOnMetadata();
         for (const enabledModule of enabledModules) {
             const enabledModuleSeedFile = `module-metadata/${enabledModule}/${enabledModule}-metadata.json`;
             const fullPath = path.join(process.cwd(), enabledModuleSeedFile);
@@ -352,6 +349,8 @@ export class ModuleMetadataSeederService {
 
         this.logger.log(`Seeding System Fields Metadata`);
         await this.seedDefaultSystemFields();
+
+        this.logger.debug(`Global metadata seeding completed`);
     }
 
     private async seedDefaultSystemFields() {
@@ -422,6 +421,13 @@ export class ModuleMetadataSeederService {
         this.logger.debug(`[End] Processing Media Storage Provider`);
     }
 
+    private async seedModelSequences(overallMetadata: any) {
+        this.logger.debug(`[Start] Processing model sequences`);
+        const modelSequences: CreateModelSequenceDto[] = overallMetadata.modelSequences;
+        await this.handleSeedModelSequences(modelSequences);
+        this.logger.debug(`[End] Processing model sequences`);
+    }
+
     // OK
     private async handleSeedEmailTemplates(emailTemplates: CreateEmailTemplateDto[], moduleName: string) {
         if (!emailTemplates) {
@@ -434,12 +440,41 @@ export class ModuleMetadataSeederService {
 
             // We need to load the actual template contents. 
             if (moduleName === 'solid-core') {
-                const modulePath = path.dirname(require.resolve('@solidstarters/solid-core'));
-                const seedDataPath = path.join(modulePath, '../src/seeders/seed-data/email-templates');
-                const filePath = path.join(seedDataPath, emailTemplate.body);
-                // this.logger.log(`Seeding email template from solid-core at path: ${filePath}`);
+                let moduleRoot: string | null = null;
+
+                try {
+                    // Always resolve package.json, never the module entry
+                    moduleRoot = path.dirname(
+                        require.resolve('@solidstarters/solid-core/package.json'),
+                    );
+                } catch (err) {
+                    this.logger.debug(
+                        'Could not resolve @solidstarters/solid-core from node_modules, assuming local execution',
+                    );
+                }
+
+                const filePathInternal = 'src/seeders/seed-data/email-templates/';
+                let filePath: string;
+                // Case 1: solid-core installed as dependency
+                if (moduleRoot) {
+                    filePath = path.join(
+                        moduleRoot,
+                        filePathInternal,
+                        emailTemplate.body,
+                    );
+                }
+                else {
+                    // Case 2: running INSIDE solid-core repo
+                    const localCoreRoot = process.cwd(); // or configurable root
+                    filePath = path.join(
+                        localCoreRoot,
+                        filePathInternal,
+                        emailTemplate.body,
+                    );
+                }
+
                 if (fs.existsSync(filePath)) {
-                    emailTemplate.body = fs.readFileSync(filePath, 'utf-8').toString();
+                    emailTemplate.body = fs.readFileSync(filePath, 'utf-8');
                 }
             }
             else {
@@ -471,12 +506,41 @@ export class ModuleMetadataSeederService {
 
             // We need to load the actual template contents. 
             if (moduleName === 'solid-core') {
-                const modulePath = path.dirname(require.resolve('@solidstarters/solid-core'));
-                const seedDataPath = path.join(modulePath, '../src/seeders/seed-data/sms-templates');
-                const filePath = path.join(seedDataPath, smsTemplate.body);
-                // this.logger.log(`Seeding sms template from solid-core at path: ${filePath}`);
+                let moduleRoot: string | null = null;
+
+                try {
+                    // Always resolve package.json, never the module entry
+                    moduleRoot = path.dirname(
+                        require.resolve('@solidstarters/solid-core/package.json'),
+                    );
+                } catch (err) {
+                    this.logger.debug(
+                        'Could not resolve @solidstarters/solid-core from node_modules, assuming local execution',
+                    );
+                }
+
+                const filePathInternal = 'src/seeders/seed-data/sms-templates/';
+                let filePath: string;
+                // Case 1: solid-core installed as dependency
+                if (moduleRoot) {
+                    filePath = path.join(
+                        moduleRoot,
+                        filePathInternal,
+                        smsTemplate.body,
+                    );
+                }
+                else {
+                    // Case 2: running INSIDE solid-core repo
+                    const localCoreRoot = process.cwd(); // or configurable root
+                    filePath = path.join(
+                        localCoreRoot,
+                        filePathInternal,
+                        smsTemplate.body,
+                    );
+                }
+
                 if (fs.existsSync(filePath)) {
-                    smsTemplate.body = fs.readFileSync(filePath, 'utf-8').toString();
+                    smsTemplate.body = fs.readFileSync(filePath, 'utf-8');
                 }
             }
             else {
@@ -535,6 +599,7 @@ export class ModuleMetadataSeederService {
                     action,
                     module,
                     parentMenuItem,
+                    sequenceNumber: m.sequenceNumber
                 };
 
                 // If existing, set its id so save() will perform an update, otherwise insert
@@ -782,5 +847,14 @@ export class ModuleMetadataSeederService {
             await this.savedFiltersRepo.upsertWithDto({ ...dto, filterQueryJson: JSON.stringify(dto.filterQueryJson) });
         }
     }
+    private async handleSeedModelSequences(modelSequencesDto: CreateModelSequenceDto[]) {
+        if (!modelSequencesDto || modelSequencesDto.length === 0) {
+            this.logger.debug(`No Model Sequences found to seed`);
+            return;
+        }
+        for (const dto of modelSequencesDto) {
+            await this.modelSequenceRepo.upsertWithDto(dto);
+        }
+    }
 
 }