@klerick/json-api-nestjs-microorm 0.1.0-beta.5 → 0.1.0-beta.7
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/CHANGELOG.md +20 -0
- package/package.json +1 -1
- package/src/lib/factory/index.js +4 -5
- package/src/lib/factory/index.js.map +1 -1
- package/src/lib/micro-orm-json-api.module.js +6 -2
- package/src/lib/micro-orm-json-api.module.js.map +1 -1
- package/src/lib/orm-methods/get-all/get-all.js +1 -0
- package/src/lib/orm-methods/get-all/get-all.js.map +1 -1
- package/src/lib/orm-methods/get-one/get-one.js +3 -3
- package/src/lib/orm-methods/get-one/get-one.js.map +1 -1
- package/src/lib/service/index.d.ts +2 -0
- package/src/lib/service/index.js +2 -0
- package/src/lib/service/index.js.map +1 -1
- package/src/lib/service/mikro-orm-format.error.service.d.ts +11 -0
- package/src/lib/service/mikro-orm-format.error.service.js +95 -0
- package/src/lib/service/mikro-orm-format.error.service.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
## 0.1.0-beta.7 (2025-06-23)
|
|
2
|
+
|
|
3
|
+
### 🩹 Fixes
|
|
4
|
+
|
|
5
|
+
- **json-api-nestjs-microorm:** add format for mikroorm error ([c1cafc2](https://github.com/klerick/nestjs-json-api/commit/c1cafc2))
|
|
6
|
+
|
|
7
|
+
### ❤️ Thank You
|
|
8
|
+
|
|
9
|
+
- Alex H
|
|
10
|
+
|
|
11
|
+
## 0.1.0-beta.6 (2025-06-10)
|
|
12
|
+
|
|
13
|
+
### 🩹 Fixes
|
|
14
|
+
|
|
15
|
+
- **json-api-nestjs-microorm:** ensure `applyFilters` is invoked in query builders for consistency ([391f4bb](https://github.com/klerick/nestjs-json-api/commit/391f4bb))
|
|
16
|
+
|
|
17
|
+
### ❤️ Thank You
|
|
18
|
+
|
|
19
|
+
- Alex H
|
|
20
|
+
|
|
1
21
|
## 0.1.0-beta.5 (2025-06-10)
|
|
2
22
|
|
|
3
23
|
### 🩹 Fixes
|
package/package.json
CHANGED
package/src/lib/factory/index.js
CHANGED
|
@@ -105,12 +105,11 @@ function FindOneRowEntityFactory() {
|
|
|
105
105
|
inject: [micro_orm_util_service_1.MicroOrmUtilService],
|
|
106
106
|
useFactory(microOrmUtilService) {
|
|
107
107
|
return async (entity, value) => {
|
|
108
|
-
|
|
109
|
-
.queryBuilder(entity)
|
|
110
|
-
.where({
|
|
108
|
+
const qb = microOrmUtilService.queryBuilder(entity).where({
|
|
111
109
|
[microOrmUtilService.currentPrimaryColumn]: value,
|
|
112
|
-
})
|
|
113
|
-
|
|
110
|
+
});
|
|
111
|
+
await qb.applyFilters();
|
|
112
|
+
return qb.getSingleResult();
|
|
114
113
|
};
|
|
115
114
|
},
|
|
116
115
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/factory/index.ts"],"names":[],"mappings":";;AA+CA,0DAUC;AAED,oDAMC;AAED,0DASC;AAED,sDAMC;AAED,4DAYC;AAED,wCA6BC;AAED,0DAQC;AAED,8CAKC;AACD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/factory/index.ts"],"names":[],"mappings":";;AA+CA,0DAUC;AAED,oDAMC;AAED,0DASC;AAED,sDAMC;AAED,4DAYC;AAED,wCA6BC;AAED,0DAQC;AAED,8CAKC;AACD,0DAiBC;AAnKD,0CAMyB;AACzB,+DAAiD;AACjD,8CAAqD;AAErD,8DAYkC;AAClC,4EAAgE;AAEhE,8CASuB;AAEvB,4CAKsB;AACtB,wCAA6C;AAE7C,8EAAwE;AAExE,SAAgB,uBAAuB,CACrC,cAAuB;IAEvB,OAAO;QACL,OAAO,EAAE,qCAAyB;QAClC,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE;YACjC,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,IAAA,yBAAgB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,eAAQ,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,SAAgB,oBAAoB;IAClC,OAAO;QACL,OAAO,EAAE,wCAA4B;QACrC,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE;QAC/C,MAAM,EAAE,CAAC,qCAAyB,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB,CACrC,MAAS;IAET,OAAO;QACL,OAAO,EAAE,qCAAyB;QAClC,UAAU,EAAE,CAAC,aAA4B,EAAE,EAAE,CAC3C,aAAa,CAAC,aAAa,CAAI,MAAmC,CAAC;QACrE,MAAM,EAAE,CAAC,wCAA4B,CAAC;KACvC,CAAC;AACJ,CAAC;AAED,SAAgB,qBAAqB;IACnC,OAAO;QACL,OAAO,EAAE,iCAAqB;QAC9B,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE;QAC1D,MAAM,EAAE,CAAC,qCAAyB,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB;IAItC,OAAO;QACL,OAAO,EAAE,qCAAmB;QAC5B,MAAM,EAAE,CAAC,4CAAmB,CAAC;QAC7B,UAAU,CAAC,mBAAkD;YAC3D,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CACvB,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;QACtE,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAAmB,QAA0B;IACzE,OAAO;QACL,OAAO,EAAE,kCAAgB;QACzB,MAAM,EAAE,CAAC,iCAAqB,EAAE,sCAAoB,CAAC;QACrD,UAAU,EAAE,CACV,eAAgC,EAChC,MAAoC,EACpC,EAAE;YACF,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkC,CAAC;YAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;YAC7C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;gBAC5B,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAI,IAAI,CAAC,CAAC;gBAC9C,MAAM,SAAS,GAAG,IAAA,sCAAa,EAAC,IAAI,CAAC,CAAC;gBACtC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE;oBACpB,KAAK,EAAE,IAAA,qBAAQ,EAAC,QAAQ,CAAC;oBACzB,SAAS,EAAE,IAAA,yBAAY,EAAC,QAAQ,EAAE,WAAW,CAAC;oBAC9C,aAAa,EAAE,IAAA,6BAAgB,EAAC,QAAQ,CAAC;oBACzC,iBAAiB,EAAE,IAAA,iCAAoB,EAAC,QAAQ,CAAC;oBACjD,iBAAiB,EAAE,IAAA,iCAAoB,EAAC,QAAQ,CAAC;oBACjD,cAAc,EAAE,IAAA,yBAAY,EAAC,QAAQ,CAAC;oBACtC,QAAQ,EAAE,IAAA,gCAAS,EAAC,SAAS,CAAC;oBAC9B,SAAS,EAAE,SAAS;oBACpB,SAAS,EAAE,IAAA,wBAAW,EAAC,QAAQ,CAAC;oBAChC,gBAAgB,EAAE,IAAA,gCAAmB,EAAC,QAAQ,CAAC;iBAChD,CAAC,CAAC;YACL,CAAC;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB;IACrC,OAAO;QACL,OAAO,EAAE,6CAA2B;QACpC,MAAM,EAAE,EAAE;QACV,UAAU;YACR,OAAO,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;QACxC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB;IAC/B,OAAO;QACL,OAAO,EAAE,6BAAW;QACpB,QAAQ,EAAE,yBAAe;KAC1B,CAAC;AACJ,CAAC;AACD,SAAgB,uBAAuB;IAIrC,OAAO;QACL,OAAO,EAAE,qCAAmB;QAC5B,MAAM,EAAE,CAAC,4CAAmB,CAAC;QAC7B,UAAU,CAAC,mBAAkD;YAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;gBAC7B,MAAM,EAAE,GAAG,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;oBACxD,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,KAAK;iBAClD,CAAC,CAAC;gBACH,MAAM,EAAE,CAAC,YAAY,EAAE,CAAC;gBACxB,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;YAC9B,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.MicroOrmJsonApiModule = void 0;
|
|
|
4
4
|
const nestjs_1 = require("@mikro-orm/nestjs");
|
|
5
5
|
const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
|
|
6
6
|
const factory_1 = require("./factory");
|
|
7
|
-
const
|
|
7
|
+
const service_1 = require("./service");
|
|
8
8
|
class MicroOrmJsonApiModule {
|
|
9
9
|
static forRoot(options) {
|
|
10
10
|
const optionProvider = {
|
|
@@ -20,6 +20,10 @@ class MicroOrmJsonApiModule {
|
|
|
20
20
|
(0, factory_1.CurrentEntityMetadata)(),
|
|
21
21
|
(0, factory_1.RunInTransactionFactory)(),
|
|
22
22
|
(0, factory_1.EntityPropsMap)(options.entities),
|
|
23
|
+
{
|
|
24
|
+
provide: json_api_nestjs_1.ErrorFormatService,
|
|
25
|
+
useClass: service_1.MikroOrmFormatErrorService,
|
|
26
|
+
},
|
|
23
27
|
];
|
|
24
28
|
const currentImport = [
|
|
25
29
|
microOrmModule,
|
|
@@ -37,7 +41,7 @@ class MicroOrmJsonApiModule {
|
|
|
37
41
|
(0, factory_1.CurrentEntityRepository)(entity),
|
|
38
42
|
(0, factory_1.CheckRelationNameFactory)(),
|
|
39
43
|
(0, factory_1.OrmServiceFactory)(),
|
|
40
|
-
|
|
44
|
+
service_1.MicroOrmUtilService,
|
|
41
45
|
(0, factory_1.FindOneRowEntityFactory)(),
|
|
42
46
|
];
|
|
43
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"micro-orm-json-api.module.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/micro-orm-json-api.module.ts"],"names":[],"mappings":";;;AACA,8CAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"micro-orm-json-api.module.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/micro-orm-json-api.module.ts"],"names":[],"mappings":";;;AACA,8CAAmD;AACnD,8DAKkC;AAGlC,uCAUmB;AACnB,uCAA4E;AAE5E,MAAa,qBAAqB;IAChC,MAAM,CAAC,OAAO,CAAC,OAAqC;QAClD,MAAM,cAAc,GAAG;YACrB,OAAO,EAAE,sCAAoB;YAC7B,QAAQ,EAAE,OAAO;SAClB,CAAC;QAEF,MAAM,cAAc,GAAG,uBAAc,CAAC,UAAU,CAC9C,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,cAAc,CACvB,CAAC;QAEF,MAAM,eAAe,GAAG;YACtB,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;YAC5B,cAAc;YACd,IAAA,iCAAuB,EAAC,OAAO,CAAC,cAAc,CAAC;YAC/C,IAAA,8BAAoB,GAAE;YACtB,IAAA,+BAAqB,GAAE;YACvB,IAAA,iCAAuB,GAAE;YACzB,IAAA,wBAAc,EAAC,OAAO,CAAC,QAAQ,CAAC;YAChC;gBACE,OAAO,EAAE,oCAAkB;gBAC3B,QAAQ,EAAE,oCAA0B;aACrC;SACF,CAAC;QAEF,MAAM,aAAa,GAAG;YACpB,cAAc;YACd,GAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAqB;SAChD,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,eAAe;YAC1B,OAAO,EAAE,CAAC,GAAG,eAAe,EAAE,GAAG,aAAa,CAAC;SAChD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,MAAc;QACpC,OAAO;YACL,IAAA,iCAAuB,EAAC,MAAM,CAAC;YAC/B,IAAA,kCAAwB,GAAE;YAC1B,IAAA,2BAAiB,GAAE;YACnB,6BAAmB;YACnB,IAAA,iCAAuB,GAAE;SAC1B,CAAC;IACJ,CAAC;CACF;AAhDD,sDAgDC"}
|
|
@@ -7,6 +7,7 @@ async function getAll(query) {
|
|
|
7
7
|
const { page } = query;
|
|
8
8
|
const countSubQuery = get_query_for_count_1.getQueryForCount.call(this, ...[query]);
|
|
9
9
|
const skip = (page.number - 1) * page.size;
|
|
10
|
+
await countSubQuery.applyFilters();
|
|
10
11
|
const paginationQuery = countSubQuery
|
|
11
12
|
.clone()
|
|
12
13
|
.select(this.microOrmUtilService.currentPrimaryColumn)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-all.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-all/get-all.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"get-all.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-all/get-all.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,9 @@ async function getOne(id, query) {
|
|
|
7
7
|
const queryBuilder = this.microOrmUtilService.queryBuilder().where({
|
|
8
8
|
[this.microOrmUtilService.currentPrimaryColumn]: id,
|
|
9
9
|
});
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
const resultQueryBuilder = this.microOrmUtilService.prePareQueryBuilder(queryBuilder, query);
|
|
11
|
+
await resultQueryBuilder.applyFilters();
|
|
12
|
+
const resultItem = await resultQueryBuilder.getSingleResult();
|
|
13
13
|
if (!resultItem) {
|
|
14
14
|
const error = {
|
|
15
15
|
code: 'invalid_arguments',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-one/get-one.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"get-one.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-methods/get-one/get-one.ts"],"names":[],"mappings":";;AAKA,wBA2BC;AAhCD,2CAAmD;AAEnD,0CAAuC;AAGhC,KAAK,UAAU,MAAM,CAE1B,EAAmB,EACnB,KAAyB;IAEzB,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;QACjE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,EAAE;KACpD,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CACrE,YAAY,EACZ,KAAY,CACb,CAAC;IAEF,MAAM,kBAAkB,CAAC,YAAY,EAAE,CAAC;IAExC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,CAAC;IAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,KAAK,GAAuB;YAChC,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,aAAa,IAAI,CAAC,mBAAmB,CAAC,YAAY,cAAc,EAAE,kBAAkB;YAC7F,IAAI,EAAE,CAAC,QAAQ,CAAC;SACjB,CAAC;QACF,MAAM,IAAI,0BAAiB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,MAAM,EAAO,CAAC;AACxC,CAAC"}
|
package/src/lib/service/index.js
CHANGED
|
@@ -2,4 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
tslib_1.__exportStar(require("./microorm-service"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./mikro-orm-format.error.service"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./micro-orm-util.service"), exports);
|
|
5
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,2EAAiD;AACjD,mEAAyC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { ErrorFormatService } from '@klerick/json-api-nestjs';
|
|
2
|
+
import { HttpException } from '@nestjs/common';
|
|
3
|
+
import { EntityManager } from '@mikro-orm/core';
|
|
4
|
+
export declare class MikroOrmFormatErrorService extends ErrorFormatService {
|
|
5
|
+
em: EntityManager;
|
|
6
|
+
private mainConfig;
|
|
7
|
+
private errorMsg;
|
|
8
|
+
formatError(error: unknown): HttpException;
|
|
9
|
+
private formatValidationError;
|
|
10
|
+
private prepareDataBaseError;
|
|
11
|
+
}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MikroOrmFormatErrorService = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const json_api_nestjs_1 = require("@klerick/json-api-nestjs");
|
|
6
|
+
const common_1 = require("@nestjs/common");
|
|
7
|
+
const core_1 = require("@mikro-orm/core");
|
|
8
|
+
const constants_1 = require("../constants");
|
|
9
|
+
const duplicateItems = (errorText, options, detail) => {
|
|
10
|
+
errorText = 'Duplicate value';
|
|
11
|
+
if (detail) {
|
|
12
|
+
const matches = detail.match(/(?<=\().+?(?=\))/gm);
|
|
13
|
+
if (matches) {
|
|
14
|
+
errorText = `Duplicate value in the "${matches[0]}"`;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
const error = {
|
|
18
|
+
code: 'invalid_arguments',
|
|
19
|
+
message: errorText,
|
|
20
|
+
path: ['data', 'attributes'],
|
|
21
|
+
};
|
|
22
|
+
return new common_1.ConflictException([error], options);
|
|
23
|
+
};
|
|
24
|
+
class MikroOrmFormatErrorService extends json_api_nestjs_1.ErrorFormatService {
|
|
25
|
+
constructor() {
|
|
26
|
+
super(...arguments);
|
|
27
|
+
this.errorMsg = 'Internal Server Error';
|
|
28
|
+
}
|
|
29
|
+
formatError(error) {
|
|
30
|
+
try {
|
|
31
|
+
if (error instanceof core_1.ValidationError) {
|
|
32
|
+
return this.formatValidationError(error);
|
|
33
|
+
}
|
|
34
|
+
if (error instanceof core_1.DriverException) {
|
|
35
|
+
return this.prepareDataBaseError(error);
|
|
36
|
+
}
|
|
37
|
+
return super.formatError(error);
|
|
38
|
+
}
|
|
39
|
+
catch (error) {
|
|
40
|
+
return super.formatError(error);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
formatValidationError(error) {
|
|
44
|
+
const { message } = error;
|
|
45
|
+
const entity = error.getEntity();
|
|
46
|
+
const errorObject = {
|
|
47
|
+
code: 'invalid_arguments',
|
|
48
|
+
message: message.split('\n').at(0) || message,
|
|
49
|
+
path: [],
|
|
50
|
+
};
|
|
51
|
+
if (entity) {
|
|
52
|
+
errorObject['path'] = ['data', 'attributes'];
|
|
53
|
+
}
|
|
54
|
+
const descriptionOrOptions = this.mainConfig.options
|
|
55
|
+
.debug
|
|
56
|
+
? { cause: error }
|
|
57
|
+
: {};
|
|
58
|
+
return new common_1.BadRequestException([errorObject], descriptionOrOptions);
|
|
59
|
+
}
|
|
60
|
+
prepareDataBaseError(error) {
|
|
61
|
+
if (!this.em
|
|
62
|
+
.getPlatform()
|
|
63
|
+
.getConfig()
|
|
64
|
+
.getDriver()
|
|
65
|
+
.constructor.name.startsWith('Postgre')) {
|
|
66
|
+
return super.formatError(error);
|
|
67
|
+
}
|
|
68
|
+
const { errorCode, errorMsg, detail, table } = {
|
|
69
|
+
errorCode: error.code,
|
|
70
|
+
errorMsg: error.message,
|
|
71
|
+
detail: Reflect.get(error, 'detail'),
|
|
72
|
+
table: Reflect.get(error, 'table'),
|
|
73
|
+
};
|
|
74
|
+
const descriptionOrOptions = this.mainConfig.options
|
|
75
|
+
.debug
|
|
76
|
+
? { cause: error }
|
|
77
|
+
: {};
|
|
78
|
+
switch (error.constructor) {
|
|
79
|
+
case core_1.UniqueConstraintViolationException:
|
|
80
|
+
return duplicateItems(errorMsg, descriptionOrOptions, detail);
|
|
81
|
+
default:
|
|
82
|
+
return super.formatError(error);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
exports.MikroOrmFormatErrorService = MikroOrmFormatErrorService;
|
|
87
|
+
tslib_1.__decorate([
|
|
88
|
+
(0, common_1.Inject)(constants_1.CURRENT_ENTITY_MANAGER_TOKEN),
|
|
89
|
+
tslib_1.__metadata("design:type", core_1.EntityManager)
|
|
90
|
+
], MikroOrmFormatErrorService.prototype, "em", void 0);
|
|
91
|
+
tslib_1.__decorate([
|
|
92
|
+
(0, common_1.Inject)(json_api_nestjs_1.MODULE_OPTIONS_TOKEN),
|
|
93
|
+
tslib_1.__metadata("design:type", Object)
|
|
94
|
+
], MikroOrmFormatErrorService.prototype, "mainConfig", void 0);
|
|
95
|
+
//# sourceMappingURL=mikro-orm-format.error.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mikro-orm-format.error.service.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/service/mikro-orm-format.error.service.ts"],"names":[],"mappings":";;;;AAAA,8DAKkC;AAClC,2CAMwB;AAExB,0CAKyB;AAEzB,4CAA4D;AAE5D,MAAM,cAAc,GAAG,CACrB,SAAiB,EACjB,OAA6B,EAC7B,MAAe,EACf,EAAE;IACF,SAAS,GAAG,iBAAiB,CAAC;IAC9B,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACnD,IAAI,OAAO,EAAE,CAAC;YACZ,SAAS,GAAG,2BAA2B,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QACvD,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAuB;QAChC,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,SAAS;QAClB,IAAI,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC;KAC7B,CAAC;IAEF,OAAO,IAAI,0BAAiB,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAa,0BAA2B,SAAQ,oCAAkB;IAAlE;;QAKU,aAAQ,GAAG,uBAAuB,CAAC;IAkE7C,CAAC;IAhEU,WAAW,CAAC,KAAc;QACjC,IAAI,CAAC;YACH,IAAI,KAAK,YAAY,sBAAe,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,KAAK,YAAY,sBAAe,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC1C,CAAC;YACD,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,KAAsB;QAClD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAE1B,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,WAAW,GAAuB;YACtC,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO;YAC7C,IAAI,EAAE,EAAE;SACT,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,oBAAoB,GAAyB,IAAI,CAAC,UAAU,CAAC,OAAO;aACvE,KAAK;YACN,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;YAClB,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO,IAAI,4BAAmB,CAAC,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACtE,CAAC;IAEO,oBAAoB,CAAC,KAAsB;QACjD,IACE,CAAC,IAAI,CAAC,EAAE;aACL,WAAW,EAAE;aACb,SAAS,EAAE;aACX,SAAS,EAAE;aACX,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EACzC,CAAC;YACD,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;YAC7C,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,QAAQ,EAAE,KAAK,CAAC,OAAO;YACvB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAW;YAC9C,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAW;SAC7C,CAAC;QACF,MAAM,oBAAoB,GAAyB,IAAI,CAAC,UAAU,CAAC,OAAO;aACvE,KAAK;YACN,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;YAClB,CAAC,CAAC,EAAE,CAAC;QAEP,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC;YAC1B,KAAK,yCAAkC;gBACrC,OAAO,cAAc,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,CAAC,CAAC;YAChE;gBACE,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF;AAvED,gEAuEC;AAtEuC;IAArC,IAAA,eAAM,EAAC,wCAA4B,CAAC;sCAAM,oBAAa;sDAAC;AAEjD;IADP,IAAA,eAAM,EAAC,sCAAoB,CAAC;;8DACM"}
|