@solidstarters/solid-core 1.2.38 → 1.2.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.38",
+  "version": "1.2.40",
   "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/media.controller.ts

@@ -1,75 +1,104 @@
-import { Body, Controller, Delete, Get, Logger, Param, ParseIntPipe, Post, Query, UploadedFile, UploadedFiles, UseInterceptors } from '@nestjs/common';
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { AnyFilesInterceptor } from "@nestjs/platform-express";
 import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
-import { PaginationQueryDto } from 'src/dtos/pagination-query.dto';
-import { MediaService } from '../services/media.service';
-import { BasicFilterDto } from '../dtos/basic-filters.dto';
-import { CreateMediaDto } from '../dtos/create-media.dto';
 import { Public } from 'src/decorators/public.decorator';
-import { AnyFilesInterceptor } from '@nestjs/platform-express';
+import { MediaService } from 'src/services/media.service';
+import { CreateMediaDto } from 'src/dtos/create-media.dto';
+import { UpdateMediaDto } from 'src/dtos/update-media.dto';
 
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
 @Controller('media')
-@ApiTags("App Builder")
 export class MediaController {
-    private logger = new Logger(MediaController.name);
-
-    constructor(
-        private readonly mediaService: MediaService
-    ) { }
-
-    @ApiBearerAuth("jwt")
-    @ApiQuery({ name: 'limit', required: false, type: Number })
-    @ApiQuery({ name: 'offset', required: false, type: Number })
-    @ApiQuery({ name: 'fields', required: false, type: Array })
-    @ApiQuery({ name: 'sort', required: false, type: Array })
-    @ApiQuery({ name: 'groupBy', required: false, type: Array })
-    @ApiQuery({ name: 'populate', required: false, type: Array })
-    @ApiQuery({ name: 'populateMedia', required: false, type: Array })
-    @ApiQuery({ name: 'filters', required: false, type: Array })
-    @Get()
-    async findMany(
-        @Query() basicFilterDto: BasicFilterDto
-    ) {
-        return this.mediaService.findMany(basicFilterDto);
-    }
-
-    @ApiBearerAuth("jwt")
-    @Get(':id')
-    findOne(@Param('id', ParseIntPipe) id: number) {
-        return this.mediaService.findOne(id);
-    }
-
-    @ApiBearerAuth("jwt")
-    @Post()
-    create(@Body() createDto: CreateMediaDto) {
-        // this.logger.log(`Creating a new model: ${JSON.stringify(createDto)}`);
-        return this.mediaService.create(createDto);
-    }
-
-    @Public()
-    @ApiBearerAuth("jwt")
-    @Post('/upload')
-    @UseInterceptors(AnyFilesInterceptor())
-    upload(@UploadedFiles() files: Array<Express.Multer.File>, @Body() createDto: CreateMediaDto, ) {
-        // this.logger.log(`Creating a new model: ${JSON.stringify(createDto)}`);
-        return this.mediaService.upload(createDto, files);
-    }
-
-
-
-    // @Patch(':id')
-    // update(@Param('id') id: number, @Body() updateCountryDto: UpdateCountryDto) {
-    //     return this.countriesService.update(id, updateCountryDto);
-    // }
-    @ApiBearerAuth("jwt")
-    @Delete('/bulk')
-    async deleteMany(@Body() ids: number[]) {
-      return this.mediaService.deleteMany(ids);
-    }
-
-    @ApiBearerAuth("jwt")
-    @Delete(':id')
-    async delete(@Param('id') id: number) {
-        return this.mediaService.remove(id);
-    }
+  constructor(private readonly service: MediaService) {}
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateMediaDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateMediaDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateMediaDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Patch(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateMediaDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @Public()
+  @ApiBearerAuth("jwt")
+  @Post('/upload')
+  @UseInterceptors(AnyFilesInterceptor())
+  upload(@UploadedFiles() files: Array<Express.Multer.File>, @Body() createDto: CreateMediaDto, ) {
+      // this.logger.log(`Creating a new model: ${JSON.stringify(createDto)}`);
+      return this.service.upload(createDto, files);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk-recover')
+  async recoverMany(@Body() ids: number[]) {
+    return this.service.recoverMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/recover/:id')
+  async recover(@Param('id') id: number) {
+    return this.service.recover(id);
+  }
+    
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array }) 
+  @ApiQuery({ name: 'groupBy', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  @Get()
+  async findMany(@Query() query: any) { 
+    return this.service.find(query);  
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get(':id')
+  async findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete('/bulk')
+  async deleteMany(@Body() ids: number[]) {
+    return this.service.deleteMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete(':id')
+  async delete(@Param('id') id: number) {
+    return this.service.delete(id);
+  }
+
 
 }

package/src/dtos/create-media.dto.ts

@@ -1,35 +1,59 @@
-import { IsBoolean, IsEnum, IsInt, IsNotEmpty, IsOptional, IsString, isBoolean } from "class-validator";
+import { ApiProperty } from '@nestjs/swagger';
+import { IsInt } from 'class-validator';
+import { IsNotEmpty, IsString, IsOptional } from 'class-validator';
 export class CreateMediaDto {
-
-    @IsNotEmpty()
-    @IsInt()
-    entityId: number;
-
-    @IsNotEmpty()
-    @IsInt()
-    modelMetadataId: number;
-
-    @IsNotEmpty()
-    @IsString()
-    relativeUri: string;
-
-    @IsOptional()
-    @IsString()
-    mimeType: string;
-
-    @IsOptional()
-    @IsInt()
-    fileSize: number;
-
-    @IsOptional()
-    @IsString()
-    originalFileName: string;
-
-    @IsNotEmpty()
-    @IsInt()
-    mediaStorageProviderMetadataId: number;
-
-    @IsNotEmpty()
-    @IsInt()
-    fieldMetadataId: number;
+@IsNotEmpty()
+@IsInt()
+@ApiProperty()
+entityId: number;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+relativeUri: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+fileSize: number;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+mimeType: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+originalFileName: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+modelMetadataId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+modelMetadataUserKey: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+mediaStorageProviderMetadataId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+mediaStorageProviderMetadataUserKey: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+fieldMetadataId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+fieldMetadataUserKey: string;
 }

package/src/dtos/update-media.dto.ts

@@ -1,5 +1,63 @@
-import { PartialType } from "@nestjs/mapped-types";
-import { CreateMediaDto } from "./create-media.dto";
+import { IsInt,IsOptional, IsNotEmpty, IsString } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+export class UpdateMediaDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
 
-export class UpdateMediaDto extends PartialType(CreateMediaDto) {
+@IsNotEmpty()
+@IsOptional()
+@IsInt()
+@ApiProperty()
+entityId: number;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+relativeUri: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+fileSize: number;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+mimeType: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+originalFileName: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+modelMetadataId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+modelMetadataUserKey: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+mediaStorageProviderMetadataId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+mediaStorageProviderMetadataUserKey: string;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+fieldMetadataId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+fieldMetadataUserKey: string;
 }

package/src/entities/media.entity.ts

@@ -1,40 +1,38 @@
-import { CommonEntity } from "src/entities/common.entity";
-import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
-import { MediaStorageProviderMetadata } from "./media-storage-provider-metadata.entity";
-import { ModelMetadata } from "./model-metadata.entity";
-import Joi from "@hapi/joi";
-import { FieldMetadata } from "./field-metadata.entity";
-
+import { CommonEntity } from 'src/entities/common.entity'
+import {Entity, Column, Index, JoinColumn, ManyToOne} from 'typeorm';
+import { ModelMetadata } from 'src/entities/model-metadata.entity';
+import { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';
+import { FieldMetadata } from 'src/entities/field-metadata.entity'
 @Entity("ss_media")
-export class Media extends CommonEntity {
-    @Index()
-    @Column({ name: "entity_id" })
-    entityId: number;
+export class Media extends CommonEntity{
+@Index()
+@Column({ type: "integer" })
+entityId: number;
 
-    @Index()
-    @ManyToOne(() => ModelMetadata)
-    @JoinColumn({ name: "model_metadata_id" })
-    modelMetadata: ModelMetadata;
+@Column({ type: "varchar", nullable: true })
+relativeUri: string;
 
-    @Column({ name: "relative_uri" })
-    relativeUri: string;
+@Column({ type: "integer", nullable: true })
+fileSize: number;
 
-    @Column({ name: "mime_type", default: "" })
-    mimeType: string = "";
+@Column({ type: "varchar", nullable: true })
+mimeType: string;
 
-    @Column({ name: "file_size", default: 0 })
-    fileSize: number = 0;
+@Column({ type: "varchar", nullable: true })
+originalFileName: string;
 
-    @Column({ name: "original_file_name", default: "" })
-    originalFileName: string = "";
+@Index()
+@ManyToOne(() => ModelMetadata, { onDelete: "SET NULL", nullable: false })
+@JoinColumn()
+modelMetadata: ModelMetadata;
 
-    @Index()
-    @ManyToOne(() => MediaStorageProviderMetadata)
-    @JoinColumn({ name: "media_storage_provider_metadata_id" })
-    mediaStorageProviderMetadata: MediaStorageProviderMetadata;
+@Index()
+@ManyToOne(() => MediaStorageProviderMetadata, { onDelete: "SET NULL", nullable: false })
+@JoinColumn()
+mediaStorageProviderMetadata: MediaStorageProviderMetadata;
 
-    @Index()
-    @ManyToOne(() => FieldMetadata)
-    @JoinColumn({ name: "field_metadata_id" })
-    fieldMetadata: FieldMetadata;
+@Index()
+@ManyToOne(() => FieldMetadata, { onDelete: "SET NULL", nullable: false })
+@JoinColumn()
+fieldMetadata: FieldMetadata;
 }

package/src/repository/media.repository.ts

@@ -0,0 +1,74 @@
+import { Repository, DataSource } from 'typeorm';
+import { Injectable } from '@nestjs/common';
+import { Media } from 'src/entities/media.entity';
+import { FieldMetadata } from 'src/entities/field-metadata.entity';
+import { InjectRepository } from '@nestjs/typeorm';
+import { ModelMetadata } from 'src/entities/model-metadata.entity';
+import { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';
+
+@Injectable()
+export class MediaRepository extends Repository<Media> {
+    constructor(
+        private dataSource: DataSource,
+        @InjectRepository(ModelMetadata)
+        private readonly modelMetadataRepo: Repository<ModelMetadata>,
+        @InjectRepository(MediaStorageProviderMetadata)
+        private readonly mediaStorageProviderMetadataRepo: Repository<MediaStorageProviderMetadata>,
+        @InjectRepository(FieldMetadata)
+        private readonly fieldMetadataRepo: Repository<FieldMetadata>,
+
+    ) {
+        super(Media, dataSource.createEntityManager());
+    }
+
+    async createMedia(createDto: any) {
+        createDto['fieldMetadata'] = await this.fieldMetadataRepo.findOne({
+            where: {
+                id: createDto['fieldMetadataId']
+            },
+        });
+        createDto['modelMetadata'] = await this.modelMetadataRepo.findOne({
+            where: {
+                id: createDto['modelMetadataId']
+            },
+        });
+        createDto['mediaStorageProviderMetadata'] = await this.mediaStorageProviderMetadataRepo.findOne({
+            where: {
+                id: createDto['mediaStorageProviderMetadataId']
+            },
+        });
+        const media = this.create(createDto);
+        return this.save(media);
+    }
+
+    async findByEntityIdAndFieldIdAndModelMetadataId(entityId: number, fieldMetadataId: number, modelMetadataId: number, relations = {}) {
+        return await this.find({
+            where: {
+                modelMetadata: {
+                    id: modelMetadataId
+                },
+                fieldMetadata: {
+                    id: fieldMetadataId
+                },
+                entityId: entityId,
+            },
+            relations: relations,
+        });
+    }
+
+    async deleteByEntityIdAndFieldIdAndModelMetadataId(entityId: number, fieldMetadataId: number, modelMetadataId: number) {
+        const entities = await this.find({
+            where: {
+                modelMetadata: {
+                    id: modelMetadataId
+                },
+                fieldMetadata: {
+                    id: fieldMetadataId
+                },
+                entityId: entityId,
+            }
+        });
+        return this.remove(entities);
+    }
+
+}

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

@@ -70,7 +70,7 @@ export class ModuleMetadataSeederService {
 
         const settingsSeederData: any = {
             iamAllowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
-            iamPasswordRegistrationEnabled: false,
+            iamPasswordRegistrationEnabled: true,
             iamPasswordLessRegistrationEnabled: this.iamConfiguration.passwordlessRegistration,
             iamActivateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
             iamGoogleOAuthEnabled: false,
@@ -370,10 +370,15 @@ export class ModuleMetadataSeederService {
         for (let j = 0; j < actions.length; j++) {
             const actionData = actions[j];
             actionData['module'] = await this.moduleMetadataService.findOneByUserKey(actionData.moduleUserKey);
-            actionData['model'] = await this.modelMetadataService.findOneByUserKey(actionData.modelUserKey);
             if (actionData.type === 'solid') {
+                actionData['model'] = await this.modelMetadataService.findOneByUserKey(actionData.modelUserKey);
                 actionData['view'] = await this.solidViewService.findOneByUserKey(actionData.viewUserKey);
             }
+            else {
+                if (actionData.modelUserKey) {
+                    actionData['model'] = await this.modelMetadataService.findOneByUserKey(actionData.modelUserKey);
+                }
+            }
             await this.solidActionService.upsert(actionData);
         }
     }