@servicelabsco/slabs-access-manager 0.1.250 → 0.1.252
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/entities/business.report.entity.d.ts +1 -0
- package/dist/access/entities/business.report.entity.js +4 -0
- package/dist/access/entities/business.report.entity.js.map +1 -1
- package/dist/access/entities/listing.column.entity.d.ts +3 -0
- package/dist/access/entities/listing.column.entity.js +10 -0
- package/dist/access/entities/listing.column.entity.js.map +1 -1
- package/dist/access/jobs/generate.business.report.job.d.ts +2 -0
- package/dist/access/jobs/generate.business.report.job.js +24 -2
- package/dist/access/jobs/generate.business.report.job.js.map +1 -1
- package/dist/access/services/listing.service.d.ts +2 -0
- package/dist/access/services/listing.service.js +21 -5
- package/dist/access/services/listing.service.js.map +1 -1
- package/dist/accessUtility/jobs/bulk.upload.stats.job.d.ts +1 -0
- package/dist/accessUtility/jobs/bulk.upload.stats.job.js +11 -3
- package/dist/accessUtility/jobs/bulk.upload.stats.job.js.map +1 -1
- package/dist/migrations/1738126453783-AddBusinessIdColumnUtlListingColumnsTable.d.ts +5 -0
- package/dist/migrations/1738126453783-AddBusinessIdColumnUtlListingColumnsTable.js +15 -0
- package/dist/migrations/1738126453783-AddBusinessIdColumnUtlListingColumnsTable.js.map +1 -0
- package/dist/migrations/1752744448255-AddFilterColumnBzBusinessReportsTable.d.ts +5 -0
- package/dist/migrations/1752744448255-AddFilterColumnBzBusinessReportsTable.js +15 -0
- package/dist/migrations/1752744448255-AddFilterColumnBzBusinessReportsTable.js.map +1 -0
- package/package.json +1 -1
|
@@ -28,6 +28,10 @@ __decorate([
|
|
|
28
28
|
(0, typeorm_1.Column)(),
|
|
29
29
|
__metadata("design:type", String)
|
|
30
30
|
], BusinessReportEntity.prototype, "url", void 0);
|
|
31
|
+
__decorate([
|
|
32
|
+
(0, typeorm_1.Column)(),
|
|
33
|
+
__metadata("design:type", String)
|
|
34
|
+
], BusinessReportEntity.prototype, "filter", void 0);
|
|
31
35
|
__decorate([
|
|
32
36
|
(0, typeorm_1.Column)(),
|
|
33
37
|
__metadata("design:type", Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"business.report.entity.js","sourceRoot":"","sources":["../../../src/access/entities/business.report.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oFAA4H;AAC5H,qCAAgE;AAChE,qEAAgE;AASzD,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sCAAY;
|
|
1
|
+
{"version":3,"file":"business.report.entity.js","sourceRoot":"","sources":["../../../src/access/entities/business.report.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oFAA4H;AAC5H,qCAAgE;AAChE,qEAAgE;AASzD,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sCAAY;CAgCrD,CAAA;AAhCY,oDAAoB;AAE7B;IADC,IAAA,gBAAM,GAAE;;yDACW;AAGpB;IADC,IAAA,gBAAM,GAAE;;2DACa;AAGtB;IADC,IAAA,gBAAM,GAAE;;iDACG;AAGZ;IADC,IAAA,gBAAM,GAAE;;oDACM;AAGf;IADC,IAAA,gBAAM,GAAE;8BACK,IAAI;0DAAC;AAGnB;IADC,IAAA,gBAAM,GAAE;;qDACO;AAGhB;IADC,IAAA,gBAAM,GAAE;;qDACO;AAGhB;IADC,IAAA,gBAAM,EAAC,MAAM,CAAC;;oDACH;AAGZ;IADC,IAAA,gBAAM,EAAC,MAAM,CAAC;8BACH,6CAAmB;wDAAC;AAGsC;IAArE,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,sCAAY,CAAC;IAAE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;8BAAa,sCAAY;wDAAC;AACnB;IAA3E,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,6CAAoB,CAAC;IAAE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BAAW,6CAAoB;sDAAC;AACtC;IAApE,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,2CAAiB,CAAC;IAAE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;8BAAO,2CAAiB;kDAAC;+BA/BpF,oBAAoB;IADhC,IAAA,gBAAM,EAAC,qBAAqB,CAAC;GACjB,oBAAoB,CAgChC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ColumnDefinitionEntity, CommonEntity } from '@servicelabsco/nestjs-utility-services';
|
|
2
2
|
import { ListingModelEntity } from '../../accessUtility/entities/listing.model.entity';
|
|
3
3
|
import { ListingColumnAttributesDto } from '../dtos/listing.column.attributes.dto';
|
|
4
|
+
import { AccessBusinessEntity } from './access.business.entity';
|
|
4
5
|
import { ListingPageEntity } from './listing.page.entity';
|
|
5
6
|
export declare class ListingColumnEntity extends CommonEntity {
|
|
6
7
|
listing_id: number;
|
|
@@ -22,10 +23,12 @@ export declare class ListingColumnEntity extends CommonEntity {
|
|
|
22
23
|
is_visible: boolean;
|
|
23
24
|
is_report_enabled: boolean;
|
|
24
25
|
reference_model_id: number;
|
|
26
|
+
business_id: number;
|
|
25
27
|
query_params: any;
|
|
26
28
|
attributes: ListingColumnAttributesDto;
|
|
27
29
|
default: boolean;
|
|
28
30
|
listing: ListingPageEntity;
|
|
29
31
|
column_type: ColumnDefinitionEntity;
|
|
30
32
|
reference_model: ListingModelEntity;
|
|
33
|
+
business: AccessBusinessEntity;
|
|
31
34
|
}
|
|
@@ -14,6 +14,7 @@ const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-service
|
|
|
14
14
|
const typeorm_1 = require("typeorm");
|
|
15
15
|
const listing_model_entity_1 = require("../../accessUtility/entities/listing.model.entity");
|
|
16
16
|
const listing_column_attributes_dto_1 = require("../dtos/listing.column.attributes.dto");
|
|
17
|
+
const access_business_entity_1 = require("./access.business.entity");
|
|
17
18
|
const listing_page_entity_1 = require("./listing.page.entity");
|
|
18
19
|
let ListingColumnEntity = class ListingColumnEntity extends nestjs_utility_services_1.CommonEntity {
|
|
19
20
|
};
|
|
@@ -94,6 +95,10 @@ __decorate([
|
|
|
94
95
|
(0, typeorm_1.Column)(),
|
|
95
96
|
__metadata("design:type", Number)
|
|
96
97
|
], ListingColumnEntity.prototype, "reference_model_id", void 0);
|
|
98
|
+
__decorate([
|
|
99
|
+
(0, typeorm_1.Column)(),
|
|
100
|
+
__metadata("design:type", Number)
|
|
101
|
+
], ListingColumnEntity.prototype, "business_id", void 0);
|
|
97
102
|
__decorate([
|
|
98
103
|
(0, typeorm_1.Column)('json'),
|
|
99
104
|
__metadata("design:type", Object)
|
|
@@ -121,6 +126,11 @@ __decorate([
|
|
|
121
126
|
(0, typeorm_1.JoinColumn)({ name: 'reference_model_id' }),
|
|
122
127
|
__metadata("design:type", listing_model_entity_1.ListingModelEntity)
|
|
123
128
|
], ListingColumnEntity.prototype, "reference_model", void 0);
|
|
129
|
+
__decorate([
|
|
130
|
+
(0, typeorm_1.ManyToOne)(() => access_business_entity_1.AccessBusinessEntity),
|
|
131
|
+
(0, typeorm_1.JoinColumn)({ name: 'business_id' }),
|
|
132
|
+
__metadata("design:type", access_business_entity_1.AccessBusinessEntity)
|
|
133
|
+
], ListingColumnEntity.prototype, "business", void 0);
|
|
124
134
|
exports.ListingColumnEntity = ListingColumnEntity = __decorate([
|
|
125
135
|
(0, typeorm_1.Entity)('utl_listing_columns')
|
|
126
136
|
], ListingColumnEntity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listing.column.entity.js","sourceRoot":"","sources":["../../../src/access/entities/listing.column.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oFAA8F;AAC9F,qCAAgE;AAChE,4FAAuF;AACvF,yFAAmF;AACnF,+DAA0D;AASnD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,sCAAY;
|
|
1
|
+
{"version":3,"file":"listing.column.entity.js","sourceRoot":"","sources":["../../../src/access/entities/listing.column.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oFAA8F;AAC9F,qCAAgE;AAChE,4FAAuF;AACvF,yFAAmF;AACnF,qEAAgE;AAChE,+DAA0D;AASnD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,sCAAY;CA6EpD,CAAA;AA7EY,kDAAmB;AAE5B;IADC,IAAA,gBAAM,GAAE;;uDACU;AAGnB;IADC,IAAA,gBAAM,GAAE;;iDACI;AAGb;IADC,IAAA,gBAAM,GAAE;;wDACW;AAGpB;IADC,IAAA,gBAAM,GAAE;;uDACU;AAGnB;IADC,IAAA,gBAAM,GAAE;;0DACa;AAGtB;IADC,IAAA,gBAAM,GAAE;;8DACiB;AAG1B;IADC,IAAA,gBAAM,GAAE;;wDACW;AAGpB;IADC,IAAA,gBAAM,GAAE;;2DACc;AAGvB;IADC,IAAA,gBAAM,GAAE;;kDACK;AAGd;IADC,IAAA,gBAAM,GAAE;;0DACa;AAGtB;IADC,IAAA,gBAAM,GAAE;;6DACgB;AAGzB;IADC,IAAA,gBAAM,GAAE;;qDACQ;AAGjB;IADC,IAAA,gBAAM,GAAE;;wDACY;AAGrB;IADC,IAAA,gBAAM,GAAE;;2DACe;AAGxB;IADC,IAAA,gBAAM,GAAE;;mDACO;AAGhB;IADC,IAAA,gBAAM,GAAE;;2DACe;AAGxB;IADC,IAAA,gBAAM,GAAE;;uDACW;AAGpB;IADC,IAAA,gBAAM,GAAE;;8DACkB;AAG3B;IADC,IAAA,gBAAM,GAAE;;+DACkB;AAG3B;IADC,IAAA,gBAAM,GAAE;;wDACW;AAGpB;IADC,IAAA,gBAAM,EAAC,MAAM,CAAC;;yDACG;AAGlB;IADC,IAAA,gBAAM,EAAC,MAAM,CAAC;8BACH,0DAA0B;uDAAC;AAGvC;IADC,IAAA,gBAAM,GAAE;;oDACQ;AAGuD;IAAvE,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAiB,CAAC;IAAE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;8BAAU,uCAAiB;oDAAC;AAElB;IAAhF,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,gDAAsB,CAAC;IAAE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;8BAAc,gDAAsB;wDAAC;AAEpC;IAAhF,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,yCAAkB,CAAC;IAAE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;8BAAkB,yCAAkB;4DAAC;AACzC;IAA3E,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,6CAAoB,CAAC;IAAE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BAAW,6CAAoB;qDAAC;8BA5ElG,mBAAmB;IAD/B,IAAA,gBAAM,EAAC,qBAAqB,CAAC;GACjB,mBAAmB,CA6E/B"}
|
|
@@ -12,4 +12,6 @@ export declare class GenerateBusinessReportJob extends CommonJob {
|
|
|
12
12
|
protected priority: number;
|
|
13
13
|
constructor(queueService: QueueService, sqlService: SqlService, uploadService: UploadService, propertyService: PropertyService, accessReportService: AccessReportService);
|
|
14
14
|
handle(id: number): Promise<BusinessReportEntity>;
|
|
15
|
+
private generateFilter;
|
|
16
|
+
private toTitleCase;
|
|
15
17
|
}
|
|
@@ -35,10 +35,32 @@ let GenerateBusinessReportJob = class GenerateBusinessReportJob extends nestjs_u
|
|
|
35
35
|
});
|
|
36
36
|
report.url = url;
|
|
37
37
|
report.processed_at = new Date();
|
|
38
|
-
|
|
39
|
-
report.
|
|
38
|
+
try {
|
|
39
|
+
report.filter = this.generateFilter(params);
|
|
40
|
+
}
|
|
41
|
+
catch (error) { }
|
|
40
42
|
return report.save();
|
|
41
43
|
}
|
|
44
|
+
generateFilter(params) {
|
|
45
|
+
if (!params)
|
|
46
|
+
return '';
|
|
47
|
+
const filterParts = [];
|
|
48
|
+
if (params?.start_time) {
|
|
49
|
+
filterParts.push(`Start Time: ${new Date(params?.start_time).toLocaleString()}`);
|
|
50
|
+
}
|
|
51
|
+
if (params.end_time) {
|
|
52
|
+
filterParts.push(`End Time: ${new Date(params?.end_time).toLocaleString()}`);
|
|
53
|
+
}
|
|
54
|
+
Object.keys(params).forEach((key) => {
|
|
55
|
+
if (key !== 'start_time' && key !== 'end_time' && params?.[key] !== undefined && params?.[key] !== null) {
|
|
56
|
+
filterParts?.push(`${this.toTitleCase(key.replace(/_/g, ' '))}: ${params?.[key]}`);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
return filterParts?.join('; ');
|
|
60
|
+
}
|
|
61
|
+
toTitleCase(str) {
|
|
62
|
+
return str.replace(/\w\S*/g, (txt) => txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase());
|
|
63
|
+
}
|
|
42
64
|
};
|
|
43
65
|
exports.GenerateBusinessReportJob = GenerateBusinessReportJob;
|
|
44
66
|
exports.GenerateBusinessReportJob = GenerateBusinessReportJob = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.business.report.job.js","sourceRoot":"","sources":["../../../src/access/jobs/generate.business.report.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oFAOgD;AAEhD,+EAA0E;AAC1E,6EAAwE;AAGjE,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,mCAAS;IAKpD,YACuB,YAA0B,EAC1B,UAAsB,EACtB,aAA4B,EAC5B,eAAgC,EAChC,mBAAwC;QAE3D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QANvB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,oBAAe,GAAf,eAAe,CAAiB;QAChC,wBAAmB,GAAnB,mBAAmB,CAAqB;QATrD,gBAAW,GAAG,IAAI,CAAC;QACnB,YAAO,GAAW,QAAQ,CAAC;QAC3B,aAAQ,GAAW,EAAE,CAAC;IAUhC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,MAAM,GAAG,MAAM,6CAAoB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAEnF,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAE7D,MAAM,GAAG,GAAG,MAAM,IAAI,wDAA8B,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC;YACzI,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,GAAG,MAAM;SACZ,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;QACjB,MAAM,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"generate.business.report.job.js","sourceRoot":"","sources":["../../../src/access/jobs/generate.business.report.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,8 @@ export declare class ListingService {
|
|
|
24
24
|
definition: ListingColumnEntity[];
|
|
25
25
|
preferences: any;
|
|
26
26
|
}>;
|
|
27
|
+
getBusinessWiseListingFromCacheService(listing_id: number, business_id: number): Promise<ListingColumnEntity[]>;
|
|
28
|
+
getBusinessWiseListing(listing_id: number, business_id: number): Promise<ListingColumnEntity[]>;
|
|
27
29
|
delete(listing: ListingPageEntity, preferenceId: number): Promise<ListingPreferenceEntity>;
|
|
28
30
|
private canSetGlobal;
|
|
29
31
|
getDownloadLimit(businessId: number): Promise<number>;
|
|
@@ -57,16 +57,32 @@ let ListingService = class ListingService {
|
|
|
57
57
|
return preference.save();
|
|
58
58
|
}
|
|
59
59
|
async get(listing, business) {
|
|
60
|
-
const definition = await
|
|
61
|
-
where: { listing_id: listing.id },
|
|
62
|
-
relations: ['reference_model'],
|
|
63
|
-
order: { priority: 'asc' },
|
|
64
|
-
});
|
|
60
|
+
const definition = await this.getBusinessWiseListingFromCacheService(listing.id, business.id);
|
|
65
61
|
const user = nestjs_utility_services_1.Auth.user();
|
|
66
62
|
const sql = `select * from utl_listing_preferences a where a.deleted_at is null and (a.business_id = ${business.id} or a.business_id is null) and a.listing_id = ${listing.id} and (a.user_id = ${user.id} or a.user_id is null) and a.active = true order by a.identifier asc`;
|
|
67
63
|
const preferences = await this.sqlService.read(sql);
|
|
68
64
|
return { definition, preferences };
|
|
69
65
|
}
|
|
66
|
+
async getBusinessWiseListingFromCacheService(listing_id, business_id) {
|
|
67
|
+
const isProd = nestjs_utility_services_1.PlatformUtility.isProductionEnvironment();
|
|
68
|
+
if (!isProd)
|
|
69
|
+
return this.getBusinessWiseListing(listing_id, business_id);
|
|
70
|
+
const CACHE_KEY = `business.wise.listing.${listing_id}.definition.${business_id}`;
|
|
71
|
+
const cacheData = await this.cacheService.get(CACHE_KEY);
|
|
72
|
+
if (cacheData)
|
|
73
|
+
return cacheData;
|
|
74
|
+
const definition = await this.getBusinessWiseListing(listing_id, business_id);
|
|
75
|
+
await this.cacheService.set(CACHE_KEY, definition);
|
|
76
|
+
return definition;
|
|
77
|
+
}
|
|
78
|
+
async getBusinessWiseListing(listing_id, business_id) {
|
|
79
|
+
const listings = await listing_column_entity_1.ListingColumnEntity.find({
|
|
80
|
+
where: { listing_id },
|
|
81
|
+
relations: ['reference_model'],
|
|
82
|
+
order: { priority: 'asc' },
|
|
83
|
+
});
|
|
84
|
+
return listings.filter((listing) => listing?.business_id === business_id || listing?.business_id === null);
|
|
85
|
+
}
|
|
70
86
|
async delete(listing, preferenceId) {
|
|
71
87
|
const preference = await listing_preference_entity_1.ListingPreferenceEntity.findOne({ where: { listing_id: listing.id, id: preferenceId } });
|
|
72
88
|
if (!preference)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listing.service.js","sourceRoot":"","sources":["../../../src/access/services/listing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"listing.service.js","sourceRoot":"","sources":["../../../src/access/services/listing.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,19 +69,22 @@ let BulkUploadStatsJob = class BulkUploadStatsJob extends nestjs_utility_service
|
|
|
69
69
|
const types = await this.bulkUploadService.getUploadTypes(entity);
|
|
70
70
|
const analysis = {};
|
|
71
71
|
const processed = {};
|
|
72
|
+
const error = {};
|
|
72
73
|
let analysisTotal = 0;
|
|
73
74
|
let processedTotal = 0;
|
|
75
|
+
let errorTotal = 0;
|
|
74
76
|
for (const type of types) {
|
|
75
77
|
const analysisCount = await this.getAnalysisTypeCount(entity, type);
|
|
76
78
|
analysis[type.name.toLocaleLowerCase()] = analysisCount;
|
|
77
79
|
analysisTotal += analysisCount;
|
|
78
|
-
}
|
|
79
|
-
for (const type of types) {
|
|
80
80
|
const processedCount = await this.getProcessedTypeCount(entity, type);
|
|
81
81
|
processed[type.name.toLocaleLowerCase()] = processedCount;
|
|
82
82
|
processedTotal += processedCount;
|
|
83
|
+
const errorCount = await this.getErrorTypeCount(entity, type);
|
|
84
|
+
error[type.name.toLocaleLowerCase()] = errorCount;
|
|
85
|
+
errorTotal += errorCount;
|
|
83
86
|
}
|
|
84
|
-
entity.stats = { ...entity.stats, analysis, processed };
|
|
87
|
+
entity.stats = { ...entity.stats, analysis, processed, error };
|
|
85
88
|
entity.analysed_rows = analysisTotal;
|
|
86
89
|
entity.processed_rows = processedTotal;
|
|
87
90
|
await entity.save();
|
|
@@ -92,6 +95,11 @@ let BulkUploadStatsJob = class BulkUploadStatsJob extends nestjs_utility_service
|
|
|
92
95
|
async getProcessedTypeCount(entity, type) {
|
|
93
96
|
return bulk_upload_item_entity_1.BulkUploadItemEntity.count({ where: { bulk_upload_id: entity.id, type_id: type.id, processed_at: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) } });
|
|
94
97
|
}
|
|
98
|
+
async getErrorTypeCount(entity, type) {
|
|
99
|
+
return bulk_upload_item_entity_1.BulkUploadItemEntity.count({
|
|
100
|
+
where: { bulk_upload_id: entity.id, type_id: type.id, processed_at: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()), error: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) },
|
|
101
|
+
});
|
|
102
|
+
}
|
|
95
103
|
};
|
|
96
104
|
exports.BulkUploadStatsJob = BulkUploadStatsJob;
|
|
97
105
|
exports.BulkUploadStatsJob = BulkUploadStatsJob = __decorate([
|
|
@@ -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;AAClE,iFAA2E;AAE3E,yEAAoE;AACpE,uEAAiE;AAE1D,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,mCAAS;IAI7C,YACuB,YAA0B,EAC5B,UAAsB,EACtB,iBAAoC,EACpC,oBAA0C;QAE3D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QALvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,yBAAoB,GAApB,oBAAoB,CAAsB;QAPrD,gBAAW,GAAY,IAAI,CAAC;QAC5B,aAAQ,GAAW,CAAC,CAAC;IAS/B,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAW;QACpB,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,EAAU;QAC7B,MAAM,MAAM,GAAG,MAAM,qCAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;QAErC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAEO,KAAK,CAAC,SAAS;QACnB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,cAAc;QACxB,MAAM,GAAG,GAAG,kKAAkK,CAAC;QAE/K,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,MAAM,qCAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAClD,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC;YACpB,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAEf,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,SAAS;QACnB,MAAM,IAAI,GAAG,IAAA,kBAAO,EAAC,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAEtC,MAAM,OAAO,GAAG,MAAM,qCAAgB,CAAC,IAAI,CAAC;YACxC,KAAK,EAAE;gBACH,EAAE,UAAU,EAAE,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAA,gBAAM,GAAE,EAAE;gBACtD,EAAE,UAAU,EAAE,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE,WAAW,EAAE,IAAA,gBAAM,GAAE,EAAE;aACxD;SACJ,CAAC,CAAC;QAEH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,MAAwB;QAC9C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAElE,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,EAAE,CAAC;
|
|
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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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AddBusinessIdColumnUtlListingColumnsTable1738126453783 = void 0;
|
|
4
|
+
const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
|
|
5
|
+
class AddBusinessIdColumnUtlListingColumnsTable1738126453783 extends nestjs_utility_services_1.MigrationUtility {
|
|
6
|
+
constructor() {
|
|
7
|
+
super('utl_listing_columns');
|
|
8
|
+
this.process();
|
|
9
|
+
}
|
|
10
|
+
process() {
|
|
11
|
+
this.foreign({ name: 'business_id', foreignTable: 'bz_business_details' });
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.AddBusinessIdColumnUtlListingColumnsTable1738126453783 = AddBusinessIdColumnUtlListingColumnsTable1738126453783;
|
|
15
|
+
//# sourceMappingURL=1738126453783-AddBusinessIdColumnUtlListingColumnsTable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"1738126453783-AddBusinessIdColumnUtlListingColumnsTable.js","sourceRoot":"","sources":["../../src/migrations/1738126453783-AddBusinessIdColumnUtlListingColumnsTable.ts"],"names":[],"mappings":";;;AAAA,oFAA0E;AAE1E,MAAa,sDAAuD,SAAQ,0CAAgB;IACxF;QACI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAC/E,CAAC;CACJ;AATD,wHASC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AddFilterColumnBzBusinessReportsTable1752744448255 = void 0;
|
|
4
|
+
const nestjs_utility_services_1 = require("@servicelabsco/nestjs-utility-services");
|
|
5
|
+
class AddFilterColumnBzBusinessReportsTable1752744448255 extends nestjs_utility_services_1.MigrationUtility {
|
|
6
|
+
constructor() {
|
|
7
|
+
super('bz_business_reports');
|
|
8
|
+
this.process();
|
|
9
|
+
}
|
|
10
|
+
process() {
|
|
11
|
+
this.string('filter', { length: '1024' });
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.AddFilterColumnBzBusinessReportsTable1752744448255 = AddFilterColumnBzBusinessReportsTable1752744448255;
|
|
15
|
+
//# sourceMappingURL=1752744448255-AddFilterColumnBzBusinessReportsTable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"1752744448255-AddFilterColumnBzBusinessReportsTable.js","sourceRoot":"","sources":["../../src/migrations/1752744448255-AddFilterColumnBzBusinessReportsTable.ts"],"names":[],"mappings":";;;AAAA,oFAA0E;AAE1E,MAAa,kDAAmD,SAAQ,0CAAgB;IACpF;QACI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,CAAC;CACJ;AATD,gHASC"}
|
package/package.json
CHANGED