baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Cop fixes

pull/412/head
baarkerlounger 3 years ago
parent
07c02edf90
commit
af921ef7e7
5 changed files with 97 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/models/user.rb
  2. 16
      app/services/imports/data_protection_confirmation_import_service.rb
  3. 6
      db/migrate/20220323094418_create_data_protection_confirmation.rb
  4. 81
      spec/services/imports/data_protection_confirmation_import_service_spec.rb
  5. 56
      spec/services/imports/data_protection_confirmation_service_spec.rb

2
app/models/user.rb
Unescape View File

@ -14,7 +14,7 @@ class User < ApplicationRecord
data_accessor: 0,
data_provider: 1,
data_coordinator: 2,
data_protection_officer: 3
data_protection_officer: 3,
}.freeze
enum role: ROLES

16
app/services/imports/data_protection_confirmation_import_service.rb
Unescape View File

@ -8,17 +8,25 @@ module Imports
def create_data_protection_confirmation(xml_document)
org = Organisation.find_by(old_org_id: record_field_value(xml_document, "institution"))
dp_officer = User.find_or_create_by(
dp_officer = User.find_by(
name: record_field_value(xml_document, "dp-user"),
organisation: org,
role: "data_protection_officer",
)
dp_officer.encrypted_password = SecureRandom.hex(10)
dp_officer.save(validate: false)
if dp_officer.blank?
dp_officer = User.new(
name: record_field_value(xml_document, "dp-user"),
organisation: org,
role: "data_protection_officer",
encrypted_password: SecureRandom.hex(10),
)
dp_officer.save!(validate: false)
end
DataProtectionConfirmation.create!(
organisation: org,
confirmed: !!record_field_value(xml_document, "data-protection"),
confirmed: record_field_value(xml_document, "data-protection").casecmp("true").zero?,
data_protection_officer: dp_officer,
old_id: record_field_value(xml_document, "id"),
old_org_id: record_field_value(xml_document, "institution"),

6
db/migrate/20220323094418_create_data_protection_confirmation.rb
Unescape View File

@ -11,8 +11,8 @@ class CreateDataProtectionConfirmation < ActiveRecord::Migration[7.0]
end
add_index :data_protection_confirmations,
[:organisation_id, :data_protection_officer_id, :confirmed],
unique: true,
name: "data_protection_confirmations_unique"
%i[organisation_id data_protection_officer_id confirmed],
unique: true,
name: "data_protection_confirmations_unique"
end
end

81
spec/services/imports/data_protection_confirmation_import_service_spec.rb
Unescape View File

@ -0,0 +1,81 @@
require "rails_helper"
RSpec.describe Imports::DataProtectionConfirmationImportService do
let(:fixture_directory) { "spec/fixtures/softwire_imports/data_protection_confirmations" }
let(:old_org_id) { "7c5bd5fb549c09a2c55d7cb90d7ba84927e64618" }
let(:old_id) { old_org_id }
let(:import_file) { File.open("#{fixture_directory}/#{old_id}.xml") }
let(:storage_service) { instance_double(StorageService) }
context "when importing data protection confirmations" do
subject(:import_service) { described_class.new(storage_service) }
before do
allow(storage_service)
.to receive(:list_files)
.and_return(["data_protection_directory/#{old_id}.xml"])
allow(storage_service)
.to receive(:get_file_io)
.with("data_protection_directory/#{old_id}.xml")
.and_return(import_file)
end
context "when the organisation in the import file doesn't exist in the system" do
it "does not create a data protection confirmation" do
expect { import_service.create_data_protection_confirmations("data_protection_directory") }
.to raise_error(ActiveRecord::RecordInvalid, /Organisation must exist/)
end
end
context "when the organisation does exist" do
let!(:organisation) { FactoryBot.create(:organisation, old_org_id:) }
context "when a data protection officer with matching name does not exists for the organisation" do
it "creates a data protection officer without sign in credentials" do
expect { import_service.create_data_protection_confirmations("data_protection_directory") }
.to change(User, :count).by(1)
data_protection_officer = User.find_by(organisation:, role: "data_protection_officer")
expect(data_protection_officer.email).to eq("")
end
it "successfully create a data protection confirmation record with the expected data" do
import_service.create_data_protection_confirmations("data_protection_directory")
confirmation = Organisation.find_by(old_org_id:).data_protection_confirmations.last
expect(confirmation.data_protection_officer.name).to eq("John Doe")
expect(confirmation.confirmed).to be_truthy
end
end
context "when a data protection officer with matching name already exists for the organisation" do
let!(:data_protection_officer) do
FactoryBot.create(:user, :data_protection_officer, name: "John Doe", organisation:)
end
it "successfully creates a data protection confirmation record with the expected data" do
import_service.create_data_protection_confirmations("data_protection_directory")
confirmation = Organisation.find_by(old_org_id:).data_protection_confirmations.last
expect(confirmation.data_protection_officer.id).to eq(data_protection_officer.id)
expect(confirmation.confirmed).to be_truthy
end
context "when the data protection record has already been imported previously" do
before do
FactoryBot.create(
:data_protection_confirmation,
organisation:,
data_protection_officer:,
old_org_id:,
old_id:,
)
end
it "logs that the record already exists" do
expect(Rails.logger).to receive(:warn)
import_service.create_data_protection_confirmations("data_protection_directory")
end
end
end
end
end
end

56
spec/services/imports/data_protection_confirmation_service_spec.rb
Unescape View File

@ -1,56 +0,0 @@
require "rails_helper"
RSpec.describe Imports::DataProtectionConfirmationImportService do
let(:fixture_directory) { "spec/fixtures/softwire_imports/data_protection_confirmations" }
let(:old_org_id) { "7c5bd5fb549c09a2c55d7cb90d7ba84927e64618" }
let(:old_id) { old_org_id }
let(:import_file) { File.open("#{fixture_directory}/#{old_id}.xml") }
let(:storage_service) { instance_double(StorageService) }
context "when importing data protection confirmations" do
subject(:import_service) { described_class.new(storage_service) }
before do
allow(storage_service)
.to receive(:list_files)
.and_return(["data_protection_directory/#{old_id}.xml"])
allow(storage_service)
.to receive(:get_file_io)
.with("data_protection_directory/#{old_id}.xml")
.and_return(import_file)
end
it "successfully create a data protection confirmation record with the expected data" do
FactoryBot.create(:organisation, old_org_id:)
import_service.create_data_protection_confirmations("data_protection_directory")
confirmation = Organisation.find_by(old_org_id:).data_protection_confirmations.last
expect(confirmation.data_protection_officer.name).to eq("John Doe")
expect(confirmation.confirmed).to be_truthy
end
it "refuses to create a data protection confirmation belonging to a non existing organisation" do
expect { import_service.create_data_protection_confirmations("data_protection_directory") }
.to raise_error(ActiveRecord::RecordInvalid, /Organisation must exist/)
end
context "when the data protection record has already been imported previously" do
let(:organisation) { FactoryBot.create(:organisation, old_org_id:) }
let(:data_protection_officer) { FactoryBot.create(:user, :data_protection_officer, name: "John Doe", organisation:) }
let!(:data_protection_confirmation) do
FactoryBot.create(
:data_protection_confirmation,
organisation:,
data_protection_officer:,
old_org_id:,
old_id:
)
end
it "logs that the record already exists" do
expect(Rails.logger).to receive(:warn)
import_service.create_data_protection_confirmations("data_protection_directory")
end
end
end
end
Write Preview
Loading…
Cancel
Save