DHFPROD-10568: Only include 'latest' when matching temporal docs

Author: Ryan Dew

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/impl/hub-utils/invoke-queue-write.mjs

@@ -81,6 +81,9 @@ if(writerQueue != null && Object.keys(writerQueue).length !== 0) {
       const quality = context.quality || 0;
 
       if (temporalCollection) {
+        if (!content.value) {
+          content.value = cts.doc(content.uri);
+        }
         // temporalDocURI is managed by the temporal package and must not be carried forward.
         if (metadata) {
           delete metadata.temporalDocURI;

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/mastering/matching/matchable.mjs

@@ -4,6 +4,7 @@ import httpUtils from "/data-hub/5/impl/http-utils.mjs";
 import hubUtils from "/data-hub/5/impl/hub-utils.mjs";
 import common from "/data-hub/5/mastering/common.mjs";
 import {getEntityModel} from "/data-hub/core/models/entities.mjs";
+import temporalLib from "/data-hub/5/temporal/hub-temporal.mjs";
 
 // matching XQuery module for performance
 const matchingXqy = require("/data-hub/5/mastering/matching/matching.xqy");
@@ -113,7 +114,12 @@ export class Matchable {
    */
   baselineQuery() {
     if (!this._baselineQuery) {
-      const firstBaseline = this._model.instanceQuery();
+      let firstBaseline = this._model.instanceQuery();
+      const temporalCollections = temporalLib.getTemporalCollections().toArray();
+      const includesTemporalDocuments = temporalCollections.some(collection => cts.exists(cts.andQuery([firstBaseline, cts.collectionQuery(collection)])));
+      if (includesTemporalDocuments) {
+        firstBaseline = cts.andQuery([firstBaseline, cts.collectionQuery("latest")]);
+      }
       this._baselineQuery = common.applyInterceptors("Baseline Query Interceptor", firstBaseline, this.matchStep.baselineQueryInterceptors);
       if (matchingTraceEnabled) {
         xdmp.trace(matchingTraceEvent, `Initializing the baseline match query: ${xdmp.describe(this._baselineQuery, Sequence.from([]), Sequence.from([]))}`);

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/features/temporal/temporal.mjs

@@ -1,7 +1,10 @@
 import temporalFeature from "/data-hub/features/temporal.mjs";
-const test = require("/test/test-helper.xqy");
 import temporalLib from "/data-hub/5/temporal/hub-temporal.mjs";
 
+import { Matchable } from "/data-hub/5/mastering/matching/matchable.mjs";
+
+const test = require("/test/test-helper.xqy");
+
 const myTempCollection = "koolTest";
 function getTemporalCollection(tempCollection) {
   const temporalCollections = temporalLib.getTemporalCollections().toArray();
@@ -37,15 +40,32 @@ const contentArray = [];
 contentArray.push({
   "uri": "/affiliate1.json",
   "value": { "meta": { "systemStart": "1601-01-01T13:59:00Z", "systemEnd": "9999-12-31T11:59:59Z", "validStart": fn.currentDateTime() , "validEnd": fn.currentDateTime().add(xs.yearMonthDuration('P1Y'))  },"customerId": "1"} ,
-  "context": { "collections":[myTempCollection]}});
+  "context": { "collections":[myTempCollection, "AffiliateCustomer"]}});
 xdmp.invokeFunction(() =>{
-temporalFeature.onInstanceSave(stepContext, model, contentArray);
+  temporalFeature.onInstanceSave(stepContext, model, contentArray);
 });
 xdmp.invokeFunction(() => {
   assertions.push(test.assertEqual(1,
     cts.estimate(cts.andQuery([cts.collectionQuery(["koolTest"]), cts.collectionQuery(["latest"])])),
     `One document must be found with collection: ${myTempCollection}.`));
 });
+
+// Test matching with temporal collection
+xdmp.invokeFunction(() => {
+  const matchable = new Matchable({ targetEntityType: "http://example.org/AffiliateCustomer-0.0.1/AffiliateCustomer" });
+  const baselineQuery = matchable.baselineQuery();
+  assertions.push(
+    test.assertTrue(baselineQuery instanceof cts.andQuery, `Baseline for temporal query should be a cts.andQuery: ${xdmp.toJsonString(baselineQuery)}.`)
+  );
+  const latestQuery = cts.andQueryQueries(baselineQuery).toArray()[1];
+  assertions.push(
+    test.assertTrue(latestQuery instanceof cts.collectionQuery, `Second query in cts.andQuery should be a cts.collectionQuery: ${xdmp.toJsonString(latestQuery)}.`),
+    test.assertEqual("latest",fn.head(cts.collectionQueryUris(latestQuery)))
+  );
+
+});
+
+
 const contentArrayDelete = [];
 contentArrayDelete.push({
   "uri": "/affiliate1.json",