Make sure the buyer has seen <%= govuk_link_to "the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.
+Make sure the buyer has seen <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.
diff --git a/app/views/form/guidance/_privacy_notice_buyer_2024.erb b/app/views/form/guidance/_privacy_notice_buyer_2024.erb index 9977bf20b..1ed6e683e 100644 --- a/app/views/form/guidance/_privacy_notice_buyer_2024.erb +++ b/app/views/form/guidance/_privacy_notice_buyer_2024.erb @@ -1 +1 @@ -Make sure the buyer has seen or been given access to <%= govuk_link_to "the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.
+Make sure the buyer has seen or been given access to <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.
diff --git a/app/views/form/guidance/_privacy_notice_buyer_2024_joint_purchase.erb b/app/views/form/guidance/_privacy_notice_buyer_2024_joint_purchase.erb index b2f4fd8ca..74ce54a3d 100644 --- a/app/views/form/guidance/_privacy_notice_buyer_2024_joint_purchase.erb +++ b/app/views/form/guidance/_privacy_notice_buyer_2024_joint_purchase.erb @@ -1 +1 @@ -Make sure the buyers have seen or been given access to <%= govuk_link_to "the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.
+Make sure the buyers have seen or been given access to <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.
diff --git a/app/views/form/guidance/_privacy_notice_buyer_joint_purchase.erb b/app/views/form/guidance/_privacy_notice_buyer_joint_purchase.erb index 772a2ee68..edab9e1e9 100644 --- a/app/views/form/guidance/_privacy_notice_buyer_joint_purchase.erb +++ b/app/views/form/guidance/_privacy_notice_buyer_joint_purchase.erb @@ -1 +1 @@ -Make sure the buyers have seen <%= govuk_link_to "the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.
+Make sure the buyers have seen <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.
diff --git a/app/views/form/guidance/_privacy_notice_tenant.erb b/app/views/form/guidance/_privacy_notice_tenant.erb index 88b281730..7df685448 100644 --- a/app/views/form/guidance/_privacy_notice_tenant.erb +++ b/app/views/form/guidance/_privacy_notice_tenant.erb @@ -1 +1 @@ -Make sure the tenant has seen <%= govuk_link_to "the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.
+Make sure the tenant has seen <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.
diff --git a/app/views/form/guidance/_privacy_notice_tenant_2024.erb b/app/views/form/guidance/_privacy_notice_tenant_2024.erb index 3007c8904..12de7baba 100644 --- a/app/views/form/guidance/_privacy_notice_tenant_2024.erb +++ b/app/views/form/guidance/_privacy_notice_tenant_2024.erb @@ -1 +1 @@ -Make sure the lead tenant has seen or been given access to <%= govuk_link_to "the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.
+Make sure the lead tenant has seen or been given access to <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.
diff --git a/app/views/organisation_relationships/add_managing_agent.html.erb b/app/views/organisation_relationships/add_managing_agent.html.erb index 1cb00e989..b3e3a4a42 100644 --- a/app/views/organisation_relationships/add_managing_agent.html.erb +++ b/app/views/organisation_relationships/add_managing_agent.html.erb @@ -31,7 +31,7 @@<% if @data_protection_confirmation&.confirmed? %> @@ -25,13 +25,13 @@
1) <%= @organisation.name %> of <%= @organisation.address_row %> (“CORE Data Provider”)
<% end %>and
-2) The Department for Levelling Up, Housing and Communities of 2 Marsham Street, London, SW1P 4DF (“DLUHC”)
+2) The Ministry of Housing, Communities and Local Government of 2 Marsham Street, London, SW1P 4DF (“MHCLG”)
1.1. The Department for Levelling Up, Housing and Communities (DLUHC) collect data on social housing lettings and sales via CORE (COntinuous REcording of social housing lettings and sales) for statistical purposes. They are the data controller for all data within the CORE system.
-1.2. The purpose of this Agreement is to describe the duties of CORE data providers to DLUHC and to formalise the arrangement established to share the data between DLUHC and data providers. This agreement covers all data in the CORE system. This agreement does not cover data providers’ own versions of these data.
-1.3. Data providers and DLUHC will each be responsible for compliance with the Data Protection legislation including the Data Protection Act 2018 and the EU General Data Protection Regulation (GDPR).
-1.4. DLUHC shall only collect data from and share data with CORE data providers that have signed this data sharing agreement.
-1.5. There are occasions when DLUHC may instruct a third party to carry out analysis on the CORE dataset on their behalf. This third party will be a data processor for DLUHC and work under a contract ensuring data protection compliance.
+1.1. The Ministry of Housing, Communities and Local Government (MHCLG) collect data on social housing lettings and sales via CORE (COntinuous REcording of social housing lettings and sales) for statistical purposes. They are the data controller for all data within the CORE system.
+1.2. The purpose of this Agreement is to describe the duties of CORE data providers to MHCLG and to formalise the arrangement established to share the data between MHCLG and data providers. This agreement covers all data in the CORE system. This agreement does not cover data providers’ own versions of these data.
+1.3. Data providers and MHCLG will each be responsible for compliance with the Data Protection legislation including the Data Protection Act 2018 and the EU General Data Protection Regulation (GDPR).
+1.4. MHCLG shall only collect data from and share data with CORE data providers that have signed this data sharing agreement.
+1.5. There are occasions when MHCLG may instruct a third party to carry out analysis on the CORE dataset on their behalf. This third party will be a data processor for MHCLG and work under a contract ensuring data protection compliance.
It is now agreed as follows:
2.1. In this Agreement the following words and phrases shall have the following meanings, unless expressly stated to the contrary:
@@ -45,7 +45,7 @@3.1. This Agreement shall commence upon signature by the Parties and shall continue in effect whilst the CORE data collection remains live, in accordance with the requirements of this Agreement unless otherwise subject to earlier termination in accordance with Clause 15.
3.2. The Parties may, by mutual consent in writing, agree to amend this agreement.
4.1. CORE (COntinuous Recording of social housing lettings and sales) is a national information source funded by the Department for Levelling Up, Housing and Communities that records information on the characteristics of Private Registered Providers’ and Local Authorities’ new social housing tenants and the homes they rent and buy.
+4.1. CORE (COntinuous Recording of social housing lettings and sales) is a national information source funded by the Ministry of Housing, Communities and Local Government that records information on the characteristics of Private Registered Providers’ and Local Authorities’ new social housing tenants and the homes they rent and buy.
4.2. The CORE dataset includes information on the letting or sale, type of tenancy or sale, rents and charges, demographic information about the tenant/buyer and other information related to the tenants/buyers themselves (e.g. source of referral, route into housing, whether they are on benefits, income).
4.3. The data in the CORE dataset is considered personal data because individuals could be easily identified. The dataset does not contain direct personal identifiers but when taken as a whole the data allows social housing tenants to be identified. This is because the dataset contains information such as UPRN (Unique Property Reference Number), which allows properties to be uniquely identified or full postcode data.
4.4. The dataset also contains information which is very sensitive, and which in some cases is “special category” personal data for the purposes of the GDPR, and if disclosed could cause considerable distress to the data subject, for example it indicates whether the social housing tenant has been in prison or probation or referred by a mental health institution; or whether anyone in the household has suffered from domestic abuse or hate crime.
5.1. DLUHC shall be the ‘Data controller’ for all personal data held within the CORE database.
+5.1. MHCLG shall be the ‘Data controller’ for all personal data held within the CORE database.
5.2. CORE data providers are data controllers for personal data that they hold within their own systems. It is recognised that while much of the CORE data will be replicated in data collections held by CORE data providers, each organisation accepts full data controller responsibility for the data it holds.
5.3. CORE data providers need to submit information for the tenancy, the tenants and the property each time there is a new social housing letting or sale. The data collection covers general needs and supported housing lettings. Since April 2012, local authorities and private registered providers report their affordable rent lettings as well as their social rent lettings and, from April 2017, rent-to-buy lettings are also included.
5.4. In order to be compliant with the data protection legislation all data subjects (social housing tenants and buyers) from the CORE dataset need to be informed of how their data will be processed and used.
-5.5. DLUHC has set the information that needs to be provided to new CORE data subjects in the privacy notice in Annex 1 of this agreement. CORE data providers must either share the DLUHC privacy notice with tenants or if using their own privacy notice, state within that they share the data with DLUHC and provide a link to the DLUHC privacy notice.
+5.5. MHCLG has set the information that needs to be provided to new CORE data subjects in the privacy notice in Annex 1 of this agreement. CORE data providers must either share the MHCLG privacy notice with tenants or if using their own privacy notice, state within that they share the data with MHCLG and provide a link to the MHCLG privacy notice.
6.1. CORE provides DLUHC with an essential evidence base for monitoring and developing government policy, in particular to assess who is accessing social housing and their associated tenancy and property details. It is necessary therefore that the personal data that forms the CORE data is processed for that purpose. The legal basis for processing this personal data is s(8)(d) of the Data Protection Act 2018 which states:
+6.1. CORE provides MHCLG with an essential evidence base for monitoring and developing government policy, in particular to assess who is accessing social housing and their associated tenancy and property details. It is necessary therefore that the personal data that forms the CORE data is processed for that purpose. The legal basis for processing this personal data is s(8)(d) of the Data Protection Act 2018 which states:
In Article 6(1) of the GDPR (lawfulness of processing), the reference in point (e) to processing of personal data that is necessary for the performance of a task carried out in the public interest or in the exercise of the controller’s official authority includes processing of personal data that is necessary for— (d) the exercise of a function of the Crown, a Minister of the Crown or a government department.
@@ -91,35 +91,35 @@8.1. The security of the CORE data collection system is compliant with Government security standards (https://core.communities.gov.uk/public/index.html).
8.2. All parts of the CORE website where an individual’s letting/sale data is submitted or downloaded are only accessible via login and passwords. The CORE system has hierarchies in place to ensure that data providers and users can only submit, view or download data for the organisations they are associated with.
8.3. Data providers will be able to access the CORE personal data they submitted right after it is validated by the system; but can only access processed data from MHCLG after MHCLG has published the data. MHCLG will make the processed data available to data providers as soon as possible via the system.
-8.4.CORE team members in DLUHC and third-party data processors as developers/maintenance contractors have access to all parts of the website, including data. The handling of CORE data by contractors is covered in the contracts with these organisations. All CORE staff that have access to the data have had training on how to handle personal data.
-8.5. All work carried out by DLUHC will follow appropriate security measures and procedures to ensure the protection of the data.
+8.4.CORE team members in MHCLG and third-party data processors as developers/maintenance contractors have access to all parts of the website, including data. The handling of CORE data by contractors is covered in the contracts with these organisations. All CORE staff that have access to the data have had training on how to handle personal data.
+8.5. All work carried out by MHCLG will follow appropriate security measures and procedures to ensure the protection of the data.
9. Protection of personal data
-9.1. CORE data providers and DLUHC agree that they shall:
+9.1. CORE data providers and MHCLG agree that they shall:
-
- A. Implement appropriate technical and organisational measures to protect the Personal Data against unauthorised or unlawful Processing and against accidental loss, destruction, damage, alteration or disclosure. These measures shall ensure a level of security appropriate to the harm which might result from any unauthorised or unlawful Processing, accidental loss, destruction or damage to the Personal Data and having regard to the nature of the Personal Data which is to be protected;
-- B. Take reasonable steps to ensure the reliability of any personnel who have access to the Personal Data. DLUHC and Data providers will ensure such personnel will be a limited number of analysts assigned to the data collection.
+- B. Take reasonable steps to ensure the reliability of any personnel who have access to the Personal Data. MHCLG and Data providers will ensure such personnel will be a limited number of analysts assigned to the data collection.
9.2. The data providers and DLUHC shall comply at all times with the Data Protection Legislation and shall ensure that they each perform their obligations under this agreement in full compliance with the Data Protection Legislation and any other applicable law, in particular the Human Rights Act 1998 and the common law duty of confidentiality.
+9.2. The data providers and MHCLG shall comply at all times with the Data Protection Legislation and shall ensure that they each perform their obligations under this agreement in full compliance with the Data Protection Legislation and any other applicable law, in particular the Human Rights Act 1998 and the common law duty of confidentiality.
9.3. CORE data providers should limit access to CORE to a small number of individuals who can be named on request. CORE access is limited to registered users only via password, but it is the responsibility of the CORE data providers to ensure that all individuals granted access to the datasets should be briefed on the legal requirements around handling and storing the Data from CORE.
10. Freedom of information
-10.1. DLUHC acknowledges that CORE data providers that are or act on behalf of local authorities may be subject to the requirements of the FOIA and the Environmental Information Regulations and shall assist and cooperate with them to enable them to comply with their Information disclosure requirements.
+10.1. MHCLG acknowledges that CORE data providers that are or act on behalf of local authorities may be subject to the requirements of the FOIA and the Environmental Information Regulations and shall assist and cooperate with them to enable them to comply with their Information disclosure requirements.
11. Loss or unauthorised release
-11.1. CORE data providers will report to DLUHC any loss or unauthorised release of the Data as soon as possible and no later than 24 hours after the loss or unauthorised release is identified. DLUHC will report to CORE data providers any loss or unauthorised release of the Data as soon as possible and no later than 24 hours after the loss or unauthorised release is identified.
-11.2. CORE data providers and DLUHC acknowledge that any loss or unauthorised release of the Data can be treated as valid grounds for immediately terminating this agreement by DLUHC.
+11.1. CORE data providers will report to MHCLG any loss or unauthorised release of the Data as soon as possible and no later than 24 hours after the loss or unauthorised release is identified. MHCLG will report to CORE data providers any loss or unauthorised release of the Data as soon as possible and no later than 24 hours after the loss or unauthorised release is identified.
+11.2. CORE data providers and MHCLG acknowledge that any loss or unauthorised release of the Data can be treated as valid grounds for immediately terminating this agreement by MHCLG.
12. Authorised representatives
-12.1. CORE data providers and DLUHC will each appoint an Authorised Representative to be the primary point of contact in all day-to-day matters relating to this Agreement:
+12.1. CORE data providers and MHCLG will each appoint an Authorised Representative to be the primary point of contact in all day-to-day matters relating to this Agreement:
<%= present_section_12_2(data_protection_confirmation: @data_protection_confirmation, user: current_user, organisation: @organisation) %>
-12.3. For DLUHC: Name: Rachel Worledge, +
12.3. For MHCLG: Name: Rachel Worledge, Postal Address: South-west section, 4th Floor, Fry Building, 2 Marsham Street, London, SW1P 4DF, - E-mail address: Rachel.Worledge@levellingup.gov.uk
+ E-mail address: Rachel.Worledge@communities.gov.uk13. Products and publications
13.1. The Data potentially allows for persons to be identified, although the risk of this happening should be minimised by the steps taken in clause 9. CORE data providers should agree to carry out a thorough check of the Data and ensure that all steps are taken within its powers to minimise the risk that any outputs lead to identification of a person by a third party.
14. Dispute resolution
-14.1. Any disputes arising concerning this Agreement will be resolved initially by discussions between the Authorised Representatives of the CORE data providers and DLUHC.
-14.2. If the dispute cannot be resolved amicably between the Authorised Representatives then the matter will be escalated to: for the CORE data providers: the Chief Executive; and for DLUHC: the Deputy Director of the Data, Analytics and Statistics Division.
+14.1. Any disputes arising concerning this Agreement will be resolved initially by discussions between the Authorised Representatives of the CORE data providers and MHCLG.
+14.2. If the dispute cannot be resolved amicably between the Authorised Representatives then the matter will be escalated to: for the CORE data providers: the Chief Executive; and for MHCLG: the Deputy Director of the Data, Analytics and Statistics Division.
15. Termination
15.1. Any Party may terminate this Agreement upon one month’s written notice to the other.
15.2. Any Party may terminate this Agreement with immediate effect in the event of a @@ -132,7 +132,7 @@
Name: <%= name_for_data_sharing_agreement(@data_protection_confirmation, current_user) %> Title: Data Protection Officer -SIGNED for and on behalf of the deputy director of the data, analytics & statistics in the Department for Levelling Up, Housing and Communities, by:
+SIGNED for and on behalf of the deputy director of the data, analytics & statistics in the Ministry of Housing, Communities and Local Government, by:
- Name: Sandra Tudor
- Title: Deputy Director
diff --git a/app/views/start/index.html.erb b/app/views/start/index.html.erb index 14ed39282..491d68d49 100644 --- a/app/views/start/index.html.erb +++ b/app/views/start/index.html.erb @@ -4,7 +4,7 @@-Use this service to submit social housing lettings and sales data to the Department for Levelling Up, Housing and Communities (DLUHC).
+Use this service to submit social housing lettings and sales data to the Ministry of Housing, Communities and Local Government (MHCLG).
We’ll ask you questions about a letting or sale, like details about the household or property. Your answers will create a log that you can submit directly to us.
Your organisation can also set up and manage user accounts.
The data will be used to update the national record for social housing. It will also help to inform policy about the cost of social housing and what type of housing needs to be built.
@@ -21,7 +21,7 @@Before you start
Use your account details to sign in.
If you need to set up a new account, speak to your organisation’s CORE data coordinator. If you don’t know who that is, <%= govuk_link_to("contact the helpdesk", GlobalConstants::HELPDESK_URL) %>.
-You can <%= govuk_mail_to("dluhc.digital-services@levellingup.gov.uk", "request an account", subject: "CORE: Request a new account") %> if your organisation doesn’t have one.
+You can <%= govuk_mail_to("mhclg.digital-services@communities.gov.uk", "request an account", subject: "CORE: Request a new account") %> if your organisation doesn’t have one.
<%= govuk_link_to guidance_path do %>Guidance for submitting social housing lettings and sales data (CORE)<% end %>
<%= render partial: "layouts/collection_resources" %> diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 37e796e04..f4c94c35c 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1134,7 +1134,7 @@ ], "pages": { "declaration": { - "header": "Department for Levelling Up, Housing & Communities privacy notice", + "header": "Ministry of Housing, Communities and Local Government privacy notice", "description": "", "questions": { "declaration": { @@ -1145,7 +1145,7 @@ "type": "checkbox", "answer_options": { "declaration": { - "value": "The tenant has seen the DLUHC privacy notice" + "value": "The tenant has seen the MHCLG privacy notice" } } } diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index 7de00a07b..96fa8cfb4 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -1164,7 +1164,7 @@ ], "pages": { "declaration": { - "header": "Department for Levelling Up, Housing & Communities privacy notice", + "header": "Ministry of Housing, Communities and Local Government privacy notice", "description": "", "questions": { "declaration": { @@ -1175,7 +1175,7 @@ "type": "checkbox", "answer_options": { "declaration": { - "value": "The tenant has seen the DLUHC privacy notice" + "value": "The tenant has seen the MHCLG privacy notice" } } } diff --git a/config/locales/en.yml b/config/locales/en.yml index 9dcfed8c3..51ddfdc36 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -581,13 +581,13 @@ en: declaration: missing: - pre_2024: "You must show the DLUHC privacy notice to the tenant before you can submit this log." - post_2024: "You must show or give access to the DLUHC privacy notice to the tenant before you can submit this log." + pre_2024: "You must show the MHCLG privacy notice to the tenant before you can submit this log." + post_2024: "You must show or give access to the MHCLG privacy notice to the tenant before you can submit this log." privacynotice: missing: - pre_2024: "You must show the DLUHC privacy notice to the %{buyer_or_buyers} before you can submit this log." - post_2024: "You must show or give access to the DLUHC privacy notice to the %{buyer_or_buyers} before you can submit this log." + pre_2024: "You must show the MHCLG privacy notice to the %{buyer_or_buyers} before you can submit this log." + post_2024: "You must show or give access to the MHCLG privacy notice to the %{buyer_or_buyers} before you can submit this log." scheme: toggle_date: diff --git a/db/seeds.rb b/db/seeds.rb index 38125d8d1..2dd8570bc 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -61,7 +61,7 @@ unless Rails.env.test? ) org = Organisation.find_or_create_by!( - name: "DLUHC", + name: "MHCLG", address_line1: "2 Marsham Street", address_line2: "London", postcode: "SW1P 4DF", @@ -70,7 +70,7 @@ unless Rails.env.test? managing_agents_label: "None", provider_type: "LA", ) do - info = "Seeded DLUHC Organisation" + info = "Seeded MHCLG Organisation" if Rails.env.development? pp info else diff --git a/docs/adr/adr-001-initial-architecture-decisions.md b/docs/adr/adr-001-initial-architecture-decisions.md index dd69e546f..9951621a4 100644 --- a/docs/adr/adr-001-initial-architecture-decisions.md +++ b/docs/adr/adr-001-initial-architecture-decisions.md @@ -6,7 +6,7 @@ parent: Architecture decisions ## Ruby on Rails -- Well established and commonly used within DLUHC and GOV.UK in general +- Well established and commonly used within MHCLG and GOV.UK in general - Good ecosystem for common web app tasks, quick productivity - Matches team skill set - Analysis/RAP pipelines will sit in the DAP platform and not this application directly so optimising for web framework tasks makes sense. diff --git a/docs/adr/adr-004-gov-paas.md b/docs/adr/adr-004-gov-paas.md index e33d92618..5c2699c67 100644 --- a/docs/adr/adr-004-gov-paas.md +++ b/docs/adr/adr-004-gov-paas.md @@ -13,7 +13,7 @@ Production infrastructure sizing will be decided at a later time and once our ac The reasoning for this is: - Department policy is to use GOV.UK PaaS whenever possible -- DLUHC does not have a lot of internal dev ops skills/capacity so by leveraging GOV.UK PaaS we can leverage having most of the monitoring, running, scaling and security already provided. +- MHCLG does not have a lot of internal dev ops skills/capacity so by leveraging GOV.UK PaaS we can leverage having most of the monitoring, running, scaling and security already provided. - We get a simpler infrastructure setup than the AWS setup we currently have - All of the infrastructure we currently require is well supported on GOV.UK PaaS diff --git a/docs/adr/adr-010-admin-users-vs-users.md b/docs/adr/adr-010-admin-users-vs-users.md index d05371b74..5b72a3c48 100644 --- a/docs/adr/adr-010-admin-users-vs-users.md +++ b/docs/adr/adr-010-admin-users-vs-users.md @@ -6,7 +6,7 @@ parent: Architecture decisions ## Why do we have 2 user classes, `AdminUser` and `User`? -This is modelling a real life split. `AdminUsers` are internal DLUHC users or help desk employees. While `Users` are external users working at data providing organisations. So local authority/housing association’s "admin" users, i.e. Data Co-ordinators are a type of the User class. They have the ability to add or remove other users to or from their organisation, and to update their organisation details etc, but only through the designed UI. They do not get direct access to ActiveAdmin. +This is modelling a real life split. `AdminUsers` are internal MHCLG users or help desk employees. While `Users` are external users working at data providing organisations. So local authority/housing association’s "admin" users, i.e. Data Co-ordinators are a type of the User class. They have the ability to add or remove other users to or from their organisation, and to update their organisation details etc, but only through the designed UI. They do not get direct access to ActiveAdmin. AdminUsers on the other hand get direct access to ActiveAdmin. From there they can download entire datasets (via CSV, XML, JSON), view any log from any organisation, and add or remove users of any type including other Admin users. This means TDA will likely also require more stringent authentication for them using MFA (which users will likely not require). So the class split also helps there. diff --git a/docs/adr/adr-020-migration-to-aws.md b/docs/adr/adr-020-migration-to-aws.md index f7a900750..4892c835e 100644 --- a/docs/adr/adr-020-migration-to-aws.md +++ b/docs/adr/adr-020-migration-to-aws.md @@ -6,4 +6,4 @@ parent: Architecture decisions GOV.UK PaaS is being decomissioned at the end of this year and by 23 December 2023 all services hosted on GOV.UK PaaS will need to have migrated to an alternate hosting platform. -Like other DLUHC services, we are moving our service directly to DLUHC-owned AWS infrastructure. +Like other MHCLG services, we are moving our service directly to MHCLG-owned AWS infrastructure. diff --git a/docs/api/index.html b/docs/api/index.html index 5711eb9fa..7bc29b8cf 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -4,7 +4,7 @@ -DLUHC CORE Data Collection API +MHCLG CORE Data Collection API diff --git a/docs/api/v1.json b/docs/api/v1.json index 1caf96253..7d66f3eca 100644 --- a/docs/api/v1.json +++ b/docs/api/v1.json @@ -1,7 +1,7 @@ { "openapi": "3.0.0", "info": { - "title": "DLUHC CORE Data Collection API", + "title": "MHCLG CORE Data Collection API", "version": "1.0", "description": "Submit social housing lettings and sales data (CORE)" }, diff --git a/docs/index.md b/docs/index.md index b41df293c..031e56ab7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,13 +4,13 @@ nav_order: 1 # Overview -All lettings and and sales of social housing in England need to be logged with the Department for levelling up, housing and communities (DLUHC). This is done by data providing organisations: Local Authorities and Private Registered Providers (PRPs, i.e. housing associations). +All lettings and and sales of social housing in England need to be logged with the Ministry of Housing, Communities and Local Government (MHCLG). This is done by data providing organisations: Local Authorities and Private Registered Providers (PRPs, i.e. housing associations). Data is collected via a form that runs on an annual data collection window basis. Form changes are made annually to add new questions, remove any that are no longer needed, or adjust wording or answer options etc. Each data collection window runs from 1 April to 1 April the following year (plus an extra 3 months to allow for any late submissions). This means that between April and June, 2 collection windows are open simultaneously and logs can be submitted for either. -ADD (Analytics & Data Directorate) statisticians are the other primary users of the service. The data collected is transferred to DLUHCs consolidated data store (CDS) via nightly XML exports to an S3 bucket. CDS ingests and transforms this data, ultimately storing it in a MS SQL database and exposing it to analysts and statisticians via Amazon Workspaces. +ADD (Analytics & Data Directorate) statisticians are the other primary users of the service. The data collected is transferred to MHCLGs consolidated data store (CDS) via nightly XML exports to an S3 bucket. CDS ingests and transforms this data, ultimately storing it in a MS SQL database and exposing it to analysts and statisticians via Amazon Workspaces. ## Users diff --git a/docs/monitoring.md b/docs/monitoring.md index ce9e81a37..bbd5dcf64 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -14,7 +14,7 @@ From CloudWatch, navigate to the desired log group (e.g. for the app task runnin Alternatively, you can also navigate to a specific AWS service / resource in question (e.g. ECS tasks), selecting the instance of interest (e.g. a specific ECS task), and finding the “logs” tab (or similar) to view the log “events”. ### Sentry -To access Sentry, ensure you have been added to the DLUHC account. +To access Sentry, ensure you have been added to the MHCLG account. Generally error logs in Sentry will also be present somewhere in the CloudWatch logs, but they will be easier to assess here (e.g. number of occurrences over a time period). The logs in Sentry are created by the application when it makes Rails.logger.error calls. ## Debugging diff --git a/spec/components/lettings_log_summary_component_spec.rb b/spec/components/lettings_log_summary_component_spec.rb index 0c30a1fd8..52b6b1955 100644 --- a/spec/components/lettings_log_summary_component_spec.rb +++ b/spec/components/lettings_log_summary_component_spec.rb @@ -18,8 +18,8 @@ RSpec.describe LettingsLogSummaryComponent, type: :component do expect(result).to have_text("Tenancy starts #{Time.zone.today.strftime('%e %B %Y').strip}") expect(result).to have_text("Created #{Time.zone.today.strftime('%e %B %Y').strip}") expect(result).to have_text("Assigned to Danny Rojas") - expect(result).to have_content("Owned by\n DLUHC") - expect(result).to have_content("Managed by\n DLUHC") + expect(result).to have_content("Owned by\n MHCLG") + expect(result).to have_content("Managed by\n MHCLG") end end diff --git a/spec/components/sales_log_summary_component_spec.rb b/spec/components/sales_log_summary_component_spec.rb index 8635873af..ce9b3a45c 100644 --- a/spec/components/sales_log_summary_component_spec.rb +++ b/spec/components/sales_log_summary_component_spec.rb @@ -16,7 +16,7 @@ RSpec.describe SalesLogSummaryComponent, type: :component do it "shows the log summary with organisational relationships" do result = render_inline(described_class.new(current_user: support_user, log: sales_log)) - expect(result).to have_content("Owned by\n DLUHC") + expect(result).to have_content("Owned by\n MHCLG") expect(result).not_to have_content("Managed by") end end diff --git a/spec/factories/organisation.rb b/spec/factories/organisation.rb index f498632cd..6623ff355 100644 --- a/spec/factories/organisation.rb +++ b/spec/factories/organisation.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :organisation do - name { "DLUHC" } + name { "MHCLG" } address_line1 { "2 Marsham Street" } address_line2 { "London" } provider_type { "LA" } diff --git a/spec/features/lettings_log_spec.rb b/spec/features/lettings_log_spec.rb index a29047cbb..2b977fdd7 100644 --- a/spec/features/lettings_log_spec.rb +++ b/spec/features/lettings_log_spec.rb @@ -269,7 +269,7 @@ RSpec.describe "Lettings Log Features" do expect(breadcrumbs.length).to eq 3 expect(breadcrumbs[0].text).to eq "Home" expect(breadcrumbs[0][:href]).to eq root_path - expect(breadcrumbs[1].text).to eq "Lettings logs (DLUHC)" + expect(breadcrumbs[1].text).to eq "Lettings logs (MHCLG)" expect(breadcrumbs[1][:href]).to eq lettings_logs_organisation_path(lettings_log.owning_organisation) expect(breadcrumbs[2].text).to eq "Log #{lettings_log.id}" expect(breadcrumbs[2][:href]).to eq lettings_log_path(lettings_log) @@ -285,7 +285,7 @@ RSpec.describe "Lettings Log Features" do expect(breadcrumbs.length).to eq 3 expect(breadcrumbs[0].text).to eq "Home" expect(breadcrumbs[0][:href]).to eq root_path - expect(breadcrumbs[1].text).to eq "Lettings logs (DLUHC)" + expect(breadcrumbs[1].text).to eq "Lettings logs (MHCLG)" expect(breadcrumbs[1][:href]).to eq lettings_logs_organisation_path(lettings_log.owning_organisation) expect(breadcrumbs[2].text).to eq "Log #{lettings_log.id}" expect(breadcrumbs[2][:href]).to eq lettings_log_path(lettings_log) diff --git a/spec/features/sales_log_spec.rb b/spec/features/sales_log_spec.rb index 86469658c..779d978bf 100644 --- a/spec/features/sales_log_spec.rb +++ b/spec/features/sales_log_spec.rb @@ -259,7 +259,7 @@ RSpec.describe "Sales Log Features" do expect(breadcrumbs.length).to eq 3 expect(breadcrumbs[0].text).to eq "Home" expect(breadcrumbs[0][:href]).to eq root_path - expect(breadcrumbs[1].text).to eq "Sales logs (DLUHC)" + expect(breadcrumbs[1].text).to eq "Sales logs (MHCLG)" expect(breadcrumbs[1][:href]).to eq sales_logs_organisation_path(sales_log.owning_organisation) expect(breadcrumbs[2].text).to eq "Log #{sales_log.id}" expect(breadcrumbs[2][:href]).to eq sales_log_path(sales_log.id) @@ -273,7 +273,7 @@ RSpec.describe "Sales Log Features" do expect(breadcrumbs.length).to eq 3 expect(breadcrumbs[0].text).to eq "Home" expect(breadcrumbs[0][:href]).to eq root_path - expect(breadcrumbs[1].text).to eq "Sales logs (DLUHC)" + expect(breadcrumbs[1].text).to eq "Sales logs (MHCLG)" expect(breadcrumbs[1][:href]).to eq sales_logs_organisation_path(sales_log.owning_organisation) expect(breadcrumbs[2].text).to eq "Log #{sales_log.id}" expect(breadcrumbs[2][:href]).to eq sales_log_path(sales_log.id) diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb index 7b94cb298..da80693ec 100644 --- a/spec/features/schemes_spec.rb +++ b/spec/features/schemes_spec.rb @@ -211,7 +211,7 @@ RSpec.describe "Schemes scheme Features" do end it "shows list of links to the organisation's schemes" do - click_on("Schemes (DLUHC)") + click_on("Schemes (MHCLG)") same_organisation_schemes.each do |scheme| expect(page).to have_link(scheme.service_name) expect(page).to have_content(scheme.id_to_display) diff --git a/spec/fixtures/forms/2021_2022.json b/spec/fixtures/forms/2021_2022.json index 9f4195223..2667dff4b 100644 --- a/spec/fixtures/forms/2021_2022.json +++ b/spec/fixtures/forms/2021_2022.json @@ -1216,7 +1216,7 @@ "type": "checkbox", "answer_options": { "declaration": { - "value": "The tenant has seen the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice" + "value": "The tenant has seen the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice" } } } diff --git a/spec/helpers/tab_nav_helper_spec.rb b/spec/helpers/tab_nav_helper_spec.rb index 9dbf92e7a..dac470244 100644 --- a/spec/helpers/tab_nav_helper_spec.rb +++ b/spec/helpers/tab_nav_helper_spec.rb @@ -15,7 +15,7 @@ RSpec.describe TabNavHelper do describe "#org_cell" do it "returns the users org name and role separated by a newline character" do - expected_html = "DLUHC\nData provider" + expected_html = "MHCLG\nData provider" expect(org_cell(current_user)).to match(expected_html) end end diff --git a/spec/models/form/lettings/questions/declaration_spec.rb b/spec/models/form/lettings/questions/declaration_spec.rb index 7b90a964e..ab9bcebef 100644 --- a/spec/models/form/lettings/questions/declaration_spec.rb +++ b/spec/models/form/lettings/questions/declaration_spec.rb @@ -50,7 +50,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do it "has the correct answer_options" do expect(question.answer_options).to eq({ - "declaration" => { "value" => "The tenant has seen the DLUHC privacy notice" }, + "declaration" => { "value" => "The tenant has seen the MHCLG privacy notice" }, }) end @@ -63,7 +63,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do end it "returns correct unanswered_error_message" do - expect(question.unanswered_error_message).to eq("You must show the DLUHC privacy notice to the tenant before you can submit this log.") + expect(question.unanswered_error_message).to eq("You must show the MHCLG privacy notice to the tenant before you can submit this log.") end end @@ -74,7 +74,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do it "has the correct answer_options" do expect(question.answer_options).to eq({ - "declaration" => { "value" => "The tenant has seen or been given access to the DLUHC privacy notice" }, + "declaration" => { "value" => "The tenant has seen or been given access to the MHCLG privacy notice" }, }) end @@ -87,7 +87,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do end it "returns correct unanswered_error_message" do - expect(question.unanswered_error_message).to eq("You must show or give access to the DLUHC privacy notice to the tenant before you can submit this log.") + expect(question.unanswered_error_message).to eq("You must show or give access to the MHCLG privacy notice to the tenant before you can submit this log.") end end end diff --git a/spec/models/form/sales/pages/privacy_notice_spec.rb b/spec/models/form/sales/pages/privacy_notice_spec.rb index db560407d..fc34d42de 100644 --- a/spec/models/form/sales/pages/privacy_notice_spec.rb +++ b/spec/models/form/sales/pages/privacy_notice_spec.rb @@ -26,7 +26,7 @@ RSpec.describe Form::Sales::Pages::PrivacyNotice, type: :model do end it "has the correct header" do - expect(page.header).to eq("Department for Levelling Up, Housing and Communities privacy notice") + expect(page.header).to eq("Ministry of Housing, Communities and Local Government privacy notice") end it "has the correct description" do diff --git a/spec/models/form/sales/questions/privacy_notice_spec.rb b/spec/models/form/sales/questions/privacy_notice_spec.rb index 263623ea9..4be918c5c 100644 --- a/spec/models/form/sales/questions/privacy_notice_spec.rb +++ b/spec/models/form/sales/questions/privacy_notice_spec.rb @@ -51,7 +51,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do context "and there is a single buyer" do it "has the correct answer_options" do expect(question.answer_options).to eq({ - "privacynotice" => { "value" => "The buyer has seen the DLUHC privacy notice" }, + "privacynotice" => { "value" => "The buyer has seen the MHCLG privacy notice" }, }) end @@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do end it "returns correct unanswered_error_message" do - expect(question.unanswered_error_message).to eq("You must show the DLUHC privacy notice to the buyer before you can submit this log.") + expect(question.unanswered_error_message).to eq("You must show the MHCLG privacy notice to the buyer before you can submit this log.") end end @@ -69,7 +69,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do it "has the correct answer_options" do expect(question.answer_options).to eq({ - "privacynotice" => { "value" => "The buyers have seen the DLUHC privacy notice" }, + "privacynotice" => { "value" => "The buyers have seen the MHCLG privacy notice" }, }) end @@ -78,7 +78,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do end it "returns correct unanswered_error_message" do - expect(question.unanswered_error_message).to eq("You must show the DLUHC privacy notice to the buyers before you can submit this log.") + expect(question.unanswered_error_message).to eq("You must show the MHCLG privacy notice to the buyers before you can submit this log.") end end end @@ -91,7 +91,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do context "and there is a single buyer" do it "has the correct answer_options" do expect(question.answer_options).to eq({ - "privacynotice" => { "value" => "The buyer has seen or been given access to the DLUHC privacy notice" }, + "privacynotice" => { "value" => "The buyer has seen or been given access to the MHCLG privacy notice" }, }) end @@ -100,7 +100,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do end it "returns correct unanswered_error_message" do - expect(question.unanswered_error_message).to eq("You must show or give access to the DLUHC privacy notice to the buyer before you can submit this log.") + expect(question.unanswered_error_message).to eq("You must show or give access to the MHCLG privacy notice to the buyer before you can submit this log.") end end @@ -109,7 +109,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do it "has the correct answer_options" do expect(question.answer_options).to eq({ - "privacynotice" => { "value" => "The buyers have seen or been given access to the DLUHC privacy notice" }, + "privacynotice" => { "value" => "The buyers have seen or been given access to the MHCLG privacy notice" }, }) end @@ -118,7 +118,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do end it "returns correct unanswered_error_message" do - expect(question.unanswered_error_message).to eq("You must show or give access to the DLUHC privacy notice to the buyers before you can submit this log.") + expect(question.unanswered_error_message).to eq("You must show or give access to the MHCLG privacy notice to the buyers before you can submit this log.") end end end diff --git a/spec/models/organisation_spec.rb b/spec/models/organisation_spec.rb index 3964923f0..2cd3351d5 100644 --- a/spec/models/organisation_spec.rb +++ b/spec/models/organisation_spec.rb @@ -20,8 +20,8 @@ RSpec.describe Organisation, type: :model do end context "with parent/child associations", :aggregate_failures do - let!(:child_organisation) { create(:organisation, name: "DLUHC Child") } - let!(:grandchild_organisation) { create(:organisation, name: "DLUHC Grandchild") } + let!(:child_organisation) { create(:organisation, name: "MHCLG Child") } + let!(:grandchild_organisation) { create(:organisation, name: "MHCLG Grandchild") } before do create( @@ -49,8 +49,8 @@ RSpec.describe Organisation, type: :model do end context "with owning association", :aggregate_failures do - let!(:child_organisation) { create(:organisation, name: "DLUHC Child") } - let!(:grandchild_organisation) { create(:organisation, name: "DLUHC Grandchild") } + let!(:child_organisation) { create(:organisation, name: "MHCLG Child") } + let!(:grandchild_organisation) { create(:organisation, name: "MHCLG Grandchild") } before do create( @@ -73,8 +73,8 @@ RSpec.describe Organisation, type: :model do end context "with managing association", :aggregate_failures do - let!(:child_organisation) { create(:organisation, name: "DLUHC Child") } - let!(:grandchild_organisation) { create(:organisation, name: "DLUHC Grandchild") } + let!(:child_organisation) { create(:organisation, name: "MHCLG Child") } + let!(:grandchild_organisation) { create(:organisation, name: "MHCLG Grandchild") } before do create( @@ -208,7 +208,7 @@ RSpec.describe Organisation, type: :model do it "allows lettings logs to be restored to a previous version" do organisation.update!(name: "new test name") - expect(organisation.paper_trail.previous_version.name).to eq("DLUHC") + expect(organisation.paper_trail.previous_version.name).to eq("MHCLG") end end diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index 4b6cefe5f..13879a38c 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -1513,7 +1513,7 @@ RSpec.describe OrganisationsController, type: :request do end context "when search results require pagination" do - let(:search_param) { "DLUHC" } + let(:search_param) { "MHCLG" } it "has search and pagination in the title" do expect(page).to have_title("Organisations (27 organisations matching ‘#{search_param}’) (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK") diff --git a/spec/views/organisations/data_sharing_agreement.html.erb_spec.rb b/spec/views/organisations/data_sharing_agreement.html.erb_spec.rb index 8bcb29c9d..a2c7a5dd1 100644 --- a/spec/views/organisations/data_sharing_agreement.html.erb_spec.rb +++ b/spec/views/organisations/data_sharing_agreement.html.erb_spec.rb @@ -28,7 +28,7 @@ RSpec.describe "organisations/data_sharing_agreement.html.erb", :aggregate_failu # org details expect(fragment).to have_content("#{organisation.name} of #{organisation.address_row} (“CORE Data Provider”)") # header - expect(fragment).to have_css("h2", text: "#{organisation.name} and Department for Levelling Up, Housing and Communities") + expect(fragment).to have_css("h2", text: "#{organisation.name} and Ministry of Housing, Communities and Local Government") # action buttons expect(fragment).to have_button(text: "Accept this agreement") expect(fragment).to have_link(text: "Cancel", href: "/organisations/#{organisation.id}/details") @@ -56,7 +56,7 @@ RSpec.describe "organisations/data_sharing_agreement.html.erb", :aggregate_failu # org details expect(fragment).to have_content("#{organisation.name} of #{organisation.address_row} (“CORE Data Provider”)") # header - expect(fragment).to have_css("h2", text: "#{organisation.name} and Department for Levelling Up, Housing and Communities") + expect(fragment).to have_css("h2", text: "#{organisation.name} and Ministry of Housing, Communities and Local Government") # does not show action buttons expect(fragment).not_to have_button(text: "Accept this agreement") expect(fragment).not_to have_link(text: "Cancel", href: "/organisations/#{organisation.id}/details") @@ -99,7 +99,7 @@ RSpec.describe "organisations/data_sharing_agreement.html.erb", :aggregate_failu # org details expect(fragment).to have_content("#{organisation.name} of #{organisation.address_row} (“CORE Data Provider”)") # header - expect(fragment).to have_css("h2", text: "#{organisation.name} and Department for Levelling Up, Housing and Communities") + expect(fragment).to have_css("h2", text: "#{organisation.name} and Ministry of Housing, Communities and Local Government") # does not show action buttons expect(fragment).not_to have_button(text: "Accept this agreement") expect(fragment).not_to have_link(text: "Cancel", href: "/organisations/#{organisation.id}/details") @@ -124,7 +124,7 @@ RSpec.describe "organisations/data_sharing_agreement.html.erb", :aggregate_failu # org details expect(fragment).to have_content("#{organisation.name} of #{organisation.address_row} (“CORE Data Provider”)") # header - expect(fragment).to have_css("h2", text: "#{organisation.name} and Department for Levelling Up, Housing and Communities") + expect(fragment).to have_css("h2", text: "#{organisation.name} and Ministry of Housing, Communities and Local Government") # does not show action buttons expect(fragment).not_to have_button(text: "Accept this agreement") expect(fragment).not_to have_link(text: "Cancel", href: "/organisations/#{organisation.id}/details") @@ -152,7 +152,7 @@ RSpec.describe "organisations/data_sharing_agreement.html.erb", :aggregate_failu # org details expect(fragment).to have_content("#{organisation.name} of #{organisation.address_row} (“CORE Data Provider”)") # header - expect(fragment).to have_css("h2", text: "#{organisation.name} and Department for Levelling Up, Housing and Communities") + expect(fragment).to have_css("h2", text: "#{organisation.name} and Ministry of Housing, Communities and Local Government") # does not show action buttons expect(fragment).not_to have_button(text: "Accept this agreement") expect(fragment).not_to have_link(text: "Cancel", href: "/organisations/#{organisation.id}/details")