@serene-dev/la-nest-library 0.0.146 → 0.0.148
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/dist/libs/la-library/src/controllers/base.controller.d.ts +1 -1
- package/dist/libs/la-library/src/controllers/base.controller.js +4 -3
- package/dist/libs/la-library/src/controllers/base.controller.js.map +1 -1
- package/dist/libs/la-library/src/enums/search.enum.d.ts +4 -0
- package/dist/libs/la-library/src/enums/search.enum.js +6 -1
- package/dist/libs/la-library/src/enums/search.enum.js.map +1 -1
- package/dist/libs/la-library/src/interfaces/search.interface.d.ts +2 -1
- package/dist/libs/la-library/src/modules/category/category.service.js +5 -1
- package/dist/libs/la-library/src/modules/category/category.service.js.map +1 -1
- package/dist/libs/la-library/src/services/base.service.d.ts +3 -2
- package/dist/libs/la-library/src/services/base.service.js +4 -3
- package/dist/libs/la-library/src/services/base.service.js.map +1 -1
- package/dist/libs/la-library/src/services/search.service.js +24 -21
- package/dist/libs/la-library/src/services/search.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,7 +12,7 @@ export declare class BaseController<TEntity extends BaseEntity, TSearchDto exten
|
|
|
12
12
|
static toggleBulkPath: string;
|
|
13
13
|
constructor(service: SDKBaseService<TEntity, TSearchDto>);
|
|
14
14
|
analytics(params: ChartQueryDto): Promise<string | Chart[]>;
|
|
15
|
-
getByID(params: IItemID): Promise<string | TEntity>;
|
|
15
|
+
getByID(params: IItemID, auth?: IAuthParam): Promise<string | TEntity>;
|
|
16
16
|
search(query: TSearchDto): Promise<string | import("..").ISearchResponse<TEntity>>;
|
|
17
17
|
setOrder(body: SetOrderDTO): Promise<string | boolean>;
|
|
18
18
|
toggleAllActive(body: ToggleActiveDTO): Promise<string | {
|
|
@@ -37,9 +37,9 @@ class BaseController {
|
|
|
37
37
|
return utility_service_1.UtilityClass.handleError(error);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
async getByID(params) {
|
|
40
|
+
async getByID(params, auth) {
|
|
41
41
|
return utility_service_1.UtilityClass.handleSuccess({
|
|
42
|
-
data: await this.service.getById(params.id),
|
|
42
|
+
data: await this.service.getById(params.id, auth),
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
async search(query) {
|
|
@@ -110,8 +110,9 @@ __decorate([
|
|
|
110
110
|
required: true,
|
|
111
111
|
}),
|
|
112
112
|
__param(0, (0, common_1.Param)()),
|
|
113
|
+
__param(1, (0, authentication_guard_1.AuthParam)()),
|
|
113
114
|
__metadata("design:type", Function),
|
|
114
|
-
__metadata("design:paramtypes", [Object]),
|
|
115
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
115
116
|
__metadata("design:returntype", Promise)
|
|
116
117
|
], BaseController.prototype, "getByID", null);
|
|
117
118
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.controller.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/controllers/base.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,6CAAwD;AAExD,mDAAuE;AAEvE,iEAA2D;AAE3D,+CAM0B;AAE1B,yFAA2E;AAC3E,yDAA6D;AAE7D,MAAa,cAAc;IAOzB,YACqB,OAA4C;QAA5C,YAAO,GAAP,OAAO,CAAqC;QAJjE,YAAO,GAAG,MAAM,CAAC;QACjB,YAAO,GAAG,IAAI,CAAC;IAIZ,CAAC;IAIE,AAAN,KAAK,CAAC,SAAS,CAAU,MAAqB;QAC5C,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC;aAC9C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAOK,AAAN,KAAK,CAAC,OAAO,CAAU,MAAe;
|
|
1
|
+
{"version":3,"file":"base.controller.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/controllers/base.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,6CAAwD;AAExD,mDAAuE;AAEvE,iEAA2D;AAE3D,+CAM0B;AAE1B,yFAA2E;AAC3E,yDAA6D;AAE7D,MAAa,cAAc;IAOzB,YACqB,OAA4C;QAA5C,YAAO,GAAP,OAAO,CAAqC;QAJjE,YAAO,GAAG,MAAM,CAAC;QACjB,YAAO,GAAG,IAAI,CAAC;IAIZ,CAAC;IAIE,AAAN,KAAK,CAAC,SAAS,CAAU,MAAqB;QAC5C,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC;aAC9C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAOK,AAAN,KAAK,CAAC,OAAO,CAAU,MAAe,EAAe,IAAiB;QACpE,OAAO,8BAAY,CAAC,aAAa,CAAC;YAChC,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAC,IAAI,CAAC;SACjD,CAAC,CAAC;IACL,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM,CAAU,KAAiB;QACrC,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEK,AAAN,KAAK,CAAC,QAAQ,CAAS,IAAiB;QACtC,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CAAS,IAAqB;QACjD,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC;aAC/C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAS,IAAyB;QACtD,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;aAChD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAS,IAAqB,EAAW,KAAY;QACrE,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC;aACtD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;;AAvFH,wCAwFC;AAlFQ,6BAAc,GAAG,aAAa,AAAhB,CAAiB;AAOhC;IAFL,IAAA,YAAG,EAAC,WAAW,CAAC;IAChB,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,CAAC,qBAAK,CAAC,EAAE,CAAC;IACd,WAAA,IAAA,cAAK,GAAE,CAAA;;qCAAS,6BAAa;;+CAQ7C;AAOK;IALL,IAAA,YAAG,EAAC,aAAa,CAAC;IAClB,IAAA,kBAAQ,EAAC;QACR,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;KACf,CAAC;IACa,WAAA,IAAA,cAAK,GAAE,CAAA;IAAmB,WAAA,IAAA,gCAAS,GAAE,CAAA;;;;6CAInD;AAIK;IAFL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACb,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,8BAAiB,EAAE,CAAC;IAC3B,WAAA,IAAA,cAAK,GAAE,CAAA;;;;4CAQpB;AAEK;IADL,IAAA,cAAK,EAAC,SAAS,CAAC;IACD,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAO,sBAAW;;8CAQvC;AAGK;IADL,IAAA,YAAG,EAAC,YAAY,CAAC;IACK,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAO,0BAAe;;qDAQlD;AAGK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC,cAAc,CAAC;IACX,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAO,8BAAmB;;sDAQvD;AAGK;IADL,IAAA,YAAG,EAAC,YAAY,CAAC;IACE,WAAA,IAAA,aAAI,GAAE,CAAA;IAAyB,WAAA,IAAA,cAAK,GAAE,CAAA;;qCAAzB,0BAAe,EAAkB,gBAAK;;kDAQtE;AAGH,MAAa,iBAGX,SAAQ,cAAmC;IAE3C,MAAM,CACI,IAAS,EACJ,IAAgB,EAC7B,iBAAkD,CAAC,IAAI,EAAE,EAAE,CACzD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAE5B,IAAI,CAAC;YACH,8BAAY,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;aAC3B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,UAAU,CAIR,KAAY,EACZ,IAAgB,EAChB,IAAgB,EAChB,iBAAqE,CACnE,EAAE,EACF,IAAI,EACJ,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC;QAEvC,IAAI,CAAC;YACH,8BAAY,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC;aACrC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,MAAM,CACJ,cAA+B,EAC/B,GAAG,MAAmC;QAEtC,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;aAC7B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;CACF;AAvDD,8CAuDC;AAlDC;IADC,IAAA,aAAI,GAAE;IAEJ,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,gCAAS,GAAE,CAAA;;iEAAO,UAAU,oBAAV,UAAU;;+CAY9B;AAsCH,MAAa,kBAGX,SAAQ,iBAAsC;IAE9C,UAAU,CACC,KAAY,EACrB,iBAA+C,CAAC,EAAE,EAAE,EAAE,CACpD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAE9B,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;aAC/B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAGD,WAAW,CACD,IAAoB,EAC5B,iBAAkD,CAAC,GAAG,EAAE,EAAE,CACxD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC;QAEhC,IAAI,CAAC;YACH,OAAO,8BAAY,CAAC,aAAa,CAAC;gBAChC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;aAC/B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,8BAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;CACF;AAjCD,gDAiCC;AA5BC;IADC,IAAA,eAAM,EAAC,KAAK,CAAC;IAEX,WAAA,IAAA,cAAK,GAAE,CAAA;;qCAAQ,gBAAK;;oDAWtB;AAGD;IADC,IAAA,eAAM,EAAC,EAAE,CAAC;IAER,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAO,yBAAc;;qDAW7B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ESearchCondition = exports.ESortOrder = void 0;
|
|
3
|
+
exports.ESearchJoinCondition = exports.ESearchCondition = exports.ESortOrder = void 0;
|
|
4
4
|
var ESortOrder;
|
|
5
5
|
(function (ESortOrder) {
|
|
6
6
|
ESortOrder["asc"] = "ASC";
|
|
@@ -18,4 +18,9 @@ var ESearchCondition;
|
|
|
18
18
|
ESearchCondition["leftJoin"] = "leftJoin";
|
|
19
19
|
ESearchCondition["inArray"] = "inArray";
|
|
20
20
|
})(ESearchCondition || (exports.ESearchCondition = ESearchCondition = {}));
|
|
21
|
+
var ESearchJoinCondition;
|
|
22
|
+
(function (ESearchJoinCondition) {
|
|
23
|
+
ESearchJoinCondition["and"] = "AND";
|
|
24
|
+
ESearchJoinCondition["or"] = "OR";
|
|
25
|
+
})(ESearchJoinCondition || (exports.ESearchJoinCondition = ESearchJoinCondition = {}));
|
|
21
26
|
//# sourceMappingURL=search.enum.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.enum.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/enums/search.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,yBAAW,CAAA;IACX,2BAAa,CAAA;AACf,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AACD,IAAY,gBAUX;AAVD,WAAY,gBAAgB;IAC1B,qCAAiB,CAAA;IACjB,6CAAyB,CAAA;IACzB,kCAAc,CAAA;IACd,0CAAsB,CAAA;IACtB,+BAAW,CAAA;IACX,yCAAqB,CAAA;IACrB,uCAAmB,CAAA;IACnB,yCAAqB,CAAA;IACrB,uCAAmB,CAAA;AACrB,CAAC,EAVW,gBAAgB,gCAAhB,gBAAgB,QAU3B"}
|
|
1
|
+
{"version":3,"file":"search.enum.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/enums/search.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,yBAAW,CAAA;IACX,2BAAa,CAAA;AACf,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AACD,IAAY,gBAUX;AAVD,WAAY,gBAAgB;IAC1B,qCAAiB,CAAA;IACjB,6CAAyB,CAAA;IACzB,kCAAc,CAAA;IACd,0CAAsB,CAAA;IACtB,+BAAW,CAAA;IACX,yCAAqB,CAAA;IACrB,uCAAmB,CAAA;IACnB,yCAAqB,CAAA;IACrB,uCAAmB,CAAA;AACrB,CAAC,EAVW,gBAAgB,gCAAhB,gBAAgB,QAU3B;AAED,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,mCAAW,CAAA;IACX,iCAAS,CAAA;AACX,CAAC,EAHW,oBAAoB,oCAApB,oBAAoB,QAG/B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SearchQueryDto } from '../dtos/search.dto';
|
|
2
|
-
import { ESearchCondition } from '../enums/search.enum';
|
|
2
|
+
import { ESearchCondition, ESearchJoinCondition } from '../enums/search.enum';
|
|
3
3
|
export interface ISearchQueryItem<T> {
|
|
4
4
|
tableAlias?: string;
|
|
5
5
|
value?: string;
|
|
@@ -9,6 +9,7 @@ export interface ISearchQueryItem<T> {
|
|
|
9
9
|
upperRange?: keyof T;
|
|
10
10
|
lowerRange?: keyof T;
|
|
11
11
|
condition?: ESearchCondition;
|
|
12
|
+
joinCondition?: ESearchJoinCondition;
|
|
12
13
|
}
|
|
13
14
|
export interface ISearchResponse<TResultRow = any> extends SearchQueryDto {
|
|
14
15
|
data: TResultRow[];
|
|
@@ -27,7 +27,11 @@ let CategoryService = class CategoryService extends base_service_1.BaseService {
|
|
|
27
27
|
this.queryStruct = [
|
|
28
28
|
{ field: 'title', condition: search_enum_1.ESearchCondition.contains },
|
|
29
29
|
{ field: 'description', condition: search_enum_1.ESearchCondition.contains },
|
|
30
|
-
{
|
|
30
|
+
{
|
|
31
|
+
field: 'slug',
|
|
32
|
+
condition: search_enum_1.ESearchCondition.equal,
|
|
33
|
+
joinCondition: search_enum_1.ESearchJoinCondition.or,
|
|
34
|
+
},
|
|
31
35
|
{ field: 'parentId', condition: search_enum_1.ESearchCondition.equal },
|
|
32
36
|
];
|
|
33
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"category.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/category/category.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,8DAA0D;AAC1D,uDAAmD;AACnD,qCAA8C;AAC9C,6CAAmD;AACnD,qDAAmD;AAQnD,
|
|
1
|
+
{"version":3,"file":"category.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/category/category.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,8DAA0D;AAC1D,uDAAmD;AACnD,qCAA8C;AAC9C,6CAAmD;AACnD,qDAAmD;AAQnD,yDAGiC;AAG1B,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,0BAGpC;IACC,YAEkB,IAAgC;QAEhD,KAAK,CAAC,IAAI,EAAE,sBAAU,CAAC,QAAQ,CAAC,CAAC;QAFjB,SAAI,GAAJ,IAAI,CAA4B;QAGhD,IAAI,CAAC,WAAW,GAAG;YACjB,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,8BAAgB,CAAC,QAAQ,EAAE;YACxD,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,8BAAgB,CAAC,QAAQ,EAAE;YAC9D;gBACE,KAAK,EAAE,MAAM;gBACb,SAAS,EAAE,8BAAgB,CAAC,KAAK;gBACjC,aAAa,EAAE,kCAAoB,CAAC,EAAE;aACvC;YACD,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,8BAAgB,CAAC,KAAK,EAAE;SACzD,CAAC;IACJ,CAAC;IAEQ,KAAK,CAAC,aAAa,CAAC,IAAuB;QAClD,IAAI,IAAI,CAAC,QAAQ;YACf,MAAM,IAAI,CAAC,eAAe,CACxB,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,EACrB,EAAE,YAAY,EAAE,uBAAuB,EAAE,CAC1C,CAAC;QAEJ,MAAM,IAAI,CAAC,eAAe,CACxB,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAC5C,EAAE,YAAY,EAAE,QAAQ,IAAI,CAAC,IAAI,iBAAiB,EAAE,CACrD,CAAC;IACJ,CAAC;IAEQ,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,IAAuB;QAC9D,IAAI,IAAI,CAAC,QAAQ;YACf,MAAM,IAAI,CAAC,eAAe,CACxB,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,EACrB,EAAE,YAAY,EAAE,uBAAuB,EAAE,CAC1C,CAAC;QACJ,MAAM,IAAI,CAAC,eAAe,CACxB,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,EAAE,CAAC,EAAE,EACzD,EAAE,YAAY,EAAE,QAAQ,IAAI,CAAC,IAAI,iBAAiB,EAAE,CACrD,CAAC;IACJ,CAAC;IAEQ,KAAK,CAAC,aAAa,CAAC,GAAa;QACxC,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,GAAG,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,SAAS,CAAC,KAAgC;QACxC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,EAAE;YAC/D,MAAM,EAAE;gBACN,KAAK,EAAE,IAAI;gBACX,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,IAAI;gBACV,WAAW,EAAE,IAAI;aAClB;SACF,CAAoC,CAAC;IACxC,CAAC;CACF,CAAA;AA7DY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,0BAAgB,EAAC,gCAAc,CAAC,CAAA;qCACX,oBAAU;GANvB,eAAe,CA6D3B"}
|
|
@@ -6,6 +6,7 @@ import { BaseEntity } from '../entities/base.entity';
|
|
|
6
6
|
import { Chart, ChartItem, ChartQueryDto } from '../dtos/analytics.dto';
|
|
7
7
|
import { PickKeysByType } from 'typeorm/common/PickKeysByType';
|
|
8
8
|
import { ToggleActiveDTO, ToggleBulkActiveDTO, SetOrderDTO } from '../dtos/base.dto';
|
|
9
|
+
import { IAuthParam } from '../modules/authentication/authentication.interface';
|
|
9
10
|
export declare class SDKBaseService<TEntity extends BaseEntity, TSearchDto extends SearchQueryDto = SearchQueryDto> {
|
|
10
11
|
protected readonly repo: Repository<BaseEntity>;
|
|
11
12
|
tableName: string;
|
|
@@ -15,8 +16,8 @@ export declare class SDKBaseService<TEntity extends BaseEntity, TSearchDto exten
|
|
|
15
16
|
static path: string;
|
|
16
17
|
static get tag(): string;
|
|
17
18
|
constructor(repo: Repository<BaseEntity>, tableName: string);
|
|
18
|
-
getById(id: string): Promise<TEntity>;
|
|
19
|
-
getSingle(where: FindOptionsWhere<TEntity
|
|
19
|
+
getById(id: string, auth?: IAuthParam): Promise<TEntity>;
|
|
20
|
+
getSingle(where: FindOptionsWhere<TEntity>, auth?: IAuthParam): Promise<TEntity>;
|
|
20
21
|
getWhere(where: FindOptionsWhere<TEntity> | FindOptionsWhere<TEntity>[]): Promise<TEntity[]>;
|
|
21
22
|
checkIfExistsById(id: string, config?: Pick<ICheckByParams<TEntity>['config'], 'throwError' | 'errorMessage'>): Promise<boolean>;
|
|
22
23
|
checkIfExistsBy(where: ICheckByParams<TEntity>['where'], config?: Omit<ICheckByParams<TEntity>['config'], 'shouldExist'>): Promise<boolean>;
|
|
@@ -22,10 +22,11 @@ class SDKBaseService {
|
|
|
22
22
|
this.formatSearchQuery = async (query) => query;
|
|
23
23
|
this.formatSearchResults = async (results) => results;
|
|
24
24
|
}
|
|
25
|
-
async getById(id) {
|
|
26
|
-
return this.getSingle({ id });
|
|
25
|
+
async getById(id, auth) {
|
|
26
|
+
return this.getSingle({ id }, auth);
|
|
27
27
|
}
|
|
28
|
-
async getSingle(where) {
|
|
28
|
+
async getSingle(where, auth) {
|
|
29
|
+
auth;
|
|
29
30
|
return (await this.repo.findOneBy(where));
|
|
30
31
|
}
|
|
31
32
|
async getWhere(where) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/base.service.ts"],"names":[],"mappings":";;;AAAA,qCAAiE;AACjE,qDAAiD;AASjD,4DAAqD;AACrD,uDAAiD;
|
|
1
|
+
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/base.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,31 +9,34 @@ class SearchService {
|
|
|
9
9
|
const qs = (queryStruct || []).concat(this.defaultQueryStruct);
|
|
10
10
|
for (const queryParam of qs) {
|
|
11
11
|
const prefix = `${tableName}.${queryParam.field?.toString()}`;
|
|
12
|
-
if (queryParam.condition == search_enum_1.ESearchCondition.leftJoin)
|
|
12
|
+
if (queryParam.condition == search_enum_1.ESearchCondition.leftJoin)
|
|
13
13
|
queryBuild.leftJoinAndSelect(prefix, queryParam.tableAlias);
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
query
|
|
18
|
-
|
|
14
|
+
else {
|
|
15
|
+
const joinerFunc = (query) => queryParam.joinCondition == search_enum_1.ESearchJoinCondition.or
|
|
16
|
+
? queryBuild.orWhere(query)
|
|
17
|
+
: queryBuild.andWhere(query);
|
|
18
|
+
if (queryParam.condition == search_enum_1.ESearchCondition.between) {
|
|
19
|
+
if (query[queryParam.upperRange] != null &&
|
|
20
|
+
query[queryParam.lowerRange] != null)
|
|
21
|
+
joinerFunc(`${prefix} BETWEEN '${query[queryParam.lowerRange]}' AND '${query[queryParam.upperRange]}'`);
|
|
19
22
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
let prefix = `${tableName}.${queryParam.field?.toString()}`;
|
|
23
|
-
if (queryParam.subFields?.length)
|
|
24
|
-
prefix = `${tableName}.${queryParam.subFields[0]} ${queryParam.subFields
|
|
25
|
-
.slice(1)
|
|
26
|
-
.map((x, index) => `->${index + 2 == queryParam.subFields.length ? '>' : ''} '${x?.toString()}'`)
|
|
27
|
-
.join(' ')}`;
|
|
28
|
-
if (queryParam.condition == search_enum_1.ESearchCondition.contains)
|
|
29
|
-
queryBuild.andWhere(`${prefix} LIKE '%${query[queryParam.field]}%'`);
|
|
30
|
-
else if (queryParam.condition == search_enum_1.ESearchCondition.inArray)
|
|
23
|
+
else if (query[queryParam.field] != null) {
|
|
24
|
+
let prefix = `${tableName}.${queryParam.field?.toString()}`;
|
|
31
25
|
if (queryParam.subFields?.length)
|
|
32
|
-
|
|
26
|
+
prefix = `${tableName}.${queryParam.subFields[0]} ${queryParam.subFields
|
|
27
|
+
.slice(1)
|
|
28
|
+
.map((x, index) => `->${index + 2 == queryParam.subFields.length ? '>' : ''} '${x?.toString()}'`)
|
|
29
|
+
.join(' ')}`;
|
|
30
|
+
if (queryParam.condition == search_enum_1.ESearchCondition.contains)
|
|
31
|
+
joinerFunc(`${prefix} LIKE '%${query[queryParam.field]}%'`);
|
|
32
|
+
else if (queryParam.condition == search_enum_1.ESearchCondition.inArray)
|
|
33
|
+
if (queryParam.subFields?.length)
|
|
34
|
+
joinerFunc(`(${prefix})::jsonb ? '${query[queryParam.field]}'`);
|
|
35
|
+
else
|
|
36
|
+
joinerFunc(`'${query[queryParam.field]}'=ANY(${prefix})`);
|
|
33
37
|
else
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
queryBuild.andWhere(`${prefix} ${queryParam.condition || '='} '${this.formatValue(query[queryParam.field], queryParam)}'`);
|
|
38
|
+
joinerFunc(`${prefix} ${queryParam.condition || '='} '${this.formatValue(query[queryParam.field], queryParam)}'`);
|
|
39
|
+
}
|
|
37
40
|
}
|
|
38
41
|
}
|
|
39
42
|
query.sortField = query.sortField || 'createdAt';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/search.service.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/search.service.ts"],"names":[],"mappings":"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"}
|