@solidxai/core 0.1.4 → 0.1.5-beta.0

package/src/dtos/resolve-s3-url.dto.ts

@@ -2,17 +2,7 @@ import { IsEmail, IsNotEmpty, IsOptional, MinLength } from 'class-validator';
 
 export class ResolveS3UrlDto {
     @IsNotEmpty()
-    modelName: string;
-
-    @IsNotEmpty()
-    fieldName: string;
-
-
-    @IsNotEmpty()
-    fileType?: string;
-
-    @IsNotEmpty()
-    s3Key?: string;
+    s3Key: string;
 
     @IsOptional()
     bucketName?: string;
@@ -21,7 +11,7 @@ export class ResolveS3UrlDto {
     mediaStorageProviderUserKey?: string;
 
     @IsNotEmpty()
-    isPrivate?: string;
+    isPrivate: string;
 }
 
 

package/src/dtos/sign-up.dto.ts

@@ -25,6 +25,4 @@ export class SignUpDto {
     @IsArray()
     @Type(() => String)
     roles?: string[];
-
-
 }

package/src/dtos/update-email-template.dto.ts

@@ -12,29 +12,35 @@ export class UpdateEmailTemplateDto extends PartialType(CreateEmailTemplateDto)
     @IsString()
     @ApiProperty()
     name: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     displayName: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     body: string;
+
     @IsOptional()
     @IsString()
     @ApiProperty()
     type: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     subject: string;
+
     @IsOptional()
     @IsString()
     @ApiProperty()
     description: string;
+
     @IsOptional()
     @IsBoolean()
     @ApiProperty()

package/src/dtos/update-list-of-values.dto.ts

@@ -5,38 +5,46 @@ export class UpdateListOfValuesDto {
     @IsOptional()
     @IsInt()
     id: number;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     type: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     value: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     display: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     description: string;
+
     @IsOptional()
     @IsBoolean()
     @ApiProperty()
     default: boolean;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     sequence: number;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     moduleId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()

package/src/dtos/update-menu-item-metadata.dto.ts

@@ -8,41 +8,50 @@ export class UpdateMenuItemMetadataDto {
     @IsOptional()
     @IsInt()
     id: number;
+
     @IsNotEmpty()
     @IsOptional()
     @Matches(/[a-z]+(-[a-z]+)*/)
     @IsString()
     @ApiProperty()
     name: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     displayName: string;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     moduleId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     moduleUserKey: string;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     parentMenuItemId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     parentMenuItemUserKey: string;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     actionId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     actionUserKey: string;
+
     @Transform(arrayTransformer)
     @IsOptional()
     @ApiProperty()
@@ -50,14 +59,17 @@ export class UpdateMenuItemMetadataDto {
     @ValidateNested({ each: true })
     @Type(() => UpdateRoleMetadataDto)
     roles: UpdateRoleMetadataDto[];
+
     @IsOptional()
     @IsArray()
     @ApiProperty()
     rolesIds: number[];
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     rolesCommand: string;
+
     @IsOptional()
     @IsNumber()
     @ApiProperty()

package/src/dtos/update-scheduled-job.dto.ts

@@ -5,66 +5,81 @@ export class UpdateScheduledJobDto {
     @IsOptional()
     @IsInt()
     id: number;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     scheduleName: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsBoolean()
     @ApiProperty()
     isActive: boolean;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     frequency: string;
+
     @IsOptional()
     @IsDate()
     @ApiProperty()
     startTime: Date;
+
     @IsOptional()
     @IsDate()
     @ApiProperty()
     endTime: Date;
+
     @IsOptional()
     @IsDate()
     @ApiProperty()
     startDate: Date;
+
     @IsOptional()
     @IsDate()
     @ApiProperty()
     endDate: Date;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     dayOfMonth: number;
+
     @IsOptional()
     @IsDate()
     @ApiProperty()
     lastRunAt: Date;
+
     @IsOptional()
     @IsDate()
     @ApiProperty()
     nextRunAt: Date;
+
     @IsOptional()
     @IsString()
     @ApiProperty()
     dayOfWeek: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     job: string;
+
     @IsOptional()
     @IsString()
     @ApiProperty()
     cronExpression: string;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     moduleId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()

package/src/dtos/update-security-rule.dto.ts

@@ -5,32 +5,39 @@ export class UpdateSecurityRuleDto {
     @IsOptional()
     @IsInt()
     id: number;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     name: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     description: string;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     roleId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     roleUserKey: string;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     modelMetadataId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     modelMetadataUserKey: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsJSON()

package/src/dtos/update-sms-template.dto.ts

@@ -3,42 +3,42 @@ import { CreateSmsTemplateDto } from './create-sms-template.dto';
 import { IsString } from 'class-validator';
 import { IsOptional, Matches, IsNotEmpty, IsBoolean } from 'class-validator';
 
-export class UpdateSmsTemplateDto extends PartialType(CreateSmsTemplateDto) { 
-@IsOptional()
-@IsString()
-@ApiProperty()
-type: string;
+export class UpdateSmsTemplateDto extends PartialType(CreateSmsTemplateDto) {
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    type: string;
 
-@IsNotEmpty()
-@IsOptional()
-@Matches(/[a-z]+(-[a-z]+)*/)
-@IsString()
-@ApiProperty()
-name: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @Matches(/[a-z]+(-[a-z]+)*/)
+    @IsString()
+    @ApiProperty()
+    name: string;
 
-@IsOptional()
-@IsString()
-@ApiProperty()
-smsProviderTemplateId: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    smsProviderTemplateId: string;
 
-@IsNotEmpty()
-@IsOptional()
-@IsString()
-@ApiProperty()
-displayName: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    displayName: string;
 
-@IsOptional()
-@IsString()
-@ApiProperty()
-body: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    body: string;
 
-@IsOptional()
-@IsString()
-@ApiProperty()
-description: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    description: string;
 
-@IsOptional()
-@IsBoolean()
-@ApiProperty()
-active: boolean;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    active: boolean;
 } { }

package/src/dtos/update-view-metadata.dto.ts

@@ -7,58 +7,70 @@ export class UpdateViewMetadataDto {
     @IsOptional()
     @IsInt()
     id: number;
+
     @IsNotEmpty()
     @IsOptional()
     @Matches(/[a-z]+(-[a-z]+)*/)
     @IsString()
     @ApiProperty()
     name: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     displayName: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
     type: string;
+
     @IsNotEmpty()
     @IsOptional()
     @IsJSON()
     @ApiProperty()
     context: any;
+
     @IsNotEmpty()
     @IsOptional()
     @IsJSON()
     @ApiProperty()
     layout: any;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     moduleId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     moduleUserKey: string;
+
     @IsOptional()
     @IsInt()
     @ApiProperty()
     modelId: number;
+
     @IsString()
     @IsOptional()
     @ApiProperty()
     modelUserKey: string;
+
     @IsOptional()
     @ApiProperty()
     @IsArray()
     @ValidateNested({ each: true })
     @Type(() => UpdateUserViewMetadataDto)
     userViewMetadata: UpdateUserViewMetadataDto[];
+
     @IsOptional()
     @IsArray()
     @ApiProperty()
     userViewMetadataIds: number[];
+
     @IsString()
     @IsOptional()
     @ApiProperty()

package/src/entities/user.entity.ts

@@ -111,6 +111,9 @@ export class User extends CommonEntity {
     // dont send to client
     @Column({ nullable: true })
     rehashedAt: Date;
+    // dont send to client
+    @Column({ type: "int", default: 0 })
+    failedLoginAttempts: number = 0;
     @Expose()
     _media: any;
 }

package/src/helpers/field-crud-managers/ManyToManyRelationFieldCrudManager.ts

@@ -14,6 +14,8 @@ export interface ManyToManyRelationFieldOptions {
     entityManager: EntityManager;
     fieldName: string;
     relationCoModelFieldName?: string;
+    isUpdate?: boolean;
+    entityId?: number;
 }
 
 const linkCommands = [RelationFieldsCommand.link, RelationFieldsCommand.unlink, RelationFieldsCommand.set];
@@ -74,16 +76,21 @@ export class ManyToManyRelationFieldCrudManager implements FieldCrudManager {
         const relatedEntityName = classify(this.options.relationCoModelSingularName);
         const relatedEntityRepository = this.options.entityManager.getRepository(relatedEntityName)
 
-        dto[this.valueFieldName] = await this.transformByCommand(dto, relatedEntityRepository, currentEntityRepository);
+        const result = await this.transformByCommand(dto, relatedEntityRepository, currentEntityRepository);
+        if (result !== undefined) {
+            dto[this.valueFieldName] = result;
+        } else {
+            delete dto[this.valueFieldName];
+        }
         return dto;
     }
 
-    private async transformByCommand(dto: any, relatedEntityRepository: any, currentEntityRepository: any): Promise<any[]> {
+    private async transformByCommand(dto: any, relatedEntityRepository: any, currentEntityRepository: any): Promise<any[] | undefined> {
         // TODO : Need to add support for the multiple commands
         const command = dto[this.commandFieldName];
         const values = dto[this.valueFieldName];
         const ids = dto[this.idFieldName];
-        
+
         switch (command) {
             case RelationFieldsCommand.create:
                 return await this.transformForCommandCreate(values, relatedEntityRepository);
@@ -94,15 +101,15 @@ export class ManyToManyRelationFieldCrudManager implements FieldCrudManager {
             case RelationFieldsCommand.clear:
                 return this.transformForCommandClear();
             case RelationFieldsCommand.set:
-                return await this.transformForCommandSet(ids, relatedEntityRepository, dto, currentEntityRepository);    
+                return await this.transformForCommandSet(ids, relatedEntityRepository);
             case RelationFieldsCommand.link:
-                return await this.tranformForCommandLink(ids, relatedEntityRepository, dto, currentEntityRepository);
+                return await this.tranformForCommandLink(ids, relatedEntityRepository);
             case RelationFieldsCommand.unlink:
-                return await this.transformForCommandUnLink(ids, relatedEntityRepository, dto, currentEntityRepository);
+                return await this.transformForCommandUnLink(ids);
             default:
                 this.logger.log(`Invalid command ${command}`);
                 return null;
-                
+
         }
     }
 
@@ -110,46 +117,50 @@ export class ManyToManyRelationFieldCrudManager implements FieldCrudManager {
         return []
     }
 
-    private async transformForCommandSet(ids: any[], relatedEntityRepository: any,  dto: any, currentEntityRepository: any): Promise<any[]> {
-        // Load the entities with the ids passed
+    private async transformForCommandSet(ids: any[], relatedEntityRepository: any): Promise<any[]> {
         const loadedEntities: any[] = await relatedEntityRepository.find({
-            where : {id: In(ids) } 
+            where : {id: In(ids) }
         })
         if (loadedEntities.length !== ids.length) {
-            throw new Error('Invalid entity ids provided for linking');
+            throw new Error('Invalid entity ids provided for set');
         }
 
         return loadedEntities;
     }
 
-    private async tranformForCommandLink(ids: any, relatedEntityRepository: any, dto: any, currentEntityRepository: any) {
-        const tranformedRelatedFields = [];
-        // Load the entities with the ids passed
-        const loadedEntities: any[] = await relatedEntityRepository.find({
-            where : {id: In(ids) } 
-        })
-        if (loadedEntities.length !== ids.length) {
+    private async tranformForCommandLink(ids: any[], relatedEntityRepository: any): Promise<undefined> {
+        if (!this.options.isUpdate) {
+            throw new Error('Link command is only supported for update operations');
+        }
+
+        const count: number = await relatedEntityRepository.count({
+            where: { id: In(ids) }
+        });
+        if (count !== ids.length) {
             throw new Error('Invalid entity ids provided for linking');
         }
-        tranformedRelatedFields.push(...loadedEntities);
 
-        return tranformedRelatedFields;
+        await this.options.entityManager
+            .createQueryBuilder()
+            .relation(classify(this.options.modelSingularName), this.valueFieldName)
+            .of(this.options.entityId)
+            .add(ids);
+
+        return undefined;
     }
 
-    private async transformForCommandUnLink(ids: any, relatedEntityRepository: any, dto: any, currentEntityRepository: any) {
-        if (dto.id == null) {
-            throw new Error('Entity id is required for unlinking');
-        } 
+    private async transformForCommandUnLink(ids: any[]): Promise<undefined> {
+        if (!this.options.isUpdate) {
+            throw new Error('Unlink command is only supported for update operations');
+        }
 
-        const tranformedRelatedFields = [];
-        const entityInstance = await currentEntityRepository.findOne({
-            where: {id: dto.id},
-            relations: [this.valueFieldName]
-        });
-        const filteredEntities = entityInstance[this.valueFieldName].filter((entity) => !ids.includes(entity.id));
-        tranformedRelatedFields.push(...filteredEntities);
+        await this.options.entityManager
+            .createQueryBuilder()
+            .relation(classify(this.options.modelSingularName), this.valueFieldName)
+            .of(this.options.entityId)
+            .remove(ids);
 
-        return tranformedRelatedFields;
+        return undefined;
     }
 
     private async transformForCommandCreate(values: any[], relatedEntityRepository: any): Promise<any[]> {