@lenne.tech/nest-server 8.6.17 → 8.6.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.17",
+  "version": "8.6.18",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/core/common/services/crud.service.ts

@@ -2,6 +2,7 @@ import { NotFoundException } from '@nestjs/common';
 import { FilterQuery, QueryOptions } from 'mongoose';
 import { FilterArgs } from '../args/filter.args';
 import { merge } from '../helpers/config.helper';
+import { getStringIds } from '../helpers/db.helper';
 import { convertFilterArgsToQuery } from '../helpers/filter.helper';
 import { assignPlain } from '../helpers/input.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';
@@ -58,6 +59,34 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     );
   }
 
+  /**
+   * Find and update
+   */
+  async findAndUpdate(
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    update: any,
+    serviceOptions?: ServiceOptions
+  ): Promise<T[]> {
+    const dbItems: T[] = await this.find(filter, serviceOptions);
+    if (!dbItems?.length) {
+      return [];
+    }
+    const promises: Promise<T>[] = [];
+    for (const dbItem of dbItems) {
+      promises.push(
+        new Promise(async (resolve, reject) => {
+          try {
+            const item = await this.update(getStringIds(dbItem as any), update, serviceOptions);
+            resolve(item);
+          } catch (e) {
+            reject(e);
+          }
+        })
+      );
+    }
+    return await Promise.all(promises);
+  }
+
   /**
    * CRUD alias for get
    */
@@ -66,12 +95,18 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
   /**
    * CRUD alias for find
    */
-  async read(filterArgs?: FilterArgs, serviceOptions?: ServiceOptions): Promise<T[]>;
+  async read(
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    serviceOptions?: ServiceOptions
+  ): Promise<T[]>;
 
   /**
    * CRUD alias for get or find
    */
-  async read(input: string | FilterArgs, serviceOptions?: ServiceOptions): Promise<T | T[]> {
+  async read(
+    input: string | FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    serviceOptions?: ServiceOptions
+  ): Promise<T | T[]> {
     if (typeof input === 'string') {
       return this.get(input, serviceOptions);
     } else {

package/src/test/test.helper.ts

@@ -4,10 +4,12 @@ import * as fs from 'fs';
 import { createClient } from 'graphql-ws';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import * as LightMyRequest from 'light-my-request';
+import { Types } from 'mongoose';
 import * as superagent from 'superagent';
 import * as supertest from 'supertest';
 import * as util from 'util';
 import * as ws from 'ws';
+import { getStringIds } from '../core/common/helpers/db.helper';
 
 /**
  * GraphQL request type
@@ -98,6 +100,11 @@ export interface TestGraphQLOptions {
    */
   logError?: boolean;
 
+  /**
+   * Whether to prepare arguments (like dates)
+   */
+  prepareArguments?: boolean;
+
   /**
    * Status Code = 400
    */
@@ -187,6 +194,7 @@ export class TestHelper {
       statusCode: 200,
       log: false,
       logError: false,
+      prepareArguments: true,
       ...options,
     };
 
@@ -233,7 +241,9 @@ export class TestHelper {
 
       // Set arguments
       if (graphql.arguments) {
-        queryObj[graphql.type][graphql.name].__args = graphql.arguments;
+        queryObj[graphql.type][graphql.name].__args = config.prepareArguments
+          ? this.prepareArguments(graphql.arguments)
+          : graphql.arguments;
       }
 
       // Create request payload query
@@ -330,6 +340,39 @@ export class TestHelper {
     return result;
   }
 
+  /**
+   * Prepare arguments
+   */
+  prepareArguments(args: any, objects?: WeakMap<any, any>) {
+    if (!args) {
+      return args;
+    }
+    if (args instanceof Date) {
+      return args.toISOString();
+    }
+    if (args instanceof Types.ObjectId) {
+      return getStringIds(args);
+    }
+    if (!objects) {
+      objects = new WeakMap<any, any>();
+    }
+    if (typeof args === 'object' && objects.get(args)) {
+      return objects.get(args);
+    }
+    if (Array.isArray(args)) {
+      objects.set(args, args);
+      return args.map((item) => this.prepareArguments(item, objects));
+    }
+    if (typeof args === 'object') {
+      objects.set(args, args);
+      for (const [key, value] of Object.entries(args)) {
+        args[key] = this.prepareArguments(value, objects);
+      }
+      return args;
+    }
+    return args;
+  }
+
   /**
    * Prepare GraphQL fields for request
    * @param fields
@@ -424,6 +467,9 @@ export class TestHelper {
     }
 
     // Response
+    if (log) {
+      console.log(requestConfig);
+    }
     const response = await (variables ? request : request.send(requestConfig.payload));
     return this.processResponse(response, statusCode, log, logError);
   }