@steroidsjs/nest 1.1.11 → 1.1.15

package/usecases/helpers/DataMapperHelper.js

@@ -111,6 +111,9 @@ class DataMapperHelper {
     static applyChangesToModel(model, changes) {
         (0, BaseField_1.getMetaFields)(model.constructor).forEach(key => {
             const options = (0, BaseField_1.getFieldOptions)(model.constructor, key);
+            if (options.appType === 'primaryKey' && !model[key] && changes[key]) {
+                model[key] = changes[key];
+            }
             if (options.appType === 'relationId') {
                 const primaryKey = 'id';
                 const relationIdOptions = options;

package/usecases/helpers/DataMapperHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataMapperHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapperHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataMapperHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapperHelper.ts"],"names":[],"mappings":"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"}

package/usecases/interfaces/ICrudRepository.d.ts

@@ -11,5 +11,6 @@ export interface ICrudRepository<TModel> {
     findMany: (conditionOrQuery: ICondition | SearchQuery) => Promise<TModel[]>;
     create: (model: TModel, transactionHandler?: (callback: any) => Promise<void>) => Promise<TModel>;
     update: (id: number, model: TModel, transactionHandler?: (callback: any) => Promise<void>) => Promise<TModel>;
+    save: (model: TModel, transactionHandler?: (callback: any) => Promise<void>) => Promise<TModel>;
     remove: (id: number, transactionHandler?: (callback: any) => Promise<void>) => Promise<void>;
 }

package/usecases/services/CrudService.d.ts

@@ -19,11 +19,9 @@ export declare class CrudService<TModel, TSearchDto = ISearchInputDto, TSaveDto
     create<TSchema>(dto: TSaveDto, context?: ContextDto | null, schemaClass?: Type<TSchema>): Promise<Type<TSchema>>;
     update<TSchema>(id: number | string, dto: TSaveDto, context?: ContextDto | null): Promise<TModel>;
     update<TSchema>(id: number | string, dto: TSaveDto, context?: ContextDto | null, schemaClass?: Type<TSchema>): Promise<Type<TSchema>>;
+    saveInternal(prevModel: TModel | null, nextModel: TModel, context?: ContextDto): Promise<void>;
     remove(rawId: number | string, context?: ContextDto): Promise<void>;
-    protected beforeSave(prevModel: TModel | null, nextModel: TModel): Promise<void>;
-    protected afterSave(prevModel: TModel | null, nextModel: TModel): Promise<void>;
-    protected beforeDelete(id: number): Promise<void>;
-    protected afterDelete(id: number): Promise<void>;
+    removeInternal(id: number, context?: ContextDto): Promise<void>;
     protected modelToSchema<TSchema>(model: TModel, schemaClass: Type<TSchema>): Type<TSchema>;
     protected dtoToModel(dto: TSaveDto): Promise<TModel>;
 }

package/usecases/services/CrudService.js

@@ -36,42 +36,36 @@ class CrudService {
     async create(dto, context = null, schemaClass = null) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
         const nextModel = await this.dtoToModel(dto);
-        let model;
-        await this.repository.create(nextModel, async (save) => {
-            await this.beforeSave(null, nextModel);
-            model = await save();
-            await this.afterSave(null, model);
-        });
-        return schemaClass ? this.findById(model[this.primaryKey], context, schemaClass) : model;
+        await this.saveInternal(null, nextModel, context);
+        return schemaClass ? this.findById(nextModel[this.primaryKey], context, schemaClass) : nextModel;
     }
-    async update(id, dto, context = null, schemaClass = null) {
+    async update(rawId, dto, context = null, schemaClass = null) {
+        const id = (0, lodash_1.toInteger)(rawId);
         await (0, ValidationHelper_1.validateOrReject)(dto);
         const prevModel = await this.findById(id);
-        const nextModel = await this.dtoToModel(dto);
-        let model;
-        await this.repository.update((0, lodash_1.toInteger)(id), nextModel, async (save) => {
-            await this.beforeSave(prevModel, nextModel);
-            model = await save();
-            await this.afterSave(prevModel, model);
+        if (!prevModel) {
+            throw new Error('Not found model by id: ' + id);
+        }
+        const ModelClass = this.modelClass;
+        const nextModel = new ModelClass();
+        DataMapperHelper_1.DataMapperHelper.applyChangesToModel(nextModel, this.dtoToModel(dto));
+        await this.saveInternal(prevModel, nextModel, context);
+        return schemaClass ? this.findById(id, context, schemaClass) : nextModel;
+    }
+    async saveInternal(prevModel, nextModel, context) {
+        await this.repository.save(nextModel, async (save) => {
+            await save();
         });
-        return schemaClass ? this.findById(id, context, schemaClass) : model;
     }
     async remove(rawId, context = null) {
         const id = (0, lodash_1.toInteger)(rawId);
+        await this.removeInternal(id, context);
+    }
+    async removeInternal(id, context) {
         await this.repository.remove(id, async (remove) => {
-            await this.beforeDelete(id);
             await remove();
-            await this.afterDelete(id);
         });
     }
-    async beforeSave(prevModel, nextModel) {
-    }
-    async afterSave(prevModel, nextModel) {
-    }
-    async beforeDelete(id) {
-    }
-    async afterDelete(id) {
-    }
     modelToSchema(model, schemaClass) {
         return DataMapperHelper_1.DataMapperHelper.anyToSchema(model, schemaClass);
     }

package/usecases/services/CrudService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../../../src/usecases/services/CrudService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../../../src/usecases/services/CrudService.ts"],"names":[],"mappings":"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"}