@servicelabsco/slabs-access-manager 1.0.59 → 1.0.61
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/access/controllers/bulk.upload.controller.d.ts +4 -3
- package/dist/access/controllers/bulk.upload.controller.js +9 -8
- package/dist/access/controllers/bulk.upload.controller.js.map +1 -1
- package/dist/access/controllers/bulk.upload.item.controller.d.ts +20 -3
- package/dist/access/controllers/bulk.upload.item.controller.js +17 -6
- package/dist/access/controllers/bulk.upload.item.controller.js.map +1 -1
- package/dist/access/controllers/business.app.integration.controller.js +1 -1
- package/dist/access/controllers/business.app.integration.controller.js.map +1 -1
- package/dist/access/controllers/business.email.controller.js +1 -1
- package/dist/access/controllers/business.email.controller.js.map +1 -1
- package/dist/access/controllers/business.report.controller.js +1 -1
- package/dist/access/controllers/business.report.controller.js.map +1 -1
- package/dist/access/controllers/business.user.notification.preference.controller.js +1 -1
- package/dist/access/controllers/business.user.notification.preference.controller.js.map +1 -1
- package/dist/access/controllers/dashboard.component.controller.js +2 -2
- package/dist/access/controllers/dashboard.component.controller.js.map +1 -1
- package/dist/access/controllers/dashboard.report.controller.d.ts +6 -2
- package/dist/access/controllers/dashboard.report.controller.js +24 -9
- package/dist/access/controllers/dashboard.report.controller.js.map +1 -1
- package/dist/access/controllers/event.trigger.controller.js +1 -1
- package/dist/access/controllers/event.trigger.controller.js.map +1 -1
- package/dist/access/controllers/group.member.controller.js +1 -1
- package/dist/access/controllers/group.member.controller.js.map +1 -1
- package/dist/access/es6.classes.d.ts +1 -1
- package/dist/access/jobs/business.user.group.job.js +1 -1
- package/dist/access/jobs/business.user.group.job.js.map +1 -1
- package/dist/access/jobs/child.menu.job.d.ts +1 -1
- package/dist/access/jobs/child.menu.job.js +1 -1
- package/dist/access/jobs/child.menu.job.js.map +1 -1
- package/dist/access/jobs/custom.report.job.d.ts +1 -1
- package/dist/access/jobs/custom.report.job.js +1 -1
- package/dist/access/jobs/custom.report.job.js.map +1 -1
- package/dist/access/jobs/dashboard.component.job.d.ts +1 -1
- package/dist/access/jobs/dashboard.component.job.js +1 -1
- package/dist/access/jobs/dashboard.component.job.js.map +1 -1
- package/dist/access/jobs/dashboard.job.d.ts +1 -1
- package/dist/access/jobs/dashboard.job.js +1 -1
- package/dist/access/jobs/dashboard.job.js.map +1 -1
- package/dist/access/jobs/generate.business.report.job.js +1 -1
- package/dist/access/jobs/generate.business.report.job.js.map +1 -1
- package/dist/access/jobs/list.preference.job.d.ts +1 -1
- package/dist/access/jobs/list.preference.job.js +1 -1
- package/dist/access/jobs/list.preference.job.js.map +1 -1
- package/dist/access/jobs/menu.action.job.d.ts +1 -1
- package/dist/access/jobs/menu.action.job.js +1 -1
- package/dist/access/jobs/menu.action.job.js.map +1 -1
- package/dist/access/jobs/menu.job.d.ts +1 -1
- package/dist/access/jobs/menu.job.js +1 -1
- package/dist/access/jobs/menu.job.js.map +1 -1
- package/dist/access/jobs/menu.role.job.d.ts +1 -1
- package/dist/access/jobs/menu.role.job.js +1 -1
- package/dist/access/jobs/menu.role.job.js.map +1 -1
- package/dist/access/jobs/module.job.d.ts +1 -1
- package/dist/access/jobs/module.job.js +1 -1
- package/dist/access/jobs/module.job.js.map +1 -1
- package/dist/access/jobs/module.menu.job.d.ts +1 -1
- package/dist/access/jobs/module.menu.job.js +1 -1
- package/dist/access/jobs/module.menu.job.js.map +1 -1
- package/dist/access/jobs/overriding.script.job.js +0 -1
- package/dist/access/jobs/overriding.script.job.js.map +1 -1
- package/dist/access/jobs/process.server.email.job.js +1 -1
- package/dist/access/jobs/process.server.email.job.js.map +1 -1
- package/dist/access/jobs/product.job.d.ts +1 -1
- package/dist/access/jobs/product.job.js +1 -1
- package/dist/access/jobs/product.job.js.map +1 -1
- package/dist/access/jobs/role.group.job.d.ts +1 -1
- package/dist/access/jobs/role.group.job.js +1 -1
- package/dist/access/jobs/role.group.job.js.map +1 -1
- package/dist/access/jobs/ui.action.job.d.ts +1 -1
- package/dist/access/jobs/ui.action.job.js +1 -1
- package/dist/access/jobs/ui.action.job.js.map +1 -1
- package/dist/access/jobs/ui.action.role.job.d.ts +1 -1
- package/dist/access/jobs/ui.action.role.job.js +1 -1
- package/dist/access/jobs/ui.action.role.job.js.map +1 -1
- package/dist/access/libraries/date.fn.js +1 -1
- package/dist/access/libraries/date.fn.js.map +1 -1
- package/dist/access/libraries/process.email.notification.js +2 -0
- package/dist/access/libraries/process.email.notification.js.map +1 -1
- package/dist/access/libraries/process.listing.csv.file.js +1 -1
- package/dist/access/libraries/process.listing.csv.file.js.map +1 -1
- package/dist/access/libraries/process.notification.js +3 -0
- package/dist/access/libraries/process.notification.js.map +1 -1
- package/dist/access/libraries/process.scheduled.report.item.list.js +1 -1
- package/dist/access/libraries/process.scheduled.report.item.list.js.map +1 -1
- package/dist/access/libraries/validate.custom.field.data.js +1 -1
- package/dist/access/libraries/validate.custom.field.data.js.map +1 -1
- package/dist/access/middlewares/business.middleware.js.map +1 -1
- package/dist/access/services/business.email.service.d.ts +1 -1
- package/dist/access/services/business.email.service.js +1 -1
- package/dist/access/services/business.email.service.js.map +1 -1
- package/dist/access/services/overriding.script.service.js +1 -1
- package/dist/access/services/overriding.script.service.js.map +1 -1
- package/dist/access/services/webhook.service.js +1 -1
- package/dist/access/services/webhook.service.js.map +1 -1
- package/dist/access/subscribers/business.app.integration.credential.subscriber.js.map +1 -1
- package/dist/access/subscribers/business.currency.subscriber.js.map +1 -1
- package/dist/access/subscribers/currency.rate.subscriber.js.map +1 -1
- package/dist/access/subscribers/execution.log.subscriber.js.map +1 -1
- package/dist/access/subscribers/fcm.message.subscriber.js.map +1 -1
- package/dist/access/subscribers/fcm.template.subscriber.js.map +1 -1
- package/dist/access/subscribers/fcm.token.subscriber.js.map +1 -1
- package/dist/access/subscribers/overriding.script.subscriber.js.map +1 -1
- package/dist/access/subscribers/request.log.subscriber.js.map +1 -1
- package/dist/access/subscribers/webhook.event.subscriber.js.map +1 -1
- package/dist/accessUtility/access.utility.module.js +20 -2
- package/dist/accessUtility/access.utility.module.js.map +1 -1
- package/dist/accessUtility/commands/bulk.upload.items.migrate.command.d.ts +6 -0
- package/dist/accessUtility/commands/bulk.upload.items.migrate.command.js +53 -0
- package/dist/accessUtility/commands/bulk.upload.items.migrate.command.js.map +1 -0
- package/dist/accessUtility/commands/index.d.ts +1 -0
- package/dist/accessUtility/commands/index.js +18 -0
- package/dist/accessUtility/commands/index.js.map +1 -0
- package/dist/accessUtility/config/bulk.upload.item.storage.config.d.ts +2 -0
- package/dist/accessUtility/config/bulk.upload.item.storage.config.js +11 -0
- package/dist/accessUtility/config/bulk.upload.item.storage.config.js.map +1 -0
- package/dist/accessUtility/config/index.d.ts +1 -0
- package/dist/accessUtility/config/index.js +18 -0
- package/dist/accessUtility/config/index.js.map +1 -0
- package/dist/accessUtility/controllers/business.policy.controller.js +1 -1
- package/dist/accessUtility/controllers/business.policy.controller.js.map +1 -1
- package/dist/accessUtility/es6.classes.d.ts +8 -2
- package/dist/accessUtility/es6.classes.js +10 -0
- package/dist/accessUtility/es6.classes.js.map +1 -1
- package/dist/accessUtility/index.d.ts +4 -0
- package/dist/accessUtility/index.js +4 -0
- package/dist/accessUtility/index.js.map +1 -1
- package/dist/accessUtility/jobs/analyse.bulk.upload.job.d.ts +3 -1
- package/dist/accessUtility/jobs/analyse.bulk.upload.job.js +6 -3
- package/dist/accessUtility/jobs/analyse.bulk.upload.job.js.map +1 -1
- package/dist/accessUtility/jobs/bulk.upload.column.match.job.d.ts +3 -1
- package/dist/accessUtility/jobs/bulk.upload.column.match.job.js +6 -7
- package/dist/accessUtility/jobs/bulk.upload.column.match.job.js.map +1 -1
- package/dist/accessUtility/jobs/bulk.upload.stats.job.d.ts +3 -1
- package/dist/accessUtility/jobs/bulk.upload.stats.job.js +16 -9
- package/dist/accessUtility/jobs/bulk.upload.stats.job.js.map +1 -1
- package/dist/accessUtility/jobs/push.to.bulk.item.job.d.ts +8 -8
- package/dist/accessUtility/jobs/push.to.bulk.item.job.js +11 -21
- package/dist/accessUtility/jobs/push.to.bulk.item.job.js.map +1 -1
- package/dist/accessUtility/jobs/sanitize.bulk.upload.job.d.ts +3 -1
- package/dist/accessUtility/jobs/sanitize.bulk.upload.job.js +6 -4
- package/dist/accessUtility/jobs/sanitize.bulk.upload.job.js.map +1 -1
- package/dist/accessUtility/libraries/analyse.bulk.upload.d.ts +3 -1
- package/dist/accessUtility/libraries/analyse.bulk.upload.js +3 -3
- package/dist/accessUtility/libraries/analyse.bulk.upload.js.map +1 -1
- package/dist/accessUtility/libraries/load.xls.file.js +4 -4
- package/dist/accessUtility/libraries/load.xls.file.js.map +1 -1
- package/dist/accessUtility/libraries/read.xls.file.js +1 -1
- package/dist/accessUtility/libraries/read.xls.file.js.map +1 -1
- package/dist/accessUtility/libraries/set.bulk.upload.log.file.d.ts +3 -1
- package/dist/accessUtility/libraries/set.bulk.upload.log.file.js +3 -3
- package/dist/accessUtility/libraries/set.bulk.upload.log.file.js.map +1 -1
- package/dist/accessUtility/mentities/bulk.upload.item.mentity.d.ts +13 -0
- package/dist/accessUtility/mentities/bulk.upload.item.mentity.js +61 -0
- package/dist/accessUtility/mentities/bulk.upload.item.mentity.js.map +1 -0
- package/dist/accessUtility/mentities/index.d.ts +1 -0
- package/dist/accessUtility/mentities/index.js +18 -0
- package/dist/accessUtility/mentities/index.js.map +1 -0
- package/dist/accessUtility/services/bulk.upload.item.id.allocator.service.d.ts +9 -0
- package/dist/accessUtility/services/bulk.upload.item.id.allocator.service.js +68 -0
- package/dist/accessUtility/services/bulk.upload.item.id.allocator.service.js.map +1 -0
- package/dist/accessUtility/services/bulk.upload.item.lifecycle.service.d.ts +9 -0
- package/dist/accessUtility/services/bulk.upload.item.lifecycle.service.js +43 -0
- package/dist/accessUtility/services/bulk.upload.item.lifecycle.service.js.map +1 -0
- package/dist/accessUtility/services/bulk.upload.item.migration.service.d.ts +15 -0
- package/dist/accessUtility/services/bulk.upload.item.migration.service.js +66 -0
- package/dist/accessUtility/services/bulk.upload.item.migration.service.js.map +1 -0
- package/dist/accessUtility/services/bulk.upload.item.mongo.store.d.ts +36 -0
- package/dist/accessUtility/services/bulk.upload.item.mongo.store.js +280 -0
- package/dist/accessUtility/services/bulk.upload.item.mongo.store.js.map +1 -0
- package/dist/accessUtility/services/bulk.upload.item.postgres.store.d.ts +31 -0
- package/dist/accessUtility/services/bulk.upload.item.postgres.store.js +178 -0
- package/dist/accessUtility/services/bulk.upload.item.postgres.store.js.map +1 -0
- package/dist/accessUtility/services/bulk.upload.item.store.d.ts +19 -0
- package/dist/accessUtility/services/bulk.upload.item.store.js +7 -0
- package/dist/accessUtility/services/bulk.upload.item.store.js.map +1 -0
- package/dist/accessUtility/services/index.d.ts +6 -0
- package/dist/accessUtility/services/index.js +6 -0
- package/dist/accessUtility/services/index.js.map +1 -1
- package/dist/accessUtility/services/pdf.service.js.map +1 -1
- package/dist/accessUtility/subscribers/bulk.upload.item.mongo.subscriber.d.ts +12 -0
- package/dist/accessUtility/subscribers/bulk.upload.item.mongo.subscriber.js +55 -0
- package/dist/accessUtility/subscribers/bulk.upload.item.mongo.subscriber.js.map +1 -0
- package/dist/accessUtility/subscribers/currency.subscriber.js.map +1 -1
- package/dist/accessUtility/subscribers/gst.state.subscriber.js.map +1 -1
- package/dist/accessUtility/subscribers/index.d.ts +1 -0
- package/dist/accessUtility/subscribers/index.js +1 -0
- package/dist/accessUtility/subscribers/index.js.map +1 -1
- package/dist/accessUtility/types/bulk.upload.item.record.d.ts +34 -0
- package/dist/accessUtility/types/bulk.upload.item.record.js +3 -0
- package/dist/accessUtility/types/bulk.upload.item.record.js.map +1 -0
- package/dist/accessUtility/types/index.d.ts +1 -0
- package/dist/accessUtility/types/index.js +18 -0
- package/dist/accessUtility/types/index.js.map +1 -0
- package/dist/accessWorkflow/access.workflow.module.js.map +1 -1
- package/dist/accessWorkflow/jobs/sync.workflow.activity.job.js +1 -1
- package/dist/accessWorkflow/jobs/sync.workflow.activity.job.js.map +1 -1
- package/dist/app.controller.js.map +1 -1
- package/dist/console.js +1 -1
- package/dist/console.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,14 +14,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./commands"), exports);
|
|
18
|
+
__exportStar(require("./config"), exports);
|
|
17
19
|
__exportStar(require("./controllers"), exports);
|
|
18
20
|
__exportStar(require("./dtos"), exports);
|
|
19
21
|
__exportStar(require("./entities"), exports);
|
|
20
22
|
__exportStar(require("./enums"), exports);
|
|
21
23
|
__exportStar(require("./jobs"), exports);
|
|
22
24
|
__exportStar(require("./libraries"), exports);
|
|
25
|
+
__exportStar(require("./mentities"), exports);
|
|
23
26
|
__exportStar(require("./services"), exports);
|
|
24
27
|
__exportStar(require("./subscribers"), exports);
|
|
28
|
+
__exportStar(require("./types"), exports);
|
|
25
29
|
__exportStar(require("./access.utility.module"), exports);
|
|
26
30
|
__exportStar(require("./accessUtility.module"), exports);
|
|
27
31
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accessUtility/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAAA,yCAAuB;AAAA,6CAA2B;AAAA,0CAAwB;AAAA,yCAAuB;AAAA,8CAA4B;AAAA,6CAA2B;AAAA,gDAA8B;AAAA,0DAAwC;AAAA,yDAAsC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/accessUtility/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAAA,2CAAyB;AAAA,gDAA8B;AAAA,yCAAuB;AAAA,6CAA2B;AAAA,0CAAwB;AAAA,yCAAuB;AAAA,8CAA4B;AAAA,8CAA4B;AAAA,6CAA2B;AAAA,gDAA8B;AAAA,0CAAwB;AAAA,0DAAwC;AAAA,yDAAsC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { CommonJob, PropertyService, QueueService, RedisService, SqlService, UploadService } from '@servicelabsco/nestjs-utility-services';
|
|
2
2
|
import { BulkUploadService } from '../services/bulk.upload.service';
|
|
3
|
+
import { BulkUploadItemStore } from '../services/bulk.upload.item.store';
|
|
3
4
|
import { PushToBulkItemJob } from './push.to.bulk.item.job';
|
|
4
5
|
export declare class AnalyseBulkUploadJob extends CommonJob {
|
|
5
6
|
protected readonly queueService: QueueService;
|
|
@@ -9,8 +10,9 @@ export declare class AnalyseBulkUploadJob extends CommonJob {
|
|
|
9
10
|
protected readonly propertyService: PropertyService;
|
|
10
11
|
protected readonly sqlService: SqlService;
|
|
11
12
|
protected readonly redisService: RedisService;
|
|
13
|
+
protected readonly bulkUploadItemStore: BulkUploadItemStore;
|
|
12
14
|
protected priority: number;
|
|
13
15
|
protected timeout: number;
|
|
14
|
-
constructor(queueService: QueueService, uploadService: UploadService, bulkUploadService: BulkUploadService, pushToBulkItemJob: PushToBulkItemJob, propertyService: PropertyService, sqlService: SqlService, redisService: RedisService);
|
|
16
|
+
constructor(queueService: QueueService, uploadService: UploadService, bulkUploadService: BulkUploadService, pushToBulkItemJob: PushToBulkItemJob, propertyService: PropertyService, sqlService: SqlService, redisService: RedisService, bulkUploadItemStore: BulkUploadItemStore);
|
|
15
17
|
handle(id: number): Promise<any>;
|
|
16
18
|
}
|
|
@@ -15,9 +15,10 @@ const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-service
|
|
|
15
15
|
const bulk_upload_entity_1 = require("../entities/bulk.upload.entity");
|
|
16
16
|
const analyse_bulk_upload_1 = require("../libraries/analyse.bulk.upload");
|
|
17
17
|
const bulk_upload_service_1 = require("../services/bulk.upload.service");
|
|
18
|
+
const bulk_upload_item_store_1 = require("../services/bulk.upload.item.store");
|
|
18
19
|
const push_to_bulk_item_job_1 = require("./push.to.bulk.item.job");
|
|
19
20
|
let AnalyseBulkUploadJob = class AnalyseBulkUploadJob extends nestjs_utility_services_1.CommonJob {
|
|
20
|
-
constructor(queueService, uploadService, bulkUploadService, pushToBulkItemJob, propertyService, sqlService, redisService) {
|
|
21
|
+
constructor(queueService, uploadService, bulkUploadService, pushToBulkItemJob, propertyService, sqlService, redisService, bulkUploadItemStore) {
|
|
21
22
|
super('db42efda49d0b6258645a0419b9f46ae');
|
|
22
23
|
this.queueService = queueService;
|
|
23
24
|
this.uploadService = uploadService;
|
|
@@ -26,6 +27,7 @@ let AnalyseBulkUploadJob = class AnalyseBulkUploadJob extends nestjs_utility_ser
|
|
|
26
27
|
this.propertyService = propertyService;
|
|
27
28
|
this.sqlService = sqlService;
|
|
28
29
|
this.redisService = redisService;
|
|
30
|
+
this.bulkUploadItemStore = bulkUploadItemStore;
|
|
29
31
|
this.priority = 10;
|
|
30
32
|
this.timeout = 1000 * 60 * 60 * 24;
|
|
31
33
|
}
|
|
@@ -37,7 +39,7 @@ let AnalyseBulkUploadJob = class AnalyseBulkUploadJob extends nestjs_utility_ser
|
|
|
37
39
|
return null;
|
|
38
40
|
if (record.total_rows > 0)
|
|
39
41
|
return null;
|
|
40
|
-
return await new analyse_bulk_upload_1.AnalyseBulkUpload(this.uploadService, this.bulkUploadService, this.pushToBulkItemJob, this.propertyService, this.sqlService, this.redisService).process(id);
|
|
42
|
+
return await new analyse_bulk_upload_1.AnalyseBulkUpload(this.uploadService, this.bulkUploadService, this.pushToBulkItemJob, this.propertyService, this.sqlService, this.redisService, this.bulkUploadItemStore).process(id);
|
|
41
43
|
}
|
|
42
44
|
};
|
|
43
45
|
exports.AnalyseBulkUploadJob = AnalyseBulkUploadJob;
|
|
@@ -49,6 +51,7 @@ exports.AnalyseBulkUploadJob = AnalyseBulkUploadJob = __decorate([
|
|
|
49
51
|
push_to_bulk_item_job_1.PushToBulkItemJob,
|
|
50
52
|
nestjs_utility_services_1.PropertyService,
|
|
51
53
|
nestjs_utility_services_1.SqlService,
|
|
52
|
-
nestjs_utility_services_1.RedisService
|
|
54
|
+
nestjs_utility_services_1.RedisService,
|
|
55
|
+
bulk_upload_item_store_1.BulkUploadItemStore])
|
|
53
56
|
], AnalyseBulkUploadJob);
|
|
54
57
|
//# sourceMappingURL=analyse.bulk.upload.job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyse.bulk.upload.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/analyse.bulk.upload.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAA2I;AAC3I,uEAAkE;AAClE,0EAAqE;AACrE,yEAAoE;AACpE,mEAA4D;AAOrD,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mCAAS;IAI/C,YACuB,YAA0B,EAC1B,aAA4B,EAC9B,iBAAoC,EAClC,iBAAoC,EACpC,eAAgC,EAChC,UAAsB,EACtB,YAA0B;
|
|
1
|
+
{"version":3,"file":"analyse.bulk.upload.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/analyse.bulk.upload.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAA2I;AAC3I,uEAAkE;AAClE,0EAAqE;AACrE,yEAAoE;AACpE,+EAAyE;AACzE,mEAA4D;AAOrD,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,mCAAS;IAI/C,YACuB,YAA0B,EAC1B,aAA4B,EAC9B,iBAAoC,EAClC,iBAAoC,EACpC,eAAgC,EAChC,UAAsB,EACtB,YAA0B,EAC1B,mBAAwC;QAE3D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QATvB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,wBAAmB,GAAnB,mBAAmB,CAAqB;QAXrD,aAAQ,GAAG,EAAE,CAAC;QACd,YAAO,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAaxC,CAAC;IAeD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,MAAM,GAAG,MAAM,qCAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,IAAI,MAAM,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC;QACpC,IAAI,MAAM,CAAC,UAAU,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QAEvC,OAAO,MAAM,IAAI,uCAAiB,CAC9B,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,mBAAmB,CAC3B,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;CACJ,CAAA;AA9CY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAM4B,sCAAY;QACX,uCAAa;QACX,uCAAiB;QACf,yCAAiB;QACnB,yCAAe;QACpB,oCAAU;QACR,sCAAY;QACL,4CAAmB;GAZtD,oBAAoB,CA8ChC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { CommonJob, QueueService } from '@servicelabsco/nestjs-utility-services';
|
|
2
2
|
import { BulkUploadColumnMatchScoreDto } from '../dtos/bulk.upload.column.match.score.dto';
|
|
3
3
|
import { BulkUploadService } from '../services/bulk.upload.service';
|
|
4
|
+
import { BulkUploadItemStore } from '../services/bulk.upload.item.store';
|
|
4
5
|
export declare class BulkUploadColumnMatchJob extends CommonJob {
|
|
5
6
|
protected readonly queueService: QueueService;
|
|
6
7
|
private readonly bulkUploadService;
|
|
8
|
+
private readonly bulkUploadItemStore;
|
|
7
9
|
protected noDuplicate: boolean;
|
|
8
|
-
constructor(queueService: QueueService, bulkUploadService: BulkUploadService);
|
|
10
|
+
constructor(queueService: QueueService, bulkUploadService: BulkUploadService, bulkUploadItemStore: BulkUploadItemStore);
|
|
9
11
|
handle(id: number): Promise<BulkUploadColumnMatchScoreDto | null>;
|
|
10
12
|
private getFileColumns;
|
|
11
13
|
private scoreType;
|
|
@@ -13,14 +13,15 @@ exports.BulkUploadColumnMatchJob = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
|
|
15
15
|
const bulk_upload_entity_1 = require("../entities/bulk.upload.entity");
|
|
16
|
-
const bulk_upload_item_entity_1 = require("../entities/bulk.upload.item.entity");
|
|
17
16
|
const bulk_upload_service_1 = require("../services/bulk.upload.service");
|
|
17
|
+
const bulk_upload_item_store_1 = require("../services/bulk.upload.item.store");
|
|
18
18
|
const DATA_META_KEYS = new Set(['ignore_data']);
|
|
19
19
|
let BulkUploadColumnMatchJob = class BulkUploadColumnMatchJob extends nestjs_utility_services_1.CommonJob {
|
|
20
|
-
constructor(queueService, bulkUploadService) {
|
|
20
|
+
constructor(queueService, bulkUploadService, bulkUploadItemStore) {
|
|
21
21
|
super('2e5c6aa2968dee2e6b308f8c08cdde37');
|
|
22
22
|
this.queueService = queueService;
|
|
23
23
|
this.bulkUploadService = bulkUploadService;
|
|
24
|
+
this.bulkUploadItemStore = bulkUploadItemStore;
|
|
24
25
|
this.noDuplicate = true;
|
|
25
26
|
}
|
|
26
27
|
async handle(id) {
|
|
@@ -45,10 +46,7 @@ let BulkUploadColumnMatchJob = class BulkUploadColumnMatchJob extends nestjs_uti
|
|
|
45
46
|
return columnMatchScore;
|
|
46
47
|
}
|
|
47
48
|
async getFileColumns(bulkUploadId, type) {
|
|
48
|
-
const item = await
|
|
49
|
-
where: { bulk_upload_id: bulkUploadId, type_id: type.id },
|
|
50
|
-
order: { row_num: 'ASC' },
|
|
51
|
-
});
|
|
49
|
+
const item = await this.bulkUploadItemStore.findOne({ bulk_upload_id: bulkUploadId, type_id: type.id }, { row_num: 'ASC' });
|
|
52
50
|
if (!item?.data || typeof item.data !== 'object')
|
|
53
51
|
return [];
|
|
54
52
|
return Object.keys(item.data).filter((key) => !DATA_META_KEYS.has(key));
|
|
@@ -68,6 +66,7 @@ exports.BulkUploadColumnMatchJob = BulkUploadColumnMatchJob;
|
|
|
68
66
|
exports.BulkUploadColumnMatchJob = BulkUploadColumnMatchJob = __decorate([
|
|
69
67
|
(0, common_1.Injectable)(),
|
|
70
68
|
__metadata("design:paramtypes", [nestjs_utility_services_1.QueueService,
|
|
71
|
-
bulk_upload_service_1.BulkUploadService
|
|
69
|
+
bulk_upload_service_1.BulkUploadService,
|
|
70
|
+
bulk_upload_item_store_1.BulkUploadItemStore])
|
|
72
71
|
], BulkUploadColumnMatchJob);
|
|
73
72
|
//# sourceMappingURL=bulk.upload.column.match.job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk.upload.column.match.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/bulk.upload.column.match.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAAiF;AAEjF,uEAAkE;
|
|
1
|
+
{"version":3,"file":"bulk.upload.column.match.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/bulk.upload.column.match.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { CommonJob, QueueService, SqlService } from '@servicelabsco/nestjs-utility-services';
|
|
2
2
|
import { BulkUploadService } from '../services/bulk.upload.service';
|
|
3
|
+
import { BulkUploadItemStore } from '../services/bulk.upload.item.store';
|
|
3
4
|
import { AnalyseBulkUploadJob } from './analyse.bulk.upload.job';
|
|
4
5
|
export declare class BulkUploadStatsJob extends CommonJob {
|
|
5
6
|
protected readonly queueService: QueueService;
|
|
6
7
|
private readonly sqlService;
|
|
7
8
|
private readonly bulkUploadService;
|
|
8
9
|
private readonly analyseBulkUploadJob;
|
|
10
|
+
private readonly bulkUploadItemStore;
|
|
9
11
|
protected noDuplicate: boolean;
|
|
10
12
|
protected priority: number;
|
|
11
|
-
constructor(queueService: QueueService, sqlService: SqlService, bulkUploadService: BulkUploadService, analyseBulkUploadJob: AnalyseBulkUploadJob);
|
|
13
|
+
constructor(queueService: QueueService, sqlService: SqlService, bulkUploadService: BulkUploadService, analyseBulkUploadJob: AnalyseBulkUploadJob, bulkUploadItemStore: BulkUploadItemStore);
|
|
12
14
|
handle(id?: number): Promise<void>;
|
|
13
15
|
private handleId;
|
|
14
16
|
private handleAll;
|
|
@@ -15,16 +15,17 @@ const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-service
|
|
|
15
15
|
const date_fns_1 = require("date-fns");
|
|
16
16
|
const typeorm_1 = require("typeorm");
|
|
17
17
|
const bulk_upload_entity_1 = require("../entities/bulk.upload.entity");
|
|
18
|
-
const bulk_upload_item_entity_1 = require("../entities/bulk.upload.item.entity");
|
|
19
18
|
const bulk_upload_service_1 = require("../services/bulk.upload.service");
|
|
19
|
+
const bulk_upload_item_store_1 = require("../services/bulk.upload.item.store");
|
|
20
20
|
const analyse_bulk_upload_job_1 = require("./analyse.bulk.upload.job");
|
|
21
21
|
let BulkUploadStatsJob = class BulkUploadStatsJob extends nestjs_utility_services_1.CommonJob {
|
|
22
|
-
constructor(queueService, sqlService, bulkUploadService, analyseBulkUploadJob) {
|
|
22
|
+
constructor(queueService, sqlService, bulkUploadService, analyseBulkUploadJob, bulkUploadItemStore) {
|
|
23
23
|
super('7c7894dce6e63f8dfdc96762052ebf78');
|
|
24
24
|
this.queueService = queueService;
|
|
25
25
|
this.sqlService = sqlService;
|
|
26
26
|
this.bulkUploadService = bulkUploadService;
|
|
27
27
|
this.analyseBulkUploadJob = analyseBulkUploadJob;
|
|
28
|
+
this.bulkUploadItemStore = bulkUploadItemStore;
|
|
28
29
|
this.noDuplicate = true;
|
|
29
30
|
this.priority = 5;
|
|
30
31
|
}
|
|
@@ -72,7 +73,6 @@ let BulkUploadStatsJob = class BulkUploadStatsJob extends nestjs_utility_service
|
|
|
72
73
|
const error = {};
|
|
73
74
|
let analysisTotal = 0;
|
|
74
75
|
let processedTotal = 0;
|
|
75
|
-
let errorTotal = 0;
|
|
76
76
|
for (const type of types) {
|
|
77
77
|
const analysisCount = await this.getAnalysisTypeCount(entity, type);
|
|
78
78
|
analysis[type.name.toLocaleLowerCase()] = analysisCount;
|
|
@@ -82,7 +82,6 @@ let BulkUploadStatsJob = class BulkUploadStatsJob extends nestjs_utility_service
|
|
|
82
82
|
processedTotal += processedCount;
|
|
83
83
|
const errorCount = await this.getErrorTypeCount(entity, type);
|
|
84
84
|
error[type.name.toLocaleLowerCase()] = errorCount;
|
|
85
|
-
errorTotal += errorCount;
|
|
86
85
|
}
|
|
87
86
|
entity.stats = { ...entity.stats, analysis, processed, error };
|
|
88
87
|
entity.analysed_rows = analysisTotal;
|
|
@@ -90,14 +89,21 @@ let BulkUploadStatsJob = class BulkUploadStatsJob extends nestjs_utility_service
|
|
|
90
89
|
await entity.save();
|
|
91
90
|
}
|
|
92
91
|
async getAnalysisTypeCount(entity, type) {
|
|
93
|
-
return
|
|
92
|
+
return this.bulkUploadItemStore.count({ bulk_upload_id: entity.id, type_id: type.id });
|
|
94
93
|
}
|
|
95
94
|
async getProcessedTypeCount(entity, type) {
|
|
96
|
-
return
|
|
95
|
+
return this.bulkUploadItemStore.count({
|
|
96
|
+
bulk_upload_id: entity.id,
|
|
97
|
+
type_id: type.id,
|
|
98
|
+
processed_at: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
|
|
99
|
+
});
|
|
97
100
|
}
|
|
98
101
|
async getErrorTypeCount(entity, type) {
|
|
99
|
-
return
|
|
100
|
-
|
|
102
|
+
return this.bulkUploadItemStore.count({
|
|
103
|
+
bulk_upload_id: entity.id,
|
|
104
|
+
type_id: type.id,
|
|
105
|
+
processed_at: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
|
|
106
|
+
error: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
|
|
101
107
|
});
|
|
102
108
|
}
|
|
103
109
|
};
|
|
@@ -107,6 +113,7 @@ exports.BulkUploadStatsJob = BulkUploadStatsJob = __decorate([
|
|
|
107
113
|
__metadata("design:paramtypes", [nestjs_utility_services_1.QueueService,
|
|
108
114
|
nestjs_utility_services_1.SqlService,
|
|
109
115
|
bulk_upload_service_1.BulkUploadService,
|
|
110
|
-
analyse_bulk_upload_job_1.AnalyseBulkUploadJob
|
|
116
|
+
analyse_bulk_upload_job_1.AnalyseBulkUploadJob,
|
|
117
|
+
bulk_upload_item_store_1.BulkUploadItemStore])
|
|
111
118
|
], BulkUploadStatsJob);
|
|
112
119
|
//# sourceMappingURL=bulk.upload.stats.job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk.upload.stats.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/bulk.upload.stats.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAA6F;AAC7F,uCAAmC;AACnC,qCAAgD;AAChD,uEAAkE;
|
|
1
|
+
{"version":3,"file":"bulk.upload.stats.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/bulk.upload.stats.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { CommonJob, QueueService } from '@servicelabsco/nestjs-utility-services';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { BulkUploadItemStore } from '../services/bulk.upload.item.store';
|
|
3
|
+
import { BulkUploadItemRecord } from '../types/bulk.upload.item.record';
|
|
4
4
|
interface BulkUploadItemData {
|
|
5
5
|
bulk_upload_id: number;
|
|
6
|
-
row
|
|
6
|
+
row?: number;
|
|
7
|
+
row_num?: number;
|
|
7
8
|
sheet: string;
|
|
8
9
|
type_id: number;
|
|
9
10
|
data: any;
|
|
10
11
|
}
|
|
11
12
|
export declare class PushToBulkItemJob extends CommonJob {
|
|
12
13
|
protected readonly queueService: QueueService;
|
|
13
|
-
private readonly
|
|
14
|
+
private readonly bulkUploadItemStore;
|
|
14
15
|
protected priority: number;
|
|
15
|
-
constructor(queueService: QueueService,
|
|
16
|
-
handle(data: BulkUploadItemData | BulkUploadItemData[]): Promise<
|
|
17
|
-
private
|
|
18
|
-
private handleBatch;
|
|
16
|
+
constructor(queueService: QueueService, bulkUploadItemStore: BulkUploadItemStore);
|
|
17
|
+
handle(data: BulkUploadItemData | BulkUploadItemData[]): Promise<BulkUploadItemRecord | BulkUploadItemRecord[]>;
|
|
18
|
+
private normalize;
|
|
19
19
|
}
|
|
20
20
|
export {};
|
|
@@ -8,48 +8,38 @@ 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
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.PushToBulkItemJob = void 0;
|
|
16
13
|
const common_1 = require("@nestjs/common");
|
|
17
|
-
const typeorm_1 = require("@nestjs/typeorm");
|
|
18
14
|
const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
|
|
19
|
-
const
|
|
20
|
-
const bulk_upload_item_entity_1 = require("../entities/bulk.upload.item.entity");
|
|
15
|
+
const bulk_upload_item_store_1 = require("../services/bulk.upload.item.store");
|
|
21
16
|
let PushToBulkItemJob = class PushToBulkItemJob extends nestjs_utility_services_1.CommonJob {
|
|
22
|
-
constructor(queueService,
|
|
17
|
+
constructor(queueService, bulkUploadItemStore) {
|
|
23
18
|
super('74802720e87b9c71c5afe3c375e45a46');
|
|
24
19
|
this.queueService = queueService;
|
|
25
|
-
this.
|
|
20
|
+
this.bulkUploadItemStore = bulkUploadItemStore;
|
|
26
21
|
this.priority = 8;
|
|
27
22
|
}
|
|
28
23
|
async handle(data) {
|
|
29
24
|
if (Array.isArray(data)) {
|
|
30
|
-
return this.
|
|
25
|
+
return this.bulkUploadItemStore.insertMany(data.map((item) => this.normalize(item)));
|
|
31
26
|
}
|
|
32
|
-
return this.
|
|
27
|
+
return this.bulkUploadItemStore.upsertOne(this.normalize(data));
|
|
33
28
|
}
|
|
34
|
-
|
|
35
|
-
|
|
29
|
+
normalize(itemData) {
|
|
30
|
+
return {
|
|
36
31
|
bulk_upload_id: itemData.bulk_upload_id,
|
|
37
|
-
row_num: itemData.row,
|
|
32
|
+
row_num: itemData.row_num ?? itemData.row,
|
|
38
33
|
sheet: itemData.sheet,
|
|
39
34
|
type_id: itemData.type_id,
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
return item.save();
|
|
43
|
-
}
|
|
44
|
-
async handleBatch(itemsData) {
|
|
45
|
-
return this.bulkUploadItemRepo.insert(itemsData);
|
|
35
|
+
data: itemData.data,
|
|
36
|
+
};
|
|
46
37
|
}
|
|
47
38
|
};
|
|
48
39
|
exports.PushToBulkItemJob = PushToBulkItemJob;
|
|
49
40
|
exports.PushToBulkItemJob = PushToBulkItemJob = __decorate([
|
|
50
41
|
(0, common_1.Injectable)(),
|
|
51
|
-
__param(1, (0, typeorm_1.InjectRepository)(bulk_upload_item_entity_1.BulkUploadItemEntity)),
|
|
52
42
|
__metadata("design:paramtypes", [nestjs_utility_services_1.QueueService,
|
|
53
|
-
|
|
43
|
+
bulk_upload_item_store_1.BulkUploadItemStore])
|
|
54
44
|
], PushToBulkItemJob);
|
|
55
45
|
//# sourceMappingURL=push.to.bulk.item.job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.to.bulk.item.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/push.to.bulk.item.job.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"push.to.bulk.item.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/push.to.bulk.item.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAAiF;AACjF,+EAAyE;AAkBlE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,mCAAS;IAG5C,YACuB,YAA0B,EAC5B,mBAAwC;QAEzD,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QAJnD,aAAQ,GAAW,CAAC,CAAC;IAO/B,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,IAA+C;QACxD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzF,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACpE,CAAC;IAEO,SAAS,CAAC,QAA4B;QAC1C,OAAO;YACH,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,GAAG;YACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACtB,CAAC;IACN,CAAC;CACJ,CAAA;AAhCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAK4B,sCAAY;QACP,4CAAmB;GALpD,iBAAiB,CAgC7B"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { CommonJob, PropertyService, QueueService, SqlService } from '@servicelabsco/nestjs-utility-services';
|
|
2
|
+
import { BulkUploadItemStore } from '../services/bulk.upload.item.store';
|
|
2
3
|
export declare class SanitizeBulkUploadJob extends CommonJob {
|
|
3
4
|
protected readonly queueService: QueueService;
|
|
4
5
|
protected readonly sqlService: SqlService;
|
|
5
6
|
protected readonly propertyService: PropertyService;
|
|
7
|
+
private readonly bulkUploadItemStore;
|
|
6
8
|
protected priority: number;
|
|
7
|
-
constructor(queueService: QueueService, sqlService: SqlService, propertyService: PropertyService);
|
|
9
|
+
constructor(queueService: QueueService, sqlService: SqlService, propertyService: PropertyService, bulkUploadItemStore: BulkUploadItemStore);
|
|
8
10
|
handle(): Promise<void>;
|
|
9
11
|
private dropItems;
|
|
10
12
|
private getRetentionPeriod;
|
|
@@ -14,12 +14,14 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
|
|
15
15
|
const date_fns_1 = require("date-fns");
|
|
16
16
|
const bulk_upload_entity_1 = require("../entities/bulk.upload.entity");
|
|
17
|
+
const bulk_upload_item_store_1 = require("../services/bulk.upload.item.store");
|
|
17
18
|
let SanitizeBulkUploadJob = class SanitizeBulkUploadJob extends nestjs_utility_services_1.CommonJob {
|
|
18
|
-
constructor(queueService, sqlService, propertyService) {
|
|
19
|
+
constructor(queueService, sqlService, propertyService, bulkUploadItemStore) {
|
|
19
20
|
super('33fc4880b0363ae76605224e426270ba');
|
|
20
21
|
this.queueService = queueService;
|
|
21
22
|
this.sqlService = sqlService;
|
|
22
23
|
this.propertyService = propertyService;
|
|
24
|
+
this.bulkUploadItemStore = bulkUploadItemStore;
|
|
23
25
|
this.priority = 20;
|
|
24
26
|
}
|
|
25
27
|
async handle() {
|
|
@@ -45,8 +47,7 @@ let SanitizeBulkUploadJob = class SanitizeBulkUploadJob extends nestjs_utility_s
|
|
|
45
47
|
const bulkUploadId = Number(bulkUpload?.id);
|
|
46
48
|
if (!Number.isFinite(bulkUploadId) || bulkUploadId <= 0)
|
|
47
49
|
return;
|
|
48
|
-
|
|
49
|
-
await this.sqlService.sql(sql);
|
|
50
|
+
await this.bulkUploadItemStore.deleteByBulkUploadId(bulkUploadId);
|
|
50
51
|
global.console.log('dropped items against bulk upload', bulkUpload.id);
|
|
51
52
|
}
|
|
52
53
|
async getRetentionPeriod() {
|
|
@@ -60,6 +61,7 @@ exports.SanitizeBulkUploadJob = SanitizeBulkUploadJob = __decorate([
|
|
|
60
61
|
(0, common_1.Injectable)(),
|
|
61
62
|
__metadata("design:paramtypes", [nestjs_utility_services_1.QueueService,
|
|
62
63
|
nestjs_utility_services_1.SqlService,
|
|
63
|
-
nestjs_utility_services_1.PropertyService
|
|
64
|
+
nestjs_utility_services_1.PropertyService,
|
|
65
|
+
bulk_upload_item_store_1.BulkUploadItemStore])
|
|
64
66
|
], SanitizeBulkUploadJob);
|
|
65
67
|
//# sourceMappingURL=sanitize.bulk.upload.job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanitize.bulk.upload.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/sanitize.bulk.upload.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAA8G;AAC9G,uCAAmC;AACnC,uEAAkE;
|
|
1
|
+
{"version":3,"file":"sanitize.bulk.upload.job.js","sourceRoot":"","sources":["../../../src/accessUtility/jobs/sanitize.bulk.upload.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAA8G;AAC9G,uCAAmC;AACnC,uEAAkE;AAClE,+EAAyE;AAOlE,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,mCAAS;IAGhD,YACuB,YAA0B,EAC1B,UAAsB,EACtB,eAAgC,EAClC,mBAAwC;QAEzD,KAAK,CAAC,kCAAkC,CAAC,CAAC;QALvB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAiB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;QANnD,aAAQ,GAAW,EAAE,CAAC;IAShC,CAAC;IAOD,KAAK,CAAC,MAAM;QACR,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxD,MAAM,YAAY,GAAG,IAAA,kBAAO,EAAC,IAAI,IAAI,EAAE,EAAE,eAAe,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAE7C,MAAM,GAAG,GAAG,oFAAoF,SAAS,oEAAoE,CAAC;QAE9K,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE5D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,EAAE,EAAE;gBAAE,SAAS;YAC1B,MAAM,CAAC,GAAG,MAAM,qCAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,CAAC;gBAAE,SAAS;YAEjB,CAAC,CAAC,UAAU,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAElD,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;IACL,CAAC;IAQO,KAAK,CAAC,SAAS,CAAC,UAA4B;QAChD,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,YAAY,IAAI,CAAC;YAAE,OAAO;QAEhE,MAAM,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAElE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;IAQO,KAAK,CAAC,kBAAkB;QAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAAC;QAC5F,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChG,CAAC;CACJ,CAAA;AAjEY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAK4B,sCAAY;QACd,oCAAU;QACL,yCAAe;QACb,4CAAmB;GAPpD,qBAAqB,CAiEjC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PropertyService, RedisService, SqlService, UploadService } from '@servicelabsco/nestjs-utility-services';
|
|
2
2
|
import { PushToBulkItemJob } from '../jobs/push.to.bulk.item.job';
|
|
3
3
|
import { BulkUploadService } from '../services/bulk.upload.service';
|
|
4
|
+
import { BulkUploadItemStore } from '../services/bulk.upload.item.store';
|
|
4
5
|
import { ReadXlsFile } from './read.xls.file';
|
|
5
6
|
interface AnalysisResult {
|
|
6
7
|
totalRows: number;
|
|
@@ -15,7 +16,8 @@ export declare class AnalyseBulkUpload extends ReadXlsFile {
|
|
|
15
16
|
protected readonly propertyService: PropertyService;
|
|
16
17
|
protected readonly sqlService: SqlService;
|
|
17
18
|
protected readonly redisService: RedisService;
|
|
18
|
-
|
|
19
|
+
protected readonly bulkUploadItemStore: BulkUploadItemStore;
|
|
20
|
+
constructor(uploadService: UploadService, bulkUploadService: BulkUploadService, pushToBulkItemJob: PushToBulkItemJob, propertyService: PropertyService, sqlService: SqlService, redisService: RedisService, bulkUploadItemStore: BulkUploadItemStore);
|
|
19
21
|
process(id: number): Promise<AnalysisResult>;
|
|
20
22
|
private validate;
|
|
21
23
|
private cleanExistingItems;
|
|
@@ -5,7 +5,7 @@ const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-service
|
|
|
5
5
|
const bulk_upload_entity_1 = require("../entities/bulk.upload.entity");
|
|
6
6
|
const read_xls_file_1 = require("./read.xls.file");
|
|
7
7
|
class AnalyseBulkUpload extends read_xls_file_1.ReadXlsFile {
|
|
8
|
-
constructor(uploadService, bulkUploadService, pushToBulkItemJob, propertyService, sqlService, redisService) {
|
|
8
|
+
constructor(uploadService, bulkUploadService, pushToBulkItemJob, propertyService, sqlService, redisService, bulkUploadItemStore) {
|
|
9
9
|
super();
|
|
10
10
|
this.uploadService = uploadService;
|
|
11
11
|
this.bulkUploadService = bulkUploadService;
|
|
@@ -13,6 +13,7 @@ class AnalyseBulkUpload extends read_xls_file_1.ReadXlsFile {
|
|
|
13
13
|
this.propertyService = propertyService;
|
|
14
14
|
this.sqlService = sqlService;
|
|
15
15
|
this.redisService = redisService;
|
|
16
|
+
this.bulkUploadItemStore = bulkUploadItemStore;
|
|
16
17
|
}
|
|
17
18
|
async process(id) {
|
|
18
19
|
const entity = await this.validate(id);
|
|
@@ -43,8 +44,7 @@ class AnalyseBulkUpload extends read_xls_file_1.ReadXlsFile {
|
|
|
43
44
|
}
|
|
44
45
|
async cleanExistingItems(upload) {
|
|
45
46
|
try {
|
|
46
|
-
|
|
47
|
-
await this.sqlService.sql(sql);
|
|
47
|
+
await this.bulkUploadItemStore.deleteByBulkUploadId(upload.id);
|
|
48
48
|
}
|
|
49
49
|
catch (error) {
|
|
50
50
|
throw new nestjs_utility_services_1.OperationException(`Failed to clean existing items: ${error.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyse.bulk.upload.js","sourceRoot":"","sources":["../../../src/accessUtility/libraries/analyse.bulk.upload.ts"],"names":[],"mappings":";;;AAAA,oFAAsI;AACtI,uEAAkE;
|
|
1
|
+
{"version":3,"file":"analyse.bulk.upload.js","sourceRoot":"","sources":["../../../src/accessUtility/libraries/analyse.bulk.upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ class LoadXlsFile {
|
|
|
54
54
|
const buffer = await this.uploadService.getBufferFromUrl(this.file);
|
|
55
55
|
await this.workbook.xlsx.load(buffer);
|
|
56
56
|
}
|
|
57
|
-
async readWorksheet(sheet,
|
|
57
|
+
async readWorksheet(sheet, _columns) {
|
|
58
58
|
const tempPath = (0, path_1.join)(__dirname, `../../../tmp/${nestjs_utility_services_1.PlatformUtility.generateRandomAlpha(16).toLowerCase()}.${sheet}.csv`);
|
|
59
59
|
const writeStream = (0, fs_1.createWriteStream)(tempPath);
|
|
60
60
|
await this.workbook.csv.write(writeStream, { sheetName: sheet });
|
|
@@ -64,12 +64,12 @@ class LoadXlsFile {
|
|
|
64
64
|
async readCsv(tempPath) {
|
|
65
65
|
const fn = this;
|
|
66
66
|
let rowNumber = 0;
|
|
67
|
-
return new Promise((resolve,
|
|
67
|
+
return new Promise((resolve, _reject) => {
|
|
68
68
|
(0, fs_1.createReadStream)(tempPath)
|
|
69
69
|
.pipe((0, csv_parser_1.default)({
|
|
70
|
-
mapHeaders: ({ header, index }) => fn.mapHeader(header, fn.headers),
|
|
70
|
+
mapHeaders: ({ header, index: _index }) => fn.mapHeader(header, fn.headers),
|
|
71
71
|
}))
|
|
72
|
-
.on('data', (
|
|
72
|
+
.on('data', (_data) => {
|
|
73
73
|
++rowNumber;
|
|
74
74
|
})
|
|
75
75
|
.on('end', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.xls.file.js","sourceRoot":"","sources":["../../../src/accessUtility/libraries/load.xls.file.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"load.xls.file.js","sourceRoot":"","sources":["../../../src/accessUtility/libraries/load.xls.file.ts"],"names":[],"mappings":"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"}
|