@lenne.tech/nest-server 9.0.13 → 9.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.0.13",
+  "version": "9.0.16",
   "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",
@@ -99,15 +99,15 @@
     "@nestjs/testing": "9.1.4",
     "@types/cron": "2.0.0",
     "@types/ejs": "3.1.1",
-    "@types/jest": "29.1.2",
+    "@types/jest": "29.2.0",
     "@types/lodash": "4.14.186",
     "@types/multer": "1.4.7",
-    "@types/node": "18.8.5",
+    "@types/node": "18.11.2",
     "@types/nodemailer": "6.4.6",
     "@types/passport": "1.0.11",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.40.0",
-    "@typescript-eslint/parser": "5.40.0",
+    "@typescript-eslint/eslint-plugin": "5.40.1",
+    "@typescript-eslint/parser": "5.40.1",
     "coffeescript": "2.7.0",
     "eslint": "8.25.0",
     "eslint-config-prettier": "8.5.0",
@@ -118,7 +118,7 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "8.0.1",
-    "jest": "29.2.0",
+    "jest": "29.2.1",
     "pm2": "5.2.2",
     "prettier": "2.7.1",
     "pretty-quick": "3.1.3",

package/src/config.env.ts

@@ -58,6 +58,9 @@ const config: { [env: string]: IServerOptions } = {
     },
     loadLocalConfig: false,
     mongoose: {
+      collation: {
+        locale: 'de',
+      },
       uri: 'mongodb://127.0.0.1/nest-server-dev',
     },
     port: 3000,
@@ -114,6 +117,9 @@ const config: { [env: string]: IServerOptions } = {
     },
     loadLocalConfig: false,
     mongoose: {
+      collation: {
+        locale: 'de',
+      },
       uri: 'mongodb://127.0.0.1/nest-server-dev',
     },
     port: 3000,
@@ -170,6 +176,9 @@ const config: { [env: string]: IServerOptions } = {
     },
     loadLocalConfig: false,
     mongoose: {
+      collation: {
+        locale: 'de',
+      },
       uri: 'mongodb://127.0.0.1/nest-server-prod',
     },
     port: 3000,

package/src/core/common/interfaces/server-options.interface.ts

@@ -4,6 +4,7 @@ import { JwtModuleOptions } from '@nestjs/jwt';
 import { MongooseModuleOptions } from '@nestjs/mongoose';
 import { ServeStaticOptions } from '@nestjs/platform-express/interfaces/serve-static-options.interface';
 import { CronExpression } from '@nestjs/schedule';
+import { CollationOptions } from 'mongodb';
 import * as SMTPTransport from 'nodemailer/lib/smtp-transport';
 import { Falsy } from '../types/falsy.type';
 import { CronJobConfig } from './cron-job-config.interface';
@@ -156,7 +157,19 @@ export interface IServerOptions {
   /**
    * Configuration for Mongoose
    */
-  mongoose?: { uri: string; options?: MongooseModuleOptions };
+  mongoose?: {
+    collation?: CollationOptions;
+
+    /**
+     * Mongoose connection string
+     */
+    uri: string;
+
+    /**
+     * Mongoose module options
+     */
+    options?: MongooseModuleOptions;
+  };
 
   /**
    * Port number of the server

package/src/core/common/interfaces/service-options.interface.ts

@@ -1,3 +1,4 @@
+import { CollationOptions } from 'mongodb';
 import { Model, PopulateOptions } from 'mongoose';
 import { FieldSelection } from '../types/field-selection.type';
 import { PrepareInputOptions } from './prepare-input-options.interface';
@@ -15,6 +16,10 @@ export interface ServiceOptions {
   // If truly (default): input data will be checked
   checkRights?: boolean;
 
+  // Collation for mongodb
+  // See https://www.mongodb.com/docs/manual/reference/collation/
+  collation?: CollationOptions;
+
   // Current user to set ownership, check rights and other things
   currentUser?: {
     [key: string]: any;

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

@@ -7,6 +7,7 @@ import { convertFilterArgsToQuery } from '../helpers/filter.helper';
 import { assignPlain } from '../helpers/input.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';
 import { CoreModel } from '../models/core-model.model';
+import { ConfigService } from './config.service';
 import { ModuleService } from './module.service';
 
 export abstract class CrudService<T extends CoreModel = any> extends ModuleService<T> {
@@ -100,7 +101,12 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
         }
 
         // Find in DB
-        return this.mainDbModel.find(filterQuery.filterQuery, null, filterQuery.queryOptions).exec();
+        let find = this.mainDbModel.find(filterQuery.filterQuery, null, filterQuery.queryOptions);
+        const collation = serviceOptions?.collation || ConfigService.get('mongoose.collation');
+        if (collation) {
+          find = find.collation(collation);
+        }
+        return find.exec();
       },
       { input: filter, serviceOptions }
     );
@@ -197,7 +203,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
         aggregation.push({ $facet: facet });
 
         // Find and process db items
-        const dbResult = (await this.mainDbModel.aggregate(aggregation).exec())[0] || {};
+        const collation = serviceOptions?.collation || ConfigService.get('mongoose.collation');
+        const dbResult =
+          (await this.mainDbModel.aggregate(aggregation, collation ? { collation } : {}).exec())[0] || {};
         dbResult.totalCount = dbResult.totalCount?.[0]?.total || 0;
         dbResult.items = dbResult.items?.map((item) => this.mainDbModel.hydrate(item)) || [];
         return dbResult;

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

@@ -84,6 +84,13 @@ export abstract class CoreUserModel extends CorePersistenceModel {
   @Prop({ type: Boolean })
   verified: boolean = undefined;
 
+  /**
+   * Verification date
+   */
+  @Field({ description: 'Verified date', nullable: true })
+  @Prop()
+  verifiedAt: Date = undefined;
+
   // ===================================================================================================================
   // Methods
   // ===================================================================================================================

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

@@ -98,22 +98,25 @@ export abstract class CoreUserService<
   /**
    * Verify user with token
    */
-  async verify(token: string, serviceOptions?: ServiceOptions): Promise<TUser> {
+  async verify(token: string, serviceOptions?: ServiceOptions): Promise<TUser | string> {
     // Get user
     const dbObject = await this.mainDbModel.findOne({ verificationToken: token }).exec();
     if (!dbObject) {
       throw new NotFoundException(`No user found with verify token: ${token}`);
     }
+
     if (!dbObject.verificationToken) {
       throw new Error('User has no token');
     }
+
     if (dbObject.verified) {
-      throw new Error('User already verified');
+      return 'User already verified';
     }
+
     return this.process(
       async () => {
         // Update and return user
-        return await assignPlain(dbObject, { verified: true, verificationToken: null }).save();
+        return await assignPlain(dbObject, { verified: true, verifiedAt: new Date() }).save();
       },
       { dbObject, serviceOptions }
     );