@solidstarters/solid-core 1.2.12 → 1.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "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/controllers/setting.controller.ts

@@ -40,10 +40,10 @@ export class SettingController {
   }
 
   @ApiBearerAuth("jwt")
-  @Get('/getSettings')
-  async getAllSettings() {
-    return this.service.getAllSettings();
-  }
+  @Get('/wrapped')
+  async wrapSettings() {
+      return this.service.wrapSettings();
+  }  
     
   @ApiBearerAuth("jwt")
   @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })

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

@@ -27,6 +27,11 @@ import { SolidRegistry } from '../helpers/solid-registry';
 import { RoleMetadataService } from '../services/role-metadata.service';
 import { getCoreModuleNames, getDynamicModuleNames } from '../helpers/module.helper';
 import solidCoreMetadata from './seed-data/solid-core-metadata.json';
+import { iamConfig } from 'src/config/iam.config';
+import commonConfig from 'src/config/common.config';
+import { CreateSettingDto } from 'src/dtos/create-setting.dto';
+import { SettingService } from 'src/services/setting.service';
+import { Setting } from 'src/entities/setting.entity';
 
 @Injectable()
 export class ModuleMetadataSeederService {
@@ -51,12 +56,36 @@ export class ModuleMetadataSeederService {
         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 service: SettingService,
+        @InjectRepository(Setting, 'default')
+        readonly settingsRepo: Repository<Setting>,
     ) { }
 
     async seed() {
 
         const typedSolidCoreMetadata: any = solidCoreMetadata;
 
+        const settingsSeederData: any = {
+            iamAllowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
+            iamPasswordRegistrationEnabled: false,
+            iamPasswordLessRegistrationEnabled: this.iamConfiguration.passwordlessRegistration,
+            iamActivateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
+            iamGoogleOAuthEnabled: false,
+            authPagesLayout: "center",
+            authPagesTheme: "light",
+            appTitle: process.env.SOLID_APP_NAME || "Solid App",
+            appLogo: "",
+            appDescription: "",
+            appTnc: "",
+            appPrivacyPolicy: "",
+            iamDefaultRole: this.iamConfiguration.defaultRole,
+            shouldQueueEmails: this.commonConfiguration.shouldQueueEmails,
+            shouldQueueSms: this.commonConfiguration.shouldQueueSms
+        }
+
         // Run the permissions seeder. 
         // await this.permissionsSeederService.seed();
         await this.seedPermissions();
@@ -157,6 +186,10 @@ export class ModuleMetadataSeederService {
             await this.seedSmsTemplates(smsTemplates);
             this.logger.log(`[End] Processing sms templates for ${moduleMetadata.name}`);
 
+            // Sms templates
+            this.logger.log(`[Start] Processing settings for ${moduleMetadata.name}`);
+            await this.seedSettings(settingsSeederData);
+            this.logger.log(`[End] Processing settings for ${moduleMetadata.name}`);
 
             this.logger.log(`[End] module seed data: ${overallMetadata}`);
 
@@ -167,8 +200,8 @@ export class ModuleMetadataSeederService {
         // 1. Give all permissions to the Admin role.
         this.logger.log(`About to add all permissions to the Admin role`);
         await this.roleService.addAllPermissionsToRole("Admin");
-        // 2. Give getAllSettings permissions to the Public role.
-        await this.roleService.addPermissionToRole('Public', 'SettingController.getAllSettings');
+        // 2. Give wrapSettings permissions to the Public role.
+        await this.roleService.addPermissionToRole('Public', 'SettingController.wrapSettings');
         this.logger.log(`All Seeders finished`);
 
     }
@@ -418,4 +451,11 @@ export class ModuleMetadataSeederService {
             }
         }
     }
+
+    async seedSettings(createDto: CreateSettingDto) {
+        const settingsArray: any[] = await this.settingsRepo.find();
+        if (!settingsArray || settingsArray.length === 0) {
+            this.service.create(createDto);
+        }
+    }
 }

package/src/services/crud.service.ts

@@ -1,7 +1,7 @@
 import { BadRequestException } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { DiscoveryService } from "@nestjs/core";
-import { EntityManager, QueryFailedError, SelectQueryBuilder } from "typeorm";
+import { EntityManager, In, IsNull, Not, QueryFailedError, SelectQueryBuilder } from "typeorm";
 import { Repository } from "typeorm/repository/Repository";
 import { BasicFilterDto } from "../dtos/basic-filters.dto";
 import { ComputedFieldValueType, RelationType, SelectionValueType, SolidFieldType } from "../dtos/create-field-metadata.dto";
@@ -649,4 +649,77 @@ export class CRUDService<T> { //Add two generic value i.e Person,CreatePersonDto
         // return removedEntities
     }
 
+    async recover(id: number) {
+        try {
+          const softDeletedRows = await this.repo.findOne({
+            where: { 
+                //@ts-ignore
+                id, deletedAt: Not(IsNull()) 
+            },
+            withDeleted: true,
+          });
+      
+          if (!softDeletedRows) {
+            throw new Error('No soft-deleted record found with the given ID.');
+          }
+      
+          await this.repo.update(id, {
+                //@ts-ignore
+                deletedAt: null, deletedTracker: "not-deleted" 
+            });
+      
+          return { message: 'Record successfully recovered', data: softDeletedRows };
+        } catch (error) {
+          if (error instanceof QueryFailedError) {
+            if ((error as any).code === '23505') {
+              throw new Error('Another record is conflicting with the record you are attempting to Un-Archive, either delete or change the other record so as to avoid this conflict.');
+            }
+          }
+    
+          throw new Error(error);
+        }
+    }
+    
+    async recoverMany(ids: number[]) {
+        try {
+            if (!ids || ids.length === 0) {
+                throw new Error("No IDs provided for recovery.");
+            }
+    
+            // Find soft-deleted records matching the given IDs
+            const softDeletedRows = await this.repo.find({
+                where: {
+                    //@ts-ignore
+                    id: In(ids),
+                    deletedAt: Not(IsNull()),
+                },
+                withDeleted: true,
+            });
+    
+            if (softDeletedRows.length === 0) {
+                throw new Error("No matching soft-deleted records found.");
+            }
+    
+            // Recover the specific records by setting deletedAt to null
+            await this.repo.update(
+                //@ts-ignore
+                { id: In(ids) },
+                { deletedAt: null, deletedTracker: "not-deleted" }
+            );
+    
+            return { message: "Selected records successfully recovered", recoveredIds: ids };
+        } catch (error) {
+            if (error instanceof QueryFailedError) {
+                if ((error as any).code === "23505") {
+                    throw new Error(
+                        "Another record is conflicting with the record you are attempting to Un-Archive, either delete or change the other record to avoid this conflict."
+                    );
+                }
+            }
+    
+            throw new Error(error);
+        }
+    }
+    
+
 }

package/src/services/setting.service.ts

@@ -40,12 +40,23 @@ export class SettingService extends CRUDService<Setting>{
    );
  }
 
-  async getAllSettings(): Promise<Record<string, any>> {
-    const settings: any = await this.repo.find();
-    if (!settings || settings.length === 0) {
-      return this.getDefaultSettings();
+  async wrapSettings(): Promise<Record<string, any>> {
+    const settingsArray: any[] = await this.repo.find();
+    
+    if (!settingsArray || settingsArray.length === 0) {
+        return this.getDefaultSettings();
     }
-    return settings;
+
+    const settings = settingsArray[0];
+
+    const defaultSettings = this.getDefaultSettings();
+
+    const mergedSettings = Object.keys(defaultSettings).reduce((acc, key) => {
+        acc[key] = settings[key] !== null && settings[key] !== undefined ? settings[key] : defaultSettings[key];
+        return acc;
+    }, {} as Record<string, any>);
+
+    return mergedSettings;
   }
 
   private getDefaultSettings(): Record<string, any> {
@@ -57,7 +68,7 @@ export class SettingService extends CRUDService<Setting>{
       iamGoogleOAuthEnabled: false,
       authPagesLayout: "center",
       authPagesTheme: "light",
-      appTitle: process.env.SOLID_APP_NAME || "Default App",
+      appTitle: process.env.SOLID_APP_NAME || "Solid App",
       appLogo: "",
       appDescription: "",
       appTnc: "",