@clairejs/server 3.16.14 → 3.16.16

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.16.14:
+#### 3.16.16:
 
+-   fix CRUD order
 -   fix Job repo
 -   fix AbstractJob
 -   fix LocalJobScheduler

package/dist/http/repository/ModelRepository.js

@@ -541,12 +541,7 @@ export class ModelRepository extends AbstractRepository {
             limit: queries?.limit,
             page: queries?.page,
             projection: finalProjection,
-            order: queries?.order === "random"
-                ? queries.order
-                : queries?.order?.map((o) => {
-                    const key = Object.keys(o).find((k) => !!o[k]);
-                    return [key, o[key]];
-                }),
+            order: queries?.order,
         }, 
         //-- page and limit does not affect nested queries
         this.getNestedQueries(queries));

package/dist/job/AbstractJobRepository.d.ts

@@ -1,18 +1,18 @@
 import { IQueryProvider } from "@clairejs/orm";
 import { CustomJobInfo } from "./interfaces";
-export declare abstract class AbstractJobRepository {
+export declare abstract class AbstractJobRepository<T extends CustomJobInfo> {
     /**
      * Return all persisted jobs
      */
-    abstract getJobs(query: IQueryProvider): Promise<CustomJobInfo[]>;
+    abstract getJobs(query: IQueryProvider): Promise<T[]>;
     /**
      * Save the job info and return a unique id
      * @param jobInfo The custom job info to save
      */
-    abstract saveJob(jobInfo: CustomJobInfo, query: IQueryProvider): Promise<string>;
+    abstract saveJob(jobInfo: T, query: IQueryProvider): Promise<string>;
     /**
      * Remove job info by id
-     * @param jobId Unique id of job
+     * @param id Unique id of job
      */
-    abstract removeJobById(jobId: string, query: IQueryProvider): Promise<void>;
+    abstract removeJobById(id: string, query: IQueryProvider): Promise<void>;
 }

package/dist/job/LocalJobScheduler.d.ts

@@ -2,14 +2,14 @@ import { AbstractLogger, IInit } from "@clairejs/core";
 import Redis from "ioredis";
 import { AbstractDatabaseAdapter, ITransaction } from "@clairejs/orm";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
-import { JobInfo, ScheduledJob } from "./interfaces";
+import { CustomJobInfo, JobInfo, ScheduledJob } from "./interfaces";
 import { AbstractJobRepository } from "./AbstractJobRepository";
 export declare class LocalJobScheduler extends AbstractJobScheduler implements IInit {
     protected readonly logger: AbstractLogger;
     protected readonly db: AbstractDatabaseAdapter;
     protected readonly redisClient: Redis;
     protected readonly subscribeClient: Redis;
-    protected readonly jobRepo: AbstractJobRepository;
+    protected readonly jobRepo: AbstractJobRepository<CustomJobInfo>;
     /**
      * Redis lock key to select active scheduler
      */
@@ -35,7 +35,7 @@ export declare class LocalJobScheduler extends AbstractJobScheduler implements I
     private isActive;
     private notifyResolver;
     private jobHolder;
-    constructor(logger: AbstractLogger, db: AbstractDatabaseAdapter, redisClient: Redis, subscribeClient: Redis, jobRepo: AbstractJobRepository, 
+    constructor(logger: AbstractLogger, db: AbstractDatabaseAdapter, redisClient: Redis, subscribeClient: Redis, jobRepo: AbstractJobRepository<CustomJobInfo>, 
     /**
      * Redis lock key to select active scheduler
      */

package/dist/job/default-job-repo.d.ts

@@ -1,12 +1,11 @@
-import { Constructor } from "@clairejs/core";
+import { AbstractModel, Constructor } from "@clairejs/core";
 import { IQueryProvider } from "@clairejs/orm";
 import { CustomJobInfo } from "./interfaces";
 import { AbstractJobRepository } from "./AbstractJobRepository";
-import { AbstractJob } from "./job";
-export declare class DefaultJobRepository extends AbstractJobRepository {
-    protected readonly model: Constructor<AbstractJob>;
-    constructor(model: Constructor<AbstractJob>);
-    getJobs(query: IQueryProvider): Promise<CustomJobInfo[]>;
-    saveJob({ id, ...jobInfo }: CustomJobInfo, query: IQueryProvider): Promise<string>;
-    removeJobById(jobId: string, query: IQueryProvider): Promise<void>;
+export declare class DefaultJobRepository<T extends CustomJobInfo & AbstractModel> extends AbstractJobRepository<T> {
+    protected readonly model: Constructor<T>;
+    constructor(model: Constructor<T>);
+    getJobs(query: IQueryProvider): Promise<T[]>;
+    saveJob({ id, ...jobInfo }: T, query: IQueryProvider): Promise<string>;
+    removeJobById(id: string, query: IQueryProvider): Promise<void>;
 }

package/dist/job/default-job-repo.js

@@ -1,4 +1,3 @@
-import { pickData } from "@clairejs/core";
 import { AbstractJobRepository } from "./AbstractJobRepository";
 export class DefaultJobRepository extends AbstractJobRepository {
     model;
@@ -8,7 +7,7 @@ export class DefaultJobRepository extends AbstractJobRepository {
     }
     async getJobs(query) {
         const jobs = await query.use(this.model).getRecords();
-        return jobs.map((job) => pickData(job, ["jobName", "at", "params", "id"]));
+        return jobs;
     }
     async saveJob({ id, ...jobInfo }, query) {
         if (id) {
@@ -22,7 +21,7 @@ export class DefaultJobRepository extends AbstractJobRepository {
         }
         return id;
     }
-    async removeJobById(jobId, query) {
-        await query.use(this.model).deleteById(jobId);
+    async removeJobById(id, query) {
+        await query.use(this.model).deleteById(id);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.16.14",
+    "version": "3.16.16",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",