Historical lookup indexed db

package.json

@@ -59,7 +59,7 @@
     }
   ],
   "dependencies": {
-    "@adobe/aep-rules-engine": "^2.0.1",
+    "@adobe/aep-rules-engine": "file:../aepsdk-rulesengine-typescript",
     "@adobe/reactor-cookie": "^1.0.0",
     "@adobe/reactor-load-script": "^1.1.1",
     "@adobe/reactor-object-assign": "^1.0.0",

sandbox/src/components/InAppMessagesDemo/InAppMessages.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-bitwise, no-console */
-import React from "react";
+import React, { useEffect, useState } from "react";
 import ContentSecurityPolicy from "../ContentSecurityPolicy";
 import "./InAppMessagesStyle.css";
 
@@ -40,55 +40,51 @@ const uuidv4 = () => {
   );
 };
 
-const getInAppPayload = async payload => {
-  const res = await fetch(
-    `https://edge.adobedc.net/ee/or2/v1/interact?configId=${datastreamId}&requestId=${uuidv4()}`,
-    {
-      method: "POST",
-      body: JSON.stringify(payload)
-    }
-  );
-  return res.json();
-};
-
-const fetchMobilePayload = () =>
-  getInAppPayload({
-    events: [
+export default function InAppMessages() {
+  const [response, setResponse] = useState(null);
+  const getInAppPayload = async payload => {
+    const res = await fetch(
+      `https://edge.adobedc.net/ee/or2/v1/interact?configId=${datastreamId}&requestId=${uuidv4()}`,
       {
-        query: {
-          personalization: {
-            surfaces: [surface]
-          }
-        },
-        xdm: {
-          timestamp: new Date().toISOString(),
-          implementationDetails: {
-            name: "https://ns.adobe.com/experience/mobilesdk/ios",
-            version: "3.7.4+1.5.0",
-            environment: "app"
-          }
-        }
+        method: "POST",
+        body: JSON.stringify(payload)
       }
-    ]
-  });
+    );
+    return res.json();
+  };
 
-export default function InAppMessages() {
-  const renderDecisions = () => {
-    window
-      .alloy("subscribeRulesetItems", {
-        surfaces: [surface],
-        callback: result => {
-          console.log("subscribeRulesetItems", result);
-        }
-      })
-      .then(fetchMobilePayload)
-      .then(response => {
-        window.alloy("applyResponse", {
-          renderDecisions: true,
-          decisionContext,
-          responseBody: response
-        });
+  useEffect(() => {
+    const fetchInAppPayload = async () => {
+      const res = await getInAppPayload({
+        events: [
+          {
+            query: {
+              personalization: {
+                surfaces: [surface]
+              }
+            },
+            xdm: {
+              timestamp: new Date().toISOString(),
+              implementationDetails: {
+                name: "https://ns.adobe.com/experience/mobilesdk/ios",
+                version: "3.7.4+1.5.0",
+                environment: "app"
+              }
+            }
+          }
+        ]
       });
+      setResponse(res);
+    };
+    fetchInAppPayload();
+  }, []);
+
+  const renderDecisions = () => {
+    window.alloy("applyResponse", {
+      renderDecisions: true,
+      decisionContext,
+      responseBody: response
+    });
   };
 
   return (

sandbox/src/components/MessageFeedDemo/MessageFeed.js

@@ -34,7 +34,7 @@ const mockResponse = {
             ],
             activity: {
               id:
-                "39ae8d4b-b55e-43dc-a143-77f50195b487#b47fde8b-57c1-4bbe-ae22-64d5b782d183"
+                "8e24e51d-5203-4d0b-99c9-2b3c95ff48f2#05885219-ea84-43bc-874e-1ef4a85b6fbb"
             },
             correlationID: "02c77ea8-7c0e-4d33-8090-4a5bfd3d7503"
           },
@@ -148,7 +148,7 @@ const mockResponse = {
             ],
             activity: {
               id:
-                "39ae8d4b-b55e-43dc-a143-77f50195b487#b47fde8b-57c1-4bbe-ae22-64d5b782d183"
+                "cf087a6e-131d-4147-adc7-bc1ea947f09c#ff64e6e6-e43f-479d-b5c0-f5568c771b3b"
             },
             correlationID: "02c77ea8-7c0e-4d33-8090-4a5bfd3d7503"
           },
@@ -179,9 +179,9 @@ const mockResponse = {
                                   definition: {
                                     events: [
                                       {
-                                        type: "decisioning.propositionDisplay",
-                                        id:
-                                          "1ae11bc5-96dc-41c7-8f71-157c57a5290e"
+                                        "iam.eventType": "display",
+                                        "iam.id":
+                                          "cf087a6e-131d-4147-adc7-bc1ea947f09c#ff64e6e6-e43f-479d-b5c0-f5568c771b3b"
                                       }
                                     ],
                                     matcher: "ge",
@@ -251,7 +251,7 @@ const mockResponse = {
             ],
             activity: {
               id:
-                "39ae8d4b-b55e-43dc-a143-77f50195b487#b47fde8b-57c1-4bbe-ae22-64d5b782d183"
+                "57712381-1690-4d19-9469-0a35ea5bd4e3#74f8e5cf-d770-41c3-b595-557b3ee00ba3"
             },
             correlationID: "02c77ea8-7c0e-4d33-8090-4a5bfd3d7503"
           },
@@ -282,9 +282,9 @@ const mockResponse = {
                                   definition: {
                                     events: [
                                       {
-                                        type: "decisioning.propositionDisplay",
-                                        id:
-                                          "d1f7d411-a549-47bc-a4d8-c8e638b0a46b"
+                                        "iam.eventType": "trigger",
+                                        "iam.id":
+                                          "57712381-1690-4d19-9469-0a35ea5bd4e3#74f8e5cf-d770-41c3-b595-557b3ee00ba3"
                                       }
                                     ],
                                     matcher: "ge",
@@ -424,7 +424,6 @@ export default function MessageFeed() {
         surface: "web://target.jasonwaters.dev/aep.html",
         callback: ({ items = [], rendered, clicked }) => {
           setClickHandler(() => clicked);
-
           setMessageFeedItems(items);
           rendered(items);
         }
@@ -453,12 +452,6 @@ export default function MessageFeed() {
       }
     });
   };
-
-  const resetPersistentData = () => {
-    localStorage.clear();
-    window.location.reload();
-  };
-
   return (
     <div>
       <ContentSecurityPolicy />
@@ -469,9 +462,6 @@ export default function MessageFeed() {
         <button id="deposit-funds" onClick={() => depositFunds()}>
           Deposit funds
         </button>
-        <button id="reset" onClick={() => resetPersistentData()}>
-          Reset
-        </button>
       </div>
       <div style={{ margin: "30px 0" }}>
         <h3>Message Feed</h3>

src/components/DecisioningEngine/constants.js

@@ -24,3 +24,5 @@ export const MOBILE_EVENT_SOURCE = {
   LAUNCH: "com.adobe.eventSource.applicationLaunch",
   REQUEST: "com.adobe.eventSource.requestContent"
 };
+
+export const HISTORICAL_DATA_STORE = "historicalDataStore";

src/components/DecisioningEngine/createContextProvider.js

@@ -42,8 +42,10 @@ export default ({ eventRegistry, window }) => {
       pageLoadTimestamp,
       currentTimestamp,
       currentDate: now.getDate(),
-      currentDay: now.getDay(),
-      currentHour: now.getHours(),
+      // Day of the week starts on Monday as is practiced in ISO 8601, but we want it to start on Sunday to match the authoring UI rule
+      "~state.com.adobe.module.lifecycle/lifecyclecontextdata.dayofweek":
+        now.getDay() + 1,
+      "~state.com.adobe.module.lifecycle/lifecyclecontextdata.hourofday": now.getHours(),
       currentMinute: now.getMinutes(),
       currentMonth: now.getMonth(),
       currentYear: now.getFullYear(),
@@ -84,7 +86,10 @@ export default ({ eventRegistry, window }) => {
       ...addedContext
     };
 
-    return { ...flattenObject(context), events: eventRegistry.toJSON() };
+    return {
+      ...flattenObject(context),
+      events: eventRegistry.getIndexDB()
+    };
   };
   return {
     getContext

src/components/DecisioningEngine/createDecisionHistory.js

@@ -10,15 +10,14 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const QUALIFIED_EVENT_TYPE = "decisioning.propositionQualified";
+import { PropositionEventType } from "../Personalization/constants/propositionEventType";
 
 export default ({ eventRegistry }) => {
-  const recordQualified = item => {
-    const { id } = item;
+  const recordQualified = id => {
     if (!id) {
       return undefined;
     }
-    return eventRegistry.addEvent(item, QUALIFIED_EVENT_TYPE, id);
+    return eventRegistry.addEvent({}, PropositionEventType.TRIGGER, id);
   };
 
   return { recordQualified };

src/components/DecisioningEngine/createDecisionProvider.js

@@ -33,16 +33,22 @@ export default ({ eventRegistry }) => {
     }
   };
 
-  const evaluate = (context = {}) =>
-    Object.values(payloads)
-      .map(payload => payload.evaluate(context))
-      .filter(payload => payload.items.length > 0);
+  const evaluate = (context = {}) => {
+    return new Promise(resolve => {
+      Promise.all(
+        Object.values(payloads).map(payload => payload.evaluate(context))
+      ).then(consequences => {
+        resolve(consequences.filter(payload => payload.items.length > 0));
+      });
+    });
+  };
 
   const addPayloads = personalizationPayloads => {
     personalizationPayloads.forEach(addPayload);
   };
 
   return {
+    // TODO: remove addPayload below if unsed from outside of this file.
     addPayload,
     addPayloads,
     evaluate

src/components/DecisioningEngine/createEvaluableRulesetPayload.js

@@ -14,10 +14,11 @@ import {
   JSON_CONTENT_ITEM,
   RULESET_ITEM
 } from "../Personalization/constants/schema";
-import { DISPLAY } from "../Personalization/constants/eventType";
+import { PropositionEventType } from "../Personalization/constants/propositionEventType";
 
 import flattenArray from "../../utils/flattenArray";
 import createConsequenceAdapter from "./createConsequenceAdapter";
+import { getActivityId } from "./utils";
 
 const isRulesetItem = item => {
   const { schema, data } = item;
@@ -42,6 +43,7 @@ const isRulesetItem = item => {
 
 export default (payload, eventRegistry, decisionHistory) => {
   const consequenceAdapter = createConsequenceAdapter();
+  const activityId = getActivityId(payload);
   const items = [];
 
   const addItem = item => {
@@ -59,31 +61,51 @@ export default (payload, eventRegistry, decisionHistory) => {
   };
 
   const evaluate = context => {
-    const displayEvent = eventRegistry.getEvent(DISPLAY, payload.id);
-
-    const displayedDate = displayEvent
-      ? displayEvent.firstTimestamp
-      : undefined;
-
-    const qualifyingItems = flattenArray(
-      items.map(item => item.execute(context))
-    )
-      .map(consequenceAdapter)
-      .map(item => {
-        const {
-          firstTimestamp: qualifiedDate
-        } = decisionHistory.recordQualified(item);
-
-        return {
-          ...item,
-          data: { ...item.data, qualifiedDate, displayedDate }
-        };
-      });
-
-    return {
-      ...payload,
-      items: qualifyingItems
-    };
+    return new Promise(resolve => {
+      let consequencesFlattened = [];
+      Promise.all(items.map(item => item.execute(context)))
+        .then(consequences => {
+          consequencesFlattened = flattenArray(consequences).map(
+            consequenceAdapter
+          );
+          if (!consequencesFlattened || consequencesFlattened.length === 0) {
+            resolve({
+              ...payload,
+              items: []
+            });
+            return;
+          }
+
+          decisionHistory.recordQualified(activityId);
+        })
+        .then(() =>
+          Promise.all([
+            eventRegistry.getEventsFirstTimestamp(
+              PropositionEventType.DISPLAY,
+              activityId
+            ),
+            eventRegistry.getEventsFirstTimestamp(
+              PropositionEventType.TRIGGER,
+              activityId
+            )
+          ])
+        )
+        .then(dates => {
+          const displayedDate = dates[0];
+          const qualifiedDate = dates[1];
+          const qualifyingItems = consequencesFlattened.map(item => {
+            return {
+              ...item,
+              data: { ...item.data, qualifiedDate, displayedDate }
+            };
+          });
+
+          resolve({
+            ...payload,
+            items: qualifyingItems
+          });
+        });
+    });
   };
 
   if (Array.isArray(payload.items)) {

src/components/DecisioningEngine/createEvaluateRulesetsCommand.js

@@ -22,11 +22,12 @@ const validateOptions = ({ options }) => {
 
 export default ({ contextProvider, decisionProvider }) => {
   const run = ({ renderDecisions, decisionContext, applyResponse }) => {
-    return applyResponse({
-      renderDecisions,
-      propositions: decisionProvider.evaluate(
-        contextProvider.getContext(decisionContext)
-      )
+    return new Promise(resolve => {
+      decisionProvider
+        .evaluate(contextProvider.getContext(decisionContext))
+        .then(propositions => {
+          resolve(applyResponse({ renderDecisions, propositions }));
+        });
     });
   };