From 75decdd84e3f376776a9726abd6890ad618ecf1c Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Thu, 3 Aug 2023 10:05:14 +0100
Subject: [PATCH] Add organisations without active data coordinators to the
 report

---
 app/services/imports/import_report_service.rb   |  2 +-
 .../imports/import_report_service_spec.rb       | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/services/imports/import_report_service.rb b/app/services/imports/import_report_service.rb
index 5759f3607..3f543cc35 100644
--- a/app/services/imports/import_report_service.rb
+++ b/app/services/imports/import_report_service.rb
@@ -17,7 +17,7 @@ module Imports
       report_csv = "Organisation ID,Old Organisation ID,Organisation Name\n"
       organisations = @institutions_csv.map { |row| Organisation.find_by(name: row[0]) }.compact
       organisations.each do |organisation|
-        if organisation.users.none?(&:data_coordinator?)
+        if organisation.users.none? { |user| user.data_coordinator? && user.active? }
           report_csv += "#{organisation.id},#{organisation.old_visible_id},#{organisation.name}\n"
         end
       end
diff --git a/spec/services/imports/import_report_service_spec.rb b/spec/services/imports/import_report_service_spec.rb
index 8c96113da..8086bf29c 100644
--- a/spec/services/imports/import_report_service_spec.rb
+++ b/spec/services/imports/import_report_service_spec.rb
@@ -32,7 +32,22 @@ RSpec.describe Imports::ImportReportService do
       end
 
       it "writes an empty organisations without a data coordinators report" do
-        expect(storage_service).to receive(:write_file).with("OrganisationsWithoutDataCoordinators_report_suffix.csv", "\uFEFFOrganisation ID,Old Organisation ID,Organisation Name\n#{organisation2.id},2,#{organisation2.name}\n#{organisation3.id},3,#{organisation3.name}\n")
+        expect(storage_service).to receive(:write_file).with("OrganisationsWithoutDataCoordinators_report_suffix.csv", "\uFEFFOrganisation ID,Old Organisation ID,Organisation Name\n#{organisation2.id},2,org2\n#{organisation3.id},3,org3\n")
+
+        report_service.generate_missing_data_coordinators_report("report_suffix")
+      end
+    end
+
+    context "when organisation has an inactive data coordinator" do
+      let!(:organisation) { create(:organisation, old_visible_id: "1", name: "org1") }
+      let(:institutions_csv) { CSV.parse("Institution name,Id,Old Completed lettings logs,Old In progress lettings logs,Old Completed sales logs,Old In progress sales logs\norg1,1,2,1,4,3", headers: true) }
+
+      before do
+        create(:user, :data_coordinator, organisation:, active: false)
+      end
+
+      it "includes that organisation in the data coordinators report" do
+        expect(storage_service).to receive(:write_file).with("OrganisationsWithoutDataCoordinators_report_suffix.csv", "\uFEFFOrganisation ID,Old Organisation ID,Organisation Name\n#{organisation.id},1,org1\n")
 
         report_service.generate_missing_data_coordinators_report("report_suffix")
       end