Skip to content

Commit 56d65fc

Browse files
committed
fix(mining-api): set clean unverified contacts to work by default
1 parent 902b793 commit 56d65fc

File tree

1 file changed

+42
-73
lines changed

1 file changed

+42
-73
lines changed

backend/src/controllers/mining.controller.ts

Lines changed: 42 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ export default function initializeMiningController(
293293

294294
const {
295295
extractSignatures,
296-
cleanUnverifiedContacts,
297296
miningSource: { email },
298297
boxes: folders
299298
}: {
@@ -302,18 +301,12 @@ export default function initializeMiningController(
302301
};
303302
boxes: string[];
304303
extractSignatures: boolean;
305-
cleanUnverifiedContacts: boolean;
306304
} = req.body;
307305

308306
const errors = [
309307
validateType('email', email, 'string'),
310308
validateType('boxes', folders, 'string[]'),
311-
validateType('extractSignatures', extractSignatures, 'boolean'),
312-
validateType(
313-
'cleanUnverifiedContacts',
314-
cleanUnverifiedContacts,
315-
'boolean'
316-
)
309+
validateType('extractSignatures', extractSignatures, 'boolean')
317310
].filter(Boolean);
318311

319312
if (errors.length) {
@@ -347,20 +340,18 @@ export default function initializeMiningController(
347340
fetchEmailBody: extractSignatures
348341
});
349342

350-
if (cleanUnverifiedContacts) {
351-
const taskObject = tasksManager.getTaskOrThrow(miningTask.miningId);
352-
const { userId, miningId } = taskObject;
353-
const totalPublished =
354-
await publishPreviouslyUnverifiedEmailsToCleaning(
355-
contactsDB,
356-
userId,
357-
miningId,
358-
taskObject.process.clean.details.stream.emailsStream
359-
);
360-
taskObject.progress.createdContacts += totalPublished;
361-
taskObject.process.clean.details.progress.createdContacts +=
362-
totalPublished;
363-
}
343+
const taskObject = tasksManager.getTaskOrThrow(miningTask.miningId);
344+
const { userId, miningId } = taskObject;
345+
const totalPublished =
346+
await publishPreviouslyUnverifiedEmailsToCleaning(
347+
contactsDB,
348+
userId,
349+
miningId,
350+
taskObject.process.clean.details.stream.emailsStream
351+
);
352+
taskObject.progress.createdContacts += totalPublished;
353+
taskObject.process.clean.details.progress.createdContacts +=
354+
totalPublished;
364355

365356
return res.status(201).send({ error: null, data: miningTask });
366357
} catch (err) {
@@ -390,12 +381,10 @@ export default function initializeMiningController(
390381

391382
const {
392383
name,
393-
contacts,
394-
cleanUnverifiedContacts
384+
contacts
395385
}: {
396386
name: string;
397387
contacts: Partial<ContactFormat[]>;
398-
cleanUnverifiedContacts: boolean;
399388
} = req.body;
400389

401390
try {
@@ -409,14 +398,7 @@ export default function initializeMiningController(
409398
return res.status(400).json({ message });
410399
}
411400

412-
const errors = [
413-
validateType('name', name, 'string'),
414-
validateType(
415-
'cleanUnverifiedContacts',
416-
cleanUnverifiedContacts,
417-
'boolean'
418-
)
419-
].filter(Boolean);
401+
const errors = [validateType('name', name, 'string')].filter(Boolean);
420402

421403
if (errors.length) {
422404
return res
@@ -430,23 +412,21 @@ export default function initializeMiningController(
430412
1
431413
);
432414

433-
if (cleanUnverifiedContacts) {
434-
const taskObject = tasksManagerFile.getTaskOrThrow(
435-
fileMiningTask.miningId
415+
const taskObject = tasksManagerFile.getTaskOrThrow(
416+
fileMiningTask.miningId
417+
);
418+
const { userId, miningId } = taskObject;
419+
420+
const totalPublished =
421+
await publishPreviouslyUnverifiedEmailsToCleaning(
422+
contactsDB,
423+
userId,
424+
miningId,
425+
taskObject.process.clean.details.stream.emailsStream
436426
);
437-
const { userId, miningId } = taskObject;
438-
439-
const totalPublished =
440-
await publishPreviouslyUnverifiedEmailsToCleaning(
441-
contactsDB,
442-
userId,
443-
miningId,
444-
taskObject.process.clean.details.stream.emailsStream
445-
);
446-
taskObject.progress.createdContacts += totalPublished;
447-
taskObject.process.clean.details.progress.createdContacts +=
448-
totalPublished;
449-
}
427+
taskObject.progress.createdContacts += totalPublished;
428+
taskObject.process.clean.details.progress.createdContacts +=
429+
totalPublished;
450430

451431
// Publish contacts to extracting redis stream
452432
await redis.getClient().xadd(
@@ -480,23 +460,16 @@ export default function initializeMiningController(
480460

481461
const {
482462
name,
483-
extractSignatures,
484-
cleanUnverifiedContacts
463+
extractSignatures
485464
}: {
486465
name: string;
487466
extractSignatures: boolean;
488467
// file
489-
cleanUnverifiedContacts: boolean;
490468
} = req.body;
491469

492470
const errors = [
493471
validateType('name', name, 'string'),
494-
validateType('extractSignatures', extractSignatures, 'boolean'),
495-
validateType(
496-
'cleanUnverifiedContacts',
497-
cleanUnverifiedContacts,
498-
'boolean'
499-
)
472+
validateType('extractSignatures', extractSignatures, 'boolean')
500473
].filter(Boolean);
501474

502475
if (errors.length) {
@@ -511,22 +484,18 @@ export default function initializeMiningController(
511484
extractSignatures
512485
);
513486

514-
if (cleanUnverifiedContacts) {
515-
const taskObject = tasksManagerPST.getTaskOrThrow(
516-
miningTask.miningId
487+
const taskObject = tasksManagerPST.getTaskOrThrow(miningTask.miningId);
488+
const { userId, miningId } = taskObject;
489+
const totalPublished =
490+
await publishPreviouslyUnverifiedEmailsToCleaning(
491+
contactsDB,
492+
userId,
493+
miningId,
494+
taskObject.process.clean.details.stream.emailsStream
517495
);
518-
const { userId, miningId } = taskObject;
519-
const totalPublished =
520-
await publishPreviouslyUnverifiedEmailsToCleaning(
521-
contactsDB,
522-
userId,
523-
miningId,
524-
taskObject.process.clean.details.stream.emailsStream
525-
);
526-
taskObject.progress.createdContacts += totalPublished;
527-
taskObject.process.clean.details.progress.createdContacts +=
528-
totalPublished;
529-
}
496+
taskObject.progress.createdContacts += totalPublished;
497+
taskObject.process.clean.details.progress.createdContacts +=
498+
totalPublished;
530499

531500
return res.status(201).send({ error: null, data: miningTask });
532501
} catch (err) {

0 commit comments

Comments
 (0)