@lenne.tech/nest-server 9.0.6 → 9.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.0.6",
+  "version": "9.0.8",
   "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",
@@ -58,15 +58,15 @@
     "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/gateway": "2.0.5",
-    "@nestjs/apollo": "10.0.22",
-    "@nestjs/common": "9.0.11",
-    "@nestjs/core": "9.0.11",
-    "@nestjs/graphql": "10.0.22",
+    "@apollo/gateway": "2.1.3",
+    "@nestjs/apollo": "10.1.3",
+    "@nestjs/common": "9.1.4",
+    "@nestjs/core": "9.1.4",
+    "@nestjs/graphql": "10.1.3",
     "@nestjs/jwt": "9.0.0",
     "@nestjs/mongoose": "9.2.0",
     "@nestjs/passport": "9.0.0",
-    "@nestjs/platform-express": "9.0.11",
+    "@nestjs/platform-express": "9.1.4",
     "@nestjs/schedule": "2.1.0",
     "apollo-server-core": "3.10.2",
     "apollo-server-express": "3.10.2",
@@ -79,37 +79,37 @@
     "graphql-upload": "15.0.2",
     "js-sha256": "0.9.0",
     "json-to-graphql-query": "2.2.4",
-    "light-my-request": "5.5.1",
+    "light-my-request": "5.6.1",
     "lodash": "4.17.21",
-    "mongodb": "4.9.0",
-    "mongoose": "6.5.3",
+    "mongodb": "4.10.0",
+    "mongoose": "6.6.5",
     "mongoose-gridfs": "1.3.0",
     "multer": "1.4.5-lts.1",
     "node-mailjet": "5.1.1",
-    "nodemailer": "6.7.8",
-    "nodemon": "2.0.19",
+    "nodemailer": "6.8.0",
+    "nodemon": "2.0.20",
     "passport": "0.6.0",
     "passport-jwt": "4.0.0",
     "reflect-metadata": "0.1.13",
     "rfdc": "1.3.0",
     "rimraf": "3.0.2",
-    "rxjs": "7.5.6"
+    "rxjs": "7.5.7"
   },
   "devDependencies": {
-    "@nestjs/testing": "9.0.11",
+    "@nestjs/testing": "9.1.4",
     "@types/cron": "2.0.0",
     "@types/ejs": "3.1.1",
-    "@types/jest": "28.1.8",
-    "@types/lodash": "4.14.184",
+    "@types/jest": "29.1.1",
+    "@types/lodash": "4.14.186",
     "@types/multer": "1.4.7",
-    "@types/node": "18.7.13",
-    "@types/nodemailer": "6.4.5",
-    "@types/passport": "1.0.10",
+    "@types/node": "18.8.2",
+    "@types/nodemailer": "6.4.6",
+    "@types/passport": "1.0.11",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.35.1",
-    "@typescript-eslint/parser": "5.35.1",
+    "@typescript-eslint/eslint-plugin": "5.39.0",
+    "@typescript-eslint/parser": "5.39.0",
     "coffeescript": "2.7.0",
-    "eslint": "8.23.0",
+    "eslint": "8.24.0",
     "eslint-config-prettier": "8.5.0",
     "find-file-up": "2.0.1",
     "grunt": "1.5.3",
@@ -118,16 +118,16 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "8.0.1",
-    "jest": "28.1.3",
+    "jest": "29.1.2",
     "pm2": "5.2.0",
     "prettier": "2.7.1",
     "pretty-quick": "3.1.3",
-    "supertest": "6.2.4",
-    "ts-jest": "28.0.7",
-    "ts-morph": "15.1.0",
+    "supertest": "6.3.0",
+    "ts-jest": "29.0.3",
+    "ts-morph": "16.0.0",
     "ts-node": "10.9.1",
     "tsconfig-paths": "4.1.0",
-    "typescript": "4.8.2"
+    "typescript": "4.8.4"
   },
   "jest": {
     "collectCoverage": true,

package/src/config.env.ts

@@ -23,8 +23,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'sandra98@ethereal.email',
-          pass: 'JCQQdz8xJEfBSewahK',
+          user: 'cade72@ethereal.email',
+          pass: 'jpvTwGYeSajEqDvRKT',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -35,7 +35,7 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'sandra98@ethereal.email',
+        email: 'cade72@ethereal.email',
         name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',
@@ -75,8 +75,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'sandra98@ethereal.email',
-          pass: 'JCQQdz8xJEfBSewahK',
+          user: 'cade72@ethereal.email',
+          pass: 'jpvTwGYeSajEqDvRKT',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -87,7 +87,7 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'sandra98@ethereal.email',
+        email: 'cade72@ethereal.email',
         name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',
@@ -127,8 +127,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'sandra98@ethereal.email',
-          pass: 'JCQQdz8xJEfBSewahK',
+          user: 'cade72@ethereal.email',
+          pass: 'jpvTwGYeSajEqDvRKT',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -139,7 +139,7 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'sandra98@ethereal.email',
+        email: 'cade72@ethereal.email',
         name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',

package/src/core/common/args/filter.args.ts

@@ -15,6 +15,16 @@ export class FilterArgs extends PaginationArgs {
   @IsOptional()
   filter?: FilterInput = undefined;
 
+  /**
+   * Get a specific number of random samples from filter results
+   */
+  @Field((type) => Number, {
+    description:
+      'Request only a specified number of samples from the filter results; if not specified, all results are returned.',
+    nullable: true,
+  })
+  samples?: number = undefined;
+
   // ===================================================================================================================
   // Methods
   // ===================================================================================================================

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

@@ -39,11 +39,16 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
    * Get items via filter
    */
   async find(
-    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions?: ServiceOptions
   ): Promise<T[]> {
     return this.process(
       async (data) => {
+        // Return only a certain number of random samples
+        if (filter?.samples) {
+          return (await this.findAndCount(filter, serviceOptions)).items;
+        }
+
         // Prepare filter query
         const filterQuery = { filterQuery: data?.input?.filterQuery, queryOptions: data?.input?.queryOptions };
         if (data?.input instanceof FilterArgs) {
@@ -63,7 +68,7 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
    * Get items and total count via filter
    */
   async findAndCount(
-    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions?: ServiceOptions
   ): Promise<{ items: T[]; totalCount: number }> {
     return this.process(
@@ -77,12 +82,14 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
         }
 
         // Prepare aggregation (with fixed defined sequence)
-        const aggregation: PipelineStage[] = [
-          {
-            // Add pipeline stage 1: match
+        const aggregation: PipelineStage[] = [];
+
+        // Add pipeline stage 1: match
+        if (filterQuery.filterQuery) {
+          aggregation.push({
             $match: filterQuery.filterQuery,
-          },
-        ];
+          });
+        }
 
         // Prepare $facet
         const facet = {
@@ -109,6 +116,11 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
           }
         }
 
+        // Get a certain number of random samples
+        if (filter?.samples) {
+          facet.items.push({ $sample: { size: filter.samples } });
+        }
+
         // Set pipeline stage 3: facet => items (with skip & limit) and totalCount
         aggregation.push({ $facet: facet });
 

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

@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from './config.service';
-import Mailjet from 'node-mailjet';
+// eslint-disable-next-line
+const Mailjet = require('node-mailjet');
 
 /**
  * Mailjet service

package/src/core/modules/user/core-user.service.ts

@@ -156,11 +156,17 @@ export abstract class CoreUserService<
     if (!dbObject) {
       throw new NotFoundException(`No user found with email: ${email}`);
     }
+
     return this.process(
       async () => {
         // Set reset token and return
         dbObject.passwordResetToken = crypto.randomBytes(32).toString('hex');
-        return await dbObject.save();
+
+        // Save
+        await dbObject.save();
+
+        // Return new user
+        return dbObject;
       },
       { dbObject, serviceOptions }
     );