@steroidsjs/nest 1.1.9 → 1.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/infrastructure/decorators/ApiOkSearchResponse.d.ts +5 -1
- package/infrastructure/decorators/ApiOkSearchResponse.js +2 -1
- package/infrastructure/decorators/ApiOkSearchResponse.js.map +1 -1
- package/infrastructure/repositories/CrudRepository.d.ts +4 -5
- package/infrastructure/repositories/CrudRepository.js +19 -49
- package/infrastructure/repositories/CrudRepository.js.map +1 -1
- package/package.json +3 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/usecases/helpers/DataMapperHelper.js +3 -0
- package/usecases/helpers/DataMapperHelper.js.map +1 -1
- package/usecases/interfaces/ICrudRepository.d.ts +1 -0
- package/usecases/services/CrudService.d.ts +2 -4
- package/usecases/services/CrudService.js +19 -25
- package/usecases/services/CrudService.js.map +1 -1
|
@@ -1 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
interface ApiOkSearchResponseOptions {
|
|
2
|
+
type: Function;
|
|
3
|
+
}
|
|
4
|
+
export declare function ApiOkSearchResponse(options: ApiOkSearchResponseOptions): <TFunction extends Function, Y>(target: object | TFunction, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
|
|
5
|
+
export {};
|
|
@@ -4,7 +4,8 @@ exports.ApiOkSearchResponse = void 0;
|
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
5
|
const swagger_1 = require("@nestjs/swagger");
|
|
6
6
|
const SearchSchema_1 = require("../schemas/SearchSchema");
|
|
7
|
-
function ApiOkSearchResponse(
|
|
7
|
+
function ApiOkSearchResponse(options) {
|
|
8
|
+
const itemType = options.type;
|
|
8
9
|
return (0, common_1.applyDecorators)((0, swagger_1.ApiExtraModels)(SearchSchema_1.SearchSchema, itemType), (0, swagger_1.ApiOkResponse)({
|
|
9
10
|
schema: {
|
|
10
11
|
allOf: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiOkSearchResponse.js","sourceRoot":"","sources":["../../../src/infrastructure/decorators/ApiOkSearchResponse.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,6CAA6E;AAC7E,0DAAqD;
|
|
1
|
+
{"version":3,"file":"ApiOkSearchResponse.js","sourceRoot":"","sources":["../../../src/infrastructure/decorators/ApiOkSearchResponse.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,6CAA6E;AAC7E,0DAAqD;AAMrD,SAAgB,mBAAmB,CAAC,OAAmC;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAC9B,OAAO,IAAA,wBAAe,EAClB,IAAA,wBAAc,EAAC,2BAAY,EAAE,QAAQ,CAAC,EACtC,IAAA,uBAAa,EAAC;QACV,MAAM,EAAE;YACJ,KAAK,EAAE;gBACH,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,2BAAY,CAAC,EAAE;gBACrC;oBACI,UAAU,EAAE;wBACR,KAAK,EAAE;4BACH,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,QAAQ,CAAC,EAAE;yBAC3C;qBACJ;iBACJ;aACJ;SACJ;KACJ,CAAC,CACL,CAAC;AACN,CAAC;AApBD,kDAoBC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Repository } from 'typeorm';
|
|
1
|
+
import { EntityManager, Repository } from 'typeorm';
|
|
2
2
|
import { ICrudRepository } from '../../usecases/interfaces/ICrudRepository';
|
|
3
3
|
import { SearchInputDto } from '../../usecases/dtos/SearchInputDto';
|
|
4
4
|
import { SearchResultDto } from '../../usecases/dtos/SearchResultDto';
|
|
@@ -16,11 +16,10 @@ export declare class CrudRepository<TModel> implements ICrudRepository<TModel> {
|
|
|
16
16
|
protected createQueryBuilder(conditionOrQuery: ICondition | SearchQuery): SelectQueryBuilder<any>;
|
|
17
17
|
create(model: TModel, transactionHandler?: (callback: any) => Promise<void>): Promise<TModel>;
|
|
18
18
|
update(id: number, model: TModel, transactionHandler?: (callback: any) => Promise<void>): Promise<TModel>;
|
|
19
|
+
save(model: TModel, transactionHandler?: (callback: any) => Promise<void>): Promise<TModel>;
|
|
20
|
+
saveInternal(manager: EntityManager, nextModel: TModel): Promise<void>;
|
|
19
21
|
remove(id: number, transactionHandler?: (callback: any) => Promise<void>): Promise<void>;
|
|
20
|
-
|
|
21
|
-
protected afterSave(prevModel: TModel | null, nextModel: TModel): Promise<void>;
|
|
22
|
-
protected beforeDelete(id: number): Promise<void>;
|
|
23
|
-
protected afterDelete(id: number): Promise<void>;
|
|
22
|
+
removeInternal(manager: EntityManager, id: number): Promise<void>;
|
|
24
23
|
protected modelToEntity(model: any): any;
|
|
25
24
|
protected entityToModel(obj: any): TModel;
|
|
26
25
|
}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CrudRepository = void 0;
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
5
4
|
const SearchHelper_1 = require("../../usecases/helpers/SearchHelper");
|
|
6
5
|
const SearchQuery_1 = require("../../usecases/base/SearchQuery");
|
|
7
6
|
const DataMapperHelper_1 = require("../../usecases/helpers/DataMapperHelper");
|
|
8
|
-
const BaseField_1 = require("../decorators/fields/BaseField");
|
|
9
7
|
class CrudRepository {
|
|
10
8
|
constructor() {
|
|
11
9
|
this.primaryKey = 'id';
|
|
@@ -40,72 +38,44 @@ class CrudRepository {
|
|
|
40
38
|
return dbQuery;
|
|
41
39
|
}
|
|
42
40
|
async create(model, transactionHandler) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
const entity = await manager.save(this.modelToEntity(model));
|
|
46
|
-
DataMapperHelper_1.DataMapperHelper.applyChangesToModel(model, entity);
|
|
47
|
-
await this.afterSave(null, model);
|
|
48
|
-
return model;
|
|
49
|
-
};
|
|
50
|
-
if (transactionHandler) {
|
|
51
|
-
await this.dbRepository.manager.transaction(async (manager) => {
|
|
52
|
-
await transactionHandler(async () => saveHandler(manager));
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
await saveHandler(this.dbRepository.manager);
|
|
57
|
-
}
|
|
58
|
-
return model;
|
|
41
|
+
model[this.primaryKey] = undefined;
|
|
42
|
+
return this.save(model, transactionHandler);
|
|
59
43
|
}
|
|
60
44
|
async update(id, model, transactionHandler) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
const prevModel = await this.findOne(searchQuery);
|
|
66
|
-
if (!prevModel) {
|
|
67
|
-
throw new Error('Not found model by id: ' + id);
|
|
68
|
-
}
|
|
69
|
-
let nextModel = (0, lodash_1.cloneDeep)(prevModel);
|
|
70
|
-
DataMapperHelper_1.DataMapperHelper.applyChangesToModel(nextModel, model);
|
|
71
|
-
const saveHandler = async (manager) => {
|
|
72
|
-
await this.beforeSave(prevModel, nextModel);
|
|
73
|
-
const entity = await manager.save(this.modelToEntity(nextModel));
|
|
74
|
-
DataMapperHelper_1.DataMapperHelper.applyChangesToModel(nextModel, entity);
|
|
75
|
-
await this.afterSave(prevModel, nextModel);
|
|
76
|
-
return nextModel;
|
|
77
|
-
};
|
|
45
|
+
model[this.primaryKey] = id;
|
|
46
|
+
return this.save(model, transactionHandler);
|
|
47
|
+
}
|
|
48
|
+
async save(model, transactionHandler) {
|
|
78
49
|
if (transactionHandler) {
|
|
79
50
|
await this.dbRepository.manager.transaction(async (manager) => {
|
|
80
|
-
await transactionHandler(async () =>
|
|
51
|
+
await transactionHandler(async () => {
|
|
52
|
+
await this.saveInternal(manager, model);
|
|
53
|
+
});
|
|
81
54
|
});
|
|
82
55
|
}
|
|
83
56
|
else {
|
|
84
|
-
await
|
|
57
|
+
await this.saveInternal(this.dbRepository.manager, model);
|
|
85
58
|
}
|
|
86
|
-
return
|
|
59
|
+
return model;
|
|
60
|
+
}
|
|
61
|
+
async saveInternal(manager, nextModel) {
|
|
62
|
+
const entity = await manager.save(this.modelToEntity(nextModel));
|
|
63
|
+
DataMapperHelper_1.DataMapperHelper.applyChangesToModel(nextModel, entity);
|
|
87
64
|
}
|
|
88
65
|
async remove(id, transactionHandler) {
|
|
89
66
|
if (transactionHandler) {
|
|
90
67
|
await this.dbRepository.manager.transaction(async (manager) => {
|
|
91
68
|
await transactionHandler(async () => {
|
|
92
|
-
await this.
|
|
93
|
-
await manager.remove(id);
|
|
94
|
-
await this.afterDelete(id);
|
|
69
|
+
await this.removeInternal(manager, id);
|
|
95
70
|
});
|
|
96
71
|
});
|
|
97
72
|
}
|
|
98
73
|
else {
|
|
99
|
-
await this.dbRepository.manager
|
|
74
|
+
await this.removeInternal(this.dbRepository.manager, id);
|
|
100
75
|
}
|
|
101
76
|
}
|
|
102
|
-
async
|
|
103
|
-
|
|
104
|
-
async afterSave(prevModel, nextModel) {
|
|
105
|
-
}
|
|
106
|
-
async beforeDelete(id) {
|
|
107
|
-
}
|
|
108
|
-
async afterDelete(id) {
|
|
77
|
+
async removeInternal(manager, id) {
|
|
78
|
+
await manager.remove(this.dbRepository.create({ id }));
|
|
109
79
|
}
|
|
110
80
|
modelToEntity(model) {
|
|
111
81
|
return DataMapperHelper_1.DataMapperHelper.modelToEntity(this.dbRepository.manager.connection, model);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":";;;AACA,sEAAiE;AAIjE,iEAA0D;AAC1D,8EAAyE;AAOzE,MAAa,cAAc;IAA3B;QAIW,eAAU,GAAW,IAAI,CAAC;IA2KrC,CAAC;IA7JU,IAAI,CAAC,YAA6B,EAAE,UAAe;QACtD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,WAAwB;QACtD,MAAM,MAAM,GAAG,MAAM,2BAAY,CAAC,MAAM,CACpC,IAAI,CAAC,YAAY,EACjB,GAAG,EACH,WAAW,EACX,IAAI,CACP,CAAC;QACF,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,KAAK,CAAC,OAAO,CAAC,gBAA0C;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,gBAA0C;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IACpD,CAAC;IAOS,kBAAkB,CAAC,gBAA0C;QACnE,IAAI,WAAW,GAAG,gBAA+B,CAAC;QAClD,IAAI,CAAC,CAAC,gBAAgB,YAAY,qBAAW,CAAC,EAAE;YAC5C,WAAW,GAAG,IAAI,qBAAW,EAAE,CAAC;YAChC,WAAW,CAAC,SAAS,GAAG,gBAAgB,CAAC;SAC5C;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC;QACvD,qBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAE7D,OAAO,OAAO,CAAC;IACnB,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,kBAAgD;QACxE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QACnC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAChD,CAAC;IAQD,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAa,EAAE,kBAAgD;QACpF,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAChD,CAAC;IAOD,KAAK,CAAC,IAAI,CAAC,KAAa,EAAE,kBAAgD;QACtE,IAAI,kBAAkB,EAAE;YACpB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC1D,MAAM,kBAAkB,CAAC,KAAK,IAAI,EAAE;oBAChC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC5C,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;aAAM;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC7D;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAOD,KAAK,CAAC,YAAY,CAAC,OAAsB,EAAE,SAAiB;QACxD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;QACjE,mCAAgB,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,kBAAgD;QACrE,IAAI,kBAAkB,EAAE;YACpB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC1D,MAAM,kBAAkB,CAAC,KAAK,IAAI,EAAE;oBAChC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3C,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;aAAM;YACH,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;SAC5D;IACL,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,OAAsB,EAAE,EAAU;QACnD,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAC,EAAE,EAAC,CAAC,CAAC,CAAC;IACzD,CAAC;IAOS,aAAa,CAAC,KAAK;QACzB,OAAO,mCAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACvF,CAAC;IAOS,aAAa,CAAC,GAAQ;QAC5B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,gDAAgD,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC7F;QACD,OAAO,mCAAgB,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;CACJ;AA/KD,wCA+KC"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steroidsjs/nest",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.13",
|
|
4
4
|
"scripts": {
|
|
5
|
-
"build": "tsc && copyfiles ./{package.json,LICENSE,README.md} dist/"
|
|
5
|
+
"build": "tsc && copyfiles ./{package.json,LICENSE,README.md} dist/",
|
|
6
|
+
"watch": "tsc -p tsconfig-debug.json"
|
|
6
7
|
},
|
|
7
8
|
"description": "",
|
|
8
9
|
"main": "index.js",
|