Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
ITemplateSchemaItem,
ColumnDelimiterEnum,
UserJobImportStatusEnum,
IFilter,
FilterOperationEnum,
} from '@impler/shared';

import { SendImportJobDataConsumer } from './send-import-job-data.consumer';
Expand Down Expand Up @@ -88,8 +90,15 @@ export class SendAutoImportJobDataConsumer extends SendImportJobDataConsumer {

const validationResult = await this.validateData(_jobId, mappedData);

// Send data to webhook with validation status
this.sendDataImportData(_jobId, mappedData, 1, undefined, validationResult.hasInvalidRecords);
if (validationResult.filteredData.length > 0) {
this.sendDataImportData(
_jobId,
validationResult.filteredData,
1,
undefined,
validationResult.hasInvalidRecords
);
}

if (validationResult.hasInvalidRecords) {
await this.userJobRepository.update({ _id: _jobId }, { $set: { isInvalidRecords: true } });
Expand Down Expand Up @@ -117,6 +126,7 @@ export class SendAutoImportJobDataConsumer extends SendImportJobDataConsumer {
invalidRecords: number;
validData: Record<string, unknown>[];
invalidData: Record<string, unknown>[];
filteredData: Record<string, unknown>[];
}> {
try {
const userJob = await this.userJobRepository.findOne({ _id: _jobId });
Expand All @@ -134,6 +144,7 @@ export class SendAutoImportJobDataConsumer extends SendImportJobDataConsumer {
invalidRecords: 0,
validData: [],
invalidData: [],
filteredData: [],
};
}

Expand All @@ -150,7 +161,19 @@ export class SendAutoImportJobDataConsumer extends SendImportJobDataConsumer {
const validData: Record<string, unknown>[] = [];
const invalidData: Record<string, unknown>[] = [];

const filters = userJob.filters || [];

const filteredData: Record<string, unknown>[] = [];

for (const recordData of mappedData) {
const passesFilters = await this.applyDynamicFilters(recordData, filters);

if (passesFilters) {
filteredData.push(recordData);
}
}

for (const recordData of filteredData) {
const checkRecord: Record<string, unknown> = this.formatRecord({
record: { record: recordData },
multiSelectColumnHeadings,
Expand Down Expand Up @@ -181,6 +204,7 @@ export class SendAutoImportJobDataConsumer extends SendImportJobDataConsumer {
invalidRecords,
validData,
invalidData,
filteredData,
};
} catch (error) {
return {
Expand All @@ -190,6 +214,7 @@ export class SendAutoImportJobDataConsumer extends SendImportJobDataConsumer {
invalidRecords: 0,
validData: [],
invalidData: [],
filteredData: [],
};
}
}
Expand Down Expand Up @@ -287,6 +312,68 @@ export class SendAutoImportJobDataConsumer extends SendImportJobDataConsumer {
}
}

private async applyDynamicFilters(record: Record<string, unknown>, filters: IFilter[]): Promise<boolean> {
try {
if (!filters || filters.length === 0) {
return true;
}

for (const filter of filters) {
const fieldValue = record[filter.field];

if (fieldValue === undefined || fieldValue === null) {
return false;
}

const stringValue = String(fieldValue);
const filterValue = String(filter.value);

const operationType = filter.operation;

let operationPassed = false;

switch (operationType) {
case FilterOperationEnum.CONTAINS:
operationPassed = stringValue.includes(filterValue);
break;

case FilterOperationEnum.EQUALS:
operationPassed = stringValue === filterValue;
break;

case FilterOperationEnum.STARTSWITH:
operationPassed = stringValue.startsWith(filterValue);
break;

case FilterOperationEnum.ENDSWITH:
operationPassed = stringValue.endsWith(filterValue);
break;

case FilterOperationEnum.MATCHES:
try {
const regex = new RegExp(filter.value, 'i');
operationPassed = regex.test(stringValue);
} catch (regexError) {
operationPassed = false;
}
break;

default:
operationPassed = false;
break;
}

if (!operationPassed) {
return false;
}
}

return true;
} catch (error) {
return true;
}
}

private async finalizeAutoImportJob(
_jobId: string,
validationResult: IValidationResult,
Expand Down
4 changes: 4 additions & 0 deletions libs/dal/src/repositories/user-job/user-job.entity.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { IFilter } from '@impler/shared';

export class UserJobEntity {
_id?: string;

Expand Down Expand Up @@ -34,4 +36,6 @@ export class UserJobEntity {
validRecords?: number;

invalidRecords?: number;

filters?: IFilter[];
}
14 changes: 14 additions & 0 deletions libs/dal/src/repositories/user-job/user-job.schema.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { model, models, Schema, Model } from 'mongoose';
import { schemaOptions } from '../schema-default.options';
import { UserJobEntity } from './user-job.entity';
import { FilterOperationEnum } from '@impler/shared';

const userJobSchema = new Schema(
{
Expand Down Expand Up @@ -62,6 +63,19 @@ const userJobSchema = new Schema(
type: Schema.Types.Number,
default: 0,
},
filters: {
type: [
{
field: { type: Schema.Types.String },
operation: {
type: Schema.Types.String,
enum: Object.values(FilterOperationEnum),
},
value: { type: Schema.Types.String },
},
],
default: [],
},
},
{ ...schemaOptions }
);
Expand Down
15 changes: 15 additions & 0 deletions libs/shared/src/entities/UserJob/Userjob.interface.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
export enum FilterOperationEnum {
CONTAINS = 'contains',
EQUALS = 'equals',
STARTSWITH = 'startsWith',
ENDSWITH = 'endsWith',
MATCHES = 'matches',
}

export interface IFilter {
field: string;
operation: FilterOperationEnum;
value: string;
}

export interface IUserJob {
_id: string;
url: string;
Expand All @@ -7,4 +21,5 @@ export interface IUserJob {
endsOn?: Date;
headings: string[];
_templateId: string;
filters?: IFilter[];
}
Loading