@serene-dev/la-nest-library 0.0.73 → 0.0.75
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/dtos/base.dto.d.ts +4 -0
- package/dist/libs/la-library/src/dtos/base.dto.js.map +1 -1
- package/dist/libs/la-library/src/entities/base.entity.d.ts +2 -0
- package/dist/libs/la-library/src/entities/base.entity.js +4 -0
- package/dist/libs/la-library/src/entities/base.entity.js.map +1 -1
- package/dist/libs/la-library/src/modules/authentication/authentication.dto.d.ts +2 -0
- package/dist/libs/la-library/src/modules/authentication/authentication.dto.js +12 -1
- package/dist/libs/la-library/src/modules/authentication/authentication.dto.js.map +1 -1
- package/dist/libs/la-library/src/modules/authentication/authentication.entity.d.ts +2 -0
- package/dist/libs/la-library/src/modules/authentication/authentication.entity.js +8 -0
- package/dist/libs/la-library/src/modules/authentication/authentication.entity.js.map +1 -1
- package/dist/libs/la-library/src/modules/authentication/authentication.service.d.ts +1 -0
- package/dist/libs/la-library/src/modules/authentication/authentication.service.js +10 -0
- package/dist/libs/la-library/src/modules/authentication/authentication.service.js.map +1 -1
- package/dist/libs/la-library/src/services/mail.service.d.ts +1 -0
- package/dist/libs/la-library/src/services/mail.service.js +3 -1
- package/dist/libs/la-library/src/services/mail.service.js.map +1 -1
- package/dist/libs/la-library/src/services/search.service.d.ts +1 -0
- package/dist/libs/la-library/src/services/search.service.js +7 -1
- package/dist/libs/la-library/src/services/search.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { BaseEntity } from '../entities/base.entity';
|
|
2
|
+
import { AuthEntity } from '../modules/authentication/authentication.entity';
|
|
2
3
|
export declare class BaseDto<T = any> implements Partial<BaseEntity> {
|
|
3
4
|
creatorId?: string;
|
|
5
|
+
updaterId?: string;
|
|
4
6
|
ownerID?: string;
|
|
5
7
|
orgID?: string;
|
|
8
|
+
updater?: AuthEntity;
|
|
9
|
+
creator?: AuthEntity;
|
|
6
10
|
constructor(obj?: T);
|
|
7
11
|
}
|
|
8
12
|
export declare class BatchDeleteDto {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.dto.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/dtos/base.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAAwE;AAExE,iEAA2D;
|
|
1
|
+
{"version":3,"file":"base.dto.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/dtos/base.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAAwE;AAExE,iEAA2D;AAG3D,MAAa,OAAO;IAsBlB,YAAY,GAAO;QACjB,IAAI,GAAG;YAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;CACF;AAzBD,0BAyBC;AArBC;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;0CACd;AAOnB;IAHC,IAAA,wBAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;wCAChB;AAQjB;IANC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC;QACX,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,gEAAgE;KAC9E,CAAC;;sCACa;AAQjB,MAAa,cAAc;CAM1B;AAND,wCAMC;AADC;IAJC,IAAA,yBAAO,EAAC,EAAE,CAAC;IACX,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,8BAAY,CAAC,YAAY,CAAC;KACnE,CAAC;;2CACa;AAGjB,MAAa,KAAK;CAIjB;AAJD,sBAIC;AADC;IAFC,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;iCACF"}
|
|
@@ -37,4 +37,8 @@ __decorate([
|
|
|
37
37
|
(0, typeorm_1.ManyToOne)(() => authentication_entity_1.AuthEntity),
|
|
38
38
|
__metadata("design:type", Object)
|
|
39
39
|
], BaseEntity.prototype, "creator", void 0);
|
|
40
|
+
__decorate([
|
|
41
|
+
(0, typeorm_1.ManyToOne)(() => authentication_entity_1.AuthEntity),
|
|
42
|
+
__metadata("design:type", Object)
|
|
43
|
+
], BaseEntity.prototype, "updater", void 0);
|
|
40
44
|
//# sourceMappingURL=base.entity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.entity.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/entities/base.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAOiB;AACjB,2FAA6E;AAE7E,MAAsB,UAAU;
|
|
1
|
+
{"version":3,"file":"base.entity.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/entities/base.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAOiB;AACjB,2FAA6E;AAE7E,MAAsB,UAAU;CA4B/B;AA5BD,gCA4BC;AA1BC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;sCACnB;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;wCAC3B;AAId;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC7B,IAAA,0BAAgB,GAAE;;6CACA;AAInB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC7B,IAAA,0BAAgB,GAAE;;6CACA;AAOnB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kCAAU,CAAC;;2CACG;AAE/B;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kCAAU,CAAC;;2CACG"}
|
|
@@ -9,6 +9,8 @@ declare class AuthBaseDTO implements Partial<AuthEntity> {
|
|
|
9
9
|
export declare class RegisterDTO extends AuthBaseDTO implements Partial<AuthEntity> {
|
|
10
10
|
password?: string;
|
|
11
11
|
login: boolean;
|
|
12
|
+
firstname: string;
|
|
13
|
+
lastname: string;
|
|
12
14
|
}
|
|
13
15
|
export declare class LoginDTO extends AuthBaseDTO implements Partial<AuthEntity> {
|
|
14
16
|
password?: string;
|
|
@@ -14,6 +14,7 @@ const class_validator_1 = require("class-validator");
|
|
|
14
14
|
const authentication_enum_1 = require("./authentication.enum");
|
|
15
15
|
const swagger_1 = require("@nestjs/swagger");
|
|
16
16
|
const base_sample_1 = require("../../samples/base.sample");
|
|
17
|
+
const utility_service_1 = require("../../services/utility.service");
|
|
17
18
|
class AuthBaseDTO {
|
|
18
19
|
}
|
|
19
20
|
__decorate([
|
|
@@ -32,7 +33,7 @@ class RegisterDTO extends AuthBaseDTO {
|
|
|
32
33
|
exports.RegisterDTO = RegisterDTO;
|
|
33
34
|
__decorate([
|
|
34
35
|
(0, class_validator_1.IsString)(),
|
|
35
|
-
(0, swagger_1.ApiProperty)({ type: 'string', default: base_sample_1.Sample.password, required:
|
|
36
|
+
(0, swagger_1.ApiProperty)({ type: 'string', default: base_sample_1.Sample.password, required: false }),
|
|
36
37
|
__metadata("design:type", String)
|
|
37
38
|
], RegisterDTO.prototype, "password", void 0);
|
|
38
39
|
__decorate([
|
|
@@ -41,6 +42,16 @@ __decorate([
|
|
|
41
42
|
(0, swagger_1.ApiProperty)({ type: 'boolean', default: true }),
|
|
42
43
|
__metadata("design:type", Boolean)
|
|
43
44
|
], RegisterDTO.prototype, "login", void 0);
|
|
45
|
+
__decorate([
|
|
46
|
+
(0, swagger_1.ApiProperty)({ type: 'string', default: utility_service_1.UtilityClass.generateUserName }),
|
|
47
|
+
(0, class_validator_1.IsString)(),
|
|
48
|
+
__metadata("design:type", String)
|
|
49
|
+
], RegisterDTO.prototype, "firstname", void 0);
|
|
50
|
+
__decorate([
|
|
51
|
+
(0, swagger_1.ApiProperty)({ type: 'string', default: utility_service_1.UtilityClass.generateUserName }),
|
|
52
|
+
(0, class_validator_1.IsString)(),
|
|
53
|
+
__metadata("design:type", String)
|
|
54
|
+
], RegisterDTO.prototype, "lastname", void 0);
|
|
44
55
|
class LoginDTO extends AuthBaseDTO {
|
|
45
56
|
}
|
|
46
57
|
exports.LoginDTO = LoginDTO;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.dto.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/authentication/authentication.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAOyB;AAEzB,+DAAuD;AACvD,6CAA8C;AAC9C,2DAAmD;
|
|
1
|
+
{"version":3,"file":"authentication.dto.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/authentication/authentication.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAOyB;AAEzB,+DAAuD;AACvD,6CAA8C;AAC9C,2DAAmD;AAEnD,oEAA8D;AAE9D,MAAM,WAAW;CAUhB;AAJC;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;0CACzD;AAGf;IAFC,IAAA,yBAAO,GAAE;IACT,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxD;AAGjB,MAAa,WAAY,SAAQ,WAAW;CAc3C;AAdD,kCAcC;AAXC;IAFC,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;6CACzD;AAIlB;IAHC,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;0CACjC;AAGf;IAFC,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,8BAAY,CAAC,gBAAgB,EAAE,CAAC;IACvE,IAAA,0BAAQ,GAAE;;8CACO;AAGlB;IAFC,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,8BAAY,CAAC,gBAAgB,EAAE,CAAC;IACvE,IAAA,0BAAQ,GAAE;;6CACM;AAGnB,MAAa,QAAS,SAAQ,WAAW;CAIxC;AAJD,4BAIC;AADC;IAFC,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxD;AAGpB,MAAa,SAAS;CAMrB;AAND,8BAMC;AAHC;IAFC,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAClC;AAKhB,MAAa,aAAa;CAIzB;AAJD,sCAIC;AADC;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAChC;AAGnB,MAAa,eAAe;CAY3B;AAZD,0CAYC;AATC;IAFC,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAChC;AAQhB;IAPC,IAAA,wBAAM,EAAC,oCAAc,CAAC;IACtB,IAAA,qBAAW,EAAC;QACX,IAAI,EAAE,oCAAc;QACpB,IAAI,EAAE,oCAAc;QACpB,OAAO,EAAE,oCAAc,CAAC,KAAK;QAC7B,QAAQ,EAAE,IAAI;KACf,CAAC;;mDACyB"}
|
|
@@ -37,6 +37,14 @@ __decorate([
|
|
|
37
37
|
(0, typeorm_1.Column)({ type: 'text' }),
|
|
38
38
|
__metadata("design:type", String)
|
|
39
39
|
], AuthEntity.prototype, "type", void 0);
|
|
40
|
+
__decorate([
|
|
41
|
+
(0, typeorm_1.Column)({ type: 'text' }),
|
|
42
|
+
__metadata("design:type", String)
|
|
43
|
+
], AuthEntity.prototype, "firstname", void 0);
|
|
44
|
+
__decorate([
|
|
45
|
+
(0, typeorm_1.Column)({ type: 'text' }),
|
|
46
|
+
__metadata("design:type", String)
|
|
47
|
+
], AuthEntity.prototype, "lastname", void 0);
|
|
40
48
|
__decorate([
|
|
41
49
|
(0, typeorm_1.Column)({ type: 'text' }),
|
|
42
50
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.entity.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/authentication/authentication.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAMiB;AACjB,qDAAmD;AAG5C,IAAM,UAAU,GAAhB,MAAM,UAAU;
|
|
1
|
+
{"version":3,"file":"authentication.entity.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/authentication/authentication.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAMiB;AACjB,qDAAmD;AAG5C,IAAM,UAAU,GAAhB,MAAM,UAAU;CA+BtB,CAAA;AA/BY,gCAAU;AAErB;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;sCACnB;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;wCAC3B;AAId;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC7B,IAAA,0BAAgB,GAAE;;6CACA;AAInB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC7B,IAAA,0BAAgB,GAAE;;6CACA;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;wCACX;AAEY;IAAzB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;6CAAoB;AAEnB;IAAzB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;4CAAmB;AAG5C;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;yCACV;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;4CACP;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;yCAC1B;qBA7BJ,UAAU;IADtB,IAAA,gBAAM,EAAC,sBAAU,CAAC,cAAc,CAAC;GACrB,UAAU,CA+BtB"}
|
|
@@ -29,6 +29,7 @@ export declare class AuthenticationService<TEntity extends AuthEntity = AuthEnti
|
|
|
29
29
|
dropReason: ETokenDropType;
|
|
30
30
|
}): Promise<boolean>;
|
|
31
31
|
logout(body: LogoutDTO): Promise<boolean>;
|
|
32
|
+
accountCreationMailCreator: (auth: AuthEntity) => Promise<string>;
|
|
32
33
|
register(body: RegisterDTO): Promise<AuthEntity>;
|
|
33
34
|
toggleStatus(id: string, data: ToggleAuthDTO): Promise<void>;
|
|
34
35
|
}
|
|
@@ -24,6 +24,7 @@ const bcrypt = require("bcrypt");
|
|
|
24
24
|
const token_service_1 = require("../../services/token.service");
|
|
25
25
|
const authentication_enum_1 = require("./authentication.enum");
|
|
26
26
|
const authentication_session_entity_1 = require("./authentication-session.entity");
|
|
27
|
+
const mail_service_1 = require("../../services/mail.service");
|
|
27
28
|
let AuthSessionService = class AuthSessionService extends base_service_1.BaseService {
|
|
28
29
|
constructor(repo) {
|
|
29
30
|
super(repo, base_enum_1.ETableName.authSession);
|
|
@@ -43,6 +44,7 @@ let AuthenticationService = class AuthenticationService extends base_service_1.B
|
|
|
43
44
|
this.tokenService = tokenService;
|
|
44
45
|
this.authenticationSessionService = authenticationSessionService;
|
|
45
46
|
this.saltOrRounds = 10;
|
|
47
|
+
this.accountCreationMailCreator = async (auth) => `Dear ${auth.firstname},\nYour new account has been provisioned\nemail: ${auth.email}\npassword: ${auth.password}`;
|
|
46
48
|
}
|
|
47
49
|
decryptToken(token, ignoreExpiration = false) {
|
|
48
50
|
return this.tokenService.decryptToken(token, {
|
|
@@ -123,6 +125,14 @@ let AuthenticationService = class AuthenticationService extends base_service_1.B
|
|
|
123
125
|
});
|
|
124
126
|
if (found)
|
|
125
127
|
utility_service_1.UtilityClass.throwError({ message: `User already exists` });
|
|
128
|
+
if (!auth.password) {
|
|
129
|
+
auth.password = utility_service_1.UtilityClass.generateUUID.split('-')[0];
|
|
130
|
+
mail_service_1.MailService.sendMail({
|
|
131
|
+
to: auth.email,
|
|
132
|
+
text: await this.accountCreationMailCreator(auth),
|
|
133
|
+
from: `system${mail_service_1.MailService.baseEmailSuffix}`,
|
|
134
|
+
});
|
|
135
|
+
}
|
|
126
136
|
const password = await bcrypt.hash(auth.password, this.saltOrRounds);
|
|
127
137
|
const res = await this.repo.save({ ...auth, password });
|
|
128
138
|
if (body.login)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/authentication/authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,8DAA0D;AAC1D,mEAAqD;AAQrD,qDAAmD;AACnD,qCAAqC;AACrC,6CAAmD;AACnD,oEAA8D;AAC9D,iCAAiC;AACjC,gEAA4D;AAC5D,+DAAuD;AACvD,mFAAoE;
|
|
1
|
+
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/authentication/authentication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { SDKConfig } from '../configs/index.config';
|
|
|
3
3
|
import SMTPTransport from 'nodemailer/lib/smtp-transport';
|
|
4
4
|
import { ISDKEnvironment } from './environment.service';
|
|
5
5
|
export declare class MailService {
|
|
6
|
+
static baseEmailSuffix: string;
|
|
6
7
|
static loadConfig(config?: {
|
|
7
8
|
smtp?: typeof SDKConfig.email;
|
|
8
9
|
adminNotificationMails?: string[];
|
|
@@ -6,8 +6,10 @@ const logger_service_1 = require("./logger.service");
|
|
|
6
6
|
const index_config_1 = require("../configs/index.config");
|
|
7
7
|
class MailService {
|
|
8
8
|
static loadConfig(config) {
|
|
9
|
-
if (config.smtp)
|
|
9
|
+
if (config.smtp) {
|
|
10
10
|
index_config_1.SDKConfig.email = config.smtp;
|
|
11
|
+
this.baseEmailSuffix = '@' + config.smtp.address.split('@')[1];
|
|
12
|
+
}
|
|
11
13
|
if (config.adminNotificationMails)
|
|
12
14
|
index_config_1.SDKConfig.adminNotificationMails = config.adminNotificationMails;
|
|
13
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/mail.service.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,qDAA0C;AAE1C,0DAAoD;AAGpD,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/mail.service.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,qDAA0C;AAE1C,0DAAoD;AAGpD,MAAa,WAAW;IAItB,MAAM,CAAC,UAAU,CAAC,MAGjB;QACC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,wBAAS,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;YAC9B,IAAI,CAAC,eAAe,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,MAAM,CAAC,sBAAsB;YAC/B,wBAAS,CAAC,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,yBAAyB,CAAC,WAA4B;QAC3D,OAAO,IAAI,CAAC,UAAU,CAAC;YACrB,IAAI,EAAE;gBACJ,MAAM,EAAE,WAAW,CAAC,SAAS;gBAC7B,QAAQ,EAAE,WAAW,CAAC,SAAS;gBAC/B,OAAO,EAAE,WAAW,CAAC,oBAAoB;gBACzC,QAAQ,EAAE,WAAW,CAAC,qBAAqB;aAC5C;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,MAAoB;QAClC,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,CAAwB;YACpE,IAAI,EAAE,wBAAS,CAAC,KAAK,CAAC,MAAM;YAC5B,IAAI,EAAE,wBAAS,CAAC,KAAK,CAAC,QAAQ;YAC9B,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE;gBACJ,IAAI,EAAE,wBAAS,CAAC,KAAK,CAAC,OAAO;gBAC7B,IAAI,EAAE,wBAAS,CAAC,KAAK,CAAC,QAAQ;aAC/B;SACF,CAAC,CAAC;QAEH,OAAO,WAAW;aACf,MAAM,EAAE;aACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAEf,OAAO,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC9C,uBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,uBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,qBAAqB,CAAC,KAAK;QAChC,OAAO,IAAI,CAAC,WAAW,CAAC;YACtB,OAAO,EAAE,gBAAgB;YACzB,IAAI,EAAE,yBAAyB,IAAI,IAAI,EAAE,kBAAkB,KAAK,EAAE,QAAQ,EAAE,EAAE;SAC/E,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,IAAuD;QACxE,OAAO,IAAI,CAAC,QAAQ,CAAC;YACnB,EAAE,EAAE,wBAAS,CAAC,sBAAsB;YACpC,IAAI,EAAE,wBAAS,CAAC,KAAK,CAAC,OAAO;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AApED,kCAoEC"}
|
|
@@ -33,7 +33,7 @@ class SearchService {
|
|
|
33
33
|
else
|
|
34
34
|
queryBuild.andWhere(`'${query[queryParam.field]}'=ANY(${prefix})`);
|
|
35
35
|
else
|
|
36
|
-
queryBuild.andWhere(`${prefix} ${queryParam.condition || '='} '${query[queryParam.field]}'`);
|
|
36
|
+
queryBuild.andWhere(`${prefix} ${queryParam.condition || '='} '${this.formatValue(query[queryParam.field])}'`);
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
query.sortField = query.sortField || 'createdAt';
|
|
@@ -56,6 +56,12 @@ class SearchService {
|
|
|
56
56
|
res['query'] = queryBuild.getQuery();
|
|
57
57
|
return res;
|
|
58
58
|
}
|
|
59
|
+
static formatValue(value) {
|
|
60
|
+
if (typeof value === 'boolean')
|
|
61
|
+
return value ? 1 : 0;
|
|
62
|
+
else
|
|
63
|
+
return value;
|
|
64
|
+
}
|
|
59
65
|
}
|
|
60
66
|
exports.SearchService = SearchService;
|
|
61
67
|
SearchService.searchStructToObject = (struct) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/search.service.ts"],"names":[],"mappings":";;;AACA,sDAAoE;AAMpE,+DAA4C;AAE5C,MAAa,aAAa;IAiCxB,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,EACE,UAAU,EACV,SAAS,GAC0C,EACrD,KAAoC,EACpC,WAA8C;QAE9C,MAAM,UAAU,GAAG,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC/D,KAAK,MAAM,UAAU,IAAI,EAAE,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,GAAG,SAAS,IAAI,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;YAC9D,IAAI,UAAU,CAAC,SAAS,IAAI,8BAAgB,CAAC,QAAQ,EAAE,CAAC;gBACtD,UAAU,CAAC,iBAAiB,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;YAC9D,CAAC;iBAAM,IAAI,UAAU,CAAC,SAAS,IAAI,8BAAgB,CAAC,OAAO,EAAE,CAAC;gBAC5D,IACE,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI;oBACpC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,EACpC,CAAC;oBACD,UAAU,CAAC,QAAQ,CACjB,GAAG,MAAM,aAAa,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,UAChD,KAAK,CAAC,UAAU,CAAC,UAAU,CAC7B,GAAG,CACJ,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC3C,IAAI,MAAM,GAAG,GAAG,SAAS,IAAI,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;gBAC5D,IAAI,UAAU,CAAC,SAAS,EAAE,MAAM;oBAC9B,MAAM,GAAG,GAAG,SAAS,IACnB,UAAU,CAAC,SAAS,CAAC,CAAC,CACxB,IAAI,UAAU,CAAC,SAAS;yBACrB,KAAK,CAAC,CAAC,CAAC;yBACR,GAAG,CACF,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CACX,KACE,KAAK,GAAG,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACnD,KAAK,CAAC,EAAE,QAAQ,EAAE,GAAG,CACxB;yBACA,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAEjB,IAAI,UAAU,CAAC,SAAS,IAAI,8BAAgB,CAAC,QAAQ;oBACnD,UAAU,CAAC,QAAQ,CAAC,GAAG,MAAM,WAAW,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;qBAClE,IAAI,UAAU,CAAC,SAAS,IAAI,8BAAgB,CAAC,OAAO;oBACvD,IAAI,UAAU,CAAC,SAAS,EAAE,MAAM;wBAC9B,UAAU,CAAC,QAAQ,CACjB,IAAI,MAAM,eAAe,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CACpD,CAAC;;wBAEF,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC;;oBAErE,UAAU,CAAC,QAAQ,CACjB,GAAG,MAAM,IAAI,UAAU,CAAC,SAAS,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/search.service.ts"],"names":[],"mappings":"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"}
|