From 2a7114063d3f80ebec20a63c0eca44528fc571a1 Mon Sep 17 00:00:00 2001
From: Lucie Milan <lmilan@talend.com>
Date: Mon, 23 Oct 2023 13:43:13 +0200
Subject: [PATCH] fixed eloqua

---
 .../eloqua/v1/eloqua-v1-foreign-keys.yml      | 137 +++---------------
 .../schemas/eloqua/v1/eloqua-v1-issues.txt    |   9 --
 .../schemas/eloqua/v1/eloqua-v1-tables.yml    |  14 +-
 ...ustom-objects.json => custom_objects.json} |   0
 .../schemas/eloqua/v1/json/email_groups.json  | 124 ----------------
 5 files changed, 25 insertions(+), 259 deletions(-)
 delete mode 100644 _data/taps/schemas/eloqua/v1/eloqua-v1-issues.txt
 rename _data/taps/schemas/eloqua/v1/json/{custom-objects.json => custom_objects.json} (100%)
 delete mode 100644 _data/taps/schemas/eloqua/v1/json/email_groups.json

diff --git a/_data/taps/schemas/eloqua/v1/eloqua-v1-foreign-keys.yml b/_data/taps/schemas/eloqua/v1/eloqua-v1-foreign-keys.yml
index 3fb88a3c5..cbdbebdab 100644
--- a/_data/taps/schemas/eloqua/v1/eloqua-v1-foreign-keys.yml
+++ b/_data/taps/schemas/eloqua/v1/eloqua-v1-foreign-keys.yml
@@ -70,7 +70,7 @@ keys:
   contacts_ContactId:
   - table: contacts
     keys:
-    - id
+    - Id
   - table: activity_bounceback
     keys:
     - ContactId
@@ -106,14 +106,14 @@ keys:
     keys:
     - processingSteps.emailId
   _emailFooterId:
-  - table: email_groups
+  - table: emailGroups
     keys:
     - emailFooterId
   - table: emails
     keys:
     - emailFooterId
   _emailHeaderId:
-  - table: email_groups
+  - table: emailGroups
     keys:
     - emailHeaderId
   - table: emails
@@ -138,9 +138,6 @@ keys:
   - table: forms
     keys:
     - id
-  - table: emails
-    keys:
-    - forms.id
   _:
   - table: assets
     keys:
@@ -158,10 +155,6 @@ keys:
     - dynamicContents.updatedBy
     - fieldMerges.createdBy
     - fieldMerges.updatedBy
-    - forms.createdBy
-    - forms.updatedBy
-    - forms.elements.createdBy
-    - forms.elements.updatedBy
     - hyperlinks.createdBy
     - hyperlinks.updatedBy
     - images.createdBy
@@ -266,22 +259,6 @@ tables:
       foreign-key: fieldMerges.updatedBy
     - key: updatedBy
       foreign-key: fieldMerges.updatedBy
-    - key: createdBy
-      foreign-key: forms.createdBy
-    - key: updatedBy
-      foreign-key: forms.createdBy
-    - key: createdBy
-      foreign-key: forms.updatedBy
-    - key: updatedBy
-      foreign-key: forms.updatedBy
-    - key: createdBy
-      foreign-key: forms.elements.createdBy
-    - key: updatedBy
-      foreign-key: forms.elements.createdBy
-    - key: createdBy
-      foreign-key: forms.elements.updatedBy
-    - key: updatedBy
-      foreign-key: forms.elements.updatedBy
     - key: createdBy
       foreign-key: hyperlinks.createdBy
     - key: updatedBy
@@ -383,7 +360,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -471,7 +448,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -561,7 +538,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -645,7 +622,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -733,7 +710,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -823,7 +800,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -907,7 +884,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -989,7 +966,7 @@ tables:
   - table-name: contacts
     keys:
     - key: ContactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: visitors
     keys:
     - key: ContactId
@@ -1126,30 +1103,6 @@ tables:
       foreign-key: fieldMerges.updatedBy
     - key: runAsUserId
       foreign-key: fieldMerges.updatedBy
-    - key: createdBy
-      foreign-key: forms.createdBy
-    - key: updatedBy
-      foreign-key: forms.createdBy
-    - key: runAsUserId
-      foreign-key: forms.createdBy
-    - key: createdBy
-      foreign-key: forms.updatedBy
-    - key: updatedBy
-      foreign-key: forms.updatedBy
-    - key: runAsUserId
-      foreign-key: forms.updatedBy
-    - key: createdBy
-      foreign-key: forms.elements.createdBy
-    - key: updatedBy
-      foreign-key: forms.elements.createdBy
-    - key: runAsUserId
-      foreign-key: forms.elements.createdBy
-    - key: createdBy
-      foreign-key: forms.elements.updatedBy
-    - key: updatedBy
-      foreign-key: forms.elements.updatedBy
-    - key: runAsUserId
-      foreign-key: forms.elements.updatedBy
     - key: createdBy
       foreign-key: hyperlinks.createdBy
     - key: updatedBy
@@ -1230,8 +1183,6 @@ tables:
       foreign-key: hyperlinks.folderId
     - key: folderId
       foreign-key: images.folderId
-    - key: id
-      foreign-key: forms.id
   - table-name: assets
     keys:
     - key: folderId
@@ -1240,46 +1191,46 @@ tables:
   join:
   - table-name: activity_bounceback
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: activity_email_clickthrough
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: activity_email_open
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: activity_email_send
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: activity_form_submit
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: activity_page_view
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: activity_subscribe
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: activity_unsubscribe
     keys:
-    - key: id
+    - key: Id
       foreign-key: ContactId
   - table-name: visitors
     keys:
-    - key: id
+    - key: Id
       foreign-key: contactId
 - table-name: visitors
   join:
   - table-name: contacts
     keys:
     - key: contactId
-      foreign-key: id
+      foreign-key: Id
   - table-name: activity_bounceback
     keys:
     - key: contactId
@@ -1332,9 +1283,7 @@ tables:
       foreign-key: folderId
     - key: images.folderId
       foreign-key: folderId
-    - key: forms.id
-      foreign-key: id
-  - table-name: email_groups
+  - table-name: emailGroups
     keys:
     - key: emailFooterId
       foreign-key: emailFooterId
@@ -1358,14 +1307,6 @@ tables:
       foreign-key: createdBy
     - key: fieldMerges.updatedBy
       foreign-key: createdBy
-    - key: forms.createdBy
-      foreign-key: createdBy
-    - key: forms.updatedBy
-      foreign-key: createdBy
-    - key: forms.elements.createdBy
-      foreign-key: createdBy
-    - key: forms.elements.updatedBy
-      foreign-key: createdBy
     - key: hyperlinks.createdBy
       foreign-key: createdBy
     - key: hyperlinks.updatedBy
@@ -1386,14 +1327,6 @@ tables:
       foreign-key: updatedBy
     - key: fieldMerges.updatedBy
       foreign-key: updatedBy
-    - key: forms.createdBy
-      foreign-key: updatedBy
-    - key: forms.updatedBy
-      foreign-key: updatedBy
-    - key: forms.elements.createdBy
-      foreign-key: updatedBy
-    - key: forms.elements.updatedBy
-      foreign-key: updatedBy
     - key: hyperlinks.createdBy
       foreign-key: updatedBy
     - key: hyperlinks.updatedBy
@@ -1422,14 +1355,6 @@ tables:
       foreign-key: createdBy
     - key: fieldMerges.updatedBy
       foreign-key: createdBy
-    - key: forms.createdBy
-      foreign-key: createdBy
-    - key: forms.updatedBy
-      foreign-key: createdBy
-    - key: forms.elements.createdBy
-      foreign-key: createdBy
-    - key: forms.elements.updatedBy
-      foreign-key: createdBy
     - key: hyperlinks.createdBy
       foreign-key: createdBy
     - key: hyperlinks.updatedBy
@@ -1450,14 +1375,6 @@ tables:
       foreign-key: updatedBy
     - key: fieldMerges.updatedBy
       foreign-key: updatedBy
-    - key: forms.createdBy
-      foreign-key: updatedBy
-    - key: forms.updatedBy
-      foreign-key: updatedBy
-    - key: forms.elements.createdBy
-      foreign-key: updatedBy
-    - key: forms.elements.updatedBy
-      foreign-key: updatedBy
     - key: hyperlinks.createdBy
       foreign-key: updatedBy
     - key: hyperlinks.updatedBy
@@ -1478,14 +1395,6 @@ tables:
       foreign-key: runAsUserId
     - key: fieldMerges.updatedBy
       foreign-key: runAsUserId
-    - key: forms.createdBy
-      foreign-key: runAsUserId
-    - key: forms.updatedBy
-      foreign-key: runAsUserId
-    - key: forms.elements.createdBy
-      foreign-key: runAsUserId
-    - key: forms.elements.updatedBy
-      foreign-key: runAsUserId
     - key: hyperlinks.createdBy
       foreign-key: runAsUserId
     - key: hyperlinks.updatedBy
@@ -1496,7 +1405,7 @@ tables:
       foreign-key: runAsUserId
     - key: updatedBy
       foreign-key: runAsUserId
-- table-name: email_groups
+- table-name: emailGroups
   join:
   - table-name: emails
     keys:
diff --git a/_data/taps/schemas/eloqua/v1/eloqua-v1-issues.txt b/_data/taps/schemas/eloqua/v1/eloqua-v1-issues.txt
deleted file mode 100644
index 3c16ed414..000000000
--- a/_data/taps/schemas/eloqua/v1/eloqua-v1-issues.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-JSON file _data/taps/schemas/eloqua/v1/json/Custom Objects.json not found
-Primary Key  not found in _data/taps/schemas/eloqua/v1/json/emailGroups.json
-Replication Key  not found in _data/taps/schemas/eloqua/v1/json/emailGroups.json
-Key id not found in _data/taps/schemas/eloqua/v1/json/contacts.json
-Key forms.id not found in _data/taps/schemas/eloqua/v1/json/emails.json
-Key forms.createdBy not found in _data/taps/schemas/eloqua/v1/json/emails.json
-Key forms.updatedBy not found in _data/taps/schemas/eloqua/v1/json/emails.json
-Key forms.elements.createdBy not found in _data/taps/schemas/eloqua/v1/json/emails.json
-Key forms.elements.updatedBy not found in _data/taps/schemas/eloqua/v1/json/emails.json
diff --git a/_data/taps/schemas/eloqua/v1/eloqua-v1-tables.yml b/_data/taps/schemas/eloqua/v1/eloqua-v1-tables.yml
index f84abd02b..c02d540eb 100644
--- a/_data/taps/schemas/eloqua/v1/eloqua-v1-tables.yml
+++ b/_data/taps/schemas/eloqua/v1/eloqua-v1-tables.yml
@@ -240,7 +240,7 @@ tables:
     primary-key: Id
     replication-key: UpdatedAt
   status: not_found
-- name: Custom Objects
+- name: custom_objects
   description: 'For each custom object in your {{ integration.display_name }} account,
     Stitch will display a table as available for selection. The name of the table
     will be the normalized name of the object, using snake case (spaces replaced with
@@ -278,7 +278,7 @@ tables:
     replication-method: Key-based Incremental
     primary-key: id
     replication-key: updatedAt
-- name: email_groups
+- name: emailGroups
   description: 'The `{{ table.name }}` table contains details about the email groups
     in your {{ integration.display_name }} account.
 
@@ -295,7 +295,6 @@ tables:
     replication-method: Key-based Incremental
     primary-key: id
     replication-key: updatedAt
-  status: not_found
 - name: forms
   description: 'The `{{ table.name }}` table contains info about the forms in your
     {{ integration.display_name }} account.
@@ -333,12 +332,3 @@ tables:
     replication-method: Key-based Incremental
     primary-key: id
     replication-key: V_LastVisitDateAndTime
-- name: emailGroups
-  description: ''
-  links:
-    singer-schema: ''
-    doc-link: ''
-  table-details:
-    replication-method: ''
-    primary-key: ''
-    replication-key: ''
diff --git a/_data/taps/schemas/eloqua/v1/json/custom-objects.json b/_data/taps/schemas/eloqua/v1/json/custom_objects.json
similarity index 100%
rename from _data/taps/schemas/eloqua/v1/json/custom-objects.json
rename to _data/taps/schemas/eloqua/v1/json/custom_objects.json
diff --git a/_data/taps/schemas/eloqua/v1/json/email_groups.json b/_data/taps/schemas/eloqua/v1/json/email_groups.json
deleted file mode 100644
index d0507f133..000000000
--- a/_data/taps/schemas/eloqua/v1/json/email_groups.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "properties": {
-    "createdAt": {
-      "type": [
-        "date-time"
-      ]
-    },
-    "createdBy": {
-      "type": [
-        "string"
-      ]
-    },
-    "depth": {
-      "type": [
-        "string"
-      ]
-    },
-    "displayName": {
-      "type": [
-        "string"
-      ]
-    },
-    "emailFooterId": {
-      "type": [
-        "string"
-      ]
-    },
-    "emailHeaderId": {
-      "type": [
-        "string"
-      ]
-    },
-    "id": {
-      "type": [
-        "string"
-      ]
-    },
-    "isSecureNotificationsGroup": {
-      "type": [
-        "string"
-      ]
-    },
-    "isVisibleInOutlookPlugin": {
-      "type": [
-        "string"
-      ]
-    },
-    "isVisibleInPublicSubscriptionList": {
-      "type": [
-        "string"
-      ]
-    },
-    "isWelcomeCommunicationsGroup": {
-      "type": [
-        "string"
-      ]
-    },
-    "name": {
-      "type": [
-        "string"
-      ]
-    },
-    "notificationEmailId": {
-      "type": [
-        "string"
-      ]
-    },
-    "requireOptIn": {
-      "type": [
-        "string"
-      ]
-    },
-    "subscriptionLandingPageId": {
-      "type": [
-        "string"
-      ]
-    },
-    "subscriptionListDataLookupId": {
-      "type": [
-        "string"
-      ]
-    },
-    "subscriptionListId": {
-      "type": [
-        "string"
-      ]
-    },
-    "type": {
-      "type": [
-        "string"
-      ]
-    },
-    "unSubscriptionListDataLookupId": {
-      "type": [
-        "string"
-      ]
-    },
-    "unSubscriptionListId": {
-      "type": [
-        "string"
-      ]
-    },
-    "unsubscriptionLandingPageId": {
-      "type": [
-        "string"
-      ]
-    },
-    "updatedAt": {
-      "type": [
-        "date-time"
-      ]
-    },
-    "updatedBy": {
-      "type": [
-        "string"
-      ]
-    },
-    "useSecureChannel": {
-      "type": [
-        "string"
-      ]
-    }
-  }
-}
\ No newline at end of file