rez_core 2.2.166 → 2.2.169
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/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/module/communication/controller/communication.controller.d.ts +4 -1
- package/dist/module/communication/controller/communication.controller.js +23 -3
- package/dist/module/communication/controller/communication.controller.js.map +1 -1
- package/dist/module/communication/entity/communication-config.entity.js +1 -1
- package/dist/module/communication/entity/communication-config.entity.js.map +1 -1
- package/dist/module/communication/entity/communication-hub.entity.js +1 -1
- package/dist/module/communication/entity/communication-hub.entity.js.map +1 -1
- package/dist/module/communication/service/communication.service.d.ts +5 -1
- package/dist/module/communication/service/communication.service.js +13 -3
- package/dist/module/communication/service/communication.service.js.map +1 -1
- package/dist/module/communication/strategies/email/gmail-api.strategy.d.ts +3 -0
- package/dist/module/communication/strategies/email/gmail-api.strategy.js +33 -12
- package/dist/module/communication/strategies/email/gmail-api.strategy.js.map +1 -1
- package/dist/module/communication/strategies/gmail.strategy.d.ts +3 -0
- package/dist/module/communication/strategies/gmail.strategy.js +17 -7
- package/dist/module/communication/strategies/gmail.strategy.js.map +1 -1
- package/dist/module/listmaster/service/list-master.service.js +0 -7
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.js +0 -1
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/notification/controller/notification.controller.d.ts +17 -0
- package/dist/module/notification/controller/notification.controller.js +48 -0
- package/dist/module/notification/controller/notification.controller.js.map +1 -0
- package/dist/module/notification/controller/otp.controller.d.ts +2 -1
- package/dist/module/notification/controller/otp.controller.js +2 -2
- package/dist/module/notification/controller/otp.controller.js.map +1 -1
- package/dist/module/notification/entity/notification.entity.d.ts +8 -0
- package/dist/module/notification/entity/notification.entity.js +41 -0
- package/dist/module/notification/entity/notification.entity.js.map +1 -0
- package/dist/module/notification/firebase-admin.config.d.ts +2 -0
- package/dist/module/notification/firebase-admin.config.js +10 -0
- package/dist/module/notification/firebase-admin.config.js.map +1 -0
- package/dist/module/notification/firebase-admin.json +13 -0
- package/dist/module/notification/notification.module.js +7 -4
- package/dist/module/notification/notification.module.js.map +1 -1
- package/dist/module/notification/service/firebase.service.d.ts +11 -0
- package/dist/module/notification/service/firebase.service.js +40 -0
- package/dist/module/notification/service/firebase.service.js.map +1 -0
- package/dist/module/notification/service/otp.service.d.ts +2 -1
- package/dist/module/notification/service/otp.service.js +8 -3
- package/dist/module/notification/service/otp.service.js.map +1 -1
- package/dist/module/user/controller/login.controller.js +16 -4
- package/dist/module/user/controller/login.controller.js.map +1 -1
- package/dist/module/user/controller/user.controller.d.ts +1 -9
- package/dist/module/user/controller/user.controller.js +10 -4
- package/dist/module/user/controller/user.controller.js.map +1 -1
- package/dist/module/user/entity/user.entity.d.ts +1 -0
- package/dist/module/user/entity/user.entity.js +4 -0
- package/dist/module/user/entity/user.entity.js.map +1 -1
- package/dist/module/user/service/login.service.d.ts +17 -3
- package/dist/module/user/service/login.service.js +14 -5
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +7 -10
- package/dist/module/user/service/user.service.js +23 -8
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/module/workflow/entity/task-data.entity.d.ts +2 -0
- package/dist/module/workflow/entity/task-data.entity.js +9 -1
- package/dist/module/workflow/entity/task-data.entity.js.map +1 -1
- package/dist/module/workflow/repository/task.repository.js +6 -1
- package/dist/module/workflow/repository/task.repository.js.map +1 -1
- package/dist/module/workflow/service/task.service.d.ts +4 -1
- package/dist/module/workflow/service/task.service.js +46 -2
- package/dist/module/workflow/service/task.service.js.map +1 -1
- package/dist/module/workflow/workflow.module.js +2 -0
- package/dist/module/workflow/workflow.module.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -1
- package/src/app.module.ts +2 -0
- package/src/module/communication/controller/communication.controller.ts +19 -1
- package/src/module/communication/entity/communication-config.entity.ts +1 -1
- package/src/module/communication/entity/communication-hub.entity.ts +1 -1
- package/src/module/communication/service/communication.service.ts +21 -2
- package/src/module/communication/strategies/email/gmail-api.strategy.ts +37 -13
- package/src/module/communication/strategies/gmail.strategy.ts +15 -9
- package/src/module/listmaster/service/list-master.service.ts +0 -12
- package/src/module/meta/service/entity-service-impl.service.ts +0 -1
- package/src/module/notification/controller/notification.controller.ts +25 -0
- package/src/module/notification/controller/otp.controller.ts +3 -2
- package/src/module/notification/entity/notification.entity.ts +20 -0
- package/src/module/notification/firebase-admin.config.ts +8 -0
- package/src/module/notification/firebase-admin.json +13 -0
- package/src/module/notification/notification.module.ts +7 -4
- package/src/module/notification/service/firebase.service.ts +31 -0
- package/src/module/notification/service/otp.service.ts +9 -3
- package/src/module/user/controller/login.controller.ts +26 -11
- package/src/module/user/controller/user.controller.ts +7 -2
- package/src/module/user/entity/user.entity.ts +3 -0
- package/src/module/user/service/login.service.ts +24 -8
- package/src/module/user/service/user.service.ts +32 -6
- package/src/module/workflow/entity/task-data.entity.ts +7 -1
- package/src/module/workflow/repository/task.repository.ts +10 -2
- package/src/module/workflow/service/task.service.ts +56 -0
- package/src/module/workflow/workflow.module.ts +2 -0
- package/tsconfig.json +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,uEAAoE;AACpE,6EAAkE;AAG3D,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,+BAAU;IACtC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,uEAAoE;AACpE,6EAAkE;AAG3D,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,+BAAU;IACtC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAiDF,CAAA;AArDY,4BAAQ;AAOnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACtC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACzC;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAClB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1B;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC9B;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACpB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAChB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrB,IAAI;sCAAC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC1B;mBApDP,QAAQ;IADpB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;GACf,QAAQ,CAqDpB"}
|
|
@@ -5,6 +5,7 @@ import { ListMasterService } from 'src/module/listmaster/service/list-master.ser
|
|
|
5
5
|
import { DataSource, Repository } from 'typeorm';
|
|
6
6
|
import { Role } from '../entity/role.entity';
|
|
7
7
|
import { UserRoleMapping } from '../entity/user-role-mapping.entity';
|
|
8
|
+
import { UserData } from '../entity/user.entity';
|
|
8
9
|
import { UserSessionService } from './user-session.service';
|
|
9
10
|
import { UserService } from './user.service';
|
|
10
11
|
import { JwtAuthService } from 'src/module/auth/services/jwt.service';
|
|
@@ -18,10 +19,17 @@ export declare class LoginService {
|
|
|
18
19
|
private readonly organizationRepository;
|
|
19
20
|
private readonly listMasterService;
|
|
20
21
|
private readonly jwtAuthService;
|
|
21
|
-
|
|
22
|
+
private readonly userRepository;
|
|
23
|
+
constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, roleRepo: Repository<Role>, dataSource: DataSource, organizationRepository: OrganizationRepository, listMasterService: ListMasterService, jwtAuthService: JwtAuthService, userRepository: Repository<UserData>);
|
|
22
24
|
masterKey: string;
|
|
23
25
|
masterIv: string;
|
|
24
|
-
login(
|
|
26
|
+
login(data: {
|
|
27
|
+
email: string;
|
|
28
|
+
password?: string;
|
|
29
|
+
subdomain: string;
|
|
30
|
+
fcm_token: string;
|
|
31
|
+
is_otp?: boolean;
|
|
32
|
+
}): Promise<{
|
|
25
33
|
success: boolean;
|
|
26
34
|
message: string;
|
|
27
35
|
type: string;
|
|
@@ -40,7 +48,13 @@ export declare class LoginService {
|
|
|
40
48
|
}>;
|
|
41
49
|
formLogin(body: any): Promise<any>;
|
|
42
50
|
private getDefaultAccess;
|
|
43
|
-
loginWithGoogle(
|
|
51
|
+
loginWithGoogle(data: {
|
|
52
|
+
email: string;
|
|
53
|
+
password: string;
|
|
54
|
+
name: any;
|
|
55
|
+
subdomain: string;
|
|
56
|
+
fcm_token: string;
|
|
57
|
+
}): Promise<BadRequestException | {
|
|
44
58
|
success: boolean;
|
|
45
59
|
message: string;
|
|
46
60
|
type: string;
|
|
@@ -23,11 +23,12 @@ const typeorm_2 = require("typeorm");
|
|
|
23
23
|
const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
|
|
24
24
|
const role_entity_1 = require("../entity/role.entity");
|
|
25
25
|
const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
|
|
26
|
+
const user_entity_1 = require("../entity/user.entity");
|
|
26
27
|
const user_session_service_1 = require("./user-session.service");
|
|
27
28
|
const user_service_1 = require("./user.service");
|
|
28
29
|
const jwt_service_1 = require("../../auth/services/jwt.service");
|
|
29
30
|
let LoginService = class LoginService {
|
|
30
|
-
constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo, dataSource, organizationRepository, listMasterService, jwtAuthService) {
|
|
31
|
+
constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo, dataSource, organizationRepository, listMasterService, jwtAuthService, userRepository) {
|
|
31
32
|
this.userService = userService;
|
|
32
33
|
this.userSessionService = userSessionService;
|
|
33
34
|
this.configService = configService;
|
|
@@ -37,10 +38,12 @@ let LoginService = class LoginService {
|
|
|
37
38
|
this.organizationRepository = organizationRepository;
|
|
38
39
|
this.listMasterService = listMasterService;
|
|
39
40
|
this.jwtAuthService = jwtAuthService;
|
|
41
|
+
this.userRepository = userRepository;
|
|
40
42
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
41
43
|
this.masterIv = this.configService.get('MASTER_IV') || '';
|
|
42
44
|
}
|
|
43
|
-
async login(
|
|
45
|
+
async login(data) {
|
|
46
|
+
const { email, password, is_otp = false, subdomain, fcm_token } = data;
|
|
44
47
|
let organization;
|
|
45
48
|
if (subdomain) {
|
|
46
49
|
organization =
|
|
@@ -53,6 +56,9 @@ let LoginService = class LoginService {
|
|
|
53
56
|
if (!user || (organization && user.organization_id !== organization.id)) {
|
|
54
57
|
throw new common_1.BadRequestException('User not found in organization.');
|
|
55
58
|
}
|
|
59
|
+
if (fcm_token) {
|
|
60
|
+
await this.userRepository.update({ id: user.id }, { fcm_token });
|
|
61
|
+
}
|
|
56
62
|
const userOrgData = await this.organizationRepository.findOrganizationById(user.organization_id);
|
|
57
63
|
const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_ACTIVE, user?.organization_id || 0);
|
|
58
64
|
if (user.status != resolveStatus.id ||
|
|
@@ -160,12 +166,13 @@ let LoginService = class LoginService {
|
|
|
160
166
|
}
|
|
161
167
|
throw new common_1.BadRequestException('User does not have ORG, BRN, or SCH access for this app.');
|
|
162
168
|
}
|
|
163
|
-
async loginWithGoogle(
|
|
169
|
+
async loginWithGoogle(data) {
|
|
170
|
+
const { email, password, name, subdomain, fcm_token } = data;
|
|
164
171
|
const user = await this.userService.findByEmailId(email);
|
|
165
172
|
if (!user) {
|
|
166
173
|
return new common_1.BadRequestException('User not found');
|
|
167
174
|
}
|
|
168
|
-
return await this.login(
|
|
175
|
+
return await this.login(data);
|
|
169
176
|
}
|
|
170
177
|
async logout(sessionKey) {
|
|
171
178
|
const userSession = await this.userSessionService.findBySessionKey(sessionKey);
|
|
@@ -184,6 +191,7 @@ exports.LoginService = LoginService = __decorate([
|
|
|
184
191
|
__param(3, (0, typeorm_1.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
|
|
185
192
|
__param(4, (0, typeorm_1.InjectRepository)(role_entity_1.Role)),
|
|
186
193
|
__param(7, (0, common_1.Inject)('ListMasterService')),
|
|
194
|
+
__param(9, (0, typeorm_1.InjectRepository)(user_entity_1.UserData)),
|
|
187
195
|
__metadata("design:paramtypes", [user_service_1.UserService,
|
|
188
196
|
user_session_service_1.UserSessionService,
|
|
189
197
|
config_1.ConfigService,
|
|
@@ -192,6 +200,7 @@ exports.LoginService = LoginService = __decorate([
|
|
|
192
200
|
typeorm_2.DataSource,
|
|
193
201
|
organization_repository_1.OrganizationRepository,
|
|
194
202
|
list_master_service_1.ListMasterService,
|
|
195
|
-
jwt_service_1.JwtAuthService
|
|
203
|
+
jwt_service_1.JwtAuthService,
|
|
204
|
+
typeorm_2.Repository])
|
|
196
205
|
], LoginService);
|
|
197
206
|
//# sourceMappingURL=login.service.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,16 @@ import { EntityManager } from 'typeorm';
|
|
|
9
9
|
import { ConfigService } from '@nestjs/config';
|
|
10
10
|
import { ServiceResult } from 'src/dtos/response.dto';
|
|
11
11
|
import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
|
|
12
|
+
import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
|
|
12
13
|
export declare class UserService extends EntityServiceImpl {
|
|
13
14
|
private userRepository;
|
|
14
15
|
private userRoleMappingService;
|
|
15
16
|
private readonly clockIDGenService;
|
|
16
17
|
private configService;
|
|
18
|
+
private readonly organizationRepository;
|
|
17
19
|
private readonly roleService;
|
|
18
20
|
private readonly listMasterService;
|
|
19
|
-
constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService, roleService: RoleService, listMasterService: ListMasterService);
|
|
21
|
+
constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService, organizationRepository: OrganizationRepository, roleService: RoleService, listMasterService: ListMasterService);
|
|
20
22
|
masterKey: any;
|
|
21
23
|
masterIv: any;
|
|
22
24
|
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<ServiceResult<BaseEntity>>;
|
|
@@ -26,13 +28,8 @@ export declare class UserService extends EntityServiceImpl {
|
|
|
26
28
|
findByMobile(mobile: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
|
|
27
29
|
setDefaultLastAccess(userId: number, appcode: string): Promise<void>;
|
|
28
30
|
setLastLevelTypeAndId(userId: number, levelType: string, levelId: string, appcode: string): Promise<void>;
|
|
29
|
-
checkEmailExists(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
} | {
|
|
34
|
-
success: boolean;
|
|
35
|
-
message: string;
|
|
36
|
-
userId: number;
|
|
37
|
-
}>;
|
|
31
|
+
checkEmailExists(data: {
|
|
32
|
+
email: string;
|
|
33
|
+
subdomain: string;
|
|
34
|
+
}): Promise<any>;
|
|
38
35
|
}
|
|
@@ -24,13 +24,15 @@ const user_role_mapping_service_1 = require("./user-role-mapping.service");
|
|
|
24
24
|
const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
|
|
25
25
|
const config_1 = require("@nestjs/config");
|
|
26
26
|
const list_master_service_1 = require("../../listmaster/service/list-master.service");
|
|
27
|
+
const organization_repository_1 = require("../../enterprise/repository/organization.repository");
|
|
27
28
|
let UserService = class UserService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
28
|
-
constructor(userRepository, userRoleMappingService, clockIDGenService, configService, roleService, listMasterService) {
|
|
29
|
+
constructor(userRepository, userRoleMappingService, clockIDGenService, configService, organizationRepository, roleService, listMasterService) {
|
|
29
30
|
super();
|
|
30
31
|
this.userRepository = userRepository;
|
|
31
32
|
this.userRoleMappingService = userRoleMappingService;
|
|
32
33
|
this.clockIDGenService = clockIDGenService;
|
|
33
34
|
this.configService = configService;
|
|
35
|
+
this.organizationRepository = organizationRepository;
|
|
34
36
|
this.roleService = roleService;
|
|
35
37
|
this.listMasterService = listMasterService;
|
|
36
38
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
@@ -38,11 +40,11 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
38
40
|
}
|
|
39
41
|
async createEntity(entityData, loggedInUser, manager) {
|
|
40
42
|
const userData = entityData;
|
|
41
|
-
let existingUser = await this.userRepository.findByEmailId(userData.email_id);
|
|
43
|
+
let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.organization_id);
|
|
42
44
|
if (existingUser) {
|
|
43
45
|
return { success: false, error: 'User with this email already exists' };
|
|
44
46
|
}
|
|
45
|
-
existingUser = await this.userRepository.findByMobile(userData.mobile);
|
|
47
|
+
existingUser = await this.userRepository.findByMobile(userData.mobile, loggedInUser?.organization_id);
|
|
46
48
|
if (existingUser) {
|
|
47
49
|
return { success: false, error: 'User with this mobile already exists' };
|
|
48
50
|
}
|
|
@@ -181,11 +183,23 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
181
183
|
user.last_app_access = appcode;
|
|
182
184
|
await this.userRepository.saveUser(user);
|
|
183
185
|
}
|
|
184
|
-
async checkEmailExists(
|
|
185
|
-
|
|
186
|
-
|
|
186
|
+
async checkEmailExists(data) {
|
|
187
|
+
const { email, subdomain } = data;
|
|
188
|
+
if (!email || !subdomain) {
|
|
189
|
+
return { success: false, message: 'Email and Subdomain is required' };
|
|
190
|
+
}
|
|
191
|
+
let organization;
|
|
192
|
+
if (subdomain) {
|
|
193
|
+
organization =
|
|
194
|
+
await this.organizationRepository.findOrganizationBySubdomain(subdomain);
|
|
195
|
+
if (!organization) {
|
|
196
|
+
throw new common_1.BadRequestException('Organization not found.');
|
|
197
|
+
}
|
|
187
198
|
}
|
|
188
199
|
const user = await this.userRepository.findByEmailId(email);
|
|
200
|
+
if (!user || (organization && user.organization_id !== organization.id)) {
|
|
201
|
+
throw new common_1.BadRequestException('User not found in organization.');
|
|
202
|
+
}
|
|
189
203
|
if (user) {
|
|
190
204
|
return {
|
|
191
205
|
success: true,
|
|
@@ -201,12 +215,13 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
201
215
|
exports.UserService = UserService;
|
|
202
216
|
exports.UserService = UserService = __decorate([
|
|
203
217
|
(0, common_1.Injectable)(),
|
|
204
|
-
__param(
|
|
205
|
-
__param(
|
|
218
|
+
__param(5, (0, common_1.Inject)('RoleService')),
|
|
219
|
+
__param(6, (0, common_1.Inject)('ListMasterService')),
|
|
206
220
|
__metadata("design:paramtypes", [user_repository_1.UserRepository,
|
|
207
221
|
user_role_mapping_service_1.UserRoleMappingService,
|
|
208
222
|
clockIDGenUtil_service_1.ClockIDGenService,
|
|
209
223
|
config_1.ConfigService,
|
|
224
|
+
organization_repository_1.OrganizationRepository,
|
|
210
225
|
role_service_1.RoleService,
|
|
211
226
|
list_master_service_1.ListMasterService])
|
|
212
227
|
], UserService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAA6C;AAC7C,2CAKwB;AACxB,gGAAmF;AAGnF,mEAA+D;AAC/D,oFAAgF;AAChF,0FAAkF;AAClF,uEAI2C;AAE3C,2EAAqE;AACrE,iFAAqE;AAGrE,2CAA+C;AAG/C,sFAAsF;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ __decorate([
|
|
|
84
84
|
__metadata("design:type", Date)
|
|
85
85
|
], TaskDataEntity.prototype, "due_date", void 0);
|
|
86
86
|
__decorate([
|
|
87
|
-
(0, typeorm_1.Column)({ nullable: true, type: '
|
|
87
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'time' }),
|
|
88
88
|
__metadata("design:type", String)
|
|
89
89
|
], TaskDataEntity.prototype, "due_time", void 0);
|
|
90
90
|
__decorate([
|
|
@@ -99,6 +99,14 @@ __decorate([
|
|
|
99
99
|
(0, typeorm_1.Column)({ nullable: true, type: 'varchar' }),
|
|
100
100
|
__metadata("design:type", String)
|
|
101
101
|
], TaskDataEntity.prototype, "category", void 0);
|
|
102
|
+
__decorate([
|
|
103
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
104
|
+
__metadata("design:type", Date)
|
|
105
|
+
], TaskDataEntity.prototype, "remainder_date", void 0);
|
|
106
|
+
__decorate([
|
|
107
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'varchar' }),
|
|
108
|
+
__metadata("design:type", String)
|
|
109
|
+
], TaskDataEntity.prototype, "remainder_time", void 0);
|
|
102
110
|
exports.TaskDataEntity = TaskDataEntity = __decorate([
|
|
103
111
|
(0, typeorm_1.Entity)({ name: 'cr_wf_task_data' }),
|
|
104
112
|
__metadata("design:paramtypes", [])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-data.entity.js","sourceRoot":"","sources":["../../../../src/module/workflow/entity/task-data.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,+BAAU;IAC5C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,CAAC;
|
|
1
|
+
{"version":3,"file":"task-data.entity.js","sourceRoot":"","sources":["../../../../src/module/workflow/entity/task-data.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,+BAAU;IAC5C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,CAAC;CAmEF,CAAA;AAvEY,wCAAc;AAOzB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;kDAAC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjB,IAAI;gDAAC;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACL;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;iDACJ;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACL;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACF;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACA;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;+CACN;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;mDACtC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjB,IAAI;gDAAC;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;gDACxB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;4CAC/B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;4CAC/B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;gDAC3B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACX,IAAI;sDAAC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;sDACrB;yBAtEZ,cAAc;IAD1B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;;GACvB,cAAc,CAuE1B"}
|
|
@@ -38,6 +38,10 @@ let TaskRepository = class TaskRepository {
|
|
|
38
38
|
if (action.length > 0) {
|
|
39
39
|
for (const act of action) {
|
|
40
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]);
|
|
41
|
+
const now = new Date();
|
|
42
|
+
const dueDateTime = new Date(now.setDate(now.getDate() + 2));
|
|
43
|
+
const due_date = dueDateTime.toISOString().split('T')[0];
|
|
44
|
+
const due_time = dueDateTime.toTimeString().split(' ')[0];
|
|
41
45
|
const taskData = this.TaskRepository.create({
|
|
42
46
|
stage_id: act.stage_id,
|
|
43
47
|
user_id: loggedInUser.id,
|
|
@@ -48,7 +52,8 @@ let TaskRepository = class TaskRepository {
|
|
|
48
52
|
is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
|
|
49
53
|
mapped_entity_id,
|
|
50
54
|
mapped_entity_type,
|
|
51
|
-
due_date
|
|
55
|
+
due_date,
|
|
56
|
+
due_time,
|
|
52
57
|
is_system: true,
|
|
53
58
|
status: todoListMasterItemId[0]?.id,
|
|
54
59
|
category: act?.action_category_code,
|
|
@@ -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,uHAAuH,EACvH,CAAC,YAAY,CAAC,eAAe,CAAC,CAC/B,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC1C,qCAAqC,EACrC,CAAC,gBAAgB,CAAC,CACnB,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,eAAe,EAAE,YAAY,CAAC,eAAe;oBAC7C,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;oBAClB,QAAQ,
|
|
1
|
+
{"version":3,"file":"task.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/task.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,15 @@ import { DataSource, EntityManager } from 'typeorm';
|
|
|
6
6
|
import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
|
|
7
7
|
import { ActivityLogService } from './activity-log.service';
|
|
8
8
|
import { MediaDataService } from 'src/module/meta/service/media-data.service';
|
|
9
|
+
import { NotificationsService } from 'src/module/notification/service/firebase.service';
|
|
9
10
|
export declare class TaskService extends EntityServiceImpl {
|
|
10
11
|
private readonly taskRepository;
|
|
11
12
|
private readonly actionDataService;
|
|
12
13
|
private readonly dataSource;
|
|
13
14
|
private readonly activityLogService;
|
|
14
15
|
private readonly mediaDataService;
|
|
15
|
-
|
|
16
|
+
private readonly notificationsService;
|
|
17
|
+
constructor(taskRepository: TaskRepository, actionDataService: ActionDataService, dataSource: DataSource, activityLogService: ActivityLogService, mediaDataService: MediaDataService, notificationsService: NotificationsService);
|
|
16
18
|
createEntity(entityData: any, loggedInUser: any, manager?: EntityManager | null, appcode?: string): Promise<any>;
|
|
17
19
|
updateEntity(entityData: any, loggedInUser: UserData, appcode?: string): Promise<any>;
|
|
18
20
|
getAllTaskByUserIdandStageId(loggedInUser: UserData, data: any): Promise<any>;
|
|
@@ -43,4 +45,5 @@ export declare class TaskService extends EntityServiceImpl {
|
|
|
43
45
|
action_id: number;
|
|
44
46
|
stage_group_id?: number;
|
|
45
47
|
}, loggedInUser: any): Promise<any>;
|
|
48
|
+
fetchTasksDueIn30Mins(): Promise<void>;
|
|
46
49
|
}
|
|
@@ -21,14 +21,17 @@ const typeorm_1 = require("typeorm");
|
|
|
21
21
|
const activity_log_service_1 = require("./activity-log.service");
|
|
22
22
|
const activity_log_repository_1 = require("../repository/activity-log.repository");
|
|
23
23
|
const media_data_service_1 = require("../../meta/service/media-data.service");
|
|
24
|
+
const schedule_1 = require("@nestjs/schedule");
|
|
25
|
+
const firebase_service_1 = require("../../notification/service/firebase.service");
|
|
24
26
|
let TaskService = class TaskService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
25
|
-
constructor(taskRepository, actionDataService, dataSource, activityLogService, mediaDataService) {
|
|
27
|
+
constructor(taskRepository, actionDataService, dataSource, activityLogService, mediaDataService, notificationsService) {
|
|
26
28
|
super();
|
|
27
29
|
this.taskRepository = taskRepository;
|
|
28
30
|
this.actionDataService = actionDataService;
|
|
29
31
|
this.dataSource = dataSource;
|
|
30
32
|
this.activityLogService = activityLogService;
|
|
31
33
|
this.mediaDataService = mediaDataService;
|
|
34
|
+
this.notificationsService = notificationsService;
|
|
32
35
|
}
|
|
33
36
|
async createEntity(entityData, loggedInUser, manager, appcode) {
|
|
34
37
|
if (entityData && typeof entityData['is_mandatory'] === 'string') {
|
|
@@ -270,8 +273,48 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
|
|
|
270
273
|
console.log(notePayload);
|
|
271
274
|
return await super.createEntity(notePayload, loggedInUser);
|
|
272
275
|
}
|
|
276
|
+
async fetchTasksDueIn30Mins() {
|
|
277
|
+
const now = new Date();
|
|
278
|
+
const in30Min = new Date(now.getTime() + 30 * 60 * 1000);
|
|
279
|
+
const completedStatus = await this.dataSource.query(`SELECT id FROM cr_list_master_items WHERE name = 'completed' AND listtype = 'TKST' LIMIT 1;`);
|
|
280
|
+
const completedId = completedStatus[0]?.id;
|
|
281
|
+
const tasks = await this.dataSource.query(`
|
|
282
|
+
SELECT *
|
|
283
|
+
FROM cr_wf_task_data
|
|
284
|
+
WHERE status != ?
|
|
285
|
+
AND TIMESTAMP(due_date, due_time) BETWEEN ? AND ?
|
|
286
|
+
`, [completedId, now, in30Min]);
|
|
287
|
+
if (!tasks.length) {
|
|
288
|
+
console.log('No tasks due in 30 mins');
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
for (const task of tasks) {
|
|
292
|
+
const message = `Reminder: Task ${task.name} is due at ${task.due_time}`;
|
|
293
|
+
await this.dataSource.query(`
|
|
294
|
+
INSERT INTO cr_notification (user_id, event_type, message, entity_type, organization_id, created_date, mapped_entity_id, mapped_entity_type, level_id, level_type)
|
|
295
|
+
VALUES (?, ?, ?, ?, ?, NOW(), ?, ?, ?, ?)
|
|
296
|
+
`, [
|
|
297
|
+
task.task_owner,
|
|
298
|
+
'Task Remainder',
|
|
299
|
+
message,
|
|
300
|
+
'NOTF',
|
|
301
|
+
task.organization_id,
|
|
302
|
+
task.mapped_entity_id,
|
|
303
|
+
task.mapped_entity_type,
|
|
304
|
+
task.level_id,
|
|
305
|
+
task.level_type,
|
|
306
|
+
]);
|
|
307
|
+
await this.notificationsService.sendToUser(String(task.task_owner), 'Task Reminder', message);
|
|
308
|
+
}
|
|
309
|
+
}
|
|
273
310
|
};
|
|
274
311
|
exports.TaskService = TaskService;
|
|
312
|
+
__decorate([
|
|
313
|
+
(0, schedule_1.Cron)(schedule_1.CronExpression.EVERY_30_MINUTES),
|
|
314
|
+
__metadata("design:type", Function),
|
|
315
|
+
__metadata("design:paramtypes", []),
|
|
316
|
+
__metadata("design:returntype", Promise)
|
|
317
|
+
], TaskService.prototype, "fetchTasksDueIn30Mins", null);
|
|
275
318
|
exports.TaskService = TaskService = __decorate([
|
|
276
319
|
(0, common_1.Injectable)(),
|
|
277
320
|
__param(3, (0, common_1.Inject)('ActivityLogService')),
|
|
@@ -279,6 +322,7 @@ exports.TaskService = TaskService = __decorate([
|
|
|
279
322
|
action_data_service_1.ActionDataService,
|
|
280
323
|
typeorm_1.DataSource,
|
|
281
324
|
activity_log_service_1.ActivityLogService,
|
|
282
|
-
media_data_service_1.MediaDataService
|
|
325
|
+
media_data_service_1.MediaDataService,
|
|
326
|
+
firebase_service_1.NotificationsService])
|
|
283
327
|
], TaskService);
|
|
284
328
|
//# sourceMappingURL=task.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/task.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,gGAAwF;AAExF,mEAA+D;AAC/D,+DAA0D;AAC1D,qCAAoD;AAEpD,iEAA4D;AAC5D,mFAA4E;AAC5E,8EAA8E;
|
|
1
|
+
{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/task.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,7 @@ const activity_log_entity_1 = require("./entity/activity-log.entity");
|
|
|
71
71
|
const activity_log_service_1 = require("./service/activity-log.service");
|
|
72
72
|
const activity_log_repository_1 = require("./repository/activity-log.repository");
|
|
73
73
|
const activity_log_controller_1 = require("./controller/activity-log.controller");
|
|
74
|
+
const notification_module_1 = require("../notification/notification.module");
|
|
74
75
|
let WorkflowModule = class WorkflowModule {
|
|
75
76
|
};
|
|
76
77
|
exports.WorkflowModule = WorkflowModule;
|
|
@@ -99,6 +100,7 @@ exports.WorkflowModule = WorkflowModule = __decorate([
|
|
|
99
100
|
]),
|
|
100
101
|
entity_module_1.EntityModule,
|
|
101
102
|
listmaster_module_1.ListMasterModule,
|
|
103
|
+
notification_module_1.NotificationModule,
|
|
102
104
|
],
|
|
103
105
|
providers: [
|
|
104
106
|
{ provide: 'ActionCategoryService', useClass: action_category_service_1.ActionCategoryService },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.module.js","sourceRoot":"","sources":["../../../src/module/workflow/workflow.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA6C;AAC7C,6CAAgD;AAChD,uEAAmE;AACnE,yDAAqD;AACrD,wGAAkG;AAClG,sEAAkE;AAClE,oFAA+E;AAC/E,gGAA2F;AAC3F,gFAA2E;AAC3E,oEAAgE;AAChE,kGAA4F;AAC5F,oFAA+E;AAC/E,0EAAsE;AACtE,4EAAiE;AACjE,4FAAgF;AAChF,0DAAsD;AACtD,wEAA6D;AAC7D,oFAAyE;AACzE,sFAA0E;AAC1E,oEAAyD;AACzD,oFAAwE;AACxE,wDAA8C;AAC9C,0FAAwE;AACxE,8DAAoD;AACpD,oFAA+E;AAC/E,gFAA2E;AAC3E,oEAAgE;AAChE,0EAAsE;AACtE,+EAA0E;AAC1E,+FAAyF;AACzF,6DAAyD;AACzD,2EAAsE;AACtE,uFAAkF;AAClF,mFAA8E;AAC9E,yFAAmF;AACnF,uEAAkE;AAClE,2DAAuD;AACvD,yFAAmF;AACnF,2EAAsE;AACtE,iEAA6D;AAC7D,wFAAmF;AACnF,sFAAiF;AACjF,0FAAoF;AACpF,gEAA2D;AAC3D,oEAA+D;AAC/D,kEAA8D;AAC9D,yDAAqD;AACrD,kEAA8D;AAC9D,sEAAkE;AAClE,gFAA2E;AAC3E,uEAAkE;AAClE,oEAAmE;AACnE,gFAA2E;AAC3E,uEAAkE;AAClE,gFAA2E;AAC3E,8FAAkF;AAClF,iGAA2F;AAC3F,wGAAmG;AACnG,wFAAmF;AACnF,sDAAsD;AACtD,sEAA2D;AAC3D,yEAAoE;AACpE,kFAA6E;AAC7E,kFAA6E;
|
|
1
|
+
{"version":3,"file":"workflow.module.js","sourceRoot":"","sources":["../../../src/module/workflow/workflow.module.ts"],"names":[],"mappings":"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"}
|