Exclude internal organisations from form count metrics

Internal orgs are used for GOV.UK Forms testing and should not
appear in CloudWatch form count metrics published for reporting.

Author: theseanything

app/services/metrics/form_count_service.rb

@@ -30,10 +30,12 @@ def form_counts_by_org_and_state
       counts_by_org_and_state = Form
         .where.not(state: :deleted)
         .left_joins(group_form: { group: :organisation })
-        .group(Organisation.arel_table[:name], Form.arel_table[:state])
+        .group(Organisation.arel_table[:name], Form.arel_table[:state], Organisation.arel_table[:internal])
         .count
 
-      counts_by_org_and_state.each_with_object(Hash.new(0)) do |((org_name, state), count), totals|
+      counts_by_org_and_state.each_with_object(Hash.new(0)) do |((org_name, state, internal), count), totals|
+        next if internal == true # Skip internal organisations for metrics
+
         totals[[org_name || UNKNOWN_ORG, metric_state(state)]] += count
       end
     end

spec/services/metrics/form_count_service_spec.rb

@@ -47,6 +47,30 @@
       service.publish_form_counts
     end
 
+    context "when an organisation is internal" do
+      let(:internal_organisation) { create(:organisation, name: "Internal Org", slug: "internal-org", internal: true) }
+      let(:internal_group) { create(:group, organisation: internal_organisation) }
+
+      before do
+        create(:form, :with_group, group: internal_group, state: :draft)
+        create(:form, :with_group, group: internal_group, state: :live, pages: [])
+      end
+
+      it "excludes forms belonging to internal organisations" do
+        expect(cloud_watch_client).to receive(:put_metric_data).with(
+          namespace: "Forms",
+          metric_data: contain_exactly(
+            metric_datum(org: organisation.name, state: "draft", count: 1),
+            metric_datum(org: organisation.name, state: "live", count: 2),
+            metric_datum(org: organisation.name, state: "archived", count: 2),
+            metric_datum(org: "Unknown", state: "draft", count: 1),
+          ),
+        )
+
+        service.publish_form_counts
+      end
+    end
+
     context "when CloudWatch returns an error" do
       before do
         allow(cloud_watch_client).to receive(:put_metric_data)