@solidstarters/solid-core 1.2.39 → 1.2.41

package/src/services/mq-message-queue.service.ts

@@ -1,13 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService } from "@nestjs/core";
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, Repository } from 'typeorm';
 import { CRUDService } from 'src/services/crud.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
 import { ConfigService } from '@nestjs/config';
-import { MediaService } from "src/services/media.service";
 import { FileService } from "src/services/file.service";
 import { CrudHelperService } from "src/services/crud-helper.service";
 
@@ -19,18 +17,18 @@ export class MqMessageQueueService extends CRUDService<MqMessageQueue> {
   constructor(
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
     readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     @InjectRepository(MqMessageQueue)
     readonly repo: Repository<MqMessageQueue>,
+    readonly moduleRef: ModuleRef
+
   ) {
-    super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'mqMessageQueue', 'queues');
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'mqMessageQueue', 'queues',moduleRef);
   }
 
   async resolveQueue(queueName: string): Promise<MqMessageQueue> {

package/src/services/mq-message.service.ts

@@ -1,13 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService } from "@nestjs/core";
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, Repository } from 'typeorm';
 import { CRUDService } from 'src/services/crud.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
 import { ConfigService } from '@nestjs/config';
-import { MediaService } from "src/services/media.service";
 import { FileService } from "src/services/file.service";
 import { CrudHelperService } from "src/services/crud-helper.service";
 
@@ -19,17 +17,16 @@ export class MqMessageService extends CRUDService<MqMessage>{
   constructor(
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
-    readonly discoveryService: DiscoveryService,
+   readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     @InjectRepository(MqMessage)
     readonly repo: Repository<MqMessage>,
- ) {
-   super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService,entityManager, repo, 'mqMessage', 'queues');
+     readonly moduleRef: ModuleRef
+  ) {
+   super(modelMetadataService, moduleMetadataService,  configService, fileService, discoveryService, crudHelperService,entityManager, repo, 'mqMessage', 'queues',moduleRef);
  }
 }

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

@@ -1,13 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService } from "@nestjs/core";
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, In, Repository } from 'typeorm';
 import { CRUDService } from 'src/services/crud.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
 import { ConfigService } from '@nestjs/config';
-import { MediaService } from "src/services/media.service";
 import { FileService } from "src/services/file.service";
 import { CrudHelperService } from "src/services/crud-helper.service";
 
@@ -21,18 +19,18 @@ export class PermissionMetadataService extends CRUDService<PermissionMetadata> {
   constructor(
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
     readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     @InjectRepository(PermissionMetadata, 'default')
     readonly repo: Repository<PermissionMetadata>,
+      readonly moduleRef: ModuleRef
+  
   ) {
-    super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'permissionMetadata', 'solid-core');
+    super(modelMetadataService, moduleMetadataService,  configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'permissionMetadata', 'solid-core',moduleRef);
   }
 
 

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

@@ -1,13 +1,11 @@
 import { forwardRef, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService } from "@nestjs/core";
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, In, Repository } from 'typeorm';
 import { CRUDService } from 'src/services/crud.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
 import { ConfigService } from '@nestjs/config';
-import { MediaService } from "src/services/media.service";
 import { FileService } from "src/services/file.service";
 import { CrudHelperService } from "src/services/crud-helper.service";
 
@@ -23,10 +21,8 @@ export class RoleMetadataService extends CRUDService<RoleMetadata> {
     @Inject(forwardRef(() => ModelMetadataService))
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
     readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
@@ -35,8 +31,10 @@ export class RoleMetadataService extends CRUDService<RoleMetadata> {
     readonly repo: Repository<RoleMetadata>,
     @InjectRepository(PermissionMetadata)
     private readonly permissionRepository: Repository<PermissionMetadata>,
+    readonly moduleRef: ModuleRef
+
   ) {
-    super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'roleMetadata', 'solid-core');
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'roleMetadata', 'solid-core', moduleRef);
   }
 
   async findRoleByName(roleName: string) {

package/src/services/setting.service.ts

@@ -1,50 +1,48 @@
 import { Inject, Injectable } from '@nestjs/common';
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService } from "@nestjs/core";
 import { EntityManager, Repository } from 'typeorm';
 
+import { ConfigService, ConfigType } from '@nestjs/config';
+import { CrudHelperService } from 'src/services/crud-helper.service';
 import { CRUDService } from 'src/services/crud.service';
+import { FileService } from 'src/services/file.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
-import { ConfigService, ConfigType } from '@nestjs/config';
-import { MediaService } from 'src/services/media.service';
-import { FileService } from 'src/services/file.service';
-import { CrudHelperService } from 'src/services/crud-helper.service';
 
 
-import { Setting } from '../entities/setting.entity';
-import { iamConfig } from 'src/config/iam.config';
 import commonConfig from 'src/config/common.config';
+import { iamConfig } from 'src/config/iam.config';
+import { Setting } from '../entities/setting.entity';
 
 @Injectable()
-export class SettingService extends CRUDService<Setting>{
+export class SettingService extends CRUDService<Setting> {
   constructor(
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
     readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     @Inject(iamConfig.KEY) private readonly iamConfiguration: ConfigType<typeof iamConfig>,
     @Inject(commonConfig.KEY)
-            private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+    private readonly commonConfiguration: ConfigType<typeof commonConfig>,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     @InjectRepository(Setting, 'default')
     readonly repo: Repository<Setting>,
- ) {
-   super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService,entityManager, repo, 'setting', 'solid-core'
-   );
- }
+    readonly moduleRef: ModuleRef
+
+  ) {
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'setting', 'solid-core', moduleRef
+    );
+  }
 
   async wrapSettings(): Promise<Record<string, any>> {
     const settingsArray: any[] = await this.repo.find();
-    
+
     if (!settingsArray || settingsArray.length === 0) {
-        return this.getDefaultSettings();
+      return this.getDefaultSettings();
     }
 
     const settings = settingsArray[0];
@@ -52,8 +50,8 @@ export class SettingService extends CRUDService<Setting>{
     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;
+      acc[key] = settings[key] !== null && settings[key] !== undefined ? settings[key] : defaultSettings[key];
+      return acc;
     }, {} as Record<string, any>);
 
     return mergedSettings;

package/src/services/user.service.ts

@@ -1,32 +1,27 @@
 import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { CrudHelperService } from "src/services/crud-helper.service";
 import { CRUDService } from 'src/services/crud.service';
+import { FileService } from "src/services/file.service";
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
-import { ConfigService } from '@nestjs/config';
-import { MediaService } from "src/services/media.service";
-import { FileService } from "src/services/file.service";
-import { CrudHelperService } from "src/services/crud-helper.service";
+import { EntityManager, Repository } from 'typeorm';
 
 
-import { User } from '../entities/user.entity';
 import { OauthUserDto } from '../dtos/oauth-user-dto';
 import { RoleMetadata } from '../entities/role-metadata.entity';
+import { User } from '../entities/user.entity';
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
-import { classify } from '@angular-devkit/core/src/utils/strings';
 
 @Injectable()
 export class UserService extends CRUDService<User> {
   constructor(
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
     readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
@@ -35,8 +30,10 @@ export class UserService extends CRUDService<User> {
     readonly repo: Repository<User>,
     @InjectRepository(RoleMetadata)
     private readonly roleRepository: Repository<RoleMetadata>,
+    readonly moduleRef: ModuleRef
+
   ) {
-    super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'user', 'solid-core');
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'user', 'solid-core', moduleRef);
   }
 
 
@@ -75,7 +72,7 @@ export class UserService extends CRUDService<User> {
     // return entity;
   }
 
-  async updateUser(id: any, updateDto, files,solidRequestContext :any = {}) {
+  async updateUser(id: any, updateDto, files, solidRequestContext: any = {}) {
     const user = await this.repo.findOne({
       where: { id: id },
       relations: {
@@ -85,7 +82,7 @@ export class UserService extends CRUDService<User> {
     if (!user) {
       throw new Error(`User not found.`);
     }
-    const roles  = updateDto.roles ? updateDto.roles :[]; 
+    const roles = updateDto.roles ? updateDto.roles : [];
     await this.addRolesToUser(user.username, roles);
     await this.update(id, updateDto, files, true);
   }

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

@@ -1,21 +1,19 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { DiscoveryService } from "@nestjs/core";
-import { EntityManager, Repository } from 'typeorm';
+import { CrudHelperService } from "src/services/crud-helper.service";
 import { CRUDService } from 'src/services/crud.service';
+import { FileService } from "src/services/file.service";
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
-import { ConfigService } from '@nestjs/config';
-import { MediaService } from "src/services/media.service";
-import { FileService } from "src/services/file.service";
-import { CrudHelperService } from "src/services/crud-helper.service";
+import { EntityManager, Repository } from 'typeorm';
 
 
-import { ViewMetadata } from '../entities/view-metadata.entity';
+import { UpdateViewMetadataDto } from '../dtos/update-view-metadata.dto';
 import { FieldMetadata } from '../entities/field-metadata.entity';
 import { ModelMetadata } from '../entities/model-metadata.entity';
-import { UpdateViewMetadataDto } from '../dtos/update-view-metadata.dto';
+import { ViewMetadata } from '../entities/view-metadata.entity';
 import { ActionMetadataService } from './action-metadata.service';
 import { SolidIntrospectService } from './solid-introspect.service';
 import { BasicFilterDto } from 'src/dtos/basic-filters.dto';
@@ -25,10 +23,8 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
   constructor(
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
     readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     readonly actionMetadataService: ActionMetadataService,
@@ -41,8 +37,10 @@ export class ViewMetadataService extends CRUDService<ViewMetadata> {
     private readonly fieldMetadataRepo: Repository<FieldMetadata>,
     @InjectRepository(ModelMetadata)
     private readonly modelMetadataRepo: Repository<ModelMetadata>,
+    readonly moduleRef: ModuleRef
+
   ) {
-    super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'viewMetadata', 'app-builder');
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'viewMetadata', 'app-builder', moduleRef);
   }
 
   // START: Custom Service Methods

package/src/solid-core.module.ts

@@ -137,6 +137,9 @@ import { SettingService } from './services/setting.service';
 import { SettingController } from './controllers/setting.controller';
 import { ModuleMetadataHelperService } from './helpers/module-metadata-helper.service';
 import { ConcatComputedFieldProvider } from './services/computed-fields/concat-computed-field-provider.service';
+import { FileS3StorageProvider } from './services/mediaStorageProviders/file-s3-storage-provider';
+import { FileStorageProvider } from './services/mediaStorageProviders/file-storage-provider';
+import { MediaRepository } from './repository/media.repository';
 
 
 @Global()
@@ -296,6 +299,9 @@ import { ConcatComputedFieldProvider } from './services/computed-fields/concat-c
     UserService,
     SettingService,
     ConcatComputedFieldProvider,
+    FileStorageProvider,
+    FileS3StorageProvider,
+    MediaRepository,
   ],
   exports: [
     ModuleMetadataService,