Skip to content

Commit ecb697b

Browse files
feat: Removed the error message attached onto columns
1 parent 879b8c9 commit ecb697b

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

apps/queue-manager/src/consumers/get-import-job-data.consumer.ts

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ export class GetImportJobDataConsumer extends SendImportJobDataConsumer {
9494
validData: validationResult.validData,
9595
invalidData: validationResult.invalidData,
9696
};
97-
} catch (error) {
98-
throw error;
99-
}
97+
} catch (error) {}
10098
}
10199

102100
private async validateData(
@@ -161,7 +159,6 @@ export class GetImportJobDataConsumer extends SendImportJobDataConsumer {
161159
validData.push(recordData);
162160
} else {
163161
invalidRecords++;
164-
// Include validation errors with the invalid record
165162
invalidData.push(recordData);
166163
}
167164
}
@@ -188,7 +185,6 @@ export class GetImportJobDataConsumer extends SendImportJobDataConsumer {
188185
}
189186
}
190187

191-
// Format record method from ReReviewData
192188
private formatRecord({
193189
record,
194190
multiSelectColumnHeadings,
@@ -271,27 +267,24 @@ export class GetImportJobDataConsumer extends SendImportJobDataConsumer {
271267
private validateRecordUsingColumnSchema(
272268
record: Record<string, unknown>,
273269
columns: ITemplateSchemaItem[]
274-
): { isValid: boolean; errors: Record<string, string> } {
270+
): { isValid: boolean } {
275271
enum ValidationTypesEnum {
276272
RANGE = 'range',
277273
LENGTH = 'length',
278274
UNIQUE_WITH = 'unique_with',
279275
DIGITS = 'digits',
280276
}
281-
const errors: Record<string, string> = {};
282277
let isValid = true;
283278

284279
for (const column of columns) {
285280
const value = record[column.key];
286281

287282
if (value === undefined) {
288-
errors[column.key] = `${column.key} has undefined value`;
289283
isValid = false;
290284
continue;
291285
}
292286

293287
if (column.isRequired && (value === null || value === '' || !value)) {
294-
errors[column.key] = `${column.key} is required`;
295288
isValid = false;
296289
continue;
297290
}
@@ -300,45 +293,38 @@ export class GetImportJobDataConsumer extends SendImportJobDataConsumer {
300293
switch (column.type) {
301294
case ColumnTypesEnum.NUMBER:
302295
if (isNaN(Number(value))) {
303-
errors[column.key] = `${column.key} must be a valid number`;
304296
isValid = false;
305297
}
306298
break;
307299
case ColumnTypesEnum.DOUBLE:
308300
if (isNaN(Number(value)) || !Number.isFinite(Number(value))) {
309-
errors[column.key] = `${column.key} must be a valid decimal number`;
310301
isValid = false;
311302
}
312303
break;
313304
case ColumnTypesEnum.EMAIL:
314305
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
315306
if (!emailRegex.test(String(value))) {
316-
errors[column.key] = `${column.key} must be a valid email address`;
317307
isValid = false;
318308
}
319309
break;
320310
case ColumnTypesEnum.DATE:
321311
if (isNaN(Date.parse(String(value)))) {
322-
errors[column.key] = `${column.key} must be a valid date`;
323312
isValid = false;
324313
}
325314
break;
326315
case ColumnTypesEnum.REGEX:
327316
if (column.regex && !new RegExp(column.regex).test(String(value))) {
328-
errors[column.key] = `${column.key} does not match required format`;
329317
isValid = false;
330318
}
331319
break;
332320
case ColumnTypesEnum.SELECT:
333321
if (column.selectValues && !column.selectValues.includes(String(value))) {
334-
errors[column.key] = `${column.key} must be one of: ${column.selectValues.join(', ')}`;
335322
isValid = false;
336323
}
337324
break;
338325
case ColumnTypesEnum.IMAGE:
339326
const imageUrlRegex = /^https?:\/\/.+\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i;
340327
if (!imageUrlRegex.test(String(value))) {
341-
errors[column.key] = `${column.key} must be a valid image URL`;
342328
isValid = false;
343329
}
344330
break;
@@ -358,34 +344,28 @@ export class GetImportJobDataConsumer extends SendImportJobDataConsumer {
358344
const numValue = Number(value);
359345
if (!isNaN(numValue)) {
360346
if (validation.min !== undefined && numValue < validation.min) {
361-
errors[column.key] = `${column.key} must be at least ${validation.min}`;
362347
isValid = false;
363348
}
364349
if (validation.max !== undefined && numValue > validation.max) {
365-
errors[column.key] = `${column.key} must be at most ${validation.max}`;
366350
isValid = false;
367351
}
368352
}
369353
break;
370354
case ValidationTypesEnum.LENGTH:
371355
const strValue = String(value);
372356
if (validation.min !== undefined && strValue.length < validation.min) {
373-
errors[column.key] = `${column.key} must be at least ${validation.min} characters long`;
374357
isValid = false;
375358
}
376359
if (validation.max !== undefined && strValue.length > validation.max) {
377-
errors[column.key] = `${column.key} must be at most ${validation.max} characters long`;
378360
isValid = false;
379361
}
380362
break;
381363
case ValidationTypesEnum.DIGITS:
382364
const digitStr = String(value).replace(/[^0-9]/g, '');
383365
if (validation.min !== undefined && digitStr.length < validation.min) {
384-
errors[column.key] = `${column.key} must have at least ${validation.min} digits`;
385366
isValid = false;
386367
}
387368
if (validation.max !== undefined && digitStr.length > validation.max) {
388-
errors[column.key] = `${column.key} must have at most ${validation.max} digits`;
389369
isValid = false;
390370
}
391371
break;
@@ -397,6 +377,6 @@ export class GetImportJobDataConsumer extends SendImportJobDataConsumer {
397377
}
398378
}
399379

400-
return { isValid, errors };
380+
return { isValid };
401381
}
402382
}

0 commit comments

Comments
 (0)