Merge pull request #272 from 18F/develop

[Tech Debt] Refactor domain queries for performance -- Staging
18F · Aug 21, 2024 · b85d8fc · b85d8fc
2 parents 05531b6 + b208235
commit b85d8fc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/migrations/20240819182419_add_jsonb_data_index_ua.js b/migrations/20240819182419_add_jsonb_data_index_ua.js
@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.raw(
+    "CREATE INDEX analytics_data_ua_gin_jsonb ON analytics_data USING gin(data jsonb_path_ops)",
+  );
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.table("analytics_data", (table) => {
+    table.dropIndex("analytics_data_gin_jsonb");
+  });
+};
diff --git a/src/db.js b/src/db.js
@@ -62,7 +62,9 @@ const queryDomain = (
   if (reportName == "download") {
     mainQuery.whereRaw("data->> 'page' like ?", [`%${domain}%`]);
   } else {
-    mainQuery.whereRaw("data->> 'domain' = ?", [domain]);
+    mainQuery.whereRaw(
+      `data @> '${JSON.stringify({ domain }).replaceAll("'", "''").replaceAll("?", "\\?")}'::jsonb`,
+    );
   }
 
   return (