Added a function for event type translation and added mapping from old names to the new ones.

Author: gasperzgonec

src/common/helpers.ts

@@ -14,14 +14,59 @@ import { readFileSync } from 'fs';
 import * as path from 'path';
 import { MAX_DEVREV_FILENAME_EXTENSION_LENGTH, MAX_DEVREV_FILENAME_LENGTH } from './constants';
 
+const EVENT_TYPE_TRANSLATION_TABLE = {
+  "EXTRACTION_EXTERNAL_SYNC_UNITS_START": EventType.ExtractionExternalSyncUnitsStart,
+  "EXTRACTION_METADATA_START": EventType.ExtractionMetadataStart,
+  "EXTRACTION_DATA_START": EventType.ExtractionDataStart,
+  "EXTRACTION_DATA_CONTINUE": EventType.ExtractionDataContinue,
+  "EXTRACTION_ATTACHMENTS_START": EventType.ExtractionAttachmentsStart,
+  "EXTRACTION_ATTACHMENTS_CONTINUE": EventType.ExtractionAttachmentsContinue,
+  "EXTRACTION_DATA_DELETE": EventType.ExtractionDataDelete,
+  "EXTRACTION_ATTACHMENTS_DELETE": EventType.ExtractionAttachmentsDelete,
+
+  "EXTRACTION_EXTERNAL_SYNC_UNITS_DONE": ExtractorEventType.ExtractionExternalSyncUnitsDone,
+  "EXTRACTION_EXTERNAL_SYNC_UNITS_ERROR": ExtractorEventType.ExtractionExternalSyncUnitsError,
+  "EXTRACTION_METADATA_DONE": ExtractorEventType.ExtractionMetadataDone,
+  "EXTRACTION_METADATA_ERROR": ExtractorEventType.ExtractionMetadataError,
+  "EXTRACTION_DATA_PROGRESS": ExtractorEventType.ExtractionDataProgress,
+  "EXTRACTION_DATA_DELAY": ExtractorEventType.ExtractionDataDelay,
+  "EXTRACTION_DATA_DONE": ExtractorEventType.ExtractionDataDone,
+  "EXTRACTION_DATA_ERROR": ExtractorEventType.ExtractionDataError,
+  "EXTRACTION_ATTACHMENTS_PROGRESS": ExtractorEventType.ExtractionAttachmentsProgress,
+  "EXTRACTION_ATTACHMENTS_DELAY": ExtractorEventType.ExtractionAttachmentsDelay,
+  "EXTRACTION_ATTACHMENTS_DONE": ExtractorEventType.ExtractionAttachmentsDone,
+  "EXTRACTION_ATTACHMENTS_ERROR": ExtractorEventType.ExtractionAttachmentsError,
+  "EXTRACTION_DATA_DELETE_DONE": ExtractorEventType.ExtractionDataDeleteDone,
+  "EXTRACTION_DATA_DELETE_ERROR": ExtractorEventType.ExtractionDataDeleteError,
+  "EXTRACTION_ATTACHMENTS_DELETE_DONE": ExtractorEventType.ExtractionAttachmentsDeleteDone,
+  "EXTRACTION_ATTACHMENTS_DELETE_ERROR": ExtractorEventType.ExtractionAttachmentsDeleteError
+};
+
+/**
+ * Translates Event type from the old naming scheme to the new one
+ */
+export function translateEventType(event_type: string): EventType | ExtractorEventType {
+  // If we notice that the event has a newer translation, translate to that
+  if(event_type in EVENT_TYPE_TRANSLATION_TABLE){
+    return EVENT_TYPE_TRANSLATION_TABLE[event_type as keyof typeof EVENT_TYPE_TRANSLATION_TABLE];
+  }
+
+  // Return the correct event type
+  if (event_type in ExtractorEventType) {
+    return event_type as ExtractorEventType;
+  }
+
+  return event_type as EventType;
+}
+
 export function isEventType({
   event,
   eventType,
 }: {
   event: AirdropEvent;
   eventType: EventType;
 }): boolean {
-  return event.payload.event_type === eventType;
+  return translateEventType(event.payload.event_type) === translateEventType(eventType);
 }
 
 export function getTimeoutErrorEventType(eventType: EventType): {

src/types/extraction.ts

@@ -13,16 +13,16 @@ import { WorkerAdapter } from '../workers/worker-adapter';
  * EventType is an enum that defines the different types of events that can be sent to the external extractor from ADaaS.
  * The external extractor can use these events to know what to do next in the extraction process.
  */
-export enum EventType {
+export enum EventType { 
   // Extraction
-  ExtractionExternalSyncUnitsStart = 'EXTRACTION_EXTERNAL_SYNC_UNITS_START',
-  ExtractionMetadataStart = 'EXTRACTION_METADATA_START',
-  ExtractionDataStart = 'EXTRACTION_DATA_START',
-  ExtractionDataContinue = 'EXTRACTION_DATA_CONTINUE',
-  ExtractionDataDelete = 'EXTRACTION_DATA_DELETE',
-  ExtractionAttachmentsStart = 'EXTRACTION_ATTACHMENTS_START',
-  ExtractionAttachmentsContinue = 'EXTRACTION_ATTACHMENTS_CONTINUE',
-  ExtractionAttachmentsDelete = 'EXTRACTION_ATTACHMENTS_DELETE',
+  ExtractionExternalSyncUnitsStart = 'START_EXTRACTING_EXTERNAL_SYNC_UNITS',
+  ExtractionMetadataStart = 'START_EXTRACTING_METADATA',
+  ExtractionDataStart = 'START_EXTRACTING_DATA',
+  ExtractionDataContinue = 'CONTINUE_EXTRACTING_DATA',
+  ExtractionAttachmentsStart = 'START_EXTRACTING_ATTACHMENTS',
+  ExtractionAttachmentsContinue = 'CONTINUE_EXTRACTING_ATTACHMENTS',
+  ExtractionDataDelete = 'START_DELETING_EXTRACTOR_STATE',
+  ExtractionAttachmentsDelete = 'START_DELETING_EXTRACTOR_ATTACHMENTS_STATE',
 
   // Loading
   StartLoadingData = 'START_LOADING_DATA',
@@ -39,22 +39,22 @@ export enum EventType {
  */
 export enum ExtractorEventType {
   // Extraction
-  ExtractionExternalSyncUnitsDone = 'EXTRACTION_EXTERNAL_SYNC_UNITS_DONE',
-  ExtractionExternalSyncUnitsError = 'EXTRACTION_EXTERNAL_SYNC_UNITS_ERROR',
-  ExtractionMetadataDone = 'EXTRACTION_METADATA_DONE',
-  ExtractionMetadataError = 'EXTRACTION_METADATA_ERROR',
-  ExtractionDataProgress = 'EXTRACTION_DATA_PROGRESS',
-  ExtractionDataDelay = 'EXTRACTION_DATA_DELAY',
-  ExtractionDataDone = 'EXTRACTION_DATA_DONE',
-  ExtractionDataError = 'EXTRACTION_DATA_ERROR',
-  ExtractionDataDeleteDone = 'EXTRACTION_DATA_DELETE_DONE',
-  ExtractionDataDeleteError = 'EXTRACTION_DATA_DELETE_ERROR',
-  ExtractionAttachmentsProgress = 'EXTRACTION_ATTACHMENTS_PROGRESS',
-  ExtractionAttachmentsDelay = 'EXTRACTION_ATTACHMENTS_DELAY',
-  ExtractionAttachmentsDone = 'EXTRACTION_ATTACHMENTS_DONE',
-  ExtractionAttachmentsError = 'EXTRACTION_ATTACHMENTS_ERROR',
-  ExtractionAttachmentsDeleteDone = 'EXTRACTION_ATTACHMENTS_DELETE_DONE',
-  ExtractionAttachmentsDeleteError = 'EXTRACTION_ATTACHMENTS_DELETE_ERROR',
+  ExtractionExternalSyncUnitsDone = 'EXTERNAL_SYNC_UNIT_EXTRACTION_DONE',
+  ExtractionExternalSyncUnitsError = 'EXTERNAL_SYNC_UNIT_EXTRACTION_ERROR',
+  ExtractionMetadataDone = 'METADATA_EXTRACTION_DONE',
+  ExtractionMetadataError = 'METADATA_EXTRACTION_ERROR',
+  ExtractionDataProgress = 'DATA_EXTRACTION_PROGRESS',
+  ExtractionDataDelay = 'DATA_EXTRACTION_DELAY',
+  ExtractionDataDone = 'DATA_EXTRACTION_DONE',
+  ExtractionDataError = 'DATA_EXTRACTION_ERROR',
+  ExtractionAttachmentsProgress = 'ATTACHMENT_EXTRACTION_PROGRESS',
+  ExtractionAttachmentsDelay = 'ATTACHMENT_EXTRACTION_DELAY',
+  ExtractionAttachmentsDone = 'ATTACHMENT_EXTRACTION_DONE',
+  ExtractionAttachmentsError = 'ATTACHMENT_EXTRACTION_ERROR',
+  ExtractionDataDeleteDone = 'EXTRACTOR_STATE_DELETION_DONE',
+  ExtractionDataDeleteError = 'EXTRACTOR_STATE_DELETION_ERROR',
+  ExtractionAttachmentsDeleteDone = 'EXTRACTOR_ATTACHMENTS_STATE_DELETION_DONE',
+  ExtractionAttachmentsDeleteError = 'EXTRACTOR_ATTACHMENTS_STATE_DELETION_ERROR',
 
   // Unknown
   UnknownEventType = 'UNKNOWN_EVENT_TYPE',