Browse Source
* Failing test * Import * Cop fixes * Preserve created at date * Rubocop * Time zones are hardpull/429/head
baarkerlounger
3 years ago
committed by
GitHub
10 changed files with 187 additions and 0 deletions
@ -0,0 +1,4 @@ |
|||||||
|
class DataProtectionConfirmation < ApplicationRecord |
||||||
|
belongs_to :organisation |
||||||
|
belongs_to :data_protection_officer, class_name: "User" |
||||||
|
end |
@ -0,0 +1,45 @@ |
|||||||
|
module Imports |
||||||
|
class DataProtectionConfirmationImportService < ImportService |
||||||
|
def create_data_protection_confirmations(folder) |
||||||
|
import_from(folder, :create_data_protection_confirmation) |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def create_data_protection_confirmation(xml_document) |
||||||
|
org = Organisation.find_by(old_org_id: record_field_value(xml_document, "institution")) |
||||||
|
dp_officer = User.find_by( |
||||||
|
name: record_field_value(xml_document, "dp-user"), |
||||||
|
organisation: org, |
||||||
|
role: "data_protection_officer", |
||||||
|
) |
||||||
|
|
||||||
|
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").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"), |
||||||
|
created_at: record_field_value(xml_document, "change-date").to_time(:utc), |
||||||
|
) |
||||||
|
rescue ActiveRecord::RecordNotUnique |
||||||
|
id = record_field_value(xml_document, "id") |
||||||
|
dp_officer_name = record_field_value(xml_document, "dp-user") |
||||||
|
@logger.warn("Data protection confirmation #{id} created by #{dp_officer_name} for #{org.name} is already present, skipping.") |
||||||
|
end |
||||||
|
|
||||||
|
def record_field_value(xml_document, field) |
||||||
|
field_value(xml_document, "dataprotect", field) |
||||||
|
end |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,18 @@ |
|||||||
|
class CreateDataProtectionConfirmation < ActiveRecord::Migration[7.0] |
||||||
|
def change |
||||||
|
create_table :data_protection_confirmations do |t| |
||||||
|
t.belongs_to :organisation |
||||||
|
t.belongs_to :data_protection_officer, class_name: "User", index: { name: :dpo_user_id } |
||||||
|
t.column :confirmed, :boolean |
||||||
|
t.column :old_id, :string |
||||||
|
t.column :old_org_id, :string |
||||||
|
|
||||||
|
t.timestamps |
||||||
|
end |
||||||
|
|
||||||
|
add_index :data_protection_confirmations, |
||||||
|
%i[organisation_id data_protection_officer_id confirmed], |
||||||
|
unique: true, |
||||||
|
name: "data_protection_confirmations_unique" |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,12 @@ |
|||||||
|
FactoryBot.define do |
||||||
|
factory :data_protection_confirmation do |
||||||
|
organisation |
||||||
|
data_protection_officer { FactoryBot.create(:user, :data_protection_officer) } |
||||||
|
confirmed { true } |
||||||
|
old_org_id { "7c5bd5fb549c09a2c55d7cb90d7ba84927e64618" } |
||||||
|
old_id { "7c5bd5fb549c09a2c55d7cb90d7ba84927e64618" } |
||||||
|
|
||||||
|
created_at { Time.zone.now } |
||||||
|
updated_at { Time.zone.now } |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,7 @@ |
|||||||
|
<dataprotect:dataprotect xmlns:dataprotect="dclg:dataprotect"> |
||||||
|
<dataprotect:id>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</dataprotect:id> |
||||||
|
<dataprotect:institution>7c5bd5fb549c09a2c55d7cb90d7ba84927e64618</dataprotect:institution> |
||||||
|
<dataprotect:data-protection>true</dataprotect:data-protection> |
||||||
|
<dataprotect:dp-user>John Doe</dataprotect:dp-user> |
||||||
|
<dataprotect:change-date>05/06/2018 10:36:49:34</dataprotect:change-date> |
||||||
|
</dataprotect:dataprotect> |
@ -0,0 +1,83 @@ |
|||||||
|
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 |
||||||
|
expect(Time.zone.local_to_utc(confirmation.created_at)).to eq(Time.utc(2018, 0o6, 0o5, 10, 36, 49)) |
||||||
|
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 |
||||||
|
expect(Time.zone.local_to_utc(confirmation.created_at)).to eq(Time.utc(2018, 0o6, 0o5, 10, 36, 49)) |
||||||
|
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 |
Loading…
Reference in new issue