@solidxai/core 0.1.6-beta.9 → 0.1.6

package/src/services/authentication.service.ts

@@ -464,6 +464,10 @@ export class AuthenticationService {
 
     private async notifyUserOnOtpInitiateRegistration(user: User, registrationValidationSource: string) {
         const companyLogo = await this.getCompanyLogo();
+        const dummyOtp = this.getDummyOtpForUser(user);
+
+        if (dummyOtp)
+            return; // Do nothing if dummy otp is configured.
         if (registrationValidationSource === PasswordlessLoginValidateWhatSources.EMAIL) {
             const mailService = this.mailServiceFactory.getMailService();
             mailService.sendEmailUsingTemplate(
@@ -590,12 +594,13 @@ export class AuthenticationService {
         return true;
     }
 
-    private async otp(): Promise<otp> {
+    private async otp(user?: User): Promise<otp> {
         const now = new Date();
         const otpExpiry = this.settingService.getConfigValue<SolidCoreSetting>('otpExpiry');
+        const dummyOtp = this.getDummyOtpForUser(user);
         now.setMinutes(now.getMinutes() + otpExpiry);
         return {
-            token: randomInt(100000, 999999).toString(),
+            token: dummyOtp ? dummyOtp : randomInt(100000, 999999).toString(),
             expiresAt: now,
         };
     }
@@ -687,11 +692,8 @@ export class AuthenticationService {
 
         const type = this.resolveLoginType(signInDto);
         const user = await this.findUserForLogin(type, signInDto.identifier);
-        const dummyOtp = this.getDummyOtpForUser(user);
-        if (!dummyOtp) {
-            await this.assignLoginOtp(user, type);
-            this.notifyUserOnOtpInititateLogin(user, type);
-        }
+        await this.assignLoginOtp(user, type);
+        this.notifyUserOnOtpInititateLogin(user, type);
         return this.buildLoginOtpResponse(user, type);
     }
 
@@ -736,22 +738,15 @@ export class AuthenticationService {
     }
 
     private async assignLoginOtp(user: User, type: PasswordlessLoginValidateWhatSources): Promise<void> {
-        const { token, expiresAt } = await this.otp();
+        const { token, expiresAt } = await this.otp(user);
         if (type === PasswordlessLoginValidateWhatSources.EMAIL) {
             user.emailVerificationTokenOnLogin = token;
             user.emailVerificationTokenOnLoginExpiresAt = expiresAt;
-            await this.userRepository.update(user.id, {
-                emailVerificationTokenOnLogin: token,
-                emailVerificationTokenOnLoginExpiresAt: expiresAt,
-            });
         } else {
             user.mobileVerificationTokenOnLogin = token;
             user.mobileVerificationTokenOnLoginExpiresAt = expiresAt;
-            await this.userRepository.update(user.id, {
-                mobileVerificationTokenOnLogin: token,
-                mobileVerificationTokenOnLoginExpiresAt: expiresAt,
-            });
         }
+        await this.userRepository.save(user);
     }
 
     private buildLoginOtpResponse(user: User, type: PasswordlessLoginValidateWhatSources) {
@@ -820,15 +815,6 @@ export class AuthenticationService {
 
         const user = await this.findUserForLogin(type, identifier, { withRoles: true });
         this.checkAccountBlocked(user);
-        const dummyOtp = this.getDummyOtpForUser(user);
-
-        if (dummyOtp) {
-            if (otp !== dummyOtp) {
-                throw new UnauthorizedException(ERROR_MESSAGES.INVALID_OTP);
-            }
-            return this.buildLoginTokenResponse(user);
-        }
-
         try {
             this.validateLoginOtp(user, otp, type);
         } catch (e) {
@@ -836,9 +822,13 @@ export class AuthenticationService {
             throw e;
         }
 
-        await this.clearLoginOtp(user, type);
-        await this.userActivityHistoryService.logEvent('login', user); 
-        await this.resetFailedAttempts(user);
+        // we do not need to clear the otp when dummy otp is configured...
+        const dummyOtp = this.getDummyOtpForUser(user);
+        if (!dummyOtp)
+            this.clearLoginOtp(user, type);
+
+        user.failedLoginAttempts = 0;
+        await this.userRepository.save(user);
         return this.buildLoginTokenResponse(user);
     }
 
@@ -855,27 +845,15 @@ export class AuthenticationService {
         }
     }
 
-    private async clearLoginOtp(user: User, type: PasswordlessLoginValidateWhatSources): Promise<void> {
+    private clearLoginOtp(user: User, type: PasswordlessLoginValidateWhatSources): void {
         if (type === PasswordlessLoginValidateWhatSources.EMAIL) {
-            const verifiedAt = new Date();
-            user.emailVerifiedOnLoginAt = verifiedAt;
+            user.emailVerifiedOnLoginAt = new Date();
             user.emailVerificationTokenOnLogin = null;
             user.emailVerificationTokenOnLoginExpiresAt = null;
-            await this.userRepository.update(user.id, {
-                emailVerifiedOnLoginAt: verifiedAt,
-                emailVerificationTokenOnLogin: null,
-                emailVerificationTokenOnLoginExpiresAt: null,
-            });
         } else {
-            const verifiedAt = new Date();
-            user.mobileVerifiedOnLoginAt = verifiedAt;
+            user.mobileVerifiedOnLoginAt = new Date();
             user.mobileVerificationTokenOnLogin = null;
             user.mobileVerificationTokenOnLoginExpiresAt = null;
-            await this.userRepository.update(user.id, {
-                mobileVerifiedOnLoginAt: verifiedAt,
-                mobileVerificationTokenOnLogin: null,
-                mobileVerificationTokenOnLoginExpiresAt: null,
-            });
         }
     }
 
@@ -1318,15 +1296,14 @@ export class AuthenticationService {
     }
 
     private async incrementFailedAttempts(user: User): Promise<void> {
-        const nextFailedAttempts = (user.failedLoginAttempts ?? 0) + 1;
-        user.failedLoginAttempts = nextFailedAttempts;
-        await this.userRepository.update(user.id, { failedLoginAttempts: nextFailedAttempts });
+        user.failedLoginAttempts += 1;
+        await this.userRepository.save(user);
     }
 
     private async resetFailedAttempts(user: User): Promise<void> {
         if (user.failedLoginAttempts === 0) return;
         user.failedLoginAttempts = 0;
-        await this.userRepository.update(user.id, { failedLoginAttempts: 0 });
+        await this.userRepository.save(user);
     }
 
     //FIXME - Pending implementation

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

@@ -1,4 +1,3 @@
-import { LocalDateTimeTransformer, serializeDate } from 'src/transformers/typeorm/local-date-time-transformer';
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
@@ -142,7 +141,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
                 messageDetail.chatterMessage = savedMessage;
                 messageDetail.fieldName = field.name;
                 messageDetail.fieldDisplayName = field.displayName;
-                messageDetail.fieldType = field.type;
                 messageDetail.oldValue = null;
                 messageDetail.oldValueDisplay = null;
                 messageDetail.newValue = this.formatFieldValue(field, fieldValue);
@@ -259,7 +257,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             messageDetail.chatterMessage = savedMessage;
             messageDetail.fieldName = field.name;
             messageDetail.fieldDisplayName = field.displayName;
-            messageDetail.fieldType = field.type;
             messageDetail.oldValue = this.formatFieldValue(field, oldValue);
             messageDetail.newValue = this.formatFieldValue(field, newValue);
             messageDetail.oldValueDisplay = await this.formatFieldValueDisplay(field, oldValue);
@@ -323,9 +320,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             }
         }
 
-        if (value instanceof Date) {
-            return serializeDate(value);
-        }
 
         return value.toString();
     }
@@ -339,10 +333,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             return `${value}`;
         }
 
-        if (['date', 'datetime', 'time'].includes(field.type)) {
-            return null;
-        }
-
         if (field.type === 'relation') {
             if (field.relationType === "many-to-one") {
                 if (value.name) {
@@ -628,22 +618,6 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const [entities, count] = await qb.getManyAndCount();
         this.logHeapUsed('getChatterMessages-entitiesLoaded');
 
-        // Convert date strings in message details to ISO format for consistent handling on the frontend
-        const DATE_FIELD_TYPES = ['date', 'datetime', 'time'];
-        for (const entity of entities) {
-            for (const detail of entity.chatterMessageDetails ?? []) {
-                if (!detail.fieldType || !DATE_FIELD_TYPES.includes(detail.fieldType)) continue;
-                if (detail.oldValue) {
-                    const d = LocalDateTimeTransformer.from(detail.oldValue);
-                    if (d) detail.oldValue = d.toISOString();
-                }
-                if (detail.newValue) {
-                    const d = LocalDateTimeTransformer.from(detail.newValue);
-                    if (d) detail.newValue = d.toISOString();
-                }
-            }
-        }
-
         if (populateMedia && populateMedia.length > 0) {
             const normalizedPopulateMedia = this.crudHelperService.normalize(populateMedia);
             this.logHeapUsed('getChatterMessages-beforePopulateMedia');

package/src/services/dashboard-question.service.ts

@@ -11,18 +11,15 @@ import { SolidRegistry } from 'src/helpers/solid-registry';
 import { DashboardQuestion } from '../entities/dashboard-question.entity';
 import { SqlExpression, SqlExpressionOperator } from './question-data-providers/chartjs-sql-data-provider.service';
 import { DashboardQuestionRepository } from 'src/repository/dashboard-question.repository';
-import { QuestionSqlDataProviderContext } from 'src';
 
 enum SOURCE_TYPE {
   SQL = 'sql',
   PROVIDER = 'provider',
 }
 
-export const CHARTJS_SQL_DATA_PROVIDER_NAME = 'ChartJsSqlDataProvider';
-export const PRIME_REACT_METER_GROUP_SQL_DATA_PROVIDER_NAME = 'PrimeReactMeterGroupSqlDataProvider';
-export const PRIME_REACT_DATATABLE_SQL_DATA_PROVIDER_NAME = 'PrimeReactDatatableSqlDataProvider';
-
-export const INBUILT_SQL_DATA_PROVIDERS = [CHARTJS_SQL_DATA_PROVIDER_NAME, PRIME_REACT_METER_GROUP_SQL_DATA_PROVIDER_NAME, PRIME_REACT_DATATABLE_SQL_DATA_PROVIDER_NAME];
+const CHARTJS_SQL_DATA_PROVIDER_NAME = 'ChartJsSqlDataProvider';
+const PRIME_REACT_METER_GROUP_SQL_DATA_PROVIDER_NAME = 'PrimeReactMeterGroupSqlDataProvider';
+const PRIME_REACT_DATATABLE_SQL_DATA_PROVIDER_NAME = 'PrimeReactDatatableSqlDataProvider';
 
 @Injectable()
 export class DashboardQuestionService extends CRUDService<DashboardQuestion> {
@@ -53,38 +50,22 @@ export class DashboardQuestionService extends CRUDService<DashboardQuestion> {
 
     // Try to resolve the dataProvider based on a combination of sourceType and visualisedAs
     let dataProvider = null;
-    let context = {};
 
-    // Decide which data provider to use based on the question visualisation type if sourceType is SQL. 
     if (question.sourceType === SOURCE_TYPE.SQL && ['bar', 'pie', 'line', 'donut'].includes(question.visualisedAs)) {
       dataProvider = this.solidRegistry.getDashboardQuestionDataProviderInstance(CHARTJS_SQL_DATA_PROVIDER_NAME);
-      context = {
-        expressions,
-      } as QuestionSqlDataProviderContext;
     }
     if (question.sourceType === SOURCE_TYPE.SQL && ['prime-meter-group'].includes(question.visualisedAs)) {
       dataProvider = this.solidRegistry.getDashboardQuestionDataProviderInstance(PRIME_REACT_METER_GROUP_SQL_DATA_PROVIDER_NAME);
-            context = {
-        expressions,
-      } as QuestionSqlDataProviderContext;
     }
     if (question.sourceType === SOURCE_TYPE.SQL && ['prime-datatable'].includes(question.visualisedAs)) {
       dataProvider = this.solidRegistry.getDashboardQuestionDataProviderInstance(PRIME_REACT_DATATABLE_SQL_DATA_PROVIDER_NAME);
-      context = {
-        expressions,
-      } as QuestionSqlDataProviderContext;
-    }
-
-    // If a custom provider is specified, use that one instead
-    if (question.sourceType === SOURCE_TYPE.PROVIDER) {
-      dataProvider = this.solidRegistry.getDashboardQuestionDataProviderInstance(question.providerName);
     }
 
     if (!dataProvider) {
       throw new NotImplementedException(`Invalid data source type ${question.sourceType}`);
     }
 
-    return await dataProvider.getData(question, context);
+    return await dataProvider.getData(question, expressions);
 
   }
 

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

@@ -225,7 +225,6 @@ export class ModelMetadataService {
     let userKeyField = null;
     const listViewLayout = [];
     const formViewLayout = [];
-    const treeViewLayout = [];
 
     for (let k = 0; k < fieldsMetadata.length; k++) {
       const fieldMetadata = fieldsMetadata[k];
@@ -246,7 +245,6 @@ export class ModelMetadataService {
       }
       listViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}` } })
       formViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}` } })
-      treeViewLayout.push({ type: "field", attrs: { name: `${affectedField.name}` } })
 
     }
 
@@ -820,7 +818,6 @@ export class ModelMetadataService {
       const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
 
       const listViewLayoutFields = [{ type: "field", attrs: { name: `id` } }];
-      const treeViewLayoutFields = [{ type: "field", attrs: { name: `id` } }];
       const formViewLayoutFields = [];
 
       for (let i = 0; i < model.fields.length; i++) {
@@ -828,9 +825,8 @@ export class ModelMetadataService {
         if (field.isSystem) continue;
         listViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
         formViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
-        treeViewLayoutFields.push({ type: "field", attrs: { name: `${field.name}` } })
       }
-      this.populateVAMConfigInFileInternal(formViewLayoutFields, model, listViewLayoutFields, treeViewLayoutFields, metaData);
+      this.populateVAMConfigInFileInternal(formViewLayoutFields, model, listViewLayoutFields, metaData);
       // Write the updated object back to the file
       const updatedContent = JSON.stringify(metaData, null, 2);
       await fs.writeFile(filePath, updatedContent);
@@ -843,7 +839,7 @@ export class ModelMetadataService {
   }
 
   // Populate the View, Actions and Menus in the config file
-  private populateVAMConfigInFileInternal(formViewLayoutFields: any[], model: ModelMetadata, listViewLayoutFields: { type: string; attrs: { name: string; }; }[], treeViewLayoutFields: { type: string; attrs: { name: string; }; }[], metaData: any) {
+  private populateVAMConfigInFileInternal(formViewLayoutFields: any[], model: ModelMetadata, listViewLayoutFields: { type: string; attrs: { name: string; }; }[], metaData: any) {
     const column1Fields = [];
     const column2Fields = [];
 
@@ -856,9 +852,7 @@ export class ModelMetadataService {
       }
     }
     const actionName = `${model.singularName}-list-action`;
-    const treeViewActionName = `${model.singularName}-tree-view-action`;
-    const listViewName = `${model.singularName}-list-view`;
-    const treeViewName = `${model.singularName}-tree-view`;
+    const viewName = `${model.singularName}-list-view`;
     const formViewName = `${model.singularName}-form-view`;
     const menuName = `${model.singularName}-menu-item`;
 
@@ -871,21 +865,7 @@ export class ModelMetadataService {
       customComponent: ``,
       customIsModal: true,
       serverEndpoint: "",
-      viewUserKey: listViewName,
-      moduleUserKey: `${model.module.name}`,
-      modelUserKey: `${model.singularName}`
-    };
-
-    const treeViewAction = {
-      displayName: `${model.displayName} Tree View Action`,
-      name: treeViewActionName,
-      type: "solid",
-      domain: "",
-      context: "",
-      customComponent: ``,
-      customIsModal: true,
-      serverEndpoint: "",
-      viewUserKey: treeViewName,
+      viewUserKey: viewName,
       moduleUserKey: `${model.module.name}`,
       modelUserKey: `${model.singularName}`
     };
@@ -897,11 +877,11 @@ export class ModelMetadataService {
       actionUserKey: actionName,
       moduleUserKey: `${model.module.name}`,
       parentMenuItemUserKey: "",
-      iconName: ""
+      iconName : ""
     };
 
     const modelListview = {
-      name: listViewName,
+      name: viewName,
       displayName: `${model.displayName}`,
       type: "list",
       context: "{}",
@@ -925,31 +905,6 @@ export class ModelMetadataService {
       }
     };
 
-    const modelTreeview = {
-      name: treeViewName,
-      displayName: `${model.displayName}`,
-      type: "tree",
-      context: "{}",
-      moduleUserKey: `${model.module.name}`,
-      modelUserKey: `${model.singularName}`,
-      layout: {
-        type: "tree",
-        attrs: {
-          pagination: true,
-          pageSizeOptions: [
-            10,
-            25,
-            50
-          ],
-          enableGlobalSearch: true,
-          create: true,
-          edit: true,
-          delete: true
-        },
-        children: treeViewLayoutFields
-      }
-    };
-
 
     const modelFormView = {
       name: formViewName,
@@ -999,18 +954,10 @@ export class ModelMetadataService {
       metaData.actions.push(action);
     }
 
-    if (notExists(metaData.actions, treeViewActionName)) {
-      metaData.actions.push(treeViewAction);
-    }
-
-    if (notExists(metaData.views, listViewName)) {
+    if (notExists(metaData.views, viewName)) {
       metaData.views.push(modelListview);
     }
 
-    if (notExists(metaData.views, treeViewName)) {
-      metaData.views.push(modelTreeview);
-    }
-
     if (notExists(metaData.views, formViewName)) {
       metaData.views.push(modelFormView);
     }
@@ -1032,14 +979,6 @@ export class ModelMetadataService {
       }
     }));
 
-    const treeViewLayout = jsonFieldsList.map(field => ({
-      type: "field",
-      attrs: {
-        name: `${field.name}`,
-        isSearchable: true,
-      }
-    }));
-
     const formViewLayout = jsonFieldsList.map(field => ({
       type: "field",
       attrs: {
@@ -1080,26 +1019,6 @@ export class ModelMetadataService {
           children: listViewLayout
         }, null, 3)
       },
-      {
-        name: `${model.singularName}-tree-view`,
-        displayName: `${model.displayName}`,
-        type: 'tree',
-        context: "{}",
-        module: resolvedModule,
-        model: model,
-        layout: JSON.stringify({
-          type: "tree",
-          attrs: {
-            pagination: true,
-            pageSizeOptions: [10, 25, 50],
-            enableGlobalSearch: true,
-            create: true,
-            edit: true,
-            delete: true
-          },
-          children: treeViewLayout
-        }, null, 3)
-      },
       {
         name: `${model.singularName}-form-view`,
         displayName: `${model.displayName}`,
@@ -1148,7 +1067,6 @@ export class ModelMetadataService {
     }
 
     let view = await viewRepo.findOne({ where: { name: `${model.singularName}-list-view` } });
-    let treeView = await viewRepo.findOne({ where: { name: `${model.singularName}-tree-view` } });
 
     const actionData = {
       displayName: `${model.displayName} List Action`,
@@ -1164,33 +1082,13 @@ export class ModelMetadataService {
       model: model
     };
 
-    const treeViewActionData = {
-      displayName: `${model.displayName} Tree View Action`,
-      name: `${model.singularName}-tree-view-action`,
-      type: "solid",
-      domain: "",
-      context: "",
-      customComponent: ``,
-      customIsModal: true,
-      serverEndpoint: "",
-      view: treeView,
-      module: resolvedModule,
-      model: model
-    };
-
     let existingAction = await actionRepo.findOne({ where: { name: actionData.name } });
-    let existingTreeViewAction = await actionRepo.findOne({ where: { name: treeViewActionData.name } });
 
     if (!existingAction) {
       const createdAction = actionRepo.create(actionData);
       existingAction = await actionRepo.save(createdAction);
     }
 
-    if (!existingTreeViewAction) {
-      const createdTreeViewAction = actionRepo.create(treeViewActionData);
-      existingTreeViewAction = await actionRepo.save(createdTreeViewAction);
-    }
-
     const adminRole = await this.roleService.findRoleByName('Admin');
 
     const menuData = {

package/src/services/question-data-providers/chartjs-sql-data-provider.service.ts

@@ -1,11 +1,16 @@
 import { Injectable, Logger } from "@nestjs/common";
 import { DashboardQuestionDataProvider } from "src/decorators/dashboard-question-data-provider.decorator";
 import { DashboardQuestion } from "src/entities/dashboard-question.entity";
-import { IDashboardQuestionDataProvider, QuestionSqlDataProviderContext } from "src/interfaces";
+import { IDashboardQuestionDataProvider } from "src/interfaces";
 import { EntityManager } from "typeorm";
 import { SqlExpressionResolverService } from "../sql-expression-resolver.service";
 import { getKpi, getLabels } from "./helpers";
 
+export interface QuestionSqlDataProviderContext {
+    // questionSqlDatasetConfig: QuestionSqlDatasetConfig;
+    // questionId: number;
+    // question: Question;
+}
 
 export enum SqlExpressionOperator {
     EQUALS = '$equals',
@@ -44,8 +49,7 @@ export class ChartJsSqlDataProvider implements IDashboardQuestionDataProvider<Qu
         return "ChartJsSqlDataProvider";
     }
 
-    async getData(question: DashboardQuestion, context?: QuestionSqlDataProviderContext): Promise<any> {
-        const expressions: SqlExpression[] = context?.expressions || [];
+    async getData(question: DashboardQuestion, expressions?: SqlExpression[], context?: QuestionSqlDataProviderContext): Promise<any> {
         // TODO: put some validation to check if the results of each SQL in each dataset returns the same number of rows 
 
         // This is what we have to return.

package/src/services/question-data-providers/prime-react-datatable-sql-data-provider.service.ts

@@ -1,13 +1,19 @@
 import { Injectable } from "@nestjs/common";
 import { DashboardQuestionDataProvider } from "src/decorators/dashboard-question-data-provider.decorator";
 import { DashboardQuestion } from "src/entities/dashboard-question.entity";
-import { IDashboardQuestionDataProvider, QuestionSqlDataProviderContext } from "src/interfaces";
+import { IDashboardQuestionDataProvider } from "src/interfaces";
 import { EntityManager } from "typeorm";
 import { SqlExpressionResolverService } from "../sql-expression-resolver.service";
 import { Logger } from '@nestjs/common';
 import { SqlExpression } from "./chartjs-sql-data-provider.service";
 import { getKpi } from "./helpers";
 
+export interface QuestionSqlDataProviderContext {
+    // questionSqlDatasetConfig: QuestionSqlDatasetConfig;
+    // questionId: number;
+    // question: Question;
+}
+
 @DashboardQuestionDataProvider()
 @Injectable()
 export class PrimeReactDatatableSqlDataProvider implements IDashboardQuestionDataProvider<QuestionSqlDataProviderContext, any> {
@@ -23,9 +29,7 @@ export class PrimeReactDatatableSqlDataProvider implements IDashboardQuestionDat
         return "PrimeReactDatatableSqlDataProvider";
     }
 
-    async getData(question: DashboardQuestion, context?: QuestionSqlDataProviderContext): Promise<any> {
-        const expressions: SqlExpression[] = context?.expressions || [];
-
+    async getData(question: DashboardQuestion, expressions?: SqlExpression[], context?: QuestionSqlDataProviderContext): Promise<any> {
         // TODO: put some validation to check if the results of each SQL in each dataset returns the same number of rows 
 
         // Check the expected response for prime react data tables to understand what is going on here...

package/src/services/question-data-providers/prime-react-meter-group-sql-data-provider.service.ts

@@ -1,13 +1,19 @@
 import { Injectable } from "@nestjs/common";
 import { DashboardQuestionDataProvider } from "src/decorators/dashboard-question-data-provider.decorator";
 import { DashboardQuestion } from "src/entities/dashboard-question.entity";
-import { IDashboardQuestionDataProvider, QuestionSqlDataProviderContext } from "src/interfaces";
+import { IDashboardQuestionDataProvider } from "src/interfaces";
 import { EntityManager } from "typeorm";
 import { SqlExpressionResolverService } from "../sql-expression-resolver.service";
 import { Logger } from '@nestjs/common';
 import { SqlExpression } from "./chartjs-sql-data-provider.service";
 import { getKpi } from "./helpers";
 
+export interface QuestionSqlDataProviderContext {
+    // questionSqlDatasetConfig: QuestionSqlDatasetConfig;
+    // questionId: number;
+    // question: Question;
+}
+
 @DashboardQuestionDataProvider()
 @Injectable()
 export class PrimeReactMeterGroupSqlDataProvider implements IDashboardQuestionDataProvider<QuestionSqlDataProviderContext, any> {
@@ -52,9 +58,7 @@ export class PrimeReactMeterGroupSqlDataProvider implements IDashboardQuestionDa
         return colors;
     }
 
-    async getData(question: DashboardQuestion, context?: QuestionSqlDataProviderContext): Promise<any> {
-        const expressions: SqlExpression[] = context?.expressions || [];
-
+    async getData(question: DashboardQuestion, expressions?: SqlExpression[], context?: QuestionSqlDataProviderContext): Promise<any> {
         // TODO: put some validation to check if the results of each SQL in each dataset returns the same number of rows 
 
         // This is what we have to return.

package/src/services/queues/database-subscriber.service.ts

@@ -7,7 +7,7 @@ import { PollerService } from '../poller.service';
 import { buildNamespacedQueueName } from './common';
 
 export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscriber<T> {
-    private _loggerInstance?: Logger;
+    private readonly logger = new Logger(DatabaseSubscriber.name);
     private readonly url: string;
     private readonly serviceRole: string;
 
@@ -23,17 +23,6 @@ export abstract class DatabaseSubscriber<T> implements OnModuleInit, QueueSubscr
         // this.logger.debug(`DatabaseSubscriber instance created with options: ${JSON.stringify(this.options())}`);
     }
 
-    protected get loggerContext(): string {
-        return this.constructor.name;
-    }
-
-    protected get logger(): Logger {
-        if (!this._loggerInstance) {
-            this._loggerInstance = new Logger(this.loggerContext);
-        }
-        return this._loggerInstance;
-    }
-
     abstract subscribe(message: QueueMessage<T>);
 
     abstract options(): QueuesModuleOptions;

package/src/services/queues/publisher-factory.service.ts

@@ -23,16 +23,14 @@ export class PublisherFactory<T> {
         // Register all ISolidDatabaseModules implementations
         let actualPublisherToUse = this.solidIntrospectionService.getProvider(resolvedPublisherName);
         if (!actualPublisherToUse) {
-            // Relaxed extra check in place to make sure we do not have to refactor old publishers or publishers named without the ____RabbitMq or ____Database convention
-            actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);
 
             // Extra check in place to make sure we do not have to refactor old publishers which have been created earlier. 
-            // if (defaultBrokerToUse === 'rabbitmq') {
-            //     actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);
-            // }
-        }
-        if (!actualPublisherToUse) {
-            throw new Error(`Unable to locate publisher with name ${resolvedPublisherName}`);
+            if (defaultBrokerToUse === 'rabbitmq') {
+                actualPublisherToUse = this.solidIntrospectionService.getProvider(publisherName);
+                if (!actualPublisherToUse) {
+                    throw new Error(`Unable to locate publisher with name ${resolvedPublisherName}`);
+                }
+            }
         }
 
         // type safe

package/src/services/queues/rabbitmq-subscriber.service.ts

@@ -8,7 +8,7 @@ import { buildNamespacedQueueName } from './common';
 
 
 export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscriber<T> { // TODO This can be made a generic type for better type visibility
-    private _loggerInstance?: Logger;
+    private readonly logger = new Logger(RabbitMqSubscriber.name);
     private readonly url: string;
     private readonly serviceRole: string;
     private connection: amqp.Connection | null = null;
@@ -30,17 +30,6 @@ export abstract class RabbitMqSubscriber<T> implements OnModuleInit, QueueSubscr
         // this.logger.debug(`RabbitMqSubscriber instance created with options: ${JSON.stringify(this.options())} and url: ${this.url}`);
     }
 
-    protected get loggerContext(): string {
-        return this.constructor.name;
-    }
-
-    protected get logger(): Logger {
-        if (!this._loggerInstance) {
-            this._loggerInstance = new Logger(this.loggerContext);
-        }
-        return this._loggerInstance;
-    }
-
     abstract subscribe(message: QueueMessage<T>);
 
     abstract options(): QueuesModuleOptions;