mongodb-dynamic-api 2.3.1 → 2.3.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 Changelog
 
+## [2.3.3](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.3.2...v2.3.3) (2024-05-07)
+
+## [2.3.2](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.3.1...v2.3.2) (2024-05-07)
+
 ## [2.3.1](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.3.0...v2.3.1) (2024-05-05)
 
 ## [2.3.0](https://github.com/MikeDev75015/mongodb-dynamic-api/compare/v2.2.1...v2.3.0) (2024-05-02)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb-dynamic-api",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "Auto generated CRUD API for MongoDB using NestJS",
   "readmeFilename": "README.md",
   "main": "index.js",
@@ -86,7 +86,7 @@
     "jest-mock-extended": "^3.0.5",
     "jest-sonar-reporter": "^2.0.0",
     "prettier": "^3.2.5",
-    "release-it": "^17.1.1",
+    "release-it": "^17.2.1",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.4",
     "ts-jest": "^29.1.2",
@@ -97,7 +97,6 @@
   },
   "jest": {
     "clearMocks": true,
-    "resetMocks": true,
     "moduleFileExtensions": [
       "js",
       "json",

package/src/dynamic-api.module.d.ts

@@ -7,6 +7,5 @@ export declare class DynamicApiModule {
     static forRoot<Entity extends BaseEntity = any>(uri: string, { useGlobalCache, cacheOptions, useAuth, routesConfig, }?: DynamicApiForRootOptions<Entity>): DynamicModule;
     static forFeature<Entity extends BaseEntity>({ entity, controllerOptions, routes, }: DynamicApiForFeatureOptions<Entity>): Promise<DynamicModule>;
     private static buildStateFromOptions;
-    private static initializeAuthOptions;
     private static setDefaultRoutes;
 }

package/src/dynamic-api.module.js

@@ -37,7 +37,7 @@ let DynamicApiModule = DynamicApiModule_1 = class DynamicApiModule {
                 cache_manager_1.CacheModule.register({ isGlobal: true, ...cacheOptions }),
                 mongoose_1.MongooseModule.forRoot(uri, { connectionName: this.state.get('connectionName') }),
                 ...(useAuth?.userEntity ? [
-                    modules_1.AuthModule.forRoot(this.initializeAuthOptions(useAuth)),
+                    modules_1.AuthModule.forRoot(useAuth),
                 ] : []),
             ],
             exports: [modules_1.DynamicApiConfigModule],
@@ -139,32 +139,6 @@ let DynamicApiModule = DynamicApiModule_1 = class DynamicApiModule {
             } : {}),
         };
     }
-    static initializeAuthOptions(useAuth) {
-        return {
-            userEntity: useAuth.userEntity,
-            login: {
-                ...useAuth.login,
-                loginField: useAuth.login?.loginField ?? 'email',
-                passwordField: useAuth.login?.passwordField ?? 'password',
-                additionalFields: useAuth.login?.additionalFields ?? [],
-            },
-            register: {
-                ...useAuth.register,
-                additionalFields: useAuth.register?.additionalFields ?? [],
-                protected: useAuth.register?.protected ?? !!useAuth.register.abilityPredicate,
-            },
-            resetPassword: {
-                ...useAuth.resetPassword,
-                emailField: !useAuth.resetPassword?.emailField ? 'email' : String(useAuth.resetPassword.emailField),
-                expirationInMinutes: useAuth.resetPassword?.expirationInMinutes ?? 10,
-            },
-            jwt: {
-                secret: useAuth.jwt?.secret ?? 'dynamic-api-jwt-secret',
-                expiresIn: useAuth.jwt?.expiresIn ?? '1d',
-            },
-            validationPipeOptions: useAuth.validationPipeOptions,
-        };
-    }
     static setDefaultRoutes(stateRoutesConfig, controllerRoutesConfig = {}, routes = []) {
         const defaults = controllerRoutesConfig.defaults ?? stateRoutesConfig.defaults;
         const excluded = controllerRoutesConfig.excluded ?? stateRoutesConfig.excluded;

package/src/models/soft-deletable-entity.model.js

@@ -15,15 +15,20 @@ const swagger_1 = require("@nestjs/swagger");
 const class_transformer_1 = require("class-transformer");
 const base_entity_model_1 = require("./base-entity.model");
 class SoftDeletableEntity extends base_entity_model_1.BaseEntity {
+    constructor() {
+        super(...arguments);
+        this.isDeleted = false;
+        this.deletedAt = null;
+    }
 }
 exports.SoftDeletableEntity = SoftDeletableEntity;
 __decorate([
     (0, class_transformer_1.Exclude)(),
     (0, mongoose_1.Prop)({ type: Boolean, default: false }),
-    __metadata("design:type", Boolean)
+    __metadata("design:type", Object)
 ], SoftDeletableEntity.prototype, "isDeleted", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ type: Date, nullable: true }),
-    (0, mongoose_1.Prop)({ type: Date, nullable: true }),
+    (0, mongoose_1.Prop)({ type: Date, nullable: true, default: null }),
     __metadata("design:type", Date)
 ], SoftDeletableEntity.prototype, "deletedAt", void 0);

package/src/modules/auth/auth.module.d.ts

@@ -3,10 +3,11 @@ import { BcryptService } from '../../services';
 import { DynamicApiAuthOptions } from './interfaces';
 import { JwtStrategy } from './strategies';
 export declare class AuthModule {
-    static forRoot<Entity extends BaseEntity>({ userEntity, login: { loginField, passwordField, ...login }, register, resetPassword, jwt: { secret, expiresIn }, validationPipeOptions, }: DynamicApiAuthOptions<Entity>, extraImports?: any[]): {
+    static forRoot<Entity extends BaseEntity>(options: DynamicApiAuthOptions<Entity>, extraImports?: any[]): {
         module: typeof AuthModule;
         imports: any[];
         providers: (typeof BcryptService | import("../../interfaces/dynamic-api-service-provider.interface").DynamicAPIServiceProvider | typeof JwtStrategy)[];
         controllers: import("./interfaces/auth-controller.interface").AuthControllerConstructor<Entity>[];
     };
+    private static initializeAuthOptions;
 }

package/src/modules/auth/auth.module.js

@@ -18,10 +18,11 @@ const services_1 = require("../../services");
 const auth_helper_1 = require("./auth.helper");
 const strategies_1 = require("./strategies");
 let AuthModule = AuthModule_1 = class AuthModule {
-    static forRoot({ userEntity, login: { loginField, passwordField, ...login }, register, resetPassword, jwt: { secret, expiresIn }, validationPipeOptions, }, extraImports = []) {
-        const { resetPasswordCallback, changePasswordCallback, emailField, expirationInMinutes } = resetPassword;
+    static forRoot(options, extraImports = []) {
+        const { userEntity, login: { loginField, passwordField, ...login }, register, resetPassword, jwt: { secret, expiresIn }, validationPipeOptions, } = this.initializeAuthOptions(options);
+        const { resetPasswordCallback, changePasswordCallback, emailField, expirationInMinutes, abilityPredicate, } = resetPassword;
         const resetPasswordOptions = resetPasswordCallback
-            ? { resetPasswordCallback, changePasswordCallback, emailField, expirationInMinutes }
+            ? { resetPasswordCallback, changePasswordCallback, emailField, expirationInMinutes, abilityPredicate }
             : undefined;
         const AuthController = (0, auth_helper_1.createAuthController)(userEntity, { loginField, passwordField, ...login }, register, validationPipeOptions, resetPasswordOptions);
         const AuthServiceProvider = (0, auth_helper_1.createAuthServiceProvider)(userEntity, { loginField, passwordField, ...login }, register.callback, resetPasswordOptions);
@@ -52,6 +53,32 @@ let AuthModule = AuthModule_1 = class AuthModule {
             controllers: [AuthController],
         };
     }
+    static initializeAuthOptions({ userEntity, login, register, resetPassword, jwt, validationPipeOptions, }) {
+        return {
+            userEntity: userEntity,
+            login: {
+                ...login,
+                loginField: (login?.loginField ?? 'email'),
+                passwordField: (login?.passwordField ?? 'password'),
+                additionalFields: login?.additionalFields ?? [],
+            },
+            register: {
+                ...register,
+                additionalFields: register?.additionalFields ?? [],
+                protected: register?.protected ?? !!register?.abilityPredicate,
+            },
+            resetPassword: {
+                ...resetPassword,
+                emailField: (!resetPassword?.emailField ? 'email' : String(resetPassword.emailField)),
+                expirationInMinutes: resetPassword?.expirationInMinutes ?? 10,
+            },
+            jwt: {
+                secret: jwt?.secret ?? 'dynamic-api-jwt-secret',
+                expiresIn: jwt?.expiresIn ?? '1d',
+            },
+            validationPipeOptions: validationPipeOptions,
+        };
+    }
 };
 exports.AuthModule = AuthModule;
 exports.AuthModule = AuthModule = AuthModule_1 = __decorate([

package/src/routes/delete-many/delete-many-controller.interface.d.ts

@@ -1,8 +1,8 @@
-import { DeleteResult } from '../../interfaces';
+import { DeleteManyEntityQuery, DeletePresenter } from '../../dtos';
 import { BaseEntity } from '../../models';
 import { DeleteManyService } from './delete-many-service.interface';
 interface DeleteManyController<Entity extends BaseEntity> {
-    deleteMany(ids: string[]): Promise<DeleteResult>;
+    deleteMany(query: DeleteManyEntityQuery): Promise<DeletePresenter>;
 }
 type DeleteManyControllerConstructor<Entity extends BaseEntity> = new (service: DeleteManyService<Entity>) => DeleteManyController<Entity>;
 export type { DeleteManyController, DeleteManyControllerConstructor };

package/src/routes/delete-many/delete-many-controller.mixin.js

@@ -14,7 +14,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteManyControllerMixin = void 0;
 const common_1 = require("@nestjs/common");
+const builder_pattern_1 = require("builder-pattern");
 const builders_1 = require("../../builders");
+const dtos_1 = require("../../dtos");
 const helpers_1 = require("../../helpers");
 const mixins_1 = require("../../mixins");
 function DeleteManyControllerMixin(entity, controllerOptions, routeConfig, version) {
@@ -29,16 +31,17 @@ function DeleteManyControllerMixin(entity, controllerOptions, routeConfig, versi
             this.service = service;
             this.entity = entity;
         }
-        async deleteMany(ids) {
-            return this.service.deleteMany(ids);
+        async deleteMany({ ids }) {
+            const result = await this.service.deleteMany(ids);
+            return (0, builder_pattern_1.Builder)(dtos_1.DeletePresenter, result).build();
         }
     }
     __decorate([
         (0, helpers_1.RouteDecoratorsHelper)(routeDecoratorsBuilder),
         (0, common_1.UseGuards)(DeleteManyPoliciesGuard),
-        __param(0, (0, common_1.Query)('ids')),
+        __param(0, (0, common_1.Query)()),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Array]),
+        __metadata("design:paramtypes", [dtos_1.DeleteManyEntityQuery]),
         __metadata("design:returntype", Promise)
     ], BaseDeleteManyController.prototype, "deleteMany", null);
     Object.defineProperty(BaseDeleteManyController, 'name', {

package/src/routes/delete-one/delete-one-controller.interface.d.ts

@@ -1,8 +1,8 @@
-import { DeleteResult } from '../../interfaces';
+import { DeletePresenter } from '../../dtos';
 import { BaseEntity } from '../../models';
 import { DeleteOneService } from './delete-one-service.interface';
 interface DeleteOneController<Entity extends BaseEntity> {
-    deleteOne(id: string): Promise<DeleteResult>;
+    deleteOne(id: string): Promise<DeletePresenter>;
 }
 type DeleteOneControllerConstructor<Entity extends BaseEntity> = new (service: DeleteOneService<Entity>) => DeleteOneController<Entity>;
 export type { DeleteOneController, DeleteOneControllerConstructor };

package/src/routes/delete-one/delete-one-controller.mixin.js

@@ -14,7 +14,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteOneControllerMixin = void 0;
 const common_1 = require("@nestjs/common");
+const builder_pattern_1 = require("builder-pattern");
 const builders_1 = require("../../builders");
+const dtos_1 = require("../../dtos");
 const helpers_1 = require("../../helpers");
 const mixins_1 = require("../../mixins");
 function DeleteOneControllerMixin(entity, controllerOptions, routeConfig, version) {
@@ -31,7 +33,8 @@ function DeleteOneControllerMixin(entity, controllerOptions, routeConfig, versio
             this.entity = entity;
         }
         async deleteOne(id) {
-            return this.service.deleteOne(id);
+            const result = await this.service.deleteOne(id);
+            return (0, builder_pattern_1.Builder)(dtos_1.DeletePresenter, result).build();
         }
     }
     __decorate([

package/src/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2.3.1"
+    "version": "2.3.3"
 }