Merge pull request #67 from AirGrid/release/v0.0.0-dev.17

release: v0.0.0-dev.17 MASTER
AirGrid · Oct 5, 2020 · 23b83ff · 23b83ff
2 parents 3b7a80d + c0f189b
commit 23b83ff
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
@@ -58,6 +58,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 12
+          registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies
         run: npm install

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgrid/edgekit",
-  "version": "0.0.0-dev.15",
+  "version": "0.0.0-dev.17",
   "homepage": "https://edgekit.org/",
   "author": "AirGrid <https://airgrid.io>",
   "license": "MIT",

diff --git a/src/audiences/index.ts b/src/audiences/index.ts
@@ -13,6 +13,7 @@ export const sportInterestAudience: AudienceDefinition = {
   name: 'Interest | Sport',
   version: VERSION,
   definition: {
+    featureVersion: 1,
     ttl: TTL_IN_SECS,
     lookBack: LOOK_BACK_IN_SECS,
     occurrences: OCCURRENCES,
@@ -27,6 +28,7 @@ export const travelInterestAudience: AudienceDefinition = {
   name: 'Interest | Travel',
   version: VERSION,
   definition: {
+    featureVersion: 1,
     ttl: TTL_IN_SECS,
     lookBack: LOOK_BACK_IN_SECS,
     occurrences: OCCURRENCES,
@@ -41,6 +43,7 @@ export const automotiveInterestAudience: AudienceDefinition = {
   name: 'Interest | Automotive',
   version: VERSION,
   definition: {
+    featureVersion: 1,
     ttl: TTL_IN_SECS,
     lookBack: LOOK_BACK_IN_SECS,
     occurrences: OCCURRENCES,

diff --git a/src/engine/translate.ts b/src/engine/translate.ts
@@ -12,7 +12,7 @@ export const translate = (
         isStringArray(audienceDefinition.definition.queryValue)
           ? [
               {
-                version: audienceDefinition.version,
+                version: audienceDefinition.definition.featureVersion,
                 property: audienceDefinition.definition.queryProperty,
                 filterComparisonType:
                   audienceDefinition.definition.queryFilterComparisonType,
@@ -24,7 +24,7 @@ export const translate = (
             isVectorQueryValue(audienceDefinition.definition.queryValue)
           ? [
               {
-                version: audienceDefinition.version,
+                version: audienceDefinition.definition.featureVersion,
                 property: audienceDefinition.definition.queryProperty,
                 filterComparisonType:
                   audienceDefinition.definition.queryFilterComparisonType,

diff --git a/test/gdpr.test.ts b/test/gdpr.test.ts
@@ -24,6 +24,7 @@ const sportAudience: AudienceDefinition = {
   name: 'Sport Audience',
   version: 1,
   definition: {
+    featureVersion: 1,
     ttl: TTL,
     lookBack: 10,
     occurrences: 0,

diff --git a/test/run.test.ts b/test/run.test.ts
@@ -41,6 +41,7 @@ const sportAudience: AudienceDefinition = {
   name: 'Sport Audience',
   version: 1,
   definition: {
+    featureVersion: 1,
     ttl: TTL,
     lookBack: 10,
     occurrences: 2,
@@ -55,6 +56,7 @@ const lookBackInfinityAudience: AudienceDefinition = {
   name: 'Look Back Audience',
   version: 1,
   definition: {
+    featureVersion: 1,
     ttl: TTL,
     lookBack: 0,
     occurrences: 2,
@@ -69,6 +71,7 @@ const lookBackAudience: AudienceDefinition = {
   name: 'Look Back Audience',
   version: 1,
   definition: {
+    featureVersion: 1,
     ttl: TTL,
     lookBack: 2,
     occurrences: 2,
@@ -83,6 +86,7 @@ const topicModelAudience: AudienceDefinition = {
   name: 'Look Back Audience',
   version: 1,
   definition: {
+    featureVersion: 1,
     ttl: 100,
     lookBack: 2,
     occurrences: 1,
@@ -317,6 +321,7 @@ describe('Topic model run with additional audience', () => {
     name: 'Interest | Sport',
     version: 1,
     definition: {
+      featureVersion: 1,
       occurrences: 1,
       ttl: 1000,
       lookBack: 1000,
@@ -334,6 +339,7 @@ describe('Topic model run with additional audience', () => {
     name: 'Interest | Sport',
     version: 1,
     definition: {
+      featureVersion: 1,
       occurrences: 1,
       ttl: 1000,
       lookBack: 1000,
@@ -427,8 +433,9 @@ describe('Topic model run version mismatch', () => {
   const topicModelAudience: AudienceDefinition = {
     id: 'iab-608',
     name: 'Interest | Sport',
-    version: 2,
+    version: 1,
     definition: {
+      featureVersion: 2,
       occurrences: 1,
       ttl: 1000,
       lookBack: 1000,
@@ -444,8 +451,9 @@ describe('Topic model run version mismatch', () => {
   const keywordsAudience: AudienceDefinition = {
     id: 'iab-607',
     name: 'Interest | Sport',
-    version: 2,
+    version: 1,
     definition: {
+      featureVersion: 2,
       occurrences: 1,
       ttl: 1000,
       lookBack: 1000,

diff --git a/types/index.ts b/types/index.ts
@@ -64,6 +64,7 @@ export interface AudienceDefinition {
   name: string;
   definition:
     | {
+        featureVersion: number;
         ttl: number;
         lookBack: number;
         occurrences: number;
@@ -72,6 +73,7 @@ export interface AudienceDefinition {
         queryFilterComparisonType: 'vectorDistance';
       }
     | {
+        featureVersion: number;
         ttl: number;
         lookBack: number;
         occurrences: number;