@solidstarters/solid-core 1.2.50 → 1.2.52

package/src/services/list-of-values.service.ts

@@ -1,54 +1,62 @@
-import { InjectRepository } from "@nestjs/typeorm";
-import { Repository } from "typeorm";
-import { ListOfValues } from "../entities/list-of-values.entity";
-import { PaginationQueryDto } from "src/dtos/pagination-query.dto";
-import { Injectable, NotFoundException } from "@nestjs/common";
+import { Injectable } from '@nestjs/common';
+import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
+import { EntityManager, Repository } from 'typeorm';
 
-@Injectable()
-export class ListOfValuesService {
-    constructor(
-        @InjectRepository(ListOfValues)
-        private readonly listOfValuesRepo: Repository<ListOfValues>,
-    ) { }
+import { CRUDService } from 'src/services/crud.service';
+import { ModelMetadataService } from 'src/services/model-metadata.service';
+import { ModuleMetadataService } from 'src/services/module-metadata.service';
+import { ConfigService } from '@nestjs/config';
+import { FileService } from 'src/services/file.service';
+import { CrudHelperService } from 'src/services/crud-helper.service';
 
-    findAll(paginationQuery: PaginationQueryDto) {
-        const { limit, offset } = paginationQuery;
-        return this.listOfValuesRepo.find({
-            relations: {},
-            skip: offset,
-            take: limit,
-        });
-    }
 
-    async findOneByValueAndType(lovValue: string, lovType: string) {
-        return await this.listOfValuesRepo.findOne({
-            where: {
-                value: lovValue,
-                type: lovType,
-            },
-        });
-    }
+import { ListOfValues } from '../entities/list-of-values.entity';
 
-    async findOne(id: number, relations = {}) {
-        const lov = await this.listOfValuesRepo.findOne({
-            where: {
-                id: id,
-            },
-            relations: relations,
-        });
-        if (!lov) {
-            throw new NotFoundException(`list of values #${id} not found`);
-        }
-        return lov;
-    }
+@Injectable()
+export class ListOfValuesService extends CRUDService<ListOfValues> {
+  constructor(
+    readonly modelMetadataService: ModelMetadataService,
+    readonly moduleMetadataService: ModuleMetadataService,
+    readonly configService: ConfigService,
+    readonly fileService: FileService,
+    readonly discoveryService: DiscoveryService,
+    readonly crudHelperService: CrudHelperService,
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    @InjectRepository(ListOfValues, 'default')
+    readonly repo: Repository<ListOfValues>,
+    readonly moduleRef: ModuleRef
 
-    async create(createDto: any) {
-        const lov = this.listOfValuesRepo.create(createDto);
-        return this.listOfValuesRepo.save(lov);
-    }
+  ) {
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'listOfValues', 'solid-core', moduleRef);
+  }
+  async findOneByValueAndType(lovValue: string, lovType: string) {
+    return await this.repo.findOne({
+      where: {
+        value: lovValue,
+        type: lovType,
+      },
+    });
+  }
+  async upsert(updateListOfValuesDto: any) {
+    // First check if module already exists using name
+    const existingListOfValue = await this.repo.findOne({
+      where: {
+        value: updateListOfValuesDto.value
+      }
+    })
 
-    async remove(id: number) {
-        const lov = await this.findOne(id);
-        return this.listOfValuesRepo.remove(lov);
+    // if found
+    if (existingListOfValue) {
+      const updatedListOfValuesDto = { ...existingListOfValue, ...updateListOfValuesDto };
+      return this.repo.save(updatedListOfValuesDto);
     }
-}
+    // if not found - create new 
+    else {
+      const listOfValue = this.repo.create(updateListOfValuesDto);
+      return this.repo.save(listOfValue);
+    }
+  }
+
+}

package/src/services/mail/SMTPEmailService.ts

@@ -5,11 +5,10 @@ import { EmailQueuePublisher } from 'src/jobs/email-publisher.service';
 import commonConfig from 'src/config/common.config';
 import { EmailTemplateService } from '../email-template.service';
 import Handlebars from "handlebars";
-import { IMail } from "../../interfaces";
+import { IMail, MailAttachment } from "../../interfaces";
 
 const nodemailer = require("nodemailer");
 
-
 @Injectable()
 export class SMTPEMailService implements IMail {
     private readonly logger = new Logger(SMTPEMailService.name);
@@ -32,7 +31,7 @@ export class SMTPEMailService implements IMail {
         });
     }
 
-    async sendEmailUsingTemplate(to: string, templateName: string, templateParams: any, shouldQueueEmails = false, parentEntity = null, parentEntityId = null): Promise<void> {
+    async sendEmailUsingTemplate(to: string, templateName: string, templateParams: any, shouldQueueEmails = false, parentEntity = null, parentEntityId = null, attachments: MailAttachment[] = [], cc: string[] = []): Promise<void> {
         // Load template and evaluate it. 
         const emailTemplate = await this.emailTemplateService.findOneByName(templateName);
         if (!emailTemplate) {
@@ -48,16 +47,18 @@ export class SMTPEMailService implements IMail {
         const subject = subjectTemplate(templateParams);
 
         // Finally send the email.
-        await this.sendEmail(to, subject, body, shouldQueueEmails, parentEntity, parentEntityId);
+        await this.sendEmail(to, subject, body, shouldQueueEmails, parentEntity, parentEntityId, attachments);
     }
 
-    async sendEmail(to: string, subject: string, body: string, shouldQueueEmails = false, parentEntity = null, parentEntityId = null): Promise<void> {
+    async sendEmail(to: string, subject: string, body: string, shouldQueueEmails = false, parentEntity = null, parentEntityId = null, attachments: MailAttachment[] = [], cc: string[]=[]): Promise<void> {
         const message = {
             payload: {
                 from: this.commonConfiguration.smtpMail.from,
                 to: to,
                 subject: subject,
-                body: body
+                body: body,
+                attachments: attachments,
+                cc: cc,
             },
             parentEntity: parentEntity,
             parentEntityId: parentEntityId,
@@ -85,13 +86,30 @@ export class SMTPEMailService implements IMail {
     }
 
     async sendEmailSynchronously(message: QueueMessage<any>): Promise<void> {
-        const { from, to, subject, body } = message.payload;
+        const { from, to, subject, body, attachments, cc } = message.payload;
+
+        const attachmentsList = attachments.map((attachment: MailAttachment) => {
+            const attachmentEntry = {
+                filename: attachment.filename,
+                contentType: attachment.contentType,
+            } 
+            if (attachment.path) {
+                attachmentEntry['path'] = attachment.path;
+            }
+            if (attachment.content) {
+                attachmentEntry['content'] = attachment.content;
+            }
+            return attachmentEntry;
+        });
+
         // throw new Error('Random error....');
         const r = await this.transporter.sendMail({
             from: from,
             to: to,
+            cc: cc,
             subject: subject,
-            html: body
+            html: body,
+            attachments: attachmentsList,
         });
         // this.logger.debug(`Sending email to ${to} with subject ${subject} and body ${body}`);
         this.logger.debug(`Sending email to ${to} with subject ${subject}`);

package/src/services/saved-filters.service.ts

@@ -0,0 +1,34 @@
+import { Injectable } from '@nestjs/common';
+import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
+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 { ConfigService } from '@nestjs/config';
+import { FileService } from 'src/services/file.service';
+import { CrudHelperService } from 'src/services/crud-helper.service';
+
+
+import { SavedFilters } from '../entities/saved-filters.entity';
+
+@Injectable()
+export class SavedFiltersService extends CRUDService<SavedFilters>{
+  constructor(
+    readonly modelMetadataService: ModelMetadataService,
+    readonly moduleMetadataService: ModuleMetadataService,
+    readonly configService: ConfigService,
+    readonly fileService: FileService,
+    readonly discoveryService: DiscoveryService,
+    readonly crudHelperService: CrudHelperService,
+    @InjectEntityManager()
+    readonly entityManager: EntityManager,
+    @InjectRepository(SavedFilters, 'default')
+    readonly repo: Repository<SavedFilters>,
+    readonly moduleRef: ModuleRef
+
+ ) {
+   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'savedFilters', 'solid-core', moduleRef);
+ }
+}

package/src/solid-core.module.ts

@@ -141,6 +141,9 @@ import { FileS3StorageProvider } from './services/mediaStorageProviders/file-s3-
 import { FileStorageProvider } from './services/mediaStorageProviders/file-storage-provider';
 import { MediaRepository } from './repository/media.repository';
 import { ViewMetadataSubsciber } from './subscribers/view-metadata.subscriber';
+import { SavedFilters } from './entities/saved-filters.entity';
+import { SavedFiltersService } from './services/saved-filters.service';
+import { SavedFiltersController } from './controllers/saved-filters.controller';
 import { UserViewMetadata } from './entities/user-view-metadata.entity';
 import { UserViewMetadataService } from './services/user-view-metadata.service';
 import { UserViewMetadataController } from './controllers/user-view-metadata.controller';
@@ -150,6 +153,7 @@ import { SecurityRuleController } from './controllers/security-rule.controller';
 import { RequestContextService } from './services/request-context.service';
 import { SecurityRuleRepository } from './repository/security-rule.repository';
 import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
+import { ListOfValuesController } from './controllers/list-of-values.controller';
 
 
 @Global()
@@ -194,8 +198,11 @@ import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
     HttpModule,
     ConfigModule,
     TypeOrmModule.forFeature([Setting]),
+    TypeOrmModule.forFeature([SavedFilters]),
     TypeOrmModule.forFeature([UserViewMetadata]),
     TypeOrmModule.forFeature([SecurityRule]),
+    TypeOrmModule.forFeature([SavedFilters]),
+    TypeOrmModule.forFeature([ListOfValues]),
     // TypeOrmModule.forFeature([User]),
   ],
   controllers: [
@@ -221,8 +228,11 @@ import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
     RoleMetadataController,
     UserController,
     SettingController,
+    SavedFiltersController,
     UserViewMetadataController,
     SecurityRuleController,
+    SavedFiltersController,
+    ListOfValuesController
   ],
   providers: [
     {
@@ -317,11 +327,13 @@ import { SecurityRuleSubscriber } from './subscribers/security-rule.subscriber';
     FileS3StorageProvider,
     MediaRepository,
     ViewMetadataSubsciber,
+    SavedFiltersService,
     UserViewMetadataService,
     SecurityRuleService,
     SecurityRuleRepository,
     SecurityRuleSubscriber,
     RequestContextService,
+    SavedFiltersService
   ],
   exports: [
     ModuleMetadataService,