Add flow_id to index as well since we need to switch flows to use ids anyway

Author: rowanseymour

contacts/index_settings.json

@@ -153,6 +153,9 @@
                 "flow": {
                     "type": "keyword"
                 },
+                "flow_id": {
+                    "type": "integer"
+                },
                 "flow_history": {
                     "type": "integer"
                 },

contacts/query.go

@@ -62,6 +62,7 @@ SELECT org_id, id, modified_on, is_active, row_to_json(t) FROM (
 		(
 			SELECT f.uuid FROM flows_flow f WHERE f.id = contacts_contact.current_flow_id
 		) AS flow,
+		current_flow_id AS flow_id,
 		(
 			SELECT array_to_json(array_agg(DISTINCT fr.flow_id))
 			FROM flows_flowrun fr WHERE fr.contact_id = contacts_contact.id

indexer_test.go

@@ -104,6 +104,9 @@ func TestIndexing(t *testing.T) {
 	assertQuery(t, client, physicalName, elastic.NewMatchQuery("flow", "6d3cf1eb-546e-4fb8-a5ca-69187648fbf6"), []int64{2, 3})
 	assertQuery(t, client, physicalName, elastic.NewMatchQuery("flow", "4eea8ff1-4fe2-4ce5-92a4-0870a499973a"), []int64{4})
 
+	assertQuery(t, client, physicalName, elastic.NewMatchQuery("flow_id", 1), []int64{2, 3})
+	assertQuery(t, client, physicalName, elastic.NewMatchQuery("flow_id", 2), []int64{4})
+
 	assertQuery(t, client, physicalName, elastic.NewMatchQuery("flow_history", 1), []int64{1, 2})
 	assertQuery(t, client, physicalName, elastic.NewMatchQuery("flow_history", 2), []int64{1})