@servicelabsco/nestjs-utility-services 1.1.98 → 1.1.99
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/auth/controllers/admin.auth.controller.js +1 -0
- package/dist/auth/controllers/admin.auth.controller.js.map +1 -1
- package/dist/auth/dtos/index.d.ts +1 -0
- package/dist/auth/dtos/index.js +1 -0
- package/dist/auth/dtos/index.js.map +1 -1
- package/dist/auth/dtos/user.access.dto.d.ts +2 -5
- package/dist/auth/dtos/user.access.dto.js +2 -1
- package/dist/auth/dtos/user.access.dto.js.map +1 -1
- package/dist/auth/dtos/user.roles.access.object.d.ts +6 -0
- package/dist/auth/dtos/user.roles.access.object.dto.d.ts +6 -0
- package/dist/auth/dtos/user.roles.access.object.dto.js +7 -0
- package/dist/auth/dtos/user.roles.access.object.dto.js.map +1 -0
- package/dist/auth/dtos/user.roles.access.object.js +7 -0
- package/dist/auth/dtos/user.roles.access.object.js.map +1 -0
- package/dist/auth/es6.classes.d.ts +3 -3
- package/dist/auth/es6.classes.js +11 -1
- package/dist/auth/es6.classes.js.map +1 -1
- package/dist/auth/services/auth.service.d.ts +3 -1
- package/dist/auth/services/auth.service.js +11 -11
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/services/user.service.d.ts +6 -0
- package/dist/auth/services/user.service.js +25 -0
- package/dist/auth/services/user.service.js.map +1 -1
- package/dist/common/libraries/list.manager.d.ts +2 -2
- package/dist/common/libraries/list.manager.js +2 -2
- package/dist/common/libraries/list.manager.js.map +1 -1
- package/dist/common/libraries/record.manager.js +1 -1
- package/dist/common/libraries/record.manager.js.map +1 -1
- package/dist/common/libraries/report.list.manager.js +2 -2
- package/dist/common/libraries/report.list.manager.js.map +1 -1
- package/dist/config/read.typeorm.config.d.ts +3 -0
- package/dist/config/read.typeorm.config.js +30 -0
- package/dist/config/read.typeorm.config.js.map +1 -0
- package/dist/platformUtility/libraries/process.common.list.js +3 -3
- package/dist/platformUtility/libraries/process.common.list.js.map +1 -1
- package/dist/platformUtility/services/es6.jobs.service.js +4 -4
- package/dist/platformUtility/services/es6.jobs.service.js.map +1 -1
- package/dist/platformUtility/services/sql.service.d.ts +4 -1
- package/dist/platformUtility/services/sql.service.js +30 -5
- package/dist/platformUtility/services/sql.service.js.map +1 -1
- package/dist/system/commands/db.scanner.command.js +3 -3
- package/dist/system/commands/db.scanner.command.js.map +1 -1
- package/dist/system/jobs/report.column.sync.job.js +1 -1
- package/dist/system/jobs/report.column.sync.job.js.map +1 -1
- package/dist/system/services/document.service.js +1 -1
- package/dist/system/services/es6.jobs.service.js +17 -17
- package/dist/system/services/es6.jobs.service.js.map +1 -1
- package/dist/system/services/security.rule.service.js +1 -1
- package/dist/system/services/security.rule.service.js.map +1 -1
- package/package.json +1 -1
package/dist/app.module.js
CHANGED
|
@@ -22,6 +22,7 @@ const jwt_middleware_1 = require("./auth/middlewares/jwt.middleware");
|
|
|
22
22
|
const restricted_middleware_1 = require("./auth/middlewares/restricted.middleware");
|
|
23
23
|
const common_module_1 = require("./common/common.module");
|
|
24
24
|
const queueConfig = require("./config/queue.config");
|
|
25
|
+
const readOrmconfig = require("./config/read.typeorm.config");
|
|
25
26
|
const ormconfig = require("./config/typeorm.config");
|
|
26
27
|
const maintenance_middleware_1 = require("./platformUtility/middlewares/maintenance.middleware");
|
|
27
28
|
const platform_utility_module_1 = require("./platformUtility/platform.utility.module");
|
|
@@ -42,6 +43,7 @@ AppModule = __decorate([
|
|
|
42
43
|
(0, common_1.Module)({
|
|
43
44
|
imports: [
|
|
44
45
|
typeorm_1.TypeOrmModule.forRoot(ormconfig),
|
|
46
|
+
typeorm_1.TypeOrmModule.forRoot(readOrmconfig),
|
|
45
47
|
bull_1.BullModule.forRoot(queueConfig),
|
|
46
48
|
platform_utility_module_1.PlatformUtilityModule,
|
|
47
49
|
auth_module_1.AuthModule,
|
package/dist/app.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAA0C;AAC1C,2CAA2E;AAC3E,6CAAgD;AAChD,mDAA+C;AAC/C,mDAA+C;AAC/C,qDAAiD;AACjD,+CAA2C;AAC3C,oDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,gFAA4E;AAC5E,sEAAkE;AAClE,oFAAgF;AAChF,0DAAsD;AACtD,qDAAqD;AACrD,qDAAqD;AACrD,iGAA6F;AAC7F,uFAAkF;AAClF,gEAA4D;AAC5D,0EAAsE;AACtE,0DAAsD;AACtD,qDAAiD;
|
|
1
|
+
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAA0C;AAC1C,2CAA2E;AAC3E,6CAAgD;AAChD,mDAA+C;AAC/C,mDAA+C;AAC/C,qDAAiD;AACjD,+CAA2C;AAC3C,oDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,gFAA4E;AAC5E,sEAAkE;AAClE,oFAAgF;AAChF,0DAAsD;AACtD,qDAAqD;AACrD,8DAA8D;AAC9D,qDAAqD;AACrD,iGAA6F;AAC7F,uFAAkF;AAClF,gEAA4D;AAC5D,0EAAsE;AACtE,0DAAsD;AACtD,qDAAiD;AAkB1C,IAAM,SAAS,GAAf,MAAM,SAAS;IAGlB,SAAS,CAAC,QAA4B;QAClC,QAAQ,CAAC,KAAK,CAAC,8CAAqB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1F,QAAQ,CAAC,KAAK,CAAC,8BAAa,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,KAAK,CAAC,2CAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,QAAQ,CAAC,KAAK,CAAC,4CAAoB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7F,QAAQ,CAAC,KAAK,CAAC,wCAAkB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;IACpG,CAAC;CACJ,CAAA;AAVY,SAAS;IAhBrB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,OAAO,CAAC,SAAS,CAAC;YAChC,uBAAa,CAAC,OAAO,CAAC,aAAa,CAAC;YACpC,iBAAU,CAAC,OAAO,CAAC,WAAW,CAAC;YAC/B,+CAAqB;YACrB,wBAAU;YACV,4BAAY;YACZ,gCAAc;YACd,4BAAY;YACZ,8BAAa;YACb,8BAAa;SAChB;QACD,WAAW,EAAE,CAAC,8BAAa,EAAE,2CAAmB,EAAE,gCAAc,CAAC;QACjE,SAAS,EAAE,CAAC,wBAAU,EAAE,8BAAa,CAAC;KACzC,CAAC;GACW,SAAS,CAUrB;AAVY,8BAAS"}
|
|
@@ -44,6 +44,7 @@ let AdminAuthController = class AdminAuthController {
|
|
|
44
44
|
throw new access_exception_1.AccessException(`User credentials are not correct`);
|
|
45
45
|
if (this.authService.isUserBlocked(user))
|
|
46
46
|
throw new operation_exception_1.OperationException('This user is blocked from the platform');
|
|
47
|
+
await this.userService.setRolesCache(user.id);
|
|
47
48
|
const auth = { id: user.id };
|
|
48
49
|
return this.authService.getUserLoginInfo(auth, req);
|
|
49
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.auth.controller.js","sourceRoot":"","sources":["../../../src/auth/controllers/admin.auth.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"admin.auth.controller.js","sourceRoot":"","sources":["../../../src/auth/controllers/admin.auth.controller.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/dtos/index.js
CHANGED
|
@@ -21,4 +21,5 @@ __exportStar(require("./role.assignment.dto"), exports);
|
|
|
21
21
|
__exportStar(require("./update.user.dto"), exports);
|
|
22
22
|
__exportStar(require("./user.access.dto"), exports);
|
|
23
23
|
__exportStar(require("./user.login.dto"), exports);
|
|
24
|
+
__exportStar(require("./user.roles.access.object.dto"), exports);
|
|
24
25
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/dtos/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,qDAAmC;AACnC,8DAA4C;AAC5C,wDAAsC;AACtC,oDAAkC;AAClC,oDAAkC;AAClC,mDAAiC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/dtos/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,qDAAmC;AACnC,8DAA4C;AAC5C,wDAAsC;AACtC,oDAAkC;AAClC,oDAAkC;AAClC,mDAAiC;AACjC,iEAA+C"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import { UserRolesAccessObjectDto } from './user.roles.access.object.dto';
|
|
2
|
+
export declare class UserAccessDto extends UserRolesAccessObjectDto {
|
|
2
3
|
id?: number;
|
|
3
4
|
email?: string;
|
|
4
5
|
name?: string;
|
|
@@ -7,10 +8,6 @@ export declare class UserAccessDto {
|
|
|
7
8
|
email_validated_at?: Date;
|
|
8
9
|
mobile_validated_at?: Date;
|
|
9
10
|
attributes?: any;
|
|
10
|
-
roles?: number[];
|
|
11
|
-
role_identifiers?: string[];
|
|
12
|
-
permissions?: number[];
|
|
13
|
-
permission_identifiers?: string[];
|
|
14
11
|
auth_attributes?: Record<any, any>;
|
|
15
12
|
req?: any;
|
|
16
13
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UserAccessDto = void 0;
|
|
4
|
-
|
|
4
|
+
const user_roles_access_object_dto_1 = require("./user.roles.access.object.dto");
|
|
5
|
+
class UserAccessDto extends user_roles_access_object_dto_1.UserRolesAccessObjectDto {
|
|
5
6
|
}
|
|
6
7
|
exports.UserAccessDto = UserAccessDto;
|
|
7
8
|
//# sourceMappingURL=user.access.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.access.dto.js","sourceRoot":"","sources":["../../../src/auth/dtos/user.access.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,
|
|
1
|
+
{"version":3,"file":"user.access.dto.js","sourceRoot":"","sources":["../../../src/auth/dtos/user.access.dto.ts"],"names":[],"mappings":";;;AAAA,iFAA0E;AAE1E,MAAa,aAAc,SAAQ,uDAAwB;CAgB1D;AAhBD,sCAgBC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UserRolesAccessObjectDto = void 0;
|
|
4
|
+
class UserRolesAccessObjectDto {
|
|
5
|
+
}
|
|
6
|
+
exports.UserRolesAccessObjectDto = UserRolesAccessObjectDto;
|
|
7
|
+
//# sourceMappingURL=user.roles.access.object.dto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user.roles.access.object.dto.js","sourceRoot":"","sources":["../../../src/auth/dtos/user.roles.access.object.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,wBAAwB;CAMpC;AAND,4DAMC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UserRolesAccessObjectDto = void 0;
|
|
4
|
+
class UserRolesAccessObjectDto {
|
|
5
|
+
}
|
|
6
|
+
exports.UserRolesAccessObjectDto = UserRolesAccessObjectDto;
|
|
7
|
+
//# sourceMappingURL=user.roles.access.object.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user.roles.access.object.js","sourceRoot":"","sources":["../../../src/auth/dtos/user.roles.access.object.ts"],"names":[],"mappings":";;;AAAA,MAAa,wBAAwB;CAMpC;AAND,4DAMC"}
|
|
@@ -6,8 +6,8 @@ import { OfflineUserDto } from './dtos/offline.user.dto';
|
|
|
6
6
|
import { PermissionAssignmentDto } from './dtos/permission.assignment.dto';
|
|
7
7
|
import { RoleAssignmentDto } from './dtos/role.assignment.dto';
|
|
8
8
|
import { UpdateUserDto } from './dtos/update.user.dto';
|
|
9
|
-
import { UserAccessDto } from './dtos/user.access.dto';
|
|
10
9
|
import { UserLoginDto } from './dtos/user.login.dto';
|
|
10
|
+
import { UserRolesAccessObjectDto } from './dtos/user.roles.access.object.dto';
|
|
11
11
|
import { CountryEntity } from './entities/country.entity';
|
|
12
12
|
import { CreatorEntity } from './entities/creator.entity';
|
|
13
13
|
import { DeviceTokenEntity } from './entities/device.token.entity';
|
|
@@ -26,9 +26,9 @@ import { SocialService } from './services/social.service';
|
|
|
26
26
|
import { UserService } from './services/user.service';
|
|
27
27
|
declare const es6Classes: {
|
|
28
28
|
controllers: (typeof AdminAuthController | typeof SocialController | typeof UserController)[];
|
|
29
|
-
dtos: (typeof
|
|
29
|
+
dtos: (typeof UserRolesAccessObjectDto | typeof UserLoginDto | typeof CreateUserDto | typeof OfflineUserDto | typeof PermissionAssignmentDto | typeof RoleAssignmentDto | typeof UpdateUserDto)[];
|
|
30
30
|
entities: (typeof CreatorEntity | typeof CountryEntity | typeof UserReferralEntity | typeof DeviceTokenEntity | typeof RefreshTokenEntity)[];
|
|
31
31
|
middlewares: (typeof BasicAuthMiddleware | typeof InternalMiddleware | typeof JwtMiddleware | typeof RestrictedMiddleware)[];
|
|
32
|
-
services: (typeof RefreshTokenService | typeof
|
|
32
|
+
services: (typeof RefreshTokenService | typeof UserService | typeof AuthService | typeof DeviceTokenService | typeof SocialService | typeof AccessManager | typeof Es6Service)[];
|
|
33
33
|
};
|
|
34
34
|
export default es6Classes;
|
package/dist/auth/es6.classes.js
CHANGED
|
@@ -10,6 +10,7 @@ const role_assignment_dto_1 = require("./dtos/role.assignment.dto");
|
|
|
10
10
|
const update_user_dto_1 = require("./dtos/update.user.dto");
|
|
11
11
|
const user_access_dto_1 = require("./dtos/user.access.dto");
|
|
12
12
|
const user_login_dto_1 = require("./dtos/user.login.dto");
|
|
13
|
+
const user_roles_access_object_dto_1 = require("./dtos/user.roles.access.object.dto");
|
|
13
14
|
const country_entity_1 = require("./entities/country.entity");
|
|
14
15
|
const creator_entity_1 = require("./entities/creator.entity");
|
|
15
16
|
const device_token_entity_1 = require("./entities/device.token.entity");
|
|
@@ -29,7 +30,16 @@ const social_service_1 = require("./services/social.service");
|
|
|
29
30
|
const user_service_1 = require("./services/user.service");
|
|
30
31
|
const es6Classes = {
|
|
31
32
|
controllers: [admin_auth_controller_1.AdminAuthController, social_controller_1.SocialController, user_controller_1.UserController],
|
|
32
|
-
dtos: [
|
|
33
|
+
dtos: [
|
|
34
|
+
create_user_dto_1.CreateUserDto,
|
|
35
|
+
offline_user_dto_1.OfflineUserDto,
|
|
36
|
+
permission_assignment_dto_1.PermissionAssignmentDto,
|
|
37
|
+
role_assignment_dto_1.RoleAssignmentDto,
|
|
38
|
+
update_user_dto_1.UpdateUserDto,
|
|
39
|
+
user_access_dto_1.UserAccessDto,
|
|
40
|
+
user_login_dto_1.UserLoginDto,
|
|
41
|
+
user_roles_access_object_dto_1.UserRolesAccessObjectDto,
|
|
42
|
+
],
|
|
33
43
|
entities: [country_entity_1.CountryEntity, creator_entity_1.CreatorEntity, device_token_entity_1.DeviceTokenEntity, refresh_token_entity_1.RefreshTokenEntity, user_entity_1.UserEntity, user_referral_entity_1.UserReferralEntity],
|
|
34
44
|
middlewares: [basic_auth_middleware_1.BasicAuthMiddleware, internal_middleware_1.InternalMiddleware, jwt_middleware_1.JwtMiddleware, restricted_middleware_1.RestrictedMiddleware],
|
|
35
45
|
services: [access_manager_1.AccessManager, auth_service_1.AuthService, device_token_service_1.DeviceTokenService, es6_service_1.Es6Service, refresh_token_service_1.RefreshTokenService, social_service_1.SocialService, user_service_1.UserService],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":";;AAAA,+EAA0E;AAC1E,uEAAmE;AACnE,mEAA+D;AAC/D,4DAAuD;AACvD,8DAAyD;AACzD,gFAA2E;AAC3E,oEAA+D;AAC/D,4DAAuD;AACvD,4DAAuD;AACvD,0DAAqD;AACrD,8DAA0D;AAC1D,8DAA0D;AAC1D,wEAAmE;AACnE,0EAAqE;AACrE,wDAAoD;AACpD,0EAAqE;AACrE,+EAA0E;AAC1E,2EAAuE;AACvE,iEAA6D;AAC7D,+EAA2E;AAC3E,8DAA0D;AAC1D,0DAAsD;AACtD,0EAAqE;AACrE,wDAAoD;AACpD,4EAAuE;AACvE,8DAA0D;AAC1D,0DAAsD;AAEtD,MAAM,UAAU,GAAG;IACf,WAAW,EAAE,CAAC,2CAAmB,EAAE,oCAAgB,EAAE,gCAAc,CAAC;IACpE,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":";;AAAA,+EAA0E;AAC1E,uEAAmE;AACnE,mEAA+D;AAC/D,4DAAuD;AACvD,8DAAyD;AACzD,gFAA2E;AAC3E,oEAA+D;AAC/D,4DAAuD;AACvD,4DAAuD;AACvD,0DAAqD;AACrD,sFAA+E;AAC/E,8DAA0D;AAC1D,8DAA0D;AAC1D,wEAAmE;AACnE,0EAAqE;AACrE,wDAAoD;AACpD,0EAAqE;AACrE,+EAA0E;AAC1E,2EAAuE;AACvE,iEAA6D;AAC7D,+EAA2E;AAC3E,8DAA0D;AAC1D,0DAAsD;AACtD,0EAAqE;AACrE,wDAAoD;AACpD,4EAAuE;AACvE,8DAA0D;AAC1D,0DAAsD;AAEtD,MAAM,UAAU,GAAG;IACf,WAAW,EAAE,CAAC,2CAAmB,EAAE,oCAAgB,EAAE,gCAAc,CAAC;IACpE,IAAI,EAAE;QACF,+BAAa;QACb,iCAAc;QACd,mDAAuB;QACvB,uCAAiB;QACjB,+BAAa;QACb,+BAAa;QACb,6BAAY;QACZ,uDAAwB;KAC3B;IACD,QAAQ,EAAE,CAAC,8BAAa,EAAE,8BAAa,EAAE,uCAAiB,EAAE,yCAAkB,EAAE,wBAAU,EAAE,yCAAkB,CAAC;IAC/G,WAAW,EAAE,CAAC,2CAAmB,EAAE,wCAAkB,EAAE,8BAAa,EAAE,4CAAoB,CAAC;IAC3F,QAAQ,EAAE,CAAC,8BAAa,EAAE,0BAAW,EAAE,yCAAkB,EAAE,wBAAU,EAAE,2CAAmB,EAAE,8BAAa,EAAE,0BAAW,CAAC;CAC1H,CAAC;AAEF,kBAAe,UAAU,CAAC"}
|
|
@@ -2,10 +2,12 @@ import { JwtService } from '@nestjs/jwt';
|
|
|
2
2
|
import { UserAccessDto } from '../dtos/user.access.dto';
|
|
3
3
|
import { UserEntity } from '../entities/user.entity';
|
|
4
4
|
import { RefreshTokenService } from './refresh.token.service';
|
|
5
|
+
import { UserService } from './user.service';
|
|
5
6
|
export declare class AuthService {
|
|
6
7
|
private readonly jwtService;
|
|
7
8
|
private readonly refreshTokenService;
|
|
8
|
-
|
|
9
|
+
private readonly userService;
|
|
10
|
+
constructor(jwtService: JwtService, refreshTokenService: RefreshTokenService, userService: UserService);
|
|
9
11
|
getUserLoginInfo(auth: any, req: any): Promise<any>;
|
|
10
12
|
getUserInfo(auth: any): Promise<any>;
|
|
11
13
|
generateAuthJwtToken(auth: any): Promise<string>;
|
|
@@ -12,13 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.AuthService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const jwt_1 = require("@nestjs/jwt");
|
|
15
|
-
const class_mapper_1 = require("../../common/libraries/class.mapper");
|
|
16
15
|
const user_entity_1 = require("../entities/user.entity");
|
|
17
16
|
const refresh_token_service_1 = require("./refresh.token.service");
|
|
17
|
+
const user_service_1 = require("./user.service");
|
|
18
18
|
let AuthService = class AuthService {
|
|
19
|
-
constructor(jwtService, refreshTokenService) {
|
|
19
|
+
constructor(jwtService, refreshTokenService, userService) {
|
|
20
20
|
this.jwtService = jwtService;
|
|
21
21
|
this.refreshTokenService = refreshTokenService;
|
|
22
|
+
this.userService = userService;
|
|
22
23
|
}
|
|
23
24
|
async getUserLoginInfo(auth, req) {
|
|
24
25
|
const user = await this.getUserInfo(auth);
|
|
@@ -50,9 +51,7 @@ let AuthService = class AuthService {
|
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
53
|
async getUserObject(id) {
|
|
53
|
-
|
|
54
|
-
relations: ['roles', 'permissions'],
|
|
55
|
-
});
|
|
54
|
+
let user = await user_entity_1.UserEntity.first(id);
|
|
56
55
|
if (!user)
|
|
57
56
|
return null;
|
|
58
57
|
const record = { ...user };
|
|
@@ -60,11 +59,10 @@ let AuthService = class AuthService {
|
|
|
60
59
|
toDelete.forEach((key) => {
|
|
61
60
|
delete record[key];
|
|
62
61
|
});
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
return record;
|
|
62
|
+
if (!user.attributes?.has_admin_access)
|
|
63
|
+
return record;
|
|
64
|
+
const roles = await this.userService.getRolesObject(id);
|
|
65
|
+
return { ...record, ...roles };
|
|
68
66
|
}
|
|
69
67
|
isUserBlocked(user) {
|
|
70
68
|
return user?.attributes?.blocked;
|
|
@@ -72,7 +70,9 @@ let AuthService = class AuthService {
|
|
|
72
70
|
};
|
|
73
71
|
AuthService = __decorate([
|
|
74
72
|
(0, common_1.Injectable)(),
|
|
75
|
-
__metadata("design:paramtypes", [jwt_1.JwtService,
|
|
73
|
+
__metadata("design:paramtypes", [jwt_1.JwtService,
|
|
74
|
+
refresh_token_service_1.RefreshTokenService,
|
|
75
|
+
user_service_1.UserService])
|
|
76
76
|
], AuthService);
|
|
77
77
|
exports.AuthService = AuthService;
|
|
78
78
|
//# sourceMappingURL=auth.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAyC;
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAyC;AAEzC,yDAAqD;AACrD,mEAA8D;AAC9D,iDAA6C;AAOtC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAMpB,YACqB,UAAsB,EACtB,mBAAwC,EACxC,WAAwB;QAFxB,eAAU,GAAV,UAAU,CAAY;QACtB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,gBAAW,GAAX,WAAW,CAAa;IAC1C,CAAC;IAQJ,KAAK,CAAC,gBAAgB,CAAC,IAAS,EAAE,GAAQ;QACtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE1C,IAAI,gBAAgB,GAAW,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAGlE,IAAI,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,EAAE,CAAC,EAAE;YACvD,gBAAgB,GAAG,IAAI,CAAC;SAC3B;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAErF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC;QAEjC,OAAO,IAAI,CAAC;IAChB,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,IAAS;QACvB,MAAM,IAAI,GAAQ,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAE1D,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;IAChC,CAAC;IAQD,KAAK,CAAC,oBAAoB,CAAC,IAAI;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IASD,KAAK,CAAC,YAAY,CAAC,OAAY,EAAE,UAAe,EAAE;QAC9C,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,KAAK;QACtB,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC9C;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAQD,KAAK,CAAC,aAAa,CAAC,EAAU;QAC1B,IAAI,IAAI,GAAG,MAAM,wBAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,MAAM,MAAM,GAAQ,EAAE,GAAG,IAAI,EAAE,CAAC;QAGhC,MAAM,QAAQ,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;QACpG,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACrB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB;YAAE,OAAO,MAAM,CAAC;QAEtD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAExD,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;IACnC,CAAC;IAQM,aAAa,CAAC,IAAgB;QACjC,OAAO,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC;IACrC,CAAC;CACJ,CAAA;AArHY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAQwB,gBAAU;QACD,2CAAmB;QAC3B,0BAAW;GATpC,WAAW,CAqHvB;AArHY,kCAAW"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
import { CacheService } from '../../platformUtility/services/cache.service';
|
|
1
2
|
import { CreateUserDto } from '../dtos/create.user.dto';
|
|
2
3
|
import { OfflineUserDto } from '../dtos/offline.user.dto';
|
|
4
|
+
import { UserRolesAccessObjectDto } from '../dtos/user.roles.access.object.dto';
|
|
3
5
|
import { UserEntity } from '../entities/user.entity';
|
|
4
6
|
export declare class UserService {
|
|
7
|
+
private readonly cacheService;
|
|
8
|
+
constructor(cacheService: CacheService);
|
|
5
9
|
findUserByEmail(email: string): Promise<UserEntity>;
|
|
6
10
|
createUser(createUserDto: CreateUserDto): Promise<UserEntity>;
|
|
7
11
|
validateUser(email: any, password: any): Promise<UserEntity | false>;
|
|
8
12
|
findOrCreate(record: OfflineUserDto): Promise<UserEntity>;
|
|
13
|
+
setRolesCache(id: number): Promise<UserRolesAccessObjectDto>;
|
|
14
|
+
getRolesObject(id: number): Promise<UserRolesAccessObjectDto>;
|
|
9
15
|
}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UserService = void 0;
|
|
4
|
+
const date_fns_1 = require("date-fns");
|
|
5
|
+
const common_1 = require("../../common");
|
|
4
6
|
const hash_1 = require("../../common/libraries/hash");
|
|
5
7
|
const user_entity_1 = require("../entities/user.entity");
|
|
6
8
|
class UserService {
|
|
9
|
+
constructor(cacheService) {
|
|
10
|
+
this.cacheService = cacheService;
|
|
11
|
+
}
|
|
7
12
|
async findUserByEmail(email) {
|
|
8
13
|
return user_entity_1.UserEntity.findOne({ where: { email } });
|
|
9
14
|
}
|
|
@@ -39,6 +44,26 @@ class UserService {
|
|
|
39
44
|
await user.save();
|
|
40
45
|
return user;
|
|
41
46
|
}
|
|
47
|
+
async setRolesCache(id) {
|
|
48
|
+
const prefix = `user-${id}-roles-object`;
|
|
49
|
+
const user = await user_entity_1.UserEntity.first(id, {
|
|
50
|
+
relations: ['roles', 'permissions'],
|
|
51
|
+
});
|
|
52
|
+
const record = {};
|
|
53
|
+
record.roles = common_1.ClassMapper.extractNumber('id', user.roles);
|
|
54
|
+
record.role_identifiers = common_1.ClassMapper.extract('identifier', user.roles);
|
|
55
|
+
record.permissions = common_1.ClassMapper.extractNumber('id', user.permissions);
|
|
56
|
+
record.permission_identifiers = common_1.ClassMapper.extract('identifier', user.permissions);
|
|
57
|
+
await this.cacheService.set(prefix, record, (0, date_fns_1.addMinutes)(new Date(), 15));
|
|
58
|
+
return record;
|
|
59
|
+
}
|
|
60
|
+
async getRolesObject(id) {
|
|
61
|
+
const prefix = `user-${id}-roles-object`;
|
|
62
|
+
const roles = await this.cacheService.get(prefix);
|
|
63
|
+
if (!roles)
|
|
64
|
+
return this.setRolesCache(id);
|
|
65
|
+
return roles;
|
|
66
|
+
}
|
|
42
67
|
}
|
|
43
68
|
exports.UserService = UserService;
|
|
44
69
|
//# sourceMappingURL=user.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/auth/services/user.service.ts"],"names":[],"mappings":";;;AAAA,sDAAmD;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/auth/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { CacheService } from '../../platformUtility/services/cache.service';
|
|
2
|
+
import { SqlService } from '../../platformUtility/services/sql.service';
|
|
3
|
+
import { BusinessRuleService } from '../../system/services/business.rule.service';
|
|
2
4
|
import { ModelService } from '../../system/services/model.service';
|
|
3
5
|
import { PreferenceService } from '../../system/services/preference.service';
|
|
4
6
|
import { GenericIndexParamDto } from '../dtos/generic.index.param.dto';
|
|
5
7
|
import { DataManager } from './data.manager';
|
|
6
|
-
import { BusinessRuleService } from '../../system/services/business.rule.service';
|
|
7
|
-
import { SqlService } from '../../platformUtility/services/sql.service';
|
|
8
8
|
export declare class ListManager extends DataManager {
|
|
9
9
|
protected readonly modelService: ModelService;
|
|
10
10
|
private readonly sqlService;
|
|
@@ -82,7 +82,7 @@ class ListManager extends data_manager_1.DataManager {
|
|
|
82
82
|
let sql = `SELECT ${aggregation} FROM ${this.data.sql.tables} WHERE ${this.data.sql.joins}`;
|
|
83
83
|
if (this.params.query)
|
|
84
84
|
sql += ` and (${this.params.query})`;
|
|
85
|
-
return
|
|
85
|
+
return this.sqlService.readFirst(sql);
|
|
86
86
|
}
|
|
87
87
|
async loadListData() {
|
|
88
88
|
let sql = `SELECT ${this.data.sql.columns.name} FROM ${this.data.sql.tables} WHERE ${this.data.sql.joins}`;
|
|
@@ -93,7 +93,7 @@ class ListManager extends data_manager_1.DataManager {
|
|
|
93
93
|
else
|
|
94
94
|
sql += ` ORDER BY "${this.data.base}".updated_at DESC`;
|
|
95
95
|
sql += ` LIMIT ${this.params.limit} OFFSET ${this.params.offset}`;
|
|
96
|
-
this.data.data = await this.sqlService.
|
|
96
|
+
this.data.data = await this.sqlService.read(sql);
|
|
97
97
|
return this.data.data;
|
|
98
98
|
}
|
|
99
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.manager.js","sourceRoot":"","sources":["../../../src/common/libraries/list.manager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"list.manager.js","sourceRoot":"","sources":["../../../src/common/libraries/list.manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,7 +139,7 @@ class RecordManager extends data_manager_1.DataManager {
|
|
|
139
139
|
}
|
|
140
140
|
async loadResults(id) {
|
|
141
141
|
const sql = `SELECT ${this.data.sql.columns.name} FROM ${this.data.sql.tables} WHERE ${this.data.sql.joins} AND "${this.data.base}".id = ${id}`;
|
|
142
|
-
this.data.data =
|
|
142
|
+
this.data.data = await this.sqlService.readFirst(sql);
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
exports.RecordManager = RecordManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record.manager.js","sourceRoot":"","sources":["../../../src/common/libraries/record.manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"record.manager.js","sourceRoot":"","sources":["../../../src/common/libraries/record.manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,7 +88,7 @@ class ReportListManager extends report_data_manager_1.ReportDataManager {
|
|
|
88
88
|
else
|
|
89
89
|
sql += ` ORDER BY 1 ASC`;
|
|
90
90
|
sql += ` LIMIT ${this.params.limit} OFFSET ${this.params.offset}`;
|
|
91
|
-
this.data.data = await this.sqlService.
|
|
91
|
+
this.data.data = await this.sqlService.read(sql);
|
|
92
92
|
}
|
|
93
93
|
async getAggregationData() {
|
|
94
94
|
let aggregationColumn = null;
|
|
@@ -102,7 +102,7 @@ class ReportListManager extends report_data_manager_1.ReportDataManager {
|
|
|
102
102
|
let sql = `SELECT ${aggregationColumn} FROM ${this.data.sql.tables} WHERE ${this.data.sql.joins}`;
|
|
103
103
|
if (this.params.query)
|
|
104
104
|
sql += ` and (${this.params.query})`;
|
|
105
|
-
return
|
|
105
|
+
return this.sqlService.readFirst(sql);
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
exports.ReportListManager = ReportListManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.list.manager.js","sourceRoot":"","sources":["../../../src/common/libraries/report.list.manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"report.list.manager.js","sourceRoot":"","sources":["../../../src/common/libraries/report.list.manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
const config = require("config");
|
|
3
|
+
const pg = require("pg");
|
|
4
|
+
const typeorm_naming_strategies_1 = require("typeorm-naming-strategies");
|
|
5
|
+
const db = config.get('db');
|
|
6
|
+
const dbHost = db.read_host || db.host;
|
|
7
|
+
const envHost = process.env.DB_READ_HOST || process.env.DB_HOST;
|
|
8
|
+
pg.types.setTypeParser(20, (v) => {
|
|
9
|
+
return parseInt(v, 10);
|
|
10
|
+
});
|
|
11
|
+
pg.types.setTypeParser(1700, (v) => parseFloat(v));
|
|
12
|
+
const dbConfig = {
|
|
13
|
+
name: 'read',
|
|
14
|
+
type: process.env.DB_TYPE || db.type,
|
|
15
|
+
host: dbHost || envHost,
|
|
16
|
+
port: process.env.DB_PORT || db.port,
|
|
17
|
+
username: process.env.DB_USER || db.user,
|
|
18
|
+
password: process.env.DB_PASSWORD || db.password,
|
|
19
|
+
database: process.env.DB_DATABASE || db.database,
|
|
20
|
+
logging: process.env.DB_DATABASE || db.logging,
|
|
21
|
+
logger: 'file',
|
|
22
|
+
namingStrategy: new typeorm_naming_strategies_1.SnakeNamingStrategy(),
|
|
23
|
+
extra: {
|
|
24
|
+
charset: 'utf8_unicode_ci',
|
|
25
|
+
},
|
|
26
|
+
supportBigNumbers: true,
|
|
27
|
+
bigNumberStrings: false,
|
|
28
|
+
};
|
|
29
|
+
module.exports = dbConfig;
|
|
30
|
+
//# sourceMappingURL=read.typeorm.config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read.typeorm.config.js","sourceRoot":"","sources":["../../src/config/read.typeorm.config.ts"],"names":[],"mappings":";AACA,iCAAiC;AACjC,yBAAyB;AACzB,yEAAgE;AAEhE,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC5B,MAAM,MAAM,GAAG,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC;AACvC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;AAGhE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAM,EAAE,EAAE;IAClC,OAAO,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAGH,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAGxD,MAAM,QAAQ,GAAyB;IACnC,IAAI,EAAE,MAAM;IAEZ,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,IAAI;IACpC,IAAI,EAAE,MAAM,IAAI,OAAO;IACvB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,IAAI;IACpC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,IAAI;IACxC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,QAAQ;IAChD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,QAAQ;IAEhD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,OAAO;IAC9C,MAAM,EAAE,MAAM;IAGd,cAAc,EAAE,IAAI,+CAAmB,EAAE;IACzC,KAAK,EAAE;QACH,OAAO,EAAE,iBAAiB;KAC7B;IACD,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,KAAK;CAC1B,CAAC;AAEF,iBAAS,QAAQ,CAAC"}
|
|
@@ -25,7 +25,7 @@ class ProcessCommonList {
|
|
|
25
25
|
const metrics = this.config?.metrics || [];
|
|
26
26
|
metrics.push(`count(1) count`);
|
|
27
27
|
const sql = `select ${this.config.metrics.join(',')} from ${this.query}`;
|
|
28
|
-
const record = await this.sqlService.
|
|
28
|
+
const record = await this.sqlService.readFirst(sql);
|
|
29
29
|
this.response.stats.total = record.count;
|
|
30
30
|
this.response.metrics = {};
|
|
31
31
|
for (const [key, value] of Object.entries(record)) {
|
|
@@ -62,7 +62,7 @@ class ProcessCommonList {
|
|
|
62
62
|
const sql = `select sq.* from ${this.query} order by ${order} limit ${limit} offset ${offset}`;
|
|
63
63
|
this.response.stats.limit = limit;
|
|
64
64
|
this.response.stats.page = page;
|
|
65
|
-
this.response.records = await this.sqlService.
|
|
65
|
+
this.response.records = await this.sqlService.read(sql);
|
|
66
66
|
}
|
|
67
67
|
async aggregate() {
|
|
68
68
|
const aggregate = this.filter.aggregate;
|
|
@@ -72,7 +72,7 @@ class ProcessCommonList {
|
|
|
72
72
|
throw new common_1.OperationException(`Given aggregate function ${key} is not supported`);
|
|
73
73
|
const value = Object.values(aggregate)[0];
|
|
74
74
|
const sql = `select ${key}(sq.${value}) aggregate from ${this.query}`;
|
|
75
|
-
const response = await this.sqlService.
|
|
75
|
+
const response = await this.sqlService.readFirst(sql);
|
|
76
76
|
return { aggregate: response.aggregate };
|
|
77
77
|
}
|
|
78
78
|
processDate(date, column) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.common.list.js","sourceRoot":"","sources":["../../../src/platformUtility/libraries/process.common.list.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAKlD,+DAA0D;AAO1D,MAAa,iBAAiB;IAA9B;QAiBc,iBAAY,GAAa,EAAE,CAAC;QAgB5B,aAAQ,GAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IA2JlF,CAAC;IAjJa,MAAM;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;QAEnD,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,cAAc;QAExB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAG7B,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC/B,CAAC;IAOO,KAAK,CAAC,eAAe;QAEzB,IAAI,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG;YAAE,OAAO;QAChE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;QAE3C,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAE/B,MAAM,GAAG,GAAG,UAAU,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"process.common.list.js","sourceRoot":"","sources":["../../../src/platformUtility/libraries/process.common.list.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAKlD,+DAA0D;AAO1D,MAAa,iBAAiB;IAA9B;QAiBc,iBAAY,GAAa,EAAE,CAAC;QAgB5B,aAAQ,GAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IA2JlF,CAAC;IAjJa,MAAM;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;QAEnD,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,cAAc;QAExB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAG7B,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC/B,CAAC;IAOO,KAAK,CAAC,eAAe;QAEzB,IAAI,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG;YAAE,OAAO;QAChE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;QAE3C,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAE/B,MAAM,GAAG,GAAG,UAAU,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEpD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACzC,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,EAAE,CAAC;QAE3B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC/C,IAAI,GAAG,KAAK,OAAO;gBAAE,SAAS;YAE9B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACtC;IACL,CAAC;IAQO,oBAAoB;QACxB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM;YAAE,OAAO;QAEtC,MAAM,MAAM,GAAa,EAAE,CAAC;QAG5B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACtC,MAAM,CAAC,IAAI,CAAC,MAAM,WAAW,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAQO,QAAQ;QACZ,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9C,IAAI,GAAG,GAAG,UAAU,OAAO,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAEtD,IAAI,YAAY;YAAE,GAAG,GAAG,GAAG,GAAG,QAAQ,YAAY,GAAG,CAAC;QAEtD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY;YAAE,OAAO,IAAI,GAAG,cAAc,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAErF,OAAO,IAAI,GAAG,MAAM,CAAC;IACzB,CAAC;IAOO,KAAK,CAAC,UAAU;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE3B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAElC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,oBAAoB,CAAC;QAGxD,MAAM,GAAG,GAAG,oBAAoB,IAAI,CAAC,KAAK,aAAa,KAAK,UAAU,KAAK,WAAW,MAAM,EAAE,CAAC;QAG/F,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAEhC,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5D,CAAC;IAQO,KAAK,CAAC,SAAS;QACnB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QACxC,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAW,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,2BAAkB,CAAC,4BAA4B,GAAG,mBAAmB,CAAC,CAAC;QAE9H,MAAM,KAAK,GAAW,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,MAAM,GAAG,GAAG,UAAU,GAAG,OAAO,KAAK,oBAAoB,IAAI,CAAC,KAAK,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAEtD,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC7C,CAAC;IAUS,WAAW,CAAC,IAAmB,EAAE,MAAc;QACrD,MAAM,KAAK,GAAG,IAAI,uCAAiB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,aAAa,KAAK,CAAC,GAAG,UAAU,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;IAClF,CAAC;IAEO,KAAK,CAAC,YAAY;QACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvD,CAAC;CACJ;AA5LD,8CA4LC"}
|
|
@@ -28,10 +28,10 @@ let Es6JobsService = class Es6JobsService {
|
|
|
28
28
|
}
|
|
29
29
|
alignJobs() {
|
|
30
30
|
this.jobs = {
|
|
31
|
-
|
|
32
|
-
'
|
|
33
|
-
'
|
|
34
|
-
|
|
31
|
+
f04947e1c8234dd7e98e3629147266f8: this.loadFailedBullJob,
|
|
32
|
+
'2d5219897af8f7809c63c7ad538795f2': this.recordWatcherJob,
|
|
33
|
+
'2585362654581cff4f70fffe0249af26': this.reloadPendingBullJob,
|
|
34
|
+
ba4c3857dfa9feac842416d9c39d0edd: this.testJob,
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
setJobs() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.jobs.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/es6.jobs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uEAAiE;AACjE,mEAA8D;AAC9D,6EAAuE;AACvE,+CAA2C;AAC3C,8EAA0E;AAQnE,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,YACqB,iBAAoC,EACpC,gBAAkC,EAClC,oBAA0C,EAC1C,OAAgB;QAHhB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,YAAO,GAAP,OAAO,CAAS;QAN7B,SAAI,GAAG,EAAE,CAAC;QAQd,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAMD,SAAS;QACL,IAAI,CAAC,IAAI,GAAG;YACR,
|
|
1
|
+
{"version":3,"file":"es6.jobs.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/es6.jobs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uEAAiE;AACjE,mEAA8D;AAC9D,6EAAuE;AACvE,+CAA2C;AAC3C,8EAA0E;AAQnE,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,YACqB,iBAAoC,EACpC,gBAAkC,EAClC,oBAA0C,EAC1C,OAAgB;QAHhB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,YAAO,GAAP,OAAO,CAAS;QAN7B,SAAI,GAAG,EAAE,CAAC;QAQd,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAMD,SAAS;QACL,IAAI,CAAC,IAAI,GAAG;YACR,gCAAgC,EAAE,IAAI,CAAC,iBAAiB;YACxD,kCAAkC,EAAE,IAAI,CAAC,gBAAgB;YACzD,kCAAkC,EAAE,IAAI,CAAC,oBAAoB;YAC7D,gCAAgC,EAAE,IAAI,CAAC,OAAO;SACjD,CAAC;IACN,CAAC;IAMD,OAAO;QACH,kCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ,CAAA;AAjCY,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAK+B,wCAAiB;QAClB,qCAAgB;QACZ,8CAAoB;QACjC,kBAAO;GAP5B,cAAc,CAiC1B;AAjCY,wCAAc"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { DataSource } from 'typeorm';
|
|
2
2
|
export declare class SqlService {
|
|
3
3
|
private readonly connection;
|
|
4
|
-
|
|
4
|
+
private readonly readReplica;
|
|
5
|
+
constructor(connection: DataSource, readReplica: DataSource);
|
|
5
6
|
sql(query: string): Promise<any>;
|
|
7
|
+
read(query: string): Promise<any>;
|
|
8
|
+
readFirst(query: string): Promise<any>;
|
|
6
9
|
first(query: string): Promise<any>;
|
|
7
10
|
getConnection(): DataSource;
|
|
8
11
|
save(baseClass: any, dto: any): Promise<any>;
|
|
@@ -8,15 +8,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.SqlService = void 0;
|
|
13
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const typeorm_1 = require("@nestjs/typeorm");
|
|
14
18
|
const class_transformer_1 = require("class-transformer");
|
|
15
|
-
const
|
|
16
|
-
const
|
|
19
|
+
const typeorm_2 = require("typeorm");
|
|
20
|
+
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
17
21
|
let SqlService = class SqlService {
|
|
18
|
-
constructor(connection) {
|
|
22
|
+
constructor(connection, readReplica) {
|
|
19
23
|
this.connection = connection;
|
|
24
|
+
this.readReplica = readReplica;
|
|
20
25
|
}
|
|
21
26
|
async sql(query) {
|
|
22
27
|
let result;
|
|
@@ -26,10 +31,27 @@ let SqlService = class SqlService {
|
|
|
26
31
|
catch (error) {
|
|
27
32
|
global.console.error('sql-query-error : ', query);
|
|
28
33
|
global.console.log('error', error);
|
|
29
|
-
throw new
|
|
34
|
+
throw new operation_exception_1.OperationException(`issue with internal query`);
|
|
35
|
+
}
|
|
36
|
+
return result;
|
|
37
|
+
}
|
|
38
|
+
async read(query) {
|
|
39
|
+
global.console.log('this.readReplica', this.readReplica);
|
|
40
|
+
let result;
|
|
41
|
+
try {
|
|
42
|
+
result = await this.readReplica.query(query);
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
global.console.error('sql-query-error : ', query);
|
|
46
|
+
global.console.log('error', error);
|
|
47
|
+
throw new operation_exception_1.OperationException(`issue with internal query`);
|
|
30
48
|
}
|
|
31
49
|
return result;
|
|
32
50
|
}
|
|
51
|
+
async readFirst(query) {
|
|
52
|
+
const record = await this.read(query);
|
|
53
|
+
return Array.isArray(record) ? record[0] : null;
|
|
54
|
+
}
|
|
33
55
|
async first(query) {
|
|
34
56
|
const record = await this.sql(query);
|
|
35
57
|
return Array.isArray(record) ? record[0] : null;
|
|
@@ -57,7 +79,10 @@ let SqlService = class SqlService {
|
|
|
57
79
|
};
|
|
58
80
|
SqlService = __decorate([
|
|
59
81
|
(0, common_1.Injectable)(),
|
|
60
|
-
|
|
82
|
+
__param(0, (0, typeorm_1.InjectDataSource)('default')),
|
|
83
|
+
__param(1, (0, typeorm_1.InjectDataSource)('read')),
|
|
84
|
+
__metadata("design:paramtypes", [typeorm_2.DataSource,
|
|
85
|
+
typeorm_2.DataSource])
|
|
61
86
|
], SqlService);
|
|
62
87
|
exports.SqlService = SqlService;
|
|
63
88
|
//# sourceMappingURL=sql.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/sql.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/sql.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ let DbScannerCommand = class DbScannerCommand {
|
|
|
39
39
|
}
|
|
40
40
|
async setAllTables() {
|
|
41
41
|
const sql = `SELECT * FROM pg_catalog.pg_tables WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'`;
|
|
42
|
-
const tables = await this.sqlService.
|
|
42
|
+
const tables = await this.sqlService.read(sql);
|
|
43
43
|
const promises = [];
|
|
44
44
|
tables.forEach((table) => {
|
|
45
45
|
promises.push(this.setModel(table));
|
|
@@ -79,7 +79,7 @@ let DbScannerCommand = class DbScannerCommand {
|
|
|
79
79
|
this.logger.log(`processing db table ${model.table_name}`);
|
|
80
80
|
const sql = `SELECT a.table_catalog, a.table_schema, a.table_name, a."column_name", a.ordinal_position, a.is_nullable, a.data_type, a.udt_name
|
|
81
81
|
FROM INFORMATION_SCHEMA.COLUMNS a WHERE table_name = '${model.table_name}'`;
|
|
82
|
-
const columns = await this.sqlService.
|
|
82
|
+
const columns = await this.sqlService.read(sql);
|
|
83
83
|
const promises = [];
|
|
84
84
|
columns.forEach((column) => {
|
|
85
85
|
promises.push(this.setColumn(model, column));
|
|
@@ -119,7 +119,7 @@ let DbScannerCommand = class DbScannerCommand {
|
|
|
119
119
|
ccu.table_name AS foreign_table_name, ccu.column_name AS foreign_column_name
|
|
120
120
|
FROM information_schema.table_constraints AS tc JOIN information_schema.key_column_usage AS kcu ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema JOIN information_schema.constraint_column_usage AS ccu ON ccu.constraint_name = tc.constraint_name AND ccu.table_schema = tc.table_schema
|
|
121
121
|
WHERE tc.constraint_type = 'FOREIGN KEY' and tc."table_name" = '${model.table_name}'`;
|
|
122
|
-
const keys = await this.sqlService.
|
|
122
|
+
const keys = await this.sqlService.read(sql);
|
|
123
123
|
for (const key of keys) {
|
|
124
124
|
await this.setRelationship(model, key);
|
|
125
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.scanner.command.js","sourceRoot":"","sources":["../../../src/system/commands/db.scanner.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoD;AACpD,yDAA0D;AAC1D,mDAAyC;AACzC,qCAAiC;AACjC,yCAAoC;AACpC,gFAA4E;AAC5E,gFAA4E;AAC5E,8EAA0E;AAC1E,qFAAgF;AAChF,+DAA2D;AAC3D,6DAAyD;AACzD,2EAAuE;AACvE,uDAAwD;AAUjD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAqBzB,YAA6B,YAA0B,EAAmB,UAAsB;QAAnE,iBAAY,GAAZ,YAAY,CAAc;QAAmB,eAAU,GAAV,UAAU,CAAY;QAdxF,WAAM,GAAW,IAAI,eAAM,CAAC,WAAW,CAAC,CAAC;QAOzC,4BAAuB,GAAG,EAAE,CAAC;IAO8D,CAAC;IAU9F,AAAN,KAAK,CAAC,OAAO;QACT,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAGhC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAGjC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAG1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAGzC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAIvC,CAAC;IASD,KAAK,CAAC,YAAY;QAEd,MAAM,GAAG,GAAG,4GAA4G,CAAC;QACzH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"db.scanner.command.js","sourceRoot":"","sources":["../../../src/system/commands/db.scanner.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ let ReportColumnSyncJob = class ReportColumnSyncJob extends common_job_1.CommonJ
|
|
|
74
74
|
}
|
|
75
75
|
query += ` LIMIT 1`;
|
|
76
76
|
try {
|
|
77
|
-
return await this.sqlService.
|
|
77
|
+
return await this.sqlService.read(query);
|
|
78
78
|
}
|
|
79
79
|
catch (error) {
|
|
80
80
|
global.console.log(`error`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"report.column.sync.job.js","sourceRoot":"","sources":["../../../src/system/jobs/report.column.sync.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ let DocumentService = class DocumentService {
|
|
|
16
16
|
return document_entity_1.DocumentEntity.find({
|
|
17
17
|
where: { ...query, document_url: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) },
|
|
18
18
|
relations: ['creator'],
|
|
19
|
-
take: query.limit | 100
|
|
19
|
+
take: query.limit | 100,
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
async setDocument(source, file) {
|
|
@@ -54,23 +54,23 @@ let Es6JobsService = class Es6JobsService {
|
|
|
54
54
|
}
|
|
55
55
|
alignJobs() {
|
|
56
56
|
this.jobs = {
|
|
57
|
-
'
|
|
58
|
-
'
|
|
59
|
-
|
|
60
|
-
'
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
'
|
|
71
|
-
|
|
72
|
-
'
|
|
73
|
-
|
|
57
|
+
'6ca64f0c0b9d1a082aa5e0182020ba5b': this.cleanScheduledEventJob,
|
|
58
|
+
'7f6866a3bd3e6ab3f493425ed2f5cf2a': this.columnMapperJob,
|
|
59
|
+
b573ba7362b8f4b0da4483dfaaa73b25: this.commentJob,
|
|
60
|
+
'64c1bbde8bd1bc6355f8fa2d86a171f1': this.documentJob,
|
|
61
|
+
'469fd6148687123ec4ef17ed0ad5ef87': this.mailValidationJob,
|
|
62
|
+
fc454d05d19747fdbb8510bbc00f67dd: this.mobileValidationJob,
|
|
63
|
+
'895d52ea29c17047f690ead67db80c9c': this.modelScannerJob,
|
|
64
|
+
'5b02b9f5e3aad0a0dbc8982119ced400': this.propertyJob,
|
|
65
|
+
b7d57d912c9514786071e4e4e804db13: this.refreshPropertyCacheJob,
|
|
66
|
+
'64724c02cc076f23566976dc765eb6b6': this.relationshipMapperJob,
|
|
67
|
+
'7676ffc477bc85ccfd8418b70f2377c9': this.reportColumnSyncJob,
|
|
68
|
+
bb97644f2c505dc135d01f4c6959ec1f: this.scheduledEventJob,
|
|
69
|
+
f7e56116aafe46838edc515a02774294: this.scheduledEventsJob,
|
|
70
|
+
'568a28e3b79c7a722c9ec0d0b55515c6': this.smsMessageJob,
|
|
71
|
+
bf1fee009fc168b17af954099311394e: this.userGroupMemberJob,
|
|
72
|
+
'8a125595f1811f55136f9317a929eb60': this.userGroupPermissionJob,
|
|
73
|
+
'12b346ca5184797168e1d1c0267b58a5': this.userGroupRoleJob,
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
76
|
setJobs() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.jobs.service.js","sourceRoot":"","sources":["../../../src/system/services/es6.jobs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,iFAA2E;AAC3E,iEAA4D;AAC5D,qDAAiD;AACjD,uDAAmD;AACnD,qEAAgE;AAChE,yEAAoE;AACpE,iEAA4D;AAC5D,uDAAmD;AACnD,mFAA6E;AAC7E,6EAAwE;AACxE,2EAAqE;AACrE,qEAAgE;AAChE,uEAAkE;AAClE,6DAAwD;AACxD,yEAAmE;AACnE,iFAA2E;AAC3E,qEAA+D;AAC/D,8EAA0E;AAQnE,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,YACqB,sBAA8C,EAC9C,eAAgC,EAChC,UAAsB,EACtB,WAAwB,EACxB,iBAAoC,EACpC,mBAAwC,EACxC,eAAgC,EAChC,WAAwB,EACxB,uBAAgD,EAChD,qBAA4C,EAC5C,mBAAwC,EACxC,iBAAoC,EACpC,kBAAsC,EACtC,aAA4B,EAC5B,kBAAsC,EACtC,sBAA8C,EAC9C,gBAAkC;QAhBlC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,gBAAW,GAAX,WAAW,CAAa;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAChC,gBAAW,GAAX,WAAW,CAAa;QACxB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,kBAAa,GAAb,aAAa,CAAe;QAC5B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,qBAAgB,GAAhB,gBAAgB,CAAkB;QAnB/C,SAAI,GAAG,EAAE,CAAC;QAqBd,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAMD,SAAS;QACL,IAAI,CAAC,IAAI,GAAG;YACR,kCAAkC,EAAE,IAAI,CAAC,sBAAsB;YAC/D,kCAAkC,EAAE,IAAI,CAAC,eAAe;YACxD,gCAAgC,EAAE,IAAI,CAAC,UAAU;YACjD,kCAAkC,EAAE,IAAI,CAAC,WAAW;YACpD,
|
|
1
|
+
{"version":3,"file":"es6.jobs.service.js","sourceRoot":"","sources":["../../../src/system/services/es6.jobs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,iFAA2E;AAC3E,iEAA4D;AAC5D,qDAAiD;AACjD,uDAAmD;AACnD,qEAAgE;AAChE,yEAAoE;AACpE,iEAA4D;AAC5D,uDAAmD;AACnD,mFAA6E;AAC7E,6EAAwE;AACxE,2EAAqE;AACrE,qEAAgE;AAChE,uEAAkE;AAClE,6DAAwD;AACxD,yEAAmE;AACnE,iFAA2E;AAC3E,qEAA+D;AAC/D,8EAA0E;AAQnE,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,YACqB,sBAA8C,EAC9C,eAAgC,EAChC,UAAsB,EACtB,WAAwB,EACxB,iBAAoC,EACpC,mBAAwC,EACxC,eAAgC,EAChC,WAAwB,EACxB,uBAAgD,EAChD,qBAA4C,EAC5C,mBAAwC,EACxC,iBAAoC,EACpC,kBAAsC,EACtC,aAA4B,EAC5B,kBAAsC,EACtC,sBAA8C,EAC9C,gBAAkC;QAhBlC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,gBAAW,GAAX,WAAW,CAAa;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAChC,gBAAW,GAAX,WAAW,CAAa;QACxB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,kBAAa,GAAb,aAAa,CAAe;QAC5B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,qBAAgB,GAAhB,gBAAgB,CAAkB;QAnB/C,SAAI,GAAG,EAAE,CAAC;QAqBd,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAMD,SAAS;QACL,IAAI,CAAC,IAAI,GAAG;YACR,kCAAkC,EAAE,IAAI,CAAC,sBAAsB;YAC/D,kCAAkC,EAAE,IAAI,CAAC,eAAe;YACxD,gCAAgC,EAAE,IAAI,CAAC,UAAU;YACjD,kCAAkC,EAAE,IAAI,CAAC,WAAW;YACpD,kCAAkC,EAAE,IAAI,CAAC,iBAAiB;YAC1D,gCAAgC,EAAE,IAAI,CAAC,mBAAmB;YAC1D,kCAAkC,EAAE,IAAI,CAAC,eAAe;YACxD,kCAAkC,EAAE,IAAI,CAAC,WAAW;YACpD,gCAAgC,EAAE,IAAI,CAAC,uBAAuB;YAC9D,kCAAkC,EAAE,IAAI,CAAC,qBAAqB;YAC9D,kCAAkC,EAAE,IAAI,CAAC,mBAAmB;YAC5D,gCAAgC,EAAE,IAAI,CAAC,iBAAiB;YACxD,gCAAgC,EAAE,IAAI,CAAC,kBAAkB;YACzD,kCAAkC,EAAE,IAAI,CAAC,aAAa;YACtD,gCAAgC,EAAE,IAAI,CAAC,kBAAkB;YACzD,kCAAkC,EAAE,IAAI,CAAC,sBAAsB;YAC/D,kCAAkC,EAAE,IAAI,CAAC,gBAAgB;SAC5D,CAAC;IACN,CAAC;IAMD,OAAO;QACH,kCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ,CAAA;AA3DY,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAKoC,kDAAsB;QAC7B,mCAAe;QACpB,wBAAU;QACT,0BAAW;QACL,uCAAiB;QACf,2CAAmB;QACvB,mCAAe;QACnB,0BAAW;QACC,oDAAuB;QACzB,+CAAqB;QACvB,4CAAmB;QACrB,uCAAiB;QAChB,yCAAkB;QACvB,+BAAa;QACR,0CAAkB;QACd,kDAAsB;QAC5B,sCAAgB;GApB9C,cAAc,CA2D1B;AA3DY,wCAAc"}
|
|
@@ -68,7 +68,7 @@ let SecurityRuleService = class SecurityRuleService {
|
|
|
68
68
|
OR a.name = CONCAT('${identifier}', '.', b.name))
|
|
69
69
|
AND a.deleted_at IS NULL
|
|
70
70
|
AND b.deleted_at IS NULL`;
|
|
71
|
-
const records = await this.sqlService.
|
|
71
|
+
const records = await this.sqlService.read(sql);
|
|
72
72
|
for (const record of records) {
|
|
73
73
|
const base = this.getSecurityObjectNotation(identifier, record.name);
|
|
74
74
|
if (!rules[base])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.rule.service.js","sourceRoot":"","sources":["../../../src/system/services/security.rule.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uDAAwD;AACxD,4EAAwE;AAGxE,2EAAsE;AAG/D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IACvD,KAAK,CAAC,qBAAqB,CAAC,KAAkB,EAAE,SAAiB;QAC7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAgB;QACvC,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,yBAAyB,CAAC,UAAkB,EAAE,IAAY;QACtD,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,GAAG,UAAU,IAAI;YAAE,OAAO,UAAU,CAAC;QAEzE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACtB,MAAM,MAAM,GAAG,MAAM,yCAAkB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAU,EAAE,UAAkB,EAAE,SAAiB,EAAE,UAAkB;QACxF,MAAM,KAAK,GAAG,EAAE,CAAC;QAEjB,MAAM,GAAG,GAAG;;;;;;;;;;6BAUS,SAAS;oBAClB,UAAU;2BACH,UAAU;;;;;;;;;;;;sBAYf,EAAE;6BACK,UAAU;;+BAER,SAAS;;6BAEX,UAAU;;+BAER,CAAC;QAExB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"security.rule.service.js","sourceRoot":"","sources":["../../../src/system/services/security.rule.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uDAAwD;AACxD,4EAAwE;AAGxE,2EAAsE;AAG/D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IACvD,KAAK,CAAC,qBAAqB,CAAC,KAAkB,EAAE,SAAiB;QAC7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAgB;QACvC,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,yBAAyB,CAAC,UAAkB,EAAE,IAAY;QACtD,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,GAAG,UAAU,IAAI;YAAE,OAAO,UAAU,CAAC;QAEzE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACtB,MAAM,MAAM,GAAG,MAAM,yCAAkB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAU,EAAE,UAAkB,EAAE,SAAiB,EAAE,UAAkB;QACxF,MAAM,KAAK,GAAG,EAAE,CAAC;QAEjB,MAAM,GAAG,GAAG;;;;;;;;;;6BAUS,SAAS;oBAClB,UAAU;2BACH,UAAU;;;;;;;;;;;;sBAYf,EAAE;6BACK,UAAU;;+BAER,SAAS;;6BAEX,UAAU;;+BAER,CAAC;QAExB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAErE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAEnC,IAAI,MAAM,CAAC,SAAS;gBAAE,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE7E,IAAI,MAAM,CAAC,mBAAmB;gBAAE,MAAM,CAAC,mBAAmB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAE9G,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC5B;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAzEY,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAEgC,wBAAU;GAD1C,mBAAmB,CAyE/B;AAzEY,kDAAmB"}
|
package/package.json
CHANGED