digirati-co-uk · stephenwf · Nov 24, 2022 · Nov 25, 2022 · Nov 27, 2022 · Nov 27, 2022
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ infrastructure/ansible/vars/default.yml
 var_backup
 e2e/cypress/fixtures/madoc-test-fixtures
 services/search
+services/enrichment
 services/madoc-remix
 services/madoc-ts/service-jwts/madoc-remix.json
 e2e/test-fixtures/postgres/default/default.sql
diff --git a/docker-compose.enrichment.yml b/docker-compose.enrichment.yml
@@ -0,0 +1,34 @@
+version: "3.2"
+services:
+  # Internal services
+
+  search:
+    build:
+      context: services/enrichment
+      dockerfile: Dockerfile
+    environment:
+      - BROWSABLE=False
+      - USE_DOCKER=yes
+      - IPYTHONDIR=/app/.ipython
+      - MIGRATE=True
+      - LOAD=False
+      - DEBUG=True
+      - DJANGO_DEBUG=True
+      - WAITRESS=False
+      - POSTGRES_HOST=shared-postgres
+      - POSTGRES_PORT=${POSTGRES_PORT}
+      - POSTGRES_USER=${POSTGRES_SEARCH_API_USER}
+      - REDIS_URL=redis://gateway-redis:6379
+      - APPEND_SLASH=False
+      - ALLOWED_HOSTS=gateway,madoc.local
+      - POSTGRES_PASSWORD=${POSTGRES_SEARCH_API_PASSWORD}
+      - POSTGRES_SCHEMA=${POSTGRES_SEARCH_API_SCHEMA}
+      - POSTGRES_DB=${POSTGRES_DB}
+      - DATABASE_URL=postgres://${POSTGRES_SEARCH_API_USER}:${POSTGRES_SEARCH_API_PASSWORD}@shared-postgres:${POSTGRES_PORT}/${POSTGRES_DB}
+      - INLINE_WORKER=True
+    links:
+      - shared-postgres
+      - gateway-redis
+    volumes:
+      - ./services/enrichment/app:/app:delegated
+
diff --git a/services/gateway/conf.d/services/search-api.conf b/services/gateway/conf.d/services/search-api.conf
@@ -1,4 +1,14 @@
 location /api/search {
     auth_request /_validate_jwt;
-    proxy_pass http://search:8000/api/search;
+    proxy_pass http://search:8000/madoc;
+}
+
+location /api/enrichment {
+    auth_request /_validate_jwt;
+    proxy_pass http://search:8000/madoc;
+}
+
+location /api/enrichment/internal {
+    auth_request /_validate_jwt;
+    proxy_pass http://search:8000/api;
 }
diff --git a/services/madoc-ts/install-code.js → services/madoc-ts/install-code.cjs b/services/madoc-ts/install-code.js → services/madoc-ts/install-code.cjs
diff --git a/services/madoc-ts/migrations/2022-11-27T20-30.topic-slots.sql b/services/madoc-ts/migrations/2022-11-27T20-30.topic-slots.sql
@@ -0,0 +1,14 @@
+--topic-slots (up)
+alter table "site_slots"
+    add filter_topic_type_none boolean default true,
+    add filter_topic_type_all boolean default false,
+    add filter_topic_type_exact text,
+    add filter_topic_type_whitelist text[],
+    add filter_topic_type_blacklist text[],
+
+    add filter_topic_none boolean default true,
+    add filter_topic_all boolean default false,
+    add filter_topic_exact text,
+    add filter_topic_whitelist text[],
+    add filter_topic_blacklist text[]
+;
diff --git a/services/madoc-ts/migrations/down/2022-11-27T20-30.topic-slots.sql b/services/madoc-ts/migrations/down/2022-11-27T20-30.topic-slots.sql
@@ -0,0 +1,13 @@
+--topic-slots (down)
+
+alter table "site_slots" drop column filter_topic_type_none;
+alter table "site_slots" drop column filter_topic_type_all;
+alter table "site_slots" drop column filter_topic_type_exact;
+alter table "site_slots" drop column filter_topic_type_whitelist;
+alter table "site_slots" drop column filter_topic_type_blacklist;
+
+alter table "site_slots" drop column filter_topic_none;
+alter table "site_slots" drop column filter_topic_all;
+alter table "site_slots" drop column filter_topic_exact;
+alter table "site_slots" drop column filter_topic_whitelist;
+alter table "site_slots" drop column filter_topic_blacklist;
diff --git a/services/madoc-ts/schemas/CreateSlotRequest.json b/services/madoc-ts/schemas/CreateSlotRequest.json
@@ -123,6 +123,58 @@
               }
             }
           }
+        },
+        "topicType": {
+          "type": "object",
+          "properties": {
+            "none": {
+              "type": "boolean"
+            },
+            "all": {
+              "type": "boolean"
+            },
+            "exact": {
+              "type": "string"
+            },
+            "whitelist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "blacklist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "topic": {
+          "type": "object",
+          "properties": {
+            "none": {
+              "type": "boolean"
+            },
+            "all": {
+              "type": "boolean"
+            },
+            "exact": {
+              "type": "string"
+            },
+            "whitelist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "blacklist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
         }
       }
     },

diff --git a/services/madoc-ts/schemas/EditorialContext.json b/services/madoc-ts/schemas/EditorialContext.json
@@ -13,6 +13,12 @@
     "canvas": {
       "type": "number"
     },
+    "topic": {
+      "type": "string"
+    },
+    "topicType": {
+      "type": "string"
+    },
     "page": {
       "type": "number"
     },

diff --git a/services/madoc-ts/schemas/ServerEditorialContext.json b/services/madoc-ts/schemas/ServerEditorialContext.json
@@ -13,6 +13,12 @@
     "canvas": {
       "type": "number"
     },
+    "topic": {
+      "type": "string"
+    },
+    "topicType": {
+      "type": "string"
+    },
     "page": {
       "type": "number"
     },

diff --git a/services/madoc-ts/schemas/SiteSlot.json b/services/madoc-ts/schemas/SiteSlot.json
@@ -129,6 +129,58 @@
               }
             }
           }
+        },
+        "topic": {
+          "type": "object",
+          "properties": {
+            "none": {
+              "type": "boolean"
+            },
+            "all": {
+              "type": "boolean"
+            },
+            "exact": {
+              "type": "string"
+            },
+            "whitelist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "blacklist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "topicType": {
+          "type": "object",
+          "properties": {
+            "none": {
+              "type": "boolean"
+            },
+            "all": {
+              "type": "boolean"
+            },
+            "exact": {
+              "type": "string"
+            },
+            "whitelist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "blacklist": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
         }
       }
     },

diff --git a/services/madoc-ts/schemas/SiteSlotRow.json b/services/madoc-ts/schemas/SiteSlotRow.json
@@ -106,6 +106,48 @@
       "items": {
         "type": "number"
       }
+    },
+    "filter_topic_type_none": {
+      "type": "boolean"
+    },
+    "filter_topic_type_all": {
+      "type": "boolean"
+    },
+    "filter_topic_type_exact": {
+      "type": "string"
+    },
+    "filter_topic_type_whitelist": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "filter_topic_type_blacklist": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "filter_topic_none": {
+      "type": "boolean"
+    },
+    "filter_topic_all": {
+      "type": "boolean"
+    },
+    "filter_topic_exact": {
+      "type": "string"
+    },
+    "filter_topic_whitelist": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "filter_topic_blacklist": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
     }
   },
   "required": [
@@ -121,6 +163,12 @@
     "filter_project_all",
     "filter_project_exact",
     "filter_project_none",
+    "filter_topic_all",
+    "filter_topic_exact",
+    "filter_topic_none",
+    "filter_topic_type_all",
+    "filter_topic_type_exact",
+    "filter_topic_type_none",
     "id",
     "site_id",
     "slot_layout",

diff --git a/services/madoc-ts/schemas/SlotFilterConfig.json b/services/madoc-ts/schemas/SlotFilterConfig.json
@@ -8,18 +8,18 @@
       "type": "boolean"
     },
     "exact": {
-      "type": "number"
+      "$ref": "#/definitions/IDType"
     },
     "whitelist": {
       "type": "array",
       "items": {
-        "type": "number"
+        "$ref": "#/definitions/IDType"
       }
     },
     "blacklist": {
       "type": "array",
       "items": {
-        "type": "number"
+        "$ref": "#/definitions/IDType"
       }
     }
   },