@klerick/json-api-nestjs-microorm 0.1.0-beta.4 → 0.1.0-beta.6
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 +2 -2
- package/src/lib/factory/index.js +4 -5
- package/src/lib/factory/index.js.map +1 -1
- package/src/lib/mock-utils/entities/users.js +2 -2
- package/src/lib/mock-utils/entities/users.js.map +1 -1
- package/src/lib/orm-helper/index.js +5 -1
- package/src/lib/orm-helper/index.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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
## 0.1.0-beta.6 (2025-06-10)
|
|
2
|
+
|
|
3
|
+
### 🩹 Fixes
|
|
4
|
+
|
|
5
|
+
- **json-api-nestjs-microorm:** ensure `applyFilters` is invoked in query builders for consistency ([391f4bb](https://github.com/klerick/nestjs-json-api/commit/391f4bb))
|
|
6
|
+
|
|
7
|
+
### ❤️ Thank You
|
|
8
|
+
|
|
9
|
+
- Alex H
|
|
10
|
+
|
|
11
|
+
## 0.1.0-beta.5 (2025-06-10)
|
|
12
|
+
|
|
13
|
+
### 🩹 Fixes
|
|
14
|
+
|
|
15
|
+
- **json-api-nestjs-microorm:** Handle defaultRaw in nullable props check and update entity properties ([6d7a24f](https://github.com/klerick/nestjs-json-api/commit/6d7a24f))
|
|
16
|
+
|
|
17
|
+
### ❤️ Thank You
|
|
18
|
+
|
|
19
|
+
- Alex H
|
|
20
|
+
|
|
1
21
|
## 0.1.0-beta.4 (2025-05-24)
|
|
2
22
|
|
|
3
23
|
### 🩹 Fixes
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@klerick/json-api-nestjs-microorm",
|
|
3
|
-
"version": "0.1.0-beta.
|
|
3
|
+
"version": "0.1.0-beta.6",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"types": "./src/index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"tslib": ">2.3.0"
|
|
28
28
|
},
|
|
29
29
|
"peerDependencies": {
|
|
30
|
-
"@klerick/json-api-nestjs": "^10.0.0-beta.
|
|
30
|
+
"@klerick/json-api-nestjs": "^10.0.0-beta.5"
|
|
31
31
|
},
|
|
32
32
|
"exports": {
|
|
33
33
|
"./package.json": "./package.json",
|
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":"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"}
|
|
@@ -74,7 +74,7 @@ tslib_1.__decorate([
|
|
|
74
74
|
(0, core_1.Property)({
|
|
75
75
|
name: 'is_active',
|
|
76
76
|
type: 'boolean',
|
|
77
|
-
nullable:
|
|
77
|
+
nullable: false,
|
|
78
78
|
default: false,
|
|
79
79
|
}),
|
|
80
80
|
tslib_1.__metadata("design:type", Boolean)
|
|
@@ -83,7 +83,7 @@ tslib_1.__decorate([
|
|
|
83
83
|
(0, core_1.Property)({
|
|
84
84
|
name: 'test_date',
|
|
85
85
|
type: Date,
|
|
86
|
-
nullable:
|
|
86
|
+
nullable: false,
|
|
87
87
|
defaultRaw: 'CURRENT_TIMESTAMP(0)',
|
|
88
88
|
columnType: 'timestamp(0) without time zone',
|
|
89
89
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/users.ts"],"names":[],"mappings":";;;;AAAA,0CAWyB;AAEzB,mCAOiB;AAIjB,MAAa,UAAW,SAAQ,WAAkB;CAAG;AAArD,gCAAqD;AAK9C,IAAM,KAAK,GAAX,MAAM,KAAK;IAAX;QA4BE,aAAQ,GAAa,EAAE,CAAC;QA2C/B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAU7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAsBtB,UAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;QAGpC,aAAQ,GAAG,IAAI,iBAAU,CAAW,IAAI,CAAC,CAAC;QAG1C,UAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;IAO7C,CAAC;CAAA,CAAA;AApHY,sBAAK;AAIT;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;iCACiB;AAOZ;IALN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,IAAI;KACb,CAAC;;oCACoB;AAQf;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;wCACwB;AASnB;IAPN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,IAAI,gBAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,UAAU,EAAE,QAAQ;QACpB,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE,EAAE;KACZ,CAAC;;uCAC6B;AAQxB;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,gBAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,UAAU,EAAE,QAAQ;QACpB,QAAQ,EAAE,IAAI;KACf,CAAC;;4CACqC;AAShC;IAPN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;uCACuB;AAQlB;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/mock-utils/entities/users.ts"],"names":[],"mappings":";;;;AAAA,0CAWyB;AAEzB,mCAOiB;AAIjB,MAAa,UAAW,SAAQ,WAAkB;CAAG;AAArD,gCAAqD;AAK9C,IAAM,KAAK,GAAX,MAAM,KAAK;IAAX;QA4BE,aAAQ,GAAa,EAAE,CAAC;QA2C/B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAU7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAsBtB,UAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;QAGpC,aAAQ,GAAG,IAAI,iBAAU,CAAW,IAAI,CAAC,CAAC;QAG1C,UAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;IAO7C,CAAC;CAAA,CAAA;AApHY,sBAAK;AAIT;IAHN,IAAA,iBAAU,EAAC;QACV,aAAa,EAAE,IAAI;KACpB,CAAC;;iCACiB;AAOZ;IALN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,IAAI;KACb,CAAC;;oCACoB;AAQf;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;wCACwB;AASnB;IAPN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,IAAI,gBAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,UAAU,EAAE,QAAQ;QACpB,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE,EAAE;KACZ,CAAC;;uCAC6B;AAQxB;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,gBAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzC,UAAU,EAAE,QAAQ;QACpB,QAAQ,EAAE,IAAI;KACf,CAAC;;4CACqC;AAShC;IAPN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,SAAS;QACrB,MAAM,EAAE,GAAG;QACX,QAAQ,EAAE,IAAI;KACf,CAAC;;uCACuB;AAQlB;IANN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;KACf,CAAC;;uCACwB;AASnB;IAPN,IAAA,eAAQ,EAAC;QACR,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACgB,IAAI;uCAAC;AASvB;IAPC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,sBAAsB;QAClC,UAAU,EAAE,gCAAgC;KAC7C,CAAC;sCACS,IAAI;wCAAc;AAU7B;IARC,IAAA,eAAQ,EAAC;QACR,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gCAAgC;QAC5C,UAAU,EAAE,sBAAsB;KACnC,CAAC;sCACS,IAAI;wCAAc;AAOtB;IALN,IAAA,eAAQ,EAAC,GAAG,EAAE,CAAC,iBAAS,EAAE;QACzB,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,cAAc;QACzB,QAAQ,EAAE,IAAI;KACf,CAAC;;wCAC4B;AAOvB;IALN,IAAA,eAAQ,EAAC,GAAG,EAAE,CAAC,KAAK,EAAE;QACrB,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,YAAY;KACxB,CAAC;;sCACsB;AAQjB;IANN,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE;QAC7C,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,kBAAkB;QAC9B,iBAAiB,EAAE,SAAS;QAC5B,UAAU,EAAE,SAAS;KACtB,CAAC;;oCACyC;AAGpC;IADN,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,gBAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;;uCACT;AAG1C;IADN,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,aAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;;oCACN;AAMpC;IAJN,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,kBAAU,EAAE;QAC3B,SAAS,EAAE,gBAAgB;QAC3B,QAAQ,EAAE,IAAI;KACf,CAAC;;wCACmC;gBAnH1B,KAAK;IAHjB,IAAA,aAAM,EAAC;QACN,SAAS,EAAE,OAAO;KACnB,CAAC;GACW,KAAK,CAoHjB"}
|
|
@@ -48,7 +48,11 @@ const getPropsNullable = (entityMetadata) => {
|
|
|
48
48
|
.map((i) => {
|
|
49
49
|
// @ts-ignore
|
|
50
50
|
const props = entityMetadata.properties[i];
|
|
51
|
-
return props.nullable ||
|
|
51
|
+
return props.nullable ||
|
|
52
|
+
props.default !== undefined ||
|
|
53
|
+
props.defaultRaw !== undefined
|
|
54
|
+
? i
|
|
55
|
+
: false;
|
|
52
56
|
})
|
|
53
57
|
.filter((i) => !!i);
|
|
54
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-helper/index.ts"],"names":[],"mappings":";;;AACA,8DAIkC;AAElC,4CAAkD;AAE3C,MAAM,WAAW,GAAG,CACzB,cAAiC,EACjC,EAAE,CACF,cAAc,CAAC,SAAS,CAAC,GAAG,CAC1B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAC4B,CAAC;AALjC,QAAA,WAAW,eAKsB;AAEvC,MAAM,QAAQ,GAAG,CACtB,cAAiC,EACR,EAAE;IAC3B,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,cAAc,CAAQ,CAAC;IAErD,OAAO,cAAc,CAAC,KAAK;SACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CACQ,CAAC;AAC5C,CAAC,CAAC;AAVW,QAAA,QAAQ,YAUnB;AAEK,MAAM,YAAY,GAAG,CAC1B,cAAiC,EACjC,SAA+D,8BAAkB,EACpD,EAAE;IAC/B,MAAM,KAAK,GAAG,IAAA,gBAAQ,EAAC,cAAc,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,EAAS,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GACT,cAAc,CAAC,UAAU,CAAC,IAAsC,CAAC,CAAC;QAEpE,IAAI,SAAS,GAAc,2BAAS,CAAC,MAAM,CAAC;QAC5C,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,GAAG,2BAAS,CAAC,KAAK,CAAC;YAC/B,SAAS;QACX,CAAC;QAED,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC;YAC1B,KAAK,MAAM;gBACT,SAAS,GAAG,2BAAS,CAAC,IAAI,CAAC;gBAC3B,MAAM;YACR,KAAK,QAAQ;gBACX,SAAS,GAAG,2BAAS,CAAC,MAAM,CAAC;gBAC7B,MAAM;YACR,KAAK,SAAS;gBACZ,SAAS,GAAG,2BAAS,CAAC,OAAO,CAAC;gBAC9B,MAAM;YACR,KAAK,QAAQ;gBACX,SAAS,GAAG,2BAAS,CAAC,MAAM,CAAC;gBAC7B,MAAM;YACR;gBACE,SAAS,GAAG,2BAAS,CAAC,MAAM,CAAC;QACjC,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAC3B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AArCW,QAAA,YAAY,gBAqCvB;AAEK,MAAM,gBAAgB,GAAG,CAC9B,cAAiC,EACA,EAAE;IACnC,OAAO,IAAA,gBAAQ,EAAC,cAAc,CAAC;SAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,aAAa;QACb,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,KAAK,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-microorm/src/lib/orm-helper/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":";;AAMA,wBAsFC;AA5FD,0CAAkD;AAIlD,+DAAwE;AAEjE,KAAK,UAAU,MAAM,CAE1B,KAAsB;IAKtB,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,MAAM,aAAa,GAAG,sCAAgB,CAAC,IAAI,CAIzC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpB,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAE3C,MAAM,aAAa,CAAC,YAAY,EAAE,CAAC;IAEnC,MAAM,eAAe,GAAG,aAAa;SAClC,KAAK,EAAE;SACP,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC;SACrD,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1B,MAAM,eAAe,GAAG,YAAY,CAAC;IAErC,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB;SAC3C,YAAY,CAAC,eAAe,CAAC;SAC7B,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC;SACrD,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE;QAC5D,CAAC,GAAG,eAAe,IAAI,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,CAAC,EACrE,IAAI,CAAC,mBAAmB;aACrB,OAAO,EAAE;aACT,GAAG,CACF,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,IAAI,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,CAC5F;KACN,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB;SACxC,YAAY,EAAE;SACd,IAAI,CACH,aAAa;SACV,KAAK,EAAE;SACP,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CACzD;SACA,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAE9D,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,EAAE;SACV,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,aAAa;SAC/B,QAAQ,EAAE;SACV,OAAO,CAAC,gBAAS,CAAC,gBAAgB,CAAC;SACnC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElB,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CACzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CACxD,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;QACvE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE;YAC/C,GAAG,EAAE,QAAQ;SACd;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,IAAA,mCAAa,EAAC,KAAK,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB;SAC9C,mBAAmB,CAAC,kBAAkB,EAAE,KAAY,CAAC;SACrD,OAAO,CACN,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC;QAChC,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC;YACE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,EAAE,KAAK;SACvD,CACN;SACA,SAAS,EAAE,CAAC;IAEf,OAAO;QACL,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,CAAC,CAAC,CAAC,MAAM,EAAO,CAAC;KACpD,CAAC;AACJ,CAAC"}
|
|
@@ -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"}
|