rez_core 2.2.68 → 2.2.69
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/module/layout_preference/service/layout_preference.service.js +2 -0
- package/dist/module/layout_preference/service/layout_preference.service.js.map +1 -1
- package/dist/module/notification/controller/otp.controller.d.ts +18 -5
- package/dist/module/notification/controller/otp.controller.js +2 -10
- package/dist/module/notification/controller/otp.controller.js.map +1 -1
- package/dist/module/notification/notification.module.js +2 -0
- package/dist/module/notification/notification.module.js.map +1 -1
- package/dist/module/notification/service/otp.service.d.ts +26 -11
- package/dist/module/notification/service/otp.service.js +16 -29
- package/dist/module/notification/service/otp.service.js.map +1 -1
- package/dist/module/user/service/login.service.d.ts +1 -1
- package/dist/module/user/service/login.service.js +32 -14
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/workflow/repository/activity-log.repository.js +1 -0
- package/dist/module/workflow/repository/activity-log.repository.js.map +1 -1
- package/dist/module/workflow/repository/task.repository.js +3 -0
- package/dist/module/workflow/repository/task.repository.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/layout_preference/service/layout_preference.service.ts +2 -0
- package/src/module/notification/controller/otp.controller.ts +4 -10
- package/src/module/notification/notification.module.ts +2 -0
- package/src/module/notification/service/otp.service.ts +16 -34
- package/src/module/user/service/login.service.ts +38 -20
- package/src/module/workflow/repository/activity-log.repository.ts +1 -0
- package/src/module/workflow/repository/task.repository.ts +7 -1
|
@@ -27,7 +27,9 @@ let LayoutPreferenceService = class LayoutPreferenceService extends entity_servi
|
|
|
27
27
|
if (userId === undefined) {
|
|
28
28
|
throw new Error('User ID is required to create layout preference.');
|
|
29
29
|
}
|
|
30
|
+
console.log(mapped_entity_type, loggedInUser, userId);
|
|
30
31
|
const existingLayoutPreference = await this.layoutPreferenceRepository.findByEntityUserId(mapped_entity_type, loggedInUser.level_id, loggedInUser.level_type, userId);
|
|
32
|
+
console.log(existingLayoutPreference, 'existingLayoutPreference');
|
|
31
33
|
if (existingLayoutPreference) {
|
|
32
34
|
return await super.updateEntity({ ...entityData, id: existingLayoutPreference.id }, loggedInUser);
|
|
33
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout_preference.service.js","sourceRoot":"","sources":["../../../../src/module/layout_preference/service/layout_preference.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"layout_preference.service.js","sourceRoot":"","sources":["../../../../src/module/layout_preference/service/layout_preference.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,13 +12,26 @@ export declare class OtpController {
|
|
|
12
12
|
otp_id: string;
|
|
13
13
|
success: boolean;
|
|
14
14
|
}>;
|
|
15
|
-
verifyOtp(
|
|
15
|
+
verifyOtp(body: {
|
|
16
|
+
otp: string;
|
|
17
|
+
otp_id: string;
|
|
18
|
+
identifier: string;
|
|
19
|
+
}): Promise<{
|
|
20
|
+
success: boolean;
|
|
16
21
|
message: string;
|
|
22
|
+
type: string;
|
|
23
|
+
accessToken?: undefined;
|
|
24
|
+
appcode?: undefined;
|
|
25
|
+
level_type?: undefined;
|
|
26
|
+
level_id?: undefined;
|
|
27
|
+
} | {
|
|
17
28
|
success: boolean;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
29
|
+
accessToken: string;
|
|
30
|
+
appcode: string;
|
|
31
|
+
level_type: string;
|
|
32
|
+
level_id: string;
|
|
33
|
+
message?: undefined;
|
|
34
|
+
type?: undefined;
|
|
22
35
|
}>;
|
|
23
36
|
sendMail(body: {
|
|
24
37
|
to: string;
|
|
@@ -34,16 +34,8 @@ let OtpController = class OtpController {
|
|
|
34
34
|
let otp = await this.otpService.generate(identifier, service, parseInt(this.otpExpiry), parseInt(this.otpLength));
|
|
35
35
|
return { otp_id: otp.otp_id, success: true };
|
|
36
36
|
}
|
|
37
|
-
async verifyOtp(
|
|
38
|
-
|
|
39
|
-
if (!verify.isValid) {
|
|
40
|
-
throw new common_1.BadRequestException('Invalid OTP!');
|
|
41
|
-
}
|
|
42
|
-
return {
|
|
43
|
-
message: 'OTP verified successfully!',
|
|
44
|
-
success: true,
|
|
45
|
-
data: verify,
|
|
46
|
-
};
|
|
37
|
+
async verifyOtp(body) {
|
|
38
|
+
return await this.otpService.verifyOtp(body);
|
|
47
39
|
}
|
|
48
40
|
async sendMail(body) {
|
|
49
41
|
return await this.emailService.sendEmailWithDynamicTemplate(body.to, body.subject, body.templateCode, body.payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otp.controller.js","sourceRoot":"","sources":["../../../../src/module/notification/controller/otp.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,wDAAoD;AACpD,2CAA+C;AAC/C,4DAAwD;AAGjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YACmB,UAAsB,EACtB,YAA0B,EACnC,aAA4B;QAFnB,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QACnC,kBAAa,GAAb,aAAa,CAAe;QAGtC,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;QACxD,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;IAHrD,CAAC;IAOE,AAAN,KAAK,CAAC,WAAW,CAAS,OAAY;QACpC,IAAI,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACpC,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAE9B,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,4BAAmB,CAAC,gCAAgC,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CACtC,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EACxB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CACzB,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"otp.controller.js","sourceRoot":"","sources":["../../../../src/module/notification/controller/otp.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,wDAAoD;AACpD,2CAA+C;AAC/C,4DAAwD;AAGjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YACmB,UAAsB,EACtB,YAA0B,EACnC,aAA4B;QAFnB,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QACnC,kBAAa,GAAb,aAAa,CAAe;QAGtC,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;QACxD,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;IAHrD,CAAC;IAOE,AAAN,KAAK,CAAC,WAAW,CAAS,OAAY;QACpC,IAAI,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACpC,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAE9B,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,4BAAmB,CAAC,gCAAgC,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CACtC,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EACxB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CACzB,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CACL,IAAyD;QAEjE,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,QAAQ,CAEZ,IAKC;QAGD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,4BAA4B,CACzD,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,OAAO,CACb,CAAC;IACJ,CAAC;CACF,CAAA;AAvDY,sCAAa;AAYlB;IAFL,IAAA,aAAI,EAAC,UAAU,CAAC;IAChB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACL,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gDAcxB;AAIK;IAFL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACd,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;8CAGR;AAIK;IAFL,IAAA,aAAI,EAAC,WAAW,CAAC;IACjB,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAErB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;6CAeR;wBAtDU,aAAa;IADzB,IAAA,mBAAU,EAAC,KAAK,CAAC;qCAGe,wBAAU;QACR,4BAAY;QACpB,sBAAa;GAJ3B,aAAa,CAuDzB"}
|
|
@@ -19,6 +19,7 @@ const email_service_1 = require("./service/email.service");
|
|
|
19
19
|
const path_1 = require("path");
|
|
20
20
|
const config_1 = require("@nestjs/config");
|
|
21
21
|
const auth_module_1 = require("../auth/auth.module");
|
|
22
|
+
const user_module_1 = require("../user/user.module");
|
|
22
23
|
let NotificationModule = class NotificationModule {
|
|
23
24
|
};
|
|
24
25
|
exports.NotificationModule = NotificationModule;
|
|
@@ -52,6 +53,7 @@ exports.NotificationModule = NotificationModule = __decorate([
|
|
|
52
53
|
}),
|
|
53
54
|
}),
|
|
54
55
|
auth_module_1.AuthModule,
|
|
56
|
+
user_module_1.UserModule,
|
|
55
57
|
],
|
|
56
58
|
providers: [otp_service_1.OtpService, otp_repository_1.OtpRepository, email_service_1.EmailService],
|
|
57
59
|
exports: [otp_service_1.OtpService, email_service_1.EmailService],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.module.js","sourceRoot":"","sources":["../../../src/module/notification/notification.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,uDAAmD;AACnD,gEAA4D;AAC5D,6CAAgD;AAChD,oDAA0C;AAC1C,gEAA4D;AAC5D,mDAAsD;AACtD,gGAA4F;AAC5F,2DAAuD;AACvD,+BAA4B;AAC5B,2CAA6D;AAC7D,qDAAiD;
|
|
1
|
+
{"version":3,"file":"notification.module.js","sourceRoot":"","sources":["../../../src/module/notification/notification.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,uDAAmD;AACnD,gEAA4D;AAC5D,6CAAgD;AAChD,oDAA0C;AAC1C,gEAA4D;AAC5D,mDAAsD;AACtD,gGAA4F;AAC5F,2DAAuD;AACvD,+BAA4B;AAC5B,2CAA6D;AAC7D,qDAAiD;AACjD,qDAAiD;AAqC1C,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAAG,CAAA;AAArB,gDAAkB;6BAAlB,kBAAkB;IAnC9B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,gBAAG,CAAC,CAAC;YAC/B,qBAAY,CAAC,YAAY,CAAC;gBACxB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,MAAM,EAAE,CAAC,sBAAa,CAAC;gBACvB,UAAU,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC;oBAC7C,SAAS,EAAE;wBACT,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,GAAG;wBACT,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE;4BACJ,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;4BACrC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC;yBAC1C;qBACF;oBACD,QAAQ,EAAE;wBACR,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG;qBACnD;oBACD,QAAQ,EAAE;wBACR,GAAG,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC;wBAC7C,OAAO,EAAE,IAAI,sCAAiB,EAAE;wBAChC,OAAO,EAAE;4BACP,MAAM,EAAE,IAAI;yBACb;qBACF;iBACF,CAAC;aACH,CAAC;YACF,wBAAU;YACV,wBAAU;SACX;QACD,SAAS,EAAE,CAAC,wBAAU,EAAE,8BAAa,EAAE,4BAAY,CAAC;QACpD,OAAO,EAAE,CAAC,wBAAU,EAAE,4BAAY,CAAC;QACnC,WAAW,EAAE,CAAC,8BAAa,CAAC;KAC7B,CAAC;GACW,kBAAkB,CAAG"}
|
|
@@ -1,22 +1,37 @@
|
|
|
1
|
-
import { OtpRepository } from '../repository/otp.repository';
|
|
2
|
-
import { Otp } from '../entity/otp.entity';
|
|
3
|
-
import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
|
|
4
1
|
import { ConfigService } from '@nestjs/config';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
2
|
+
import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
|
|
3
|
+
import { Otp } from '../entity/otp.entity';
|
|
4
|
+
import { OtpRepository } from '../repository/otp.repository';
|
|
5
|
+
import { LoginService } from './../../user/service/login.service';
|
|
7
6
|
export declare class OtpService {
|
|
8
7
|
private readonly otpRepository;
|
|
9
8
|
private readonly idGen;
|
|
10
9
|
private configService;
|
|
11
|
-
private readonly
|
|
12
|
-
|
|
13
|
-
constructor(otpRepository: OtpRepository, idGen: ClockIDGenService, configService: ConfigService, jwtAuthService: JwtAuthService, databaseSource: DataSource);
|
|
10
|
+
private readonly loginService;
|
|
11
|
+
constructor(otpRepository: OtpRepository, idGen: ClockIDGenService, configService: ConfigService, loginService: LoginService);
|
|
14
12
|
VERIFY_OTP: any;
|
|
15
13
|
DEFAULT_OTP: any;
|
|
16
14
|
generate(identifier: string, service: string, expiresIn?: number, otpLength?: number): Promise<Otp>;
|
|
17
|
-
verifyOtp(
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
verifyOtp(body: {
|
|
16
|
+
otp: string;
|
|
17
|
+
otp_id: string;
|
|
18
|
+
identifier: string;
|
|
19
|
+
}): Promise<{
|
|
20
|
+
success: boolean;
|
|
21
|
+
message: string;
|
|
22
|
+
type: string;
|
|
23
|
+
accessToken?: undefined;
|
|
24
|
+
appcode?: undefined;
|
|
25
|
+
level_type?: undefined;
|
|
26
|
+
level_id?: undefined;
|
|
27
|
+
} | {
|
|
28
|
+
success: boolean;
|
|
29
|
+
accessToken: string;
|
|
30
|
+
appcode: string;
|
|
31
|
+
level_type: string;
|
|
32
|
+
level_id: string;
|
|
33
|
+
message?: undefined;
|
|
34
|
+
type?: undefined;
|
|
20
35
|
}>;
|
|
21
36
|
findByOtpId(otpId: string): Promise<Otp | null>;
|
|
22
37
|
private generateOtp;
|
|
@@ -11,19 +11,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.OtpService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const otp_repository_1 = require("../repository/otp.repository");
|
|
15
|
-
const otp_entity_1 = require("../entity/otp.entity");
|
|
16
|
-
const clockIDGenUtil_service_1 = require("../../../utils/service/clockIDGenUtil.service");
|
|
17
14
|
const config_1 = require("@nestjs/config");
|
|
18
|
-
const
|
|
19
|
-
const
|
|
15
|
+
const clockIDGenUtil_service_1 = require("../../../utils/service/clockIDGenUtil.service");
|
|
16
|
+
const otp_entity_1 = require("../entity/otp.entity");
|
|
17
|
+
const otp_repository_1 = require("../repository/otp.repository");
|
|
18
|
+
const login_service_1 = require("./../../user/service/login.service");
|
|
20
19
|
let OtpService = class OtpService {
|
|
21
|
-
constructor(otpRepository, idGen, configService,
|
|
20
|
+
constructor(otpRepository, idGen, configService, loginService) {
|
|
22
21
|
this.otpRepository = otpRepository;
|
|
23
22
|
this.idGen = idGen;
|
|
24
23
|
this.configService = configService;
|
|
25
|
-
this.
|
|
26
|
-
this.databaseSource = databaseSource;
|
|
24
|
+
this.loginService = loginService;
|
|
27
25
|
this.VERIFY_OTP = this.configService.get('VERIFY_OTP') || 'true';
|
|
28
26
|
this.DEFAULT_OTP = this.configService.get('DEFAULT_OTP') || '123456';
|
|
29
27
|
}
|
|
@@ -41,15 +39,17 @@ let OtpService = class OtpService {
|
|
|
41
39
|
otp.expiration_date = new Date(Date.now() + expiresIn * 60 * 1000);
|
|
42
40
|
return await this.otpRepository.save(otp);
|
|
43
41
|
}
|
|
44
|
-
async verifyOtp(
|
|
42
|
+
async verifyOtp(body) {
|
|
45
43
|
let verifyOTPResponse = {
|
|
46
44
|
isValid: false,
|
|
47
|
-
access_token: '',
|
|
48
45
|
};
|
|
49
|
-
let otp =
|
|
50
|
-
let otpId =
|
|
46
|
+
let otp = body.otp;
|
|
47
|
+
let otpId = body.otp_id;
|
|
51
48
|
let otpEntity = await this.findByOtpId(otpId);
|
|
52
49
|
if (otpEntity) {
|
|
50
|
+
if (otpEntity.identifier !== body.identifier) {
|
|
51
|
+
throw new common_1.BadRequestException('Invalid OTP!');
|
|
52
|
+
}
|
|
53
53
|
if (otpEntity.otp === otp &&
|
|
54
54
|
new Date(Date.now()) <= otpEntity.expiration_date &&
|
|
55
55
|
0 === otpEntity.verified) {
|
|
@@ -60,22 +60,10 @@ let OtpService = class OtpService {
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
if (verifyOTPResponse.isValid
|
|
64
|
-
|
|
65
|
-
const entity_id = request.entity.entity_id;
|
|
66
|
-
const entityData = await this.databaseSource.query(`SELECT level_id, level_type, organization_id FROM ether_core.crm_lead where id = ${entity_id}`);
|
|
67
|
-
if (entityData.length > 0) {
|
|
68
|
-
const level_id = entityData[0].level_id;
|
|
69
|
-
const level_type = entityData[0].level_type;
|
|
70
|
-
const organization_id = entityData[0].organization_id;
|
|
71
|
-
verifyOTPResponse.access_token = await this.jwtAuthService.generateJwt({
|
|
72
|
-
level_id: level_id,
|
|
73
|
-
level_type: level_type,
|
|
74
|
-
organization_id: organization_id,
|
|
75
|
-
});
|
|
76
|
-
}
|
|
63
|
+
if (!verifyOTPResponse.isValid) {
|
|
64
|
+
throw new common_1.BadRequestException('Invalid OTP!');
|
|
77
65
|
}
|
|
78
|
-
return
|
|
66
|
+
return await this.loginService.login(body.identifier, undefined, true);
|
|
79
67
|
}
|
|
80
68
|
async findByOtpId(otpId) {
|
|
81
69
|
return await this.otpRepository.findByOtpId(otpId);
|
|
@@ -92,7 +80,6 @@ exports.OtpService = OtpService = __decorate([
|
|
|
92
80
|
__metadata("design:paramtypes", [otp_repository_1.OtpRepository,
|
|
93
81
|
clockIDGenUtil_service_1.ClockIDGenService,
|
|
94
82
|
config_1.ConfigService,
|
|
95
|
-
|
|
96
|
-
typeorm_1.DataSource])
|
|
83
|
+
login_service_1.LoginService])
|
|
97
84
|
], OtpService);
|
|
98
85
|
//# sourceMappingURL=otp.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otp.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/otp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"otp.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/otp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,2CAA+C;AAC/C,0FAAkF;AAClF,qDAA2C;AAC3C,iEAA6D;AAC7D,sEAAkE;AAG3D,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YACmB,aAA4B,EAC5B,KAAwB,EACjC,aAA4B,EACnB,YAA0B;QAH1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,UAAK,GAAL,KAAK,CAAmB;QACjC,kBAAa,GAAb,aAAa,CAAe;QACnB,iBAAY,GAAZ,YAAY,CAAc;QAG7C,eAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC;QAC5D,gBAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;IAH7D,CAAC;IAKJ,KAAK,CAAC,QAAQ,CACZ,UAAkB,EAClB,OAAe,EACf,YAAoB,CAAC,EACrB,YAAoB,CAAC;QAErB,IAAI,GAAG,GAAG,IAAI,gBAAG,EAAE,CAAC;QACpB,GAAG,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACtC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC;QAC5B,GAAG,CAAC,GAAG;YACL,MAAM,KAAK,IAAI,CAAC,UAAU;gBACxB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;gBAC7B,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QACvB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QACtB,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC,eAAe,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAEnE,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAyD;QACvE,IAAI,iBAAiB,GAAG;YACtB,OAAO,EAAE,KAAK;SACf,CAAC;QAEF,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACnB,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAExB,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE9C,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,SAAS,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC7C,MAAM,IAAI,4BAAmB,CAAC,cAAc,CAAC,CAAC;YAChD,CAAC;YAED,IACE,SAAS,CAAC,GAAG,KAAK,GAAG;gBACrB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,eAAe;gBACjD,CAAC,KAAK,SAAS,CAAC,QAAQ,EACxB,CAAC;gBACD,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAChD,SAAS,CAAC,EAAE,EACZ,SAAS,CACV,CAAC;gBACF,IAAI,UAAU,EAAE,CAAC;oBACf,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC;gBACnC,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM,IAAI,4BAAmB,CAAC,cAAc,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAEO,WAAW,CAAC,MAAc;QAChC,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,GAAG,GAAG,EAAE,IAAI,MAAM,GAAG,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtE,CAAC;CACF,CAAA;AA9EY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAGuB,8BAAa;QACrB,0CAAiB;QAClB,sBAAa;QACL,4BAAY;GALlC,UAAU,CA8EtB"}
|
|
@@ -20,7 +20,7 @@ export declare class LoginService {
|
|
|
20
20
|
constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, roleRepo: Repository<Role>, dataSource: DataSource, organizationRepository: OrganizationRepository, listMasterService: ListMasterService, jwtAuthService: JwtAuthService);
|
|
21
21
|
masterKey: string;
|
|
22
22
|
masterIv: string;
|
|
23
|
-
login(email: string, password
|
|
23
|
+
login(email: string, password?: string, is_otp?: boolean): Promise<{
|
|
24
24
|
success: boolean;
|
|
25
25
|
message: string;
|
|
26
26
|
type: string;
|
|
@@ -41,7 +41,7 @@ let LoginService = class LoginService {
|
|
|
41
41
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
42
42
|
this.masterIv = this.configService.get('MASTER_IV') || '';
|
|
43
43
|
}
|
|
44
|
-
async login(email, password) {
|
|
44
|
+
async login(email, password, is_otp = false) {
|
|
45
45
|
const user = await this.userService.findByEmailId(email);
|
|
46
46
|
console.log(user, ' user data');
|
|
47
47
|
if (!user) {
|
|
@@ -63,13 +63,15 @@ let LoginService = class LoginService {
|
|
|
63
63
|
type: 'email',
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
66
|
+
if (!is_otp) {
|
|
67
|
+
const encryptedPassword = encryptUtil_service_1.EncryptUtilService.encryptGCM(password, this.masterKey, this.masterIv);
|
|
68
|
+
if (encryptedPassword !== user.password) {
|
|
69
|
+
return {
|
|
70
|
+
success: false,
|
|
71
|
+
message: 'Oops! Your password is incorrect.',
|
|
72
|
+
type: 'password',
|
|
73
|
+
};
|
|
74
|
+
}
|
|
73
75
|
}
|
|
74
76
|
let appcode = user.last_app_access;
|
|
75
77
|
if (!user.last_app_access) {
|
|
@@ -83,7 +85,7 @@ let LoginService = class LoginService {
|
|
|
83
85
|
}
|
|
84
86
|
const defaultAccess = await this.getDefaultAccess(user, roleMappings);
|
|
85
87
|
await this.userService.setLastLevelTypeAndId(user.id, defaultAccess.level_type, defaultAccess.level_id, defaultAccess.appcode);
|
|
86
|
-
const token = await this.userSessionService.createSession(user, appcode, defaultAccess);
|
|
88
|
+
const token = await this.userSessionService.createSession(user, defaultAccess.appcode, defaultAccess);
|
|
87
89
|
const resolvedInvitationStatus = await this.listMasterService.getResolvedListCode(global_constant_1.INVITATION_STATUS_ACCEPTED, user?.organization_id || 0);
|
|
88
90
|
if (user.is_firstlogin === 1) {
|
|
89
91
|
user.invitation_status = resolvedInvitationStatus.id;
|
|
@@ -94,7 +96,7 @@ let LoginService = class LoginService {
|
|
|
94
96
|
return {
|
|
95
97
|
success: true,
|
|
96
98
|
accessToken: token,
|
|
97
|
-
appcode,
|
|
99
|
+
appcode: defaultAccess.appcode,
|
|
98
100
|
level_type: defaultAccess.level_type,
|
|
99
101
|
level_id: defaultAccess.level_id,
|
|
100
102
|
};
|
|
@@ -126,23 +128,39 @@ let LoginService = class LoginService {
|
|
|
126
128
|
const validURM = roleMappings.find((r) => r.level_type === user.last_level_type &&
|
|
127
129
|
r.level_id === user.last_level_id);
|
|
128
130
|
if (user.last_level_type && user.last_level_id && validURM) {
|
|
129
|
-
return {
|
|
131
|
+
return {
|
|
132
|
+
level_type: user.last_level_type,
|
|
133
|
+
level_id: user.last_level_id,
|
|
134
|
+
appcode: user.last_app_access,
|
|
135
|
+
};
|
|
130
136
|
}
|
|
131
137
|
if (orgAccess) {
|
|
132
|
-
return {
|
|
138
|
+
return {
|
|
139
|
+
level_type: 'ORG',
|
|
140
|
+
level_id: orgAccess.level_id,
|
|
141
|
+
appcode: orgAccess.appcode,
|
|
142
|
+
};
|
|
133
143
|
}
|
|
134
144
|
if (brnAccesses.length) {
|
|
135
145
|
const brandId = brnAccesses[0].level_id;
|
|
136
146
|
const rows = await this.dataSource.query(`SELECT id FROM eth_school_profile WHERE brand_id = ? ORDER BY id ASC LIMIT 1`, [brandId]);
|
|
137
147
|
if (rows.length) {
|
|
138
|
-
return {
|
|
148
|
+
return {
|
|
149
|
+
level_type: 'SCH',
|
|
150
|
+
level_id: rows[0].id,
|
|
151
|
+
appcode: brnAccesses[0].appcode,
|
|
152
|
+
};
|
|
139
153
|
}
|
|
140
154
|
else {
|
|
141
155
|
throw new common_1.BadRequestException('User has BRN access but no schools found under that brand.');
|
|
142
156
|
}
|
|
143
157
|
}
|
|
144
158
|
if (schAccesses.length) {
|
|
145
|
-
return {
|
|
159
|
+
return {
|
|
160
|
+
level_type: 'SCH',
|
|
161
|
+
level_id: schAccesses[0].level_id,
|
|
162
|
+
appcode: schAccesses[0].appcode,
|
|
163
|
+
};
|
|
146
164
|
}
|
|
147
165
|
throw new common_1.BadRequestException('User does not have ORG, BRN, or SCH access for this app.');
|
|
148
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,2CAA+C;AAC/C,6CAAmD;AACnD,uEAGsC;AACtC,iGAAkG;AAClG,sFAAsF;AACtF,qCAAiD;AACjD,oFAAgF;AAChF,uDAA6C;AAC7C,iFAAqE;AACrE,uDAAiD;AACjD,iEAA4D;AAC5D,iDAA6C;AAC7C,iEAAsE;AAG/D,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YACyB,WAAyC,EACxD,kBAAsC,EACtC,aAA4B,EAEpC,yBAAuE,EAEvE,QAA2C,EAC1B,UAAsB,EACtB,sBAA8C,EAE/D,iBAAqD,EACpC,cAA8B;QAXP,gBAAW,GAAX,WAAW,CAAa;QACxD,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,kBAAa,GAAb,aAAa,CAAe;QAEnB,8BAAyB,GAAzB,yBAAyB,CAA6B;QAEtD,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,eAAU,GAAV,UAAU,CAAY;QACtB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAE9C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAGjD,cAAS,GAAW,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAC/D,aAAQ,GAAW,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAH1D,CAAC;IAKJ,KAAK,CAAC,KAAK,CAAC,KAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ let ActivityLogRepository = class ActivityLogRepository {
|
|
|
50
50
|
if (category) {
|
|
51
51
|
query.andWhere('log.category = :category', { category });
|
|
52
52
|
}
|
|
53
|
+
query.orderBy('log.created_date', 'DESC');
|
|
53
54
|
const rows = await query.getRawAndEntities();
|
|
54
55
|
return rows.entities.map((entity, i) => ({
|
|
55
56
|
...entity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,uEAA4D;AAC5D,qCAAqC;AACrC,iCAAiC;AAEpB,QAAA,mBAAmB,GAAG;IACjC,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,aAAa;IAC1B,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,uBAAuB;CAC3B,CAAC;AAIX,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAChC,YAEmB,qBAA8C;QAA9C,0BAAqB,GAArB,qBAAqB,CAAyB;IAC9D,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CACrB,kBAA0B,EAC1B,gBAAiC,EACjC,QAA4B,EAC5B,YAAY;QAEZ,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QAEzC,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB;aACrC,kBAAkB,CAAC,KAAK,CAAC;aACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,0BAA0B,CAAC;aACvD,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;aACnC,KAAK,CAAC,8CAA8C,EAAE;YACrD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,eAAe,EAAE,CAAC;aACvE,QAAQ,CAAC,0CAA0C,EAAE;YACpD,gBAAgB;SACjB,CAAC,CAAC;QAEL,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAE7C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACvC,GAAG,MAAM;YACT,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;YAChC,YAAY,EAAE,MAAM,CAAC,YAAY;gBAC/B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC;gBACvD,CAAC,CAAC,IAAI;SACT,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB,CAE1B,kBAA0B,EAC1B,YAAiB;QAEjB,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QAEzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB;aAC5C,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,8BAA8B,EAAE,UAAU,CAAC;aAClD,KAAK,CAAC,8CAA8C,EAAE;YACrD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,eAAe,EAAE,CAAC;aAEvE,UAAU,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,OAAO;gBACL,KAAK,EAAE,GAAG,CAAC,QAAQ;gBACnB,KAAK,EAAE,GAAG,CAAC,QAAQ;aACpB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,uEAA4D;AAC5D,qCAAqC;AACrC,iCAAiC;AAEpB,QAAA,mBAAmB,GAAG;IACjC,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,aAAa;IAC1B,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,uBAAuB;CAC3B,CAAC;AAIX,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAChC,YAEmB,qBAA8C;QAA9C,0BAAqB,GAArB,qBAAqB,CAAyB;IAC9D,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CACrB,kBAA0B,EAC1B,gBAAiC,EACjC,QAA4B,EAC5B,YAAY;QAEZ,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QAEzC,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB;aACrC,kBAAkB,CAAC,KAAK,CAAC;aACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,0BAA0B,CAAC;aACvD,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;aACnC,KAAK,CAAC,8CAA8C,EAAE;YACrD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,eAAe,EAAE,CAAC;aACvE,QAAQ,CAAC,0CAA0C,EAAE;YACpD,gBAAgB;SACjB,CAAC,CAAC;QAEL,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAE7C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACvC,GAAG,MAAM;YACT,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;YAChC,YAAY,EAAE,MAAM,CAAC,YAAY;gBAC/B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC;gBACvD,CAAC,CAAC,IAAI;SACT,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB,CAE1B,kBAA0B,EAC1B,YAAiB;QAEjB,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QAEzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB;aAC5C,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,8BAA8B,EAAE,UAAU,CAAC;aAClD,KAAK,CAAC,8CAA8C,EAAE;YACrD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,eAAe,EAAE,CAAC;aAEvE,UAAU,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,OAAO;gBACL,KAAK,EAAE,GAAG,CAAC,QAAQ;gBACnB,KAAK,EAAE,GAAG,CAAC,QAAQ;aACpB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjEY,sDAAqB;gCAArB,qBAAqB;IAE7B,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACU,oBAAU;GAHzC,qBAAqB,CAiEjC"}
|
|
@@ -34,6 +34,7 @@ let TaskRepository = class TaskRepository {
|
|
|
34
34
|
if (!action?.length)
|
|
35
35
|
return;
|
|
36
36
|
const todoListMasterItemId = await this.dataSource.query(`SELECT id FROM cr_list_master_items WHERE code = 'todo' and organization_id = ? and listtype = 'TKST' LIMIT 1;`, [loggedInUser.organization_id]);
|
|
37
|
+
const leadData = await this.dataSource.query(`SELECT * FROM crm_lead WHERE id = ?`, [mapped_entity_id]);
|
|
37
38
|
if (action.length > 0) {
|
|
38
39
|
for (const act of action) {
|
|
39
40
|
const is_mandatory = await this.dataSource.query(`SELECT code FROM cr_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`, [act.action_requirement, loggedInUser.organization_id]);
|
|
@@ -46,9 +47,11 @@ let TaskRepository = class TaskRepository {
|
|
|
46
47
|
is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
|
|
47
48
|
mapped_entity_id,
|
|
48
49
|
mapped_entity_type,
|
|
50
|
+
due_date: new Date(new Date().setDate(new Date().getDate() + 2)),
|
|
49
51
|
is_system: true,
|
|
50
52
|
status: todoListMasterItemId[0]?.id,
|
|
51
53
|
category: act?.action_category_code,
|
|
54
|
+
task_owner: leadData[0]?.lead_owner,
|
|
52
55
|
});
|
|
53
56
|
await this.TaskRepository.save(taskData);
|
|
54
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/task.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAmD;AACnD,iEAA4D;AAC5D,qCAAiD;AAG1C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAEmB,cAA0C,EAC1C,UAAsB;QADtB,mBAAc,GAAd,cAAc,CAA4B;QAC1C,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,4BAA4B,CAAC,SAAS;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE;gBACL,GAAG,SAAS;aACb;SACF,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,MAAW,EACX,YAAY,EACZ,gBAAwB,EACxB,kBAA0B;QAE1B,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,OAAO;QAE5B,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACtD,gHAAgH,EAChH,CAAC,YAAY,CAAC,eAAe,CAAC,CAC/B,CAAC;QAIF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;gBAGzB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC9C,qFAAqF,EACrF,CAAC,GAAG,CAAC,kBAAkB,EAAE,YAAY,CAAC,eAAe,CAAC,CACvD,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;oBAC1C,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,OAAO,EAAE,YAAY,CAAC,EAAE;oBACxB,SAAS,EAAE,GAAG,CAAC,EAAE;oBACjB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;oBAClE,gBAAgB;oBAChB,kBAAkB;
|
|
1
|
+
{"version":3,"file":"task.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/task.repository.ts"],"names":[],"mappings":"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"}
|