@solidxai/core 0.1.6-beta.7 → 0.1.6

package/src/services/scheduled-job.service.ts

@@ -1,12 +1,10 @@
-import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { ModuleRef } from "@nestjs/core";
 import { InjectEntityManager } from '@nestjs/typeorm';
 import { ScheduledJob } from 'src/entities/scheduled-job.entity';
-import { SolidRegistry } from 'src/helpers/solid-registry';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { EntityManager } from 'typeorm';
 import { CRUDService } from './crud.service';
-import { SchedulerServiceImpl } from './scheduled-jobs/scheduler.service';
 
 @Injectable()
 export class ScheduledJobService extends CRUDService<ScheduledJob> {
@@ -18,36 +16,9 @@ export class ScheduledJobService extends CRUDService<ScheduledJob> {
     // @InjectRepository(ScheduledJob)
     // readonly repo: Repository<ScheduledJob>,
     readonly repo: ScheduledJobRepository,
-    readonly moduleRef: ModuleRef,
-    private readonly solidRegistry: SolidRegistry,
-    private readonly schedulerService: SchedulerServiceImpl,
+    readonly moduleRef: ModuleRef
 
   ) {
     super(entityManager, repo, 'scheduledJob', 'solid-core', moduleRef);
   }
-
-  async triggerRun(id: number): Promise<ScheduledJob> {
-    const job = await this.repo.findOne({ where: { id } });
-    if (!job) {
-      throw new NotFoundException(`Scheduled job with id ${id} not found`);
-    }
-
-    const handler = this.solidRegistry.getScheduledJobProviderInstance(job.job);
-    if (!handler) {
-      throw new BadRequestException(`Scheduled job handler not found: ${job.job}`);
-    }
-
-    this.logger.log(`Manually triggering scheduled job id=${job.id}, job=${job.job}`);
-
-    await handler.execute(job);
-
-    const finishedAt = new Date();
-    job.lastRunAt = finishedAt;
-    job.nextRunAt = this.schedulerService.computeNextRunAt(job, finishedAt);
-    await this.repo.save(job);
-
-    this.logger.log(`Completed manual trigger for scheduled job id=${job.id}, nextRunAt=${job.nextRunAt?.toISOString?.()}`);
-
-    return job;
-  }
 }

package/src/services/scheduled-jobs/scheduler.interface.ts

@@ -1,6 +1,3 @@
-import { ScheduledJob } from "src/entities/scheduled-job.entity";
-
 export interface ISchedulerService {
     runScheduledJobs(): Promise<void>;
-    computeNextRunAt(job: ScheduledJob, from: Date): Date;
-}
+}

package/src/services/scheduled-jobs/scheduler.service.ts

@@ -94,21 +94,22 @@ export class SchedulerServiceImpl implements ISchedulerService {
     }
 
     private shouldRunNow(job: ScheduledJob, now: Date): boolean {
-        const today = new Date(now);
-        today.setHours(0, 0, 0, 0);
-        const timeNow = this.toHHMM(now); // hh:mm
+        const today = now.toISOString().split('T')[0]; // yyyy-mm-dd
+        const timeNow = now.toTimeString().slice(0, 5); // hh:mm
 
         // 1. Check startDate / endDate
-        const startDate = this.toDateOnly(job.startDate as unknown as Date | string | null);
-        const endDate = this.toDateOnly(job.endDate as unknown as Date | string | null);
-        if (startDate && today < startDate) return false;
-        if (endDate && today > endDate) return false;
+        if (job.startDate && new Date(today) < new Date(job.startDate)) return false;
+        if (job.endDate && new Date(today) > new Date(job.endDate)) return false;
 
         // 2. Check startTime / endTime
-        const jobStart = this.toHHMM(job.startTime as unknown as Date | string | null);
-        const jobEnd = this.toHHMM(job.endTime as unknown as Date | string | null);
-        if (jobStart && timeNow < jobStart) return false;
-        if (jobEnd && timeNow > jobEnd) return false;
+        if (job.startTime) {
+            const jobStart = job.startTime.toTimeString().slice(0, 5);
+            if (timeNow < jobStart) return false;
+        }
+        if (job.endTime) {
+            const jobEnd = job.endTime.toTimeString().slice(0, 5);
+            if (timeNow > jobEnd) return false;
+        }
 
         // 3. Check custom frequency
         if (job.frequency.toLowerCase() === 'custom') {
@@ -120,7 +121,8 @@ export class SchedulerServiceImpl implements ISchedulerService {
         // 3. Check dayOfWeek (for weekly)
         if (job.frequency.toLowerCase() === 'weekly' && job.dayOfWeek) {
             const todayName = now.toLocaleString('en-US', { weekday: 'long' }); // e.g., "Monday"
-            const days = this.parseDayOfWeek(job.dayOfWeek);
+            // const days = job.dayOfWeek.split(',').map(d => d.trim());
+            const days = JSON.parse(job.dayOfWeek) as string[];
             if (!days.includes(todayName)) return false;
         }
 
@@ -133,53 +135,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
         return true;
     }
 
-    private parseDayOfWeek(dayOfWeek: string): string[] {
-        try {
-            const parsed = JSON.parse(dayOfWeek);
-            return Array.isArray(parsed) ? parsed : [];
-        } catch (error) {
-            this.logger.warn(`Invalid dayOfWeek JSON '${dayOfWeek}'`, error as any);
-            return [];
-        }
-    }
-
-    private toDateOnly(value: Date | string | null | undefined): Date | null {
-        if (!value) return null;
-
-        if (value instanceof Date) {
-            const d = new Date(value);
-            d.setHours(0, 0, 0, 0);
-            return d;
-        }
-
-        const parsed = new Date(value);
-        if (Number.isNaN(parsed.getTime())) return null;
-
-        parsed.setHours(0, 0, 0, 0);
-        return parsed;
-    }
-
-    private toHHMM(value: Date | string | null | undefined): string | null {
-        if (!value) return null;
-
-        if (value instanceof Date) {
-            return value.toTimeString().slice(0, 5);
-        }
-
-        if (typeof value === 'string') {
-            const match = value.match(/^(\d{2}):(\d{2})/);
-            if (match) return `${match[1]}:${match[2]}`;
-
-            const parsed = new Date(value);
-            if (!Number.isNaN(parsed.getTime())) {
-                return parsed.toTimeString().slice(0, 5);
-            }
-        }
-
-        return null;
-    }
-
-    public computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {
+    private computeNextRunForCustomCron(job: ScheduledJob, from: Date): Date {
         const base = new Date(from);
 
         if (!job.cronExpression) {
@@ -209,7 +165,7 @@ export class SchedulerServiceImpl implements ISchedulerService {
         }
     }
 
-    public computeNextRunAt(job: ScheduledJob, from: Date): Date {
+    private computeNextRunAt(job: ScheduledJob, from: Date): Date {
         const base = new Date(from);
 
         switch (job.frequency.toLowerCase()) {

package/src/services/selection-providers/list-of-dashboard-question-providers-selection-provider.service.ts

@@ -3,7 +3,6 @@ import { SelectionProvider } from "src/decorators/selection-provider.decorator";
 import { SolidRegistry } from "src/helpers/solid-registry";
 import { IDashboardQuestionDataProvider, IDashboardVariableSelectionProvider, ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "../../interfaces";
 import { SQL_DYNAMIC_PROVIDER_NAME } from "../dashboard.service";
-import { CHARTJS_SQL_DATA_PROVIDER_NAME, INBUILT_SQL_DATA_PROVIDERS, PRIME_REACT_DATATABLE_SQL_DATA_PROVIDER_NAME, PRIME_REACT_METER_GROUP_SQL_DATA_PROVIDER_NAME } from "../dashboard-question.service";
 
 
 @SelectionProvider()
@@ -35,9 +34,7 @@ export class ListOfDashboardQuestionProvidersSelectionProvider implements ISelec
     async values(query: string, ctxt: ISelectionProviderContext): Promise<readonly ISelectionProviderValues[]> {
         const dashboardSelectionProviders = this.solidRegistry.getDashboardQuestionDataProviders()
         //Exclude the SQL dynamic provider from the list, (since although it is a dashboard selection provider, it is not a valid option for the user to select)
-        return dashboardSelectionProviders
-        .filter(provider => !INBUILT_SQL_DATA_PROVIDERS.includes(provider.name())) 
-        .map(i => {
+        return dashboardSelectionProviders.map(i => {
             return { label: i.name, value: i.name };
         });
     }

package/src/transformers/typeorm/local-date-time-transformer.ts

@@ -20,67 +20,59 @@ function dateToUtcComponentString(d: Date): string {
     const ss = pad(d.getUTCSeconds());
     const ms = pad(d.getUTCMilliseconds(), 3);
 
-    // A "naive" timestamp string representing the DB wall-clock components
+    // A “naive” timestamp string representing the DB wall-clock components
     return `${yyyy}-${mm}-${dd} ${hh}:${mi}:${ss}.${ms}`;
 }
 
-function getWallClockConfig(): { tz: string; wallTimeMode: boolean } {
-    return {
-        tz: process.env.SOLIDX_WALL_TIME_TIMEZONE || process.env.SOLIDX_TIMEZONE || "UTC",
-        wallTimeMode: (process.env.SOLIDX_TIME_STORED_AS_WALL_TIME || "").toLowerCase() === "true",
-    };
-}
-
-/**
- * Returns a dayjs instance positioned at the wall-clock time for the given Date.
- * - Wall-clock mode ON:  dayjs in the configured timezone (components = wall-clock components)
- * - Wall-clock mode OFF: dayjs in UTC
- * Counterpart to serializeDate — use this to format/display a date value correctly.
- */
-export function parseDate(date: Date): dayjs.Dayjs {
-    const { tz, wallTimeMode } = getWallClockConfig();
-    if (!wallTimeMode) return dayjs.utc(date);
-    return dayjs(date).tz(tz);
-}
+export const LocalDateTimeTransformer: ValueTransformer & { utc: ValueTransformer } = {
+    // DB → Entity
+    from(value: Date | string | null | undefined): Date | null | undefined {
 
-/**
- * Converts a Date to a string for storage in plain text columns (e.g. audit values).
- * - Wall-clock mode ON:  "YYYY-MM-DD HH:mm:ss.SSS" in the configured timezone (no Z suffix)
- * - Wall-clock mode OFF: ISO 8601 UTC string with Z suffix
- * The presence/absence of the Z suffix lets consumers distinguish the two cases.
- */
-export function serializeDate(date: Date): string {
-    const { wallTimeMode } = getWallClockConfig();
-    if (!wallTimeMode) return date.toISOString();
-    return parseDate(date).format("YYYY-MM-DD HH:mm:ss.SSS");
-}
+        const SOLIDX_WALL_TIME_TZ = process.env.SOLIDX_WALL_TIME_TIMEZONE || process.env.SOLIDX_TIMEZONE || "UTC";
+        const SOLIDX_TIME_STORED_AS_WALL_TIME = (process.env.SOLIDX_TIME_STORED_AS_WALL_TIME || "").toLowerCase() === "true";
 
-export const LocalDateTimeTransformer: ValueTransformer = {
-    // DB -> Entity
-    from(value: Date | string | null | undefined): Date | null | undefined {
-        // critical... super important to return undefined here
+        // critical... super important to return undefined here 
         if (value === undefined) return undefined;
         if (value === null) return null;
 
-        const { tz, wallTimeMode } = getWallClockConfig();
-
-        if (!wallTimeMode) {
+        if (!SOLIDX_TIME_STORED_AS_WALL_TIME) {
             return dayjs(value).toDate();
         }
 
         const naive = value instanceof Date ? dateToUtcComponentString(value) : String(value);
-        return dayjs.tz(naive, tz).utc().toDate();
+        return dayjs.tz(naive, SOLIDX_WALL_TIME_TZ).utc().toDate();
     },
 
-    // Entity -> DB
+    // Entity → DB
     to(value: Date | null | undefined): Date | null | undefined {
-        // critical... super important to return undefined here
+
+        const SOLIDX_WALL_TIME_TZ = process.env.SOLIDX_WALL_TIME_TIMEZONE || process.env.SOLIDX_TIMEZONE || "UTC";
+        const SOLIDX_TIME_STORED_AS_WALL_TIME = (process.env.SOLIDX_TIME_STORED_AS_WALL_TIME || "").toLowerCase() === "true";
+
+        // critical... super important to return undefined here 
         if (value === undefined) return undefined;
         if (value === null) return null;
 
-        const wallTimeStr = serializeDate(value);
+        if (!SOLIDX_TIME_STORED_AS_WALL_TIME) {
+            return dayjs(value).toDate();
+        }
+
+        const wallTimeStr = dayjs(value).tz(SOLIDX_WALL_TIME_TZ).format("YYYY-MM-DD HH:mm:ss.SSS");
         return dayjs.utc(wallTimeStr).toDate();
     },
 
+    utc: {
+        from(value: Date | string | null | undefined): Date | null | undefined {
+            if (value === undefined) return undefined;
+            if (value === null) return null;
+            return dayjs(value).toDate();
+        },
+        to(value: Date | null | undefined): Date | null | undefined {
+            if (value === undefined) return undefined;
+            if (value === null) return null;
+            return dayjs(value).toDate();
+        }
+    }
 };
 
+export const UtcDateTimeTransformer = LocalDateTimeTransformer.utc;

package/dist/services/question-data-providers/interfaces.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=interfaces.d.ts.map

package/dist/services/question-data-providers/interfaces.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/services/question-data-providers/interfaces.ts"],"names":[],"mappings":""}

package/dist/services/question-data-providers/interfaces.js

@@ -1 +0,0 @@
-//# sourceMappingURL=interfaces.js.map

package/dist/services/question-data-providers/interfaces.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/services/question-data-providers/interfaces.ts"],"names":[],"mappings":"","sourcesContent":[""]}