@solidstarters/solid-core 1.2.82 → 1.2.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.82",
+  "version": "1.2.84",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/constants.ts

@@ -23,4 +23,6 @@ export enum TransactionalRegistrationValidationSource {
 export enum ForgotPasswordSendVerificationTokenOn {
   EMAIL = 'email',
   MOBILE = 'mobile',
-}
+}
+
+export const SOLID_CORE_MODULE_NAME = 'solid-core';

package/src/helpers/module-metadata-helper.service.ts

@@ -1,10 +1,13 @@
-import { Injectable, ModuleMetadata } from "@nestjs/common";
+import { Injectable, Logger } from "@nestjs/common";
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
 import * as path from 'path'; // To handle file paths
-import { ModuleMetadataConfiguration } from "src/interfaces";
+import { SOLID_CORE_MODULE_NAME } from "src/constants";
+import { FileService } from "src/services/file.service";
 
 @Injectable()
 export class ModuleMetadataHelperService {
+    private readonly logger = new Logger(ModuleMetadataHelperService.name);
+    constructor(private readonly fileService: FileService) {}
     // async getModuleMetadataConfig(moduleName: string): Promise<ModuleMetadata> {
     //     const filePath = this.getModuleMetadataFilePath(moduleName);
     //     const metadata = await this.getModuleMetadata(filePath);
@@ -16,9 +19,20 @@ export class ModuleMetadataHelperService {
         return JSON.parse(fileContent);
     }
 
-    getModuleMetadataFilePath(moduleName: string): string {
+    async getModuleMetadataFilePath(moduleName: string): Promise<string> {
         const folderPath = path.resolve(process.cwd(), 'module-metadata', moduleName);
         const filePath = path.join(folderPath, `${moduleName}-metadata.json`);
+        // Check if filePath exists
+        const fileExists = await this.fileService.fileExists(filePath);
+        this.logger.debug(`File exists: ${fileExists} at ${filePath}`);
+        if (!fileExists) {
+            // If the module is solid-core, try the fallback path, in case the current root directory is the solid core project
+            if (moduleName === SOLID_CORE_MODULE_NAME) {
+                const fallbackPath = path.resolve(process.cwd(), 'src', 'seeders', 'seed-data', `${moduleName}-metadata.json`);
+                this.logger.debug(`Fallback path: ${fallbackPath}`);
+                return fallbackPath;
+            }
+        }
         return filePath;
     }
 

package/src/index.ts

@@ -233,6 +233,7 @@ export * from './services/chatter-message-details.service'
 // Repositories
 export * from './repository/solid-base.repository'
 export * from './repository/security-rule.repository'
+export * from './repository/field.repository'
 
 
 //softDeleteAwareEventSubscriber.subscriber.ts

package/src/repository/field.repository.ts

@@ -0,0 +1,30 @@
+import { Repository, DataSource } from 'typeorm';
+import { Injectable } from '@nestjs/common';
+import { FieldMetadata } from 'src/entities/field-metadata.entity';
+import { InjectRepository } from '@nestjs/typeorm';
+
+@Injectable()
+export class FieldRepository extends Repository<FieldMetadata> {
+    constructor(
+        private dataSource: DataSource,
+        @InjectRepository(FieldMetadata)
+        private readonly fieldMetadataRepo: Repository<FieldMetadata>,
+
+    ) {
+        super(FieldMetadata, dataSource.createEntityManager());
+    }
+
+    async findFieldMetadata(fieldName: string, modelName: string) {
+        const fileMediaField = await this.fieldMetadataRepo.findOne({
+            where: {
+              name: fieldName,
+              model: {
+                singularName: modelName
+              },
+            },
+            relations: ['model', 'mediaStorageProvider'],
+          });
+          return fileMediaField;
+    }
+
+}

package/src/services/field-metadata.service.ts

@@ -1056,7 +1056,7 @@ export class FieldMetadataService {
 
     private async updateRelationInverseFieldInFile(savedInverseField: FieldMetadata, inverseModelName: string, moduleName: string) {
         try {
-            const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(moduleName);
+            const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(moduleName);
             const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
             // Create the config object for the inverse field

package/src/services/file.service.ts

@@ -189,4 +189,14 @@ export class FileService {
       });
     });
   }
+
+  public async fileExists(filePath: string): Promise<boolean> {
+    try {
+      await fs.promises.access(filePath, fs.constants.F_OK);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  
 }

package/src/services/mediaStorageProviders/file-storage-provider.ts

@@ -69,7 +69,7 @@ export class FileStorageProvider<T> implements MediaStorageProvider<T> {
         streamPairs.forEach(async (pair) => {
             const stream = pair[0];
             const fileName = pair[1];
-            this.fileService.writeStreamToFile(stream, fileName);
+            this.fileService.writeStreamToFile(stream, this.getFullFilePath(fileName));
             const mediaEntity = await this.mediaRepository.createMedia({
                 entityId: entity.id,
                 modelMetadataId: mediaFieldMetadata.model.id,

package/src/services/model-metadata.service.ts

@@ -247,7 +247,7 @@ export class ModelMetadataService {
         relations: ["fields", "fields.mediaStorageProvider", "module", "parentModel"], //FIXME: Check with jenender and change to relations to avoid confusion
       });
 
-      const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
+      const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
       const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
       const modelMetaData = {
@@ -406,7 +406,7 @@ export class ModelMetadataService {
         relations: ["fields", "fields.mediaStorageProvider", "module", "parentModel"], //FIXME: Check with jenender and change to relations to avoid confusion
       });
 
-      const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
+      const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
       const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
       const modelMetaData = {
@@ -557,7 +557,7 @@ export class ModelMetadataService {
 
   private async populateVAMConfigInFile(model: ModelMetadata) {
     try {
-      const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
+      const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(model.module.name);
       const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
       const listViewLayoutFields = [{ type: "field", attrs: { name: `id`, sortable: true, filterable: true } }];

package/src/services/module-metadata.service.ts

@@ -158,7 +158,7 @@ export class ModuleMetadataService {
 
       // Create the folder path inside 'module-metadata'
       const folderPath = path.resolve(process.cwd(), 'module-metadata', module.name);
-      const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(module.name);
+      const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(module.name);
 
       // Ensure the folder exists
       await fs.mkdir(folderPath, { recursive: true });
@@ -211,7 +211,7 @@ export class ModuleMetadataService {
 
   async updateInFile(module: ModuleMetadata) {
     try {
-      const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(module.name);
+      const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(module.name);
 
       // Read the existing JSON file
       let metaData;

package/src/solid-core.module.ts

@@ -170,6 +170,7 @@ import { ExportTransactionController } from './controllers/export-transaction.co
 import { ExcelService } from './services/excel.service';
 import { CsvService } from './services/csv.service';
 import { ClsModule } from 'nestjs-cls';
+import { FieldRepository } from './repository/field.repository';
 
 
 @Global()
@@ -369,6 +370,7 @@ import { ClsModule } from 'nestjs-cls';
     ExportTransactionService,
     ExcelService,
     CsvService,
+    FieldRepository
   ],
   exports: [
     ModuleMetadataService,
@@ -398,6 +400,7 @@ import { ClsModule } from 'nestjs-cls';
     RefreshModuleCommand,
     RequestContextService,
     SecurityRuleRepository,
+    FieldRepository
   ],
 })
 export class SolidCoreModule { }

package/src/subscribers/security-rule.subscriber.ts

@@ -49,7 +49,7 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
             }
         });
 
-        const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(populatedModelMetadata.module.name);
+        const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(populatedModelMetadata.module.name);
         try {
             await fs.access(filePath);
         } catch (error) {
@@ -59,7 +59,7 @@ export class SecurityRuleSubscriber implements EntitySubscriberInterface<Securit
         }
         const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
-        if (metaData.securityRule) {
+        if (metaData.securityRules) {
             const securityRuleIndex = metaData.securityRules?.findIndex((ruleFromFile: { name: string }) => ruleFromFile.name === securityRule.name);
             const {id, roleId, modelMetadataId, ...requiredDto} = await this.securityRuleRepo.toDto(securityRule)
             metaData.securityRules[securityRuleIndex] = {requiredDto, securityRuleConfig: JSON.parse(securityRule.securityRuleConfig)}

package/src/subscribers/view-metadata.subscriber.ts

@@ -37,7 +37,7 @@ export class ViewMetadataSubsciber implements EntitySubscriberInterface<ViewMeta
         if (!viewMetadata) {
             throw new Error(`View metadata not found for id ${event.entity.id}`);
         }
-        const filePath = this.moduleMetadataHelperService.getModuleMetadataFilePath(viewMetadata.model.module.name);
+        const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(viewMetadata.model.module.name);
         try {
             await fs.access(filePath);
         } catch (error) {