From 8607c84bea8cd025eee4d9572dadf2dbc353b3bd Mon Sep 17 00:00:00 2001
From: Ryan Dew <ryan.j.dew@gmail.com>
Date: Tue, 15 Jan 2019 10:13:58 -0800
Subject: [PATCH] Es alignment - Fix failing tests (#1747)

* Add triggers for entity model TDE generation

* Combine referenced entities into a single entity model

* Add triggers folder to upgrade test example
---
 .../marklogic/hub/core/HubProjectTest.java    |  2 +-
 .../triggers/ml-dh-entity-create.json         | 31 +++++++++++++++++++
 .../triggers/ml-dh-entity-delete.json         | 31 +++++++++++++++++++
 .../triggers/ml-dh-entity-modify.json         | 31 +++++++++++++++++++
 4 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-create.json
 create mode 100644 marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-delete.json
 create mode 100644 marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-modify.json

diff --git a/marklogic-data-hub/src/test/java/com/marklogic/hub/core/HubProjectTest.java b/marklogic-data-hub/src/test/java/com/marklogic/hub/core/HubProjectTest.java
index db8e120ed4..35774fe45b 100644
--- a/marklogic-data-hub/src/test/java/com/marklogic/hub/core/HubProjectTest.java
+++ b/marklogic-data-hub/src/test/java/com/marklogic/hub/core/HubProjectTest.java
@@ -166,7 +166,7 @@ public void upgrade300To403ToCurrentVersion() throws Exception {
         adminHubConfig.refreshProject();
 
         dataHub.upgradeHub();
-        
+
         // Confirm that the directories have been backed up
         Assertions.assertTrue(adminHubConfig.getHubProject().getProjectDir()
                 .resolve("src/main/hub-internal-config-4.0.3").toFile().exists());
diff --git a/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-create.json b/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-create.json
new file mode 100644
index 0000000000..430363be68
--- /dev/null
+++ b/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-create.json
@@ -0,0 +1,31 @@
+{
+  "name": "ml-dh-entity-create",
+  "description": "MarkLogic Data Hub entity model creation trigger",
+  "event": {
+    "data-event": {
+      "collection-scope": {
+        "uri": "http://marklogic.com/entity-services/models"
+      },
+      "document-content": {
+        "update-kind": "create"
+      },
+      "when": "post-commit"
+    }
+  },
+  "module": "data-hub/4/triggers/entity-model-trigger.xqy",
+  "module-db": "%%mlModulesDbName%%",
+  "module-root": "/",
+  "enabled": true,
+  "recursive": true,
+  "task-priority": "normal",
+  "permission": [
+    {
+      "role-name": "%%mlHubAdminRole%%",
+      "capability": "update"
+    },
+    {
+      "role-name": "%%mlHubUserRole%%",
+      "capability": "read"
+    }
+  ]
+}
diff --git a/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-delete.json b/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-delete.json
new file mode 100644
index 0000000000..9e1275abf1
--- /dev/null
+++ b/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-delete.json
@@ -0,0 +1,31 @@
+{
+  "name": "ml-dh-entity-delete",
+  "description": "MarkLogic Data Hub entity model delete trigger",
+  "event": {
+    "data-event": {
+      "collection-scope": {
+        "uri": "http://marklogic.com/entity-services/models"
+      },
+      "document-content": {
+        "update-kind": "delete"
+      },
+      "when": "post-commit"
+    }
+  },
+  "module": "data-hub/4/triggers/entity-model-delete-trigger.xqy",
+  "module-db": "%%mlModulesDbName%%",
+  "module-root": "/",
+  "enabled": true,
+  "recursive": true,
+  "task-priority": "normal",
+  "permission": [
+    {
+      "role-name": "%%mlHubAdminRole%%",
+      "capability": "update"
+    },
+    {
+      "role-name": "%%mlHubUserRole%%",
+      "capability": "read"
+    }
+  ]
+}
diff --git a/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-modify.json b/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-modify.json
new file mode 100644
index 0000000000..5b35490faf
--- /dev/null
+++ b/marklogic-data-hub/src/test/resources/upgrade-projects/dhf403from300/src/main/hub-internal-config/triggers/ml-dh-entity-modify.json
@@ -0,0 +1,31 @@
+{
+  "name": "ml-dh-entity-modify",
+  "description": "MarkLogic Data Hub entity model update trigger",
+  "event": {
+    "data-event": {
+      "collection-scope": {
+        "uri": "http://marklogic.com/entity-services/models"
+      },
+      "document-content": {
+        "update-kind": "modify"
+      },
+      "when": "post-commit"
+    }
+  },
+  "module": "data-hub/4/triggers/entity-model-trigger.xqy",
+  "module-db": "%%mlModulesDbName%%",
+  "module-root": "/",
+  "enabled": true,
+  "recursive": true,
+  "task-priority": "normal",
+  "permission": [
+    {
+      "role-name": "%%mlHubAdminRole%%",
+      "capability": "update"
+    },
+    {
+      "role-name": "%%mlHubUserRole%%",
+      "capability": "read"
+    }
+  ]
+}