diff --git a/.github/workflows/paas_only_production_pipeline.yml b/.github/workflows/paas_only_production_pipeline.yml new file mode 100644 index 000000000..0be6e9885 --- /dev/null +++ b/.github/workflows/paas_only_production_pipeline.yml @@ -0,0 +1,220 @@ +name: PaaS-only Production CI/CD Pipeline + +on: + workflow_dispatch: + +defaults: + run: + shell: bash + +jobs: + test: + name: Tests + runs-on: ubuntu-latest + + services: + postgres: + image: postgres:13.5 + env: + POSTGRES_PASSWORD: password + POSTGRES_USER: postgres + POSTGRES_DB: data_collector + ports: + - 5432:5432 + # Needed because the Postgres container does not provide a health check + # tmpfs makes database faster by using RAM + options: >- + --mount type=tmpfs,destination=/var/lib/postgresql/data + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + + env: + RAILS_ENV: test + GEMFILE_RUBY_VERSION: 3.1.1 + DB_HOST: localhost + DB_DATABASE: data_collector + DB_USERNAME: postgres + DB_PASSWORD: password + RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }} + PARALLEL_TEST_PROCESSORS: 4 + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + cache: yarn + node-version: 18 + + - name: Create database + run: | + bundle exec rake parallel:setup + + - name: Compile assets + run: | + bundle exec rake assets:precompile + + - name: Run tests + run: | + bundle exec rake parallel:spec['spec\/(?!features)'] + + feature_test: + name: Feature Tests + runs-on: ubuntu-latest + + services: + postgres: + image: postgres:13.5 + env: + POSTGRES_PASSWORD: password + POSTGRES_USER: postgres + POSTGRES_DB: data_collector + ports: + - 5432:5432 + # Needed because the Postgres container does not provide a health check + # tmpfs makes database faster by using RAM + options: >- + --mount type=tmpfs,destination=/var/lib/postgresql/data + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + + env: + RAILS_ENV: test + GEMFILE_RUBY_VERSION: 3.1.1 + DB_HOST: localhost + DB_DATABASE: data_collector + DB_USERNAME: postgres + DB_PASSWORD: password + RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }} + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + cache: yarn + node-version: 18 + + - name: Create database + run: | + bundle exec rake db:prepare + + - name: Compile assets + run: | + bundle exec rake assets:precompile + + - name: Run tests + run: | + bundle exec rspec spec/features --fail-fast + + lint: + name: Lint + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + cache: yarn + node-version: 18 + + - name: Install packages and symlink local dependencies + run: | + yarn install --immutable --immutable-cache --check-cache + + - name: Lint + run: | + bundle exec rake lint + + audit: + name: Audit dependencies + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + + - name: Audit + run: | + bundle exec bundler-audit + + deploy: + name: Deploy + concurrency: "production" + runs-on: ubuntu-latest + environment: "production" + needs: [lint, test, feature_test, audit] + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Install Cloud Foundry CLI + run: | + wget --user-agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Safari/605.1.15" -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - + echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list + sudo apt-get update + sudo apt-get install cf8-cli + + - name: Deploy + env: + CF_USERNAME: ${{ secrets.CF_USERNAME }} + CF_PASSWORD: ${{ secrets.CF_PASSWORD }} + CF_API_ENDPOINT: ${{ secrets.CF_API_ENDPOINT }} + CF_SPACE: ${{ secrets.CF_SPACE }} + CF_ORG: ${{ secrets.CF_ORG }} + APP_NAME: dluhc-core-production + GOVUK_NOTIFY_API_KEY: ${{ secrets.GOVUK_NOTIFY_API_KEY }} + APP_HOST: ${{ secrets.APP_HOST }} + RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }} + OS_DATA_KEY: ${{ secrets.OS_DATA_KEY }} + IMPORT_PAAS_INSTANCE: ${{ secrets.IMPORT_PAAS_INSTANCE }} + EXPORT_PAAS_INSTANCE: ${{ secrets.EXPORT_PAAS_INSTANCE }} + S3_CONFIG: ${{ secrets.S3_CONFIG }} + CSV_DOWNLOAD_PAAS_INSTANCE: ${{ secrets.CSV_DOWNLOAD_PAAS_INSTANCE }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} + run: | + cf api $CF_API_ENDPOINT + cf auth + cf target -o $CF_ORG -s $CF_SPACE + cf set-env $APP_NAME GOVUK_NOTIFY_API_KEY $GOVUK_NOTIFY_API_KEY + cf set-env $APP_NAME APP_HOST $APP_HOST + cf set-env $APP_NAME RAILS_MASTER_KEY $RAILS_MASTER_KEY + cf set-env $APP_NAME OS_DATA_KEY $OS_DATA_KEY + cf set-env $APP_NAME IMPORT_PAAS_INSTANCE $IMPORT_PAAS_INSTANCE + cf set-env $APP_NAME EXPORT_PAAS_INSTANCE $EXPORT_PAAS_INSTANCE + cf set-env $APP_NAME S3_CONFIG $S3_CONFIG + cf set-env $APP_NAME CSV_DOWNLOAD_PAAS_INSTANCE $CSV_DOWNLOAD_PAAS_INSTANCE + cf set-env $APP_NAME SENTRY_DSN $SENTRY_DSN + cf push $APP_NAME --strategy rolling diff --git a/.github/workflows/production_pipeline.yml b/.github/workflows/production_pipeline.yml index 76a85eca8..d58cf74ae 100644 --- a/.github/workflows/production_pipeline.yml +++ b/.github/workflows/production_pipeline.yml @@ -167,9 +167,19 @@ jobs: with: bundler-cache: true - - name: Rubocop + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + cache: yarn + node-version: 18 + + - name: Install packages and symlink local dependencies + run: | + yarn install --immutable --immutable-cache --check-cache + + - name: Lint run: | - bundle exec rubocop + bundle exec rake lint audit: name: Audit dependencies diff --git a/app/components/search_component.html.erb b/app/components/search_component.html.erb index 2c10f3ed8..9c989f0f0 100644 --- a/app/components/search_component.html.erb +++ b/app/components/search_component.html.erb @@ -10,6 +10,7 @@ autocomplete: "off", class: "app-search__input" %> - <%= f.govuk_submit "Search", classes: "app-search__button govuk-button--secondary" %> + <%= f.govuk_submit "Search", classes: "app-search__button" %> + <%= govuk_button_link_to "Clear search", path(current_user), secondary: true, class: "app-search__button" %> <% end %> diff --git a/app/components/search_result_caption_component.html.erb b/app/components/search_result_caption_component.html.erb index f2a553828..d170922d7 100644 --- a/app/components/search_result_caption_component.html.erb +++ b/app/components/search_result_caption_component.html.erb @@ -1,7 +1,11 @@ - <% if searched.present? %> - <%= count %> <%= item_label %> found matching ‘<%= searched %>’ of <%= total_count %> total <%= item %>. <%= govuk_link_to("Clear search", path) %> + <% if searched.present? && filters_count&.positive? %> + <%= count %> <%= item_label.pluralize(count) %> matching search and filters
+ <% elsif searched.present? %> + <%= count %> <%= item_label.pluralize(count) %> matching search
+ <% elsif filters_count&.positive? %> + <%= count %> <%= item_label.pluralize(count) %> matching filters
<% else %> - <%= count %> total <%= item %> + <%= count %> matching <%= item %> <% end %> diff --git a/app/components/search_result_caption_component.rb b/app/components/search_result_caption_component.rb index 8565c125d..f748641ab 100644 --- a/app/components/search_result_caption_component.rb +++ b/app/components/search_result_caption_component.rb @@ -1,13 +1,13 @@ class SearchResultCaptionComponent < ViewComponent::Base - attr_reader :searched, :count, :item_label, :total_count, :item, :path + attr_reader :searched, :count, :item_label, :total_count, :item, :filters_count - def initialize(searched:, count:, item_label:, total_count:, item:, path:) + def initialize(searched:, count:, item_label:, total_count:, item:, filters_count:) @searched = searched @count = count @item_label = item_label @total_count = total_count @item = item - @path = path + @filters_count = filters_count super end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ff085e6dc..ae9e1beb9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,8 +3,17 @@ class ApplicationController < ActionController::Base rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized + before_action :check_maintenance before_action :set_paper_trail_whodunnit + def check_maintenance + if FeatureToggle.maintenance_mode_enabled? && !%w[service-unavailable accessibility-statement privacy-notice cookies].include?(request.fullpath.split("?")[0].delete("/")) + redirect_to service_unavailable_path + elsif !FeatureToggle.maintenance_mode_enabled? && request.fullpath.split("?")[0].delete("/") == "service-unavailable" + redirect_back(fallback_location: root_path) + end + end + def render_not_found render "errors/not_found", status: :not_found end diff --git a/app/controllers/delete_logs_controller.rb b/app/controllers/delete_logs_controller.rb index 5f4c97cbd..a0fa962ad 100644 --- a/app/controllers/delete_logs_controller.rb +++ b/app/controllers/delete_logs_controller.rb @@ -27,7 +27,7 @@ class DeleteLogsController < ApplicationController logs = LettingsLog.find(params.require(:ids)) discard logs if request.referer&.include?("delete-duplicates") - redirect_to lettings_log_duplicate_logs_path(lettings_log_id: params["remaining_log_id"], original_log_id: params["original_log_id"]), notice: I18n.t("notification.duplicate_logs_deleted", count: logs.count, log_ids: duplicate_log_ids(logs)) + redirect_to lettings_log_duplicate_logs_path(lettings_log_id: params["remaining_log_id"], original_log_id: params["original_log_id"], referrer: params[:referrer], organisation_id: params[:organisation_id]), notice: I18n.t("notification.duplicate_logs_deleted", count: logs.count, log_ids: duplicate_log_ids(logs)) else redirect_to lettings_logs_path, notice: I18n.t("notification.logs_deleted", count: logs.count) end @@ -56,7 +56,7 @@ class DeleteLogsController < ApplicationController logs = SalesLog.find(params.require(:ids)) discard logs if request.referer&.include?("delete-duplicates") - redirect_to sales_log_duplicate_logs_path(sales_log_id: params["remaining_log_id"], original_log_id: params["original_log_id"]), notice: I18n.t("notification.duplicate_logs_deleted", count: logs.count, log_ids: duplicate_log_ids(logs)) + redirect_to sales_log_duplicate_logs_path(sales_log_id: params["remaining_log_id"], original_log_id: params["original_log_id"], referrer: params[:referrer], organisation_id: params[:organisation_id]), notice: I18n.t("notification.duplicate_logs_deleted", count: logs.count, log_ids: duplicate_log_ids(logs)) else redirect_to sales_logs_path, notice: I18n.t("notification.logs_deleted", count: logs.count) end diff --git a/app/controllers/duplicate_logs_controller.rb b/app/controllers/duplicate_logs_controller.rb index bc7579e17..d5ba94130 100644 --- a/app/controllers/duplicate_logs_controller.rb +++ b/app/controllers/duplicate_logs_controller.rb @@ -5,15 +5,12 @@ class DuplicateLogsController < ApplicationController before_action :find_resource_by_named_id before_action :find_duplicates_for_a_log before_action :find_original_log + before_action :find_organisation, only: [:index] before_action :find_all_duplicates, only: [:index] def show if @log @all_duplicates = [@log, *@duplicate_logs] - @duplicate_check_questions = duplicate_check_question_ids.map { |question_id| - question = @log.form.get_question(question_id, @log) - question if question.page.routed_to?(@log, current_user) - }.compact else render_not_found end @@ -26,10 +23,8 @@ class DuplicateLogsController < ApplicationController end def index - render_not_found if @duplicates.blank? - @duplicate_sets_count = @duplicates[:lettings].count + @duplicates[:sales].count - render_not_found if @duplicate_sets_count.zero? + render "duplicate_logs/no_more_duplicates" if @duplicate_sets_count.zero? end private @@ -55,29 +50,9 @@ private def find_all_duplicates return @duplicates = duplicates_for_user(current_user) if current_user.data_provider? - organisation = current_user.support? ? Organisation.find(params[:organisation_id]) : current_user.organisation - return unless organisation + return unless @organisation - @duplicates = duplicates_for_organisation(organisation) - end - - def duplicate_check_question_ids - if @log.lettings? - ["owning_organisation_id", - "startdate", - "tenancycode", - "postcode_full", - "scheme_id", - "location_id", - "age1", - "sex1", - "ecstat1", - @log.household_charge == 1 ? "household_charge" : nil, - "tcharge", - @log.is_carehome? ? "chcharge" : nil].compact - else - %w[owning_organisation_id saledate purchid age1 sex1 ecstat1 postcode_full] - end + @duplicates = duplicates_for_organisation(@organisation) end def find_original_log @@ -89,4 +64,8 @@ private current_user.lettings_logs.find_by(id: original_log_id) end end + + def find_organisation + @organisation = current_user.support? ? Organisation.find(params[:organisation_id]) : current_user.organisation + end end diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb index e023a847a..593b14d18 100644 --- a/app/controllers/form_controller.rb +++ b/app/controllers/form_controller.rb @@ -165,7 +165,7 @@ private def successful_redirect_path if FeatureToggle.deduplication_flow_enabled? - if is_referrer_type?("duplicate_logs") + if is_referrer_type?("duplicate_logs") || is_referrer_type?("duplicate_logs_banner") return correcting_duplicate_logs_redirect_path end @@ -251,10 +251,10 @@ private if original_log.present? && current_user.send(class_name.pluralize).duplicate_logs(original_log).count.positive? flash[:notice] = deduplication_success_banner unless current_user.send(class_name.pluralize).duplicate_logs(@log).count.positive? - send("#{class_name}_duplicate_logs_path", original_log, original_log_id: original_log.id) + send("#{class_name}_duplicate_logs_path", original_log, original_log_id: original_log.id, referrer: params[:referrer], organisation_id: params[:organisation_id]) else flash[:notice] = deduplication_success_banner - send("#{class_name}_duplicate_logs_path", "#{class_name}_id".to_sym => from_referrer_query("first_remaining_duplicate_id"), original_log_id: from_referrer_query("original_log_id")) + send("#{class_name}_duplicate_logs_path", "#{class_name}_id".to_sym => from_referrer_query("first_remaining_duplicate_id"), original_log_id: from_referrer_query("original_log_id"), referrer: params[:referrer], organisation_id: params[:organisation_id]) end end diff --git a/app/controllers/maintenance_controller.rb b/app/controllers/maintenance_controller.rb new file mode 100644 index 000000000..bb6ae1f80 --- /dev/null +++ b/app/controllers/maintenance_controller.rb @@ -0,0 +1,7 @@ +class MaintenanceController < ApplicationController + def service_unavailable + if current_user + sign_out + end + end +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 225f05f8b..1e350829a 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -3,7 +3,7 @@ class SessionsController < ApplicationController session[session_name_for(params[:filter_type])] = "{}" path_params = params[:path_params].presence || {} - redirect_to send("#{params[:filter_type]}_path", scheme_id: path_params[:scheme_id]) + redirect_to send("#{params[:filter_type]}_path", scheme_id: path_params[:scheme_id], search: path_params[:search]) end private diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f9a86055d..a9344f0f7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,7 +5,7 @@ class UsersController < ApplicationController include Modules::SearchFilter before_action :authenticate_user! - before_action :find_resource, except: %i[new create] + before_action :find_user, except: %i[new create] before_action :authenticate_scope!, except: %i[new] before_action :session_filters, if: :current_user, only: %i[index] before_action -> { filter_manager.serialize_filters_to_session }, if: :current_user, only: %i[index] @@ -49,7 +49,8 @@ class UsersController < ApplicationController end def update - if @user.update(user_params) + validate_attributes + if @user.errors.empty? && @user.update(user_params) if @user == current_user bypass_sign_in @user flash[:notice] = I18n.t("devise.passwords.updated") if user_params.key?("password") @@ -83,18 +84,18 @@ class UsersController < ApplicationController def new @organisation_id = params["organisation_id"] - @resource = User.new + @user = User.new end def create - @resource = User.new(user_params.merge(org_params).merge(password_params)) + @user = User.new(user_params.merge(org_params).merge(password_params)) validate_attributes - if @resource.errors.empty? && @resource.save + if @user.errors.empty? && @user.save redirect_to created_user_redirect_path else - unless @resource.errors[:organisation].empty? - @resource.errors.delete(:organisation) + unless @user.errors[:organisation].empty? + @user.errors.delete(:organisation) end render :new, status: :unprocessable_entity end @@ -124,15 +125,15 @@ class UsersController < ApplicationController private def validate_attributes - @resource.validate + @user.validate if user_params[:role].present? && !current_user.assignable_roles.key?(user_params[:role].to_sym) - @resource.errors.add :role, I18n.t("validations.role.invalid") + @user.errors.add :role, I18n.t("validations.role.invalid") end - if user_params[:phone].blank? - @resource.errors.add :phone, :blank - elsif !valid_phone_number?(user_params[:phone]) - @resource.errors.add :phone + if !user_params[:phone].nil? && user_params[:phone].blank? + @user.errors.add :phone, :blank + elsif !user_params[:phone].nil? && !valid_phone_number?(user_params[:phone]) + @user.errors.add :phone end end @@ -188,7 +189,7 @@ private end end - def find_resource + def find_user @user = User.find_by(id: params[:user_id]) || User.find_by(id: params[:id]) || current_user end diff --git a/app/helpers/duplicate_logs_helper.rb b/app/helpers/duplicate_logs_helper.rb index e296cab1e..ec8ac9185 100644 --- a/app/helpers/duplicate_logs_helper.rb +++ b/app/helpers/duplicate_logs_helper.rb @@ -8,10 +8,13 @@ module DuplicateLogsHelper action: "delete_duplicates", "#{duplicate_log.class.name.underscore}_id": duplicate_log.id, original_log_id: original_log.id, + referrer: params[:referrer], + organisation_id: params[:organisation_id], ) end - - if !original_log.deleted? + if params[:referrer] == "duplicate_logs_banner" + current_user.support? ? govuk_button_link_to("Review other duplicates", organisation_duplicates_path(organisation_id: params[:organisation_id], referrer: params[:referrer])) : govuk_button_link_to("Review other duplicates", duplicate_logs_path(referrer: params[:referrer])) + elsif !original_log.deleted? govuk_button_link_to "Back to Log #{original_log.id}", send("#{original_log.class.name.underscore}_path", original_log) else type = duplicate_log.lettings? ? "lettings" : "sales" @@ -25,7 +28,7 @@ module DuplicateLogsHelper def change_duplicate_logs_action_href(log, page_id, all_duplicates, original_log_id) first_remaining_duplicate_id = all_duplicates.map(&:id).reject { |id| id == log.id }.first - send("#{log.model_name.param_key}_#{page_id}_path", log, referrer: "duplicate_logs", first_remaining_duplicate_id:, original_log_id:) + send("#{log.model_name.param_key}_#{page_id}_path", log, referrer: params[:referrer] == "duplicate_logs_banner" ? "duplicate_logs_banner" : "duplicate_logs", first_remaining_duplicate_id:, original_log_id:, organisation_id: params[:organisation_id]) end def duplicates_for_user(user) @@ -50,4 +53,48 @@ module DuplicateLogsHelper def duplicate_list_header(duplicate_sets_count) duplicate_sets_count > 1 ? "Review these #{duplicate_sets_count} sets of logs" : "Review this #{duplicate_sets_count} set of logs" end + + def duplicate_log_question_label(question) + if question.id == "uprn" + "Postcode (from UPRN)" + else + get_question_label(question) + end + end + + def duplicate_log_answer_label(question, log) + if question.id == "uprn" + postcode_question = log.form.get_question("postcode_full", log) + get_answer_label(postcode_question, log) + else + get_answer_label(question, log) + end + end + + def duplicate_log_extra_value(question, log) + if question.id == "uprn" + postcode_question = log.form.get_question("postcode_full", log) + postcode_question.get_extra_check_answer_value(log) + else + question.get_extra_check_answer_value(log) + end + end + + def duplicate_log_answer_label_present(question, log, current_user) + if question.id == "uprn" + postcode_question = log.form.get_question("postcode_full", log) + postcode_question.answer_label(log, current_user).present? + else + question.answer_label(log, current_user).present? + end + end + + def duplicate_log_inferred_answers(question, log) + if question.id == "uprn" + postcode_question = log.form.get_question("postcode_full", log) + postcode_question.get_inferred_answers(log) + else + question.get_inferred_answers(log) + end + end end diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index e2da5b0ed..91038dbc9 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -26,6 +26,7 @@ module FiltersHelper filters["organisation"].present? || filters["managing_organisation"].present? || filters["status"]&.compact_blank&.any? || + filters["needstypes"]&.compact_blank&.any? || filters["years"]&.compact_blank&.any? || filters["bulk_upload_id"].present? end @@ -56,6 +57,13 @@ module FiltersHelper }.freeze end + def needstype_filters + { + "1" => "General needs", + "2" => "Supported housing", + }.freeze + end + def location_status_filters { "incomplete" => "Incomplete", @@ -108,12 +116,35 @@ module FiltersHelper user.support? || org.stock_owners.count > 1 || (org.holds_own_stock? && org.stock_owners.count.positive?) end -private + def logs_for_both_needstypes_present?(organisation) + return true if current_user.support? && organisation.blank? + return [1, 2].all? { |needstype| organisation.lettings_logs.visible.where(needstype:).count.positive? } if current_user.support? + + [1, 2].all? { |needstype| current_user.lettings_logs.visible.where(needstype:).count.positive? } + end + + def non_support_with_multiple_owning_orgs? + current_user.organisation.stock_owners.count > 1 && user_lettings_path? + end + + def non_support_with_multiple_managing_orgs? + current_user.organisation.managing_agents.count > 1 && user_lettings_path? + end + + def user_lettings_path? + request.path == "/lettings-logs" + end + + def user_or_org_lettings_path? + request.path.include?("/lettings-logs") + end def applied_filters_count(filter_type) filters_count(applied_filters(filter_type)) end +private + def applied_filters(filter_type) return {} unless session[session_name_for(filter_type)] @@ -126,7 +157,7 @@ private def filters_count(filters) filters.each.sum do |category, category_filters| - if %w[status years bulk_upload_id].include?(category) + if %w[years status needstypes bulk_upload_id].include?(category) category_filters.count(&:present?) elsif %w[user owning_organisation managing_organisation].include?(category) 1 diff --git a/app/helpers/form_page_helper.rb b/app/helpers/form_page_helper.rb index e12d7fbb7..99c5276bc 100644 --- a/app/helpers/form_page_helper.rb +++ b/app/helpers/form_page_helper.rb @@ -2,4 +2,12 @@ module FormPageHelper def action_href(log, page_id, referrer = "check_answers") send("#{log.model_name.param_key}_#{page_id}_path", log, referrer:) end + + def returning_to_question_page?(page, referrer) + page.interruption_screen? || referrer == "check_answers" + end + + def accessed_from_duplicate_logs?(referrer) + %w[duplicate_logs duplicate_logs_banner].include?(referrer) + end end diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb index 9679a9839..7d1274540 100644 --- a/app/models/derived_variables/lettings_log_variables.rb +++ b/app/models/derived_variables/lettings_log_variables.rb @@ -45,6 +45,8 @@ module DerivedVariables::LettingsLogVariables end self.renttype = RENT_TYPE_MAPPING[rent_type] self.lettype = get_lettype + self.lar = get_lar + self.irproduct = get_irproduct self.totchild = get_totchild self.totelder = get_totelder self.totadult = get_totadult @@ -307,4 +309,15 @@ private self.town_or_city = nil self.county = nil end + + def get_lar + return 1 if rent_type == 2 + return 2 if rent_type == 1 + end + + def get_irproduct + return 1 if rent_type == 3 + return 2 if rent_type == 4 + return 3 if rent_type == 5 + end end diff --git a/app/models/form/lettings/pages/address.rb b/app/models/form/lettings/pages/address.rb index cf6f73036..389ce172a 100644 --- a/app/models/form/lettings/pages/address.rb +++ b/app/models/form/lettings/pages/address.rb @@ -16,9 +16,8 @@ class Form::Lettings::Pages::Address < ::Form::Page end def routed_to?(log, _current_user = nil) - return false if log.uprn_known.nil? return false if log.is_supported_housing? - log.uprn_confirmed != 1 || log.uprn_known.zero? + log.uprn_known.nil? || log.uprn_known.zero? || log.uprn_confirmed&.zero? end end diff --git a/app/models/form/lettings/pages/location.rb b/app/models/form/lettings/pages/location.rb index f20ca30d5..2c040661a 100644 --- a/app/models/form/lettings/pages/location.rb +++ b/app/models/form/lettings/pages/location.rb @@ -7,6 +7,7 @@ class Form::Lettings::Pages::Location < ::Form::Page "scheme_has_multiple_locations?" => true, }, ] + @header = "Location" @next_unresolved_page_id = :check_answers end diff --git a/app/models/form/lettings/pages/max_rent_value_check.rb b/app/models/form/lettings/pages/max_rent_value_check.rb index 82aff8481..f3280420b 100644 --- a/app/models/form/lettings/pages/max_rent_value_check.rb +++ b/app/models/form/lettings/pages/max_rent_value_check.rb @@ -19,6 +19,6 @@ class Form::Lettings::Pages::MaxRentValueCheck < ::Form::Page end def interruption_screen_question_ids - %w[brent startdate uprn postcode_full la beds rent_type needstype] + %w[brent period startdate uprn postcode_full la beds rent_type needstype] end end diff --git a/app/models/form/lettings/pages/min_rent_value_check.rb b/app/models/form/lettings/pages/min_rent_value_check.rb index b2bae4e8e..ee26b4d7e 100644 --- a/app/models/form/lettings/pages/min_rent_value_check.rb +++ b/app/models/form/lettings/pages/min_rent_value_check.rb @@ -19,6 +19,6 @@ class Form::Lettings::Pages::MinRentValueCheck < ::Form::Page end def interruption_screen_question_ids - %w[brent startdate uprn postcode_full la beds rent_type needstype] + %w[brent period startdate uprn postcode_full la beds rent_type needstype] end end diff --git a/app/models/form/lettings/questions/location_id.rb b/app/models/form/lettings/questions/location_id.rb index 6e5ed3dc0..62ee0d218 100644 --- a/app/models/form/lettings/questions/location_id.rb +++ b/app/models/form/lettings/questions/location_id.rb @@ -13,6 +13,7 @@ class Form::Lettings::Questions::LocationId < ::Form::Question } @question_number = 10 @disable_clearing_if_not_routed_or_dynamic_answer_options = true + @top_guidance_partial = "finding_location" end def answer_options diff --git a/app/models/form/lettings/questions/managing_organisation.rb b/app/models/form/lettings/questions/managing_organisation.rb index e22bf0c3d..2e955fd22 100644 --- a/app/models/form/lettings/questions/managing_organisation.rb +++ b/app/models/form/lettings/questions/managing_organisation.rb @@ -23,8 +23,8 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question if log.owning_organisation.holds_own_stock? opts[log.owning_organisation.id] = "#{log.owning_organisation.name} (Owning organisation)" end - elsif user.organisation.absorbed_organisations.exists? - opts[user.organisation.id] = "#{user.organisation.name} (Your organisation, active as of #{user.organisation.created_at.to_fs(:govuk_date)})" + elsif user.organisation.absorbed_organisations.exists? && user.organisation.available_from.present? + opts[user.organisation.id] = "#{user.organisation.name} (Your organisation, active as of #{user.organisation.available_from.to_fs(:govuk_date)})" else opts[user.organisation.id] = "#{user.organisation.name} (Your organisation)" end diff --git a/app/models/form/lettings/questions/referral.rb b/app/models/form/lettings/questions/referral.rb index a93ba8f63..7f0fb3c41 100644 --- a/app/models/form/lettings/questions/referral.rb +++ b/app/models/form/lettings/questions/referral.rb @@ -14,6 +14,7 @@ class Form::Lettings::Questions::Referral < ::Form::Question ANSWER_OPTIONS = { "1" => { "value" => "Internal transfer", + "hint" => "Where the tenant has moved to another social property owned by the same landlord.", }, "2" => { "value" => "Tenant applied directly (no referral or nomination)", diff --git a/app/models/form/lettings/questions/referral_prp.rb b/app/models/form/lettings/questions/referral_prp.rb index 8a3f03568..a1ec41fd5 100644 --- a/app/models/form/lettings/questions/referral_prp.rb +++ b/app/models/form/lettings/questions/referral_prp.rb @@ -14,6 +14,7 @@ class Form::Lettings::Questions::ReferralPrp < ::Form::Question ANSWER_OPTIONS = { "1" => { "value" => "Internal transfer", + "hint" => "Where the tenant has moved to another social property owned by the same landlord.", }, "2" => { "value" => "Tenant applied directly (no nomination)", diff --git a/app/models/form/lettings/questions/referral_supported_housing.rb b/app/models/form/lettings/questions/referral_supported_housing.rb index 68b9fd8e7..b6b6b1567 100644 --- a/app/models/form/lettings/questions/referral_supported_housing.rb +++ b/app/models/form/lettings/questions/referral_supported_housing.rb @@ -14,6 +14,7 @@ class Form::Lettings::Questions::ReferralSupportedHousing < ::Form::Question ANSWER_OPTIONS = { "1" => { "value" => "Internal transfer", + "hint" => "Where the tenant has moved to another social property owned by the same landlord.", }, "2" => { "value" => "Tenant applied directly (no referral)", diff --git a/app/models/form/lettings/questions/referral_supported_housing_prp.rb b/app/models/form/lettings/questions/referral_supported_housing_prp.rb index 32fb474ed..207eb0e8a 100644 --- a/app/models/form/lettings/questions/referral_supported_housing_prp.rb +++ b/app/models/form/lettings/questions/referral_supported_housing_prp.rb @@ -12,7 +12,7 @@ class Form::Lettings::Questions::ReferralSupportedHousingPrp < ::Form::Question end ANSWER_OPTIONS = { - "1" => { "value" => "Internal transfer" }, + "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." }, "2" => { "value" => "Tenant applied directly (no referral or nomination)" }, "3" => { "value" => "Nominated by a local housing authority" }, "4" => { "value" => "Referred by local authority housing department" }, diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb index 8fc42e66d..745350aa4 100644 --- a/app/models/form/lettings/questions/stock_owner.rb +++ b/app/models/form/lettings/questions/stock_owner.rb @@ -16,20 +16,38 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question return answer_opts unless log if log.owning_organisation_id.present? - answer_opts = answer_opts.merge({ log.owning_organisation.id => log.owning_organisation.name }) + answer_opts[log.owning_organisation.id] = log.owning_organisation.name end + recently_absorbed_organisations = user.organisation.absorbed_organisations.merged_during_open_collection_period if !user.support? && user.organisation.holds_own_stock? - answer_opts[user.organisation.id] = "#{user.organisation.name} (Your organisation)" + answer_opts[user.organisation.id] = if recently_absorbed_organisations.exists? && user.organisation.available_from.present? + "#{user.organisation.name} (Your organisation, active as of #{user.organisation.available_from.to_fs(:govuk_date)})" + else + "#{user.organisation.name} (Your organisation)" + end end - user_answer_options = if user.support? - Organisation.where(holds_own_stock: true) - else - user.organisation.stock_owners + user.organisation.absorbed_organisations.where(holds_own_stock: true) - end.pluck(:id, :name).to_h + if user.support? + Organisation.where(holds_own_stock: true).find_each do |org| + if org.merge_date.present? + answer_opts[org.id] = "#{org.name} (inactive as of #{org.merge_date.to_fs(:govuk_date)})" if org.merge_date >= FormHandler.instance.start_date_of_earliest_open_for_editing_collection_period + elsif org.absorbed_organisations.merged_during_open_collection_period.exists? + answer_opts[org.id] = "#{org.name} (active as of #{org.created_at.to_fs(:govuk_date)})" + else + answer_opts[org.id] = org.name + end + end + else + user.organisation.stock_owners.each do |stock_owner| + answer_opts[stock_owner.id] = stock_owner.name + end + recently_absorbed_organisations.each do |absorbed_org| + answer_opts[absorbed_org.id] = merged_organisation_label(absorbed_org.name, absorbed_org.merge_date) if absorbed_org.holds_own_stock? + end + end - answer_opts.merge(user_answer_options) + answer_opts end def displayed_answer_options(log, user = nil) @@ -71,4 +89,8 @@ private def selected_answer_option_is_derived?(_log) true end + + def merged_organisation_label(name, merge_date) + "#{name} (inactive as of #{merge_date.to_fs(:govuk_date)})" + end end diff --git a/app/models/form/sales/pages/address.rb b/app/models/form/sales/pages/address.rb index d68bf470a..134dcdccc 100644 --- a/app/models/form/sales/pages/address.rb +++ b/app/models/form/sales/pages/address.rb @@ -16,8 +16,6 @@ class Form::Sales::Pages::Address < ::Form::Page end def routed_to?(log, _current_user = nil) - return false if log.uprn_known.nil? - - log.uprn_known.zero? || log.uprn_confirmed&.zero? + log.uprn_known.nil? || log.uprn_known.zero? || log.uprn_confirmed&.zero? end end diff --git a/app/models/form/sales/pages/uprn.rb b/app/models/form/sales/pages/uprn.rb index c4ae5b357..6df3aaab7 100644 --- a/app/models/form/sales/pages/uprn.rb +++ b/app/models/form/sales/pages/uprn.rb @@ -11,6 +11,10 @@ class Form::Sales::Pages::Uprn < ::Form::Page ] end + def routed_to?(_log, _current_user) + true + end + def skip_text "Enter address instead" end diff --git a/app/models/form/sales/questions/owning_organisation_id.rb b/app/models/form/sales/questions/owning_organisation_id.rb index 43e97add6..529d14f66 100644 --- a/app/models/form/sales/questions/owning_organisation_id.rb +++ b/app/models/form/sales/questions/owning_organisation_id.rb @@ -22,8 +22,8 @@ class Form::Sales::Questions::OwningOrganisationId < ::Form::Question recently_absorbed_organisations = user.organisation.absorbed_organisations.merged_during_open_collection_period if !user.support? && user.organisation.holds_own_stock? - answer_opts[user.organisation.id] = if recently_absorbed_organisations.exists? - "#{user.organisation.name} (Your organisation, active as of #{user.organisation.created_at.to_fs(:govuk_date)})" + answer_opts[user.organisation.id] = if recently_absorbed_organisations.exists? && user.organisation.available_from.present? + "#{user.organisation.name} (Your organisation, active as of #{user.organisation.available_from.to_fs(:govuk_date)})" else "#{user.organisation.name} (Your organisation)" end diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index d9712ea52..51dc6ff4d 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -43,6 +43,13 @@ class LettingsLog < Log scope :filter_by_tenant_code, ->(tenant_code) { where("tenancycode ILIKE ?", "%#{tenant_code}%") } scope :filter_by_propcode, ->(propcode) { where("propcode ILIKE ?", "%#{propcode}%") } scope :filter_by_location_postcode, ->(postcode_full) { left_joins(:location).where("REPLACE(locations.postcode, ' ', '') ILIKE ?", "%#{postcode_full.delete(' ')}%") } + scope :filter_by_needstype, ->(needstype) { where(needstype:) } + scope :filter_by_needstypes, lambda { |needstypes, _user = nil| + first_needstype = needstypes.shift + query = filter_by_needstype(first_needstype) + needstypes.each { |needstype| query = query.or(filter_by_needstype(needstype)) } + query.all + } scope :search_by, lambda { |param| filter_by_location_postcode(param) .or(filter_by_tenant_code(param)) @@ -594,6 +601,22 @@ class LettingsLog < Log public_send("details_known_#{person_index}") == 1 end + def duplicate_check_question_ids + ["owning_organisation_id", + "startdate", + "tenancycode", + form.start_date.year < 2023 || uprn.blank? ? "postcode_full" : nil, + form.start_date.year >= 2023 && uprn.present? ? "uprn" : nil, + "scheme_id", + "location_id", + "age1", + "sex1", + "ecstat1", + household_charge == 1 ? "household_charge" : nil, + "tcharge", + is_carehome? ? "chcharge" : nil].compact + end + private def reset_invalid_unresolved_log_fields! diff --git a/app/models/location.rb b/app/models/location.rb index 954c034f9..65e0466b3 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -16,7 +16,7 @@ class Location < ApplicationRecord before_validation :lookup_postcode!, if: :postcode_changed? - auto_strip_attributes :name + auto_strip_attributes :name, squish: true scope :search_by_postcode, ->(postcode) { where("REPLACE(postcode, ' ', '') ILIKE ?", "%#{postcode.delete(' ')}%") } scope :search_by_name, ->(name) { where("name ILIKE ?", "%#{name}%") } @@ -110,7 +110,7 @@ class Location < ApplicationRecord def self.find_by_id_on_multiple_fields(id) return if id.nil? - where(id:).or(where(old_visible_id: id)).first + where(id:).or(where("ltrim(old_visible_id, '0') = ?", id.to_i.to_s)).first end def postcode=(postcode) @@ -131,8 +131,8 @@ class Location < ApplicationRecord location_deactivation_periods.deactivations_without_reactivation.first end - def recent_deactivation - location_deactivation_periods.order("created_at").last + def last_deactivation_before(date) + location_deactivation_periods.where("deactivation_date <= ?", date).order("created_at").last end def status @@ -143,7 +143,7 @@ class Location < ApplicationRecord return :incomplete unless confirmed return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date - return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date + return :reactivating_soon if last_deactivation_before(date)&.reactivation_date.present? && date < last_deactivation_before(date).reactivation_date return :activating_soon if startdate.present? && date < startdate :active diff --git a/app/models/log.rb b/app/models/log.rb index 5ba887c7a..7870076da 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -193,6 +193,13 @@ class Log < ApplicationRecord form.edit_end_date < Time.zone.now || older_than_previous_collection_year? end + def duplicate_check_questions(current_user) + duplicate_check_question_ids.map { |question_id| + question = form.get_question(question_id, self) + question if question.page.routed_to?(self, current_user) + }.compact + end + private # Handle logs that are older than previous collection start date diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 77b5af50c..e17d0d6eb 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -36,7 +36,7 @@ class Organisation < ApplicationRecord has_paper_trail - auto_strip_attributes :name + auto_strip_attributes :name, squish: true PROVIDER_TYPE = { LA: 1, @@ -140,4 +140,10 @@ class Organisation < ApplicationRecord def duplicate_sales_logs_sets sales_logs.duplicate_sets.map { |array_str| array_str ? array_str.map(&:to_i) : [] } end + + def recently_absorbed_organisations_grouped_by_merge_date + return unless absorbed_organisations.present? && absorbed_organisations.merged_during_open_collection_period.present? + + absorbed_organisations.merged_during_open_collection_period.group_by(&:merge_date) + end end diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index f144336bf..905b7d5a1 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -436,4 +436,15 @@ class SalesLog < Log self.pcodenk = nil if errors.attribute_names.include? :postcode_full end + + def duplicate_check_question_ids + ["owning_organisation_id", + "saledate", + "purchid", + "age1", + "sex1", + "ecstat1", + form.start_date.year < 2023 || uprn.blank? ? "postcode_full" : nil, + form.start_date.year >= 2023 && uprn.present? ? "uprn" : nil].compact + end end diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 63632b55f..254953c19 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -75,7 +75,7 @@ class Scheme < ApplicationRecord validate :validate_confirmed validate :validate_owning_organisation - auto_strip_attributes :service_name + auto_strip_attributes :service_name, squish: true SENSITIVE = { No: 0, @@ -109,6 +109,7 @@ class Scheme < ApplicationRecord "Medium level": 3, "High level": 4, "Nursing care in a care home": 5, + "Floating support": 6, }.freeze enum support_type: SUPPORT_TYPE, _suffix: true @@ -162,13 +163,15 @@ class Scheme < ApplicationRecord enum arrangement_type: ARRANGEMENT_TYPE, _suffix: true - def self.find_by_id_on_multiple_fields(id) - return if id.nil? + def self.find_by_id_on_multiple_fields(scheme_id, location_id) + return if scheme_id.nil? - if id.start_with?("S") - where(id: id[1..]).first + if scheme_id.start_with?("S") + where(id: scheme_id[1..]).first + elsif location_id.present? + joins(:locations).where("ltrim(schemes.old_visible_id, '0') = ? AND ltrim(locations.old_visible_id, '0') = ?", scheme_id.to_i.to_s, location_id.to_i.to_s).first || where("ltrim(schemes.old_visible_id, '0') = ?", scheme_id.to_i.to_s).first else - where(old_visible_id: id).first + where("ltrim(old_visible_id, '0') = ?", scheme_id.to_i.to_s).first end end @@ -225,7 +228,7 @@ class Scheme < ApplicationRecord "Medium level": "Staff on site daily or making frequent visits with some out-of-hours cover.", "High level": "Intensive level of staffing provided on a 24-hour basis.", } - Scheme.support_types.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: hints[key.to_sym]) } + Scheme.support_types.keys.excluding("Missing").excluding("Floating support").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: hints[key.to_sym]) } end def intended_length_of_stay_options_with_hints @@ -266,8 +269,8 @@ class Scheme < ApplicationRecord scheme_deactivation_periods.deactivations_without_reactivation.first end - def recent_deactivation - scheme_deactivation_periods.order("created_at").last + def last_deactivation_before(date) + scheme_deactivation_periods.where("deactivation_date <= ?", date).order("created_at").last end def status @@ -278,7 +281,7 @@ class Scheme < ApplicationRecord return :incomplete unless confirmed && locations.confirmed.any? return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date - return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date + return :reactivating_soon if last_deactivation_before(date)&.reactivation_date.present? && date < last_deactivation_before(date).reactivation_date :active end diff --git a/app/models/user.rb b/app/models/user.rb index c6deed8a1..7042034b4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -38,7 +38,7 @@ class User < ApplicationRecord has_one_time_password(encrypted: true) - auto_strip_attributes :name + auto_strip_attributes :name, squish: true ROLES = { data_provider: 1, @@ -173,9 +173,9 @@ class User < ApplicationRecord def logs_filters(specific_org: false) if (support? && !specific_org) || organisation.has_managing_agents? || organisation.has_stock_owners? - %w[status years assigned_to user managing_organisation owning_organisation bulk_upload_id] + %w[years status needstypes assigned_to user managing_organisation owning_organisation bulk_upload_id] else - %w[status years assigned_to user bulk_upload_id] + %w[years status needstypes assigned_to user bulk_upload_id] end end diff --git a/app/models/validations/financial_validations.rb b/app/models/validations/financial_validations.rb index 29c22eb62..879cf8cb5 100644 --- a/app/models/validations/financial_validations.rb +++ b/app/models/validations/financial_validations.rb @@ -146,7 +146,7 @@ module Validations::FinancialValidations private - CHARGE_MAXIMUMS = { + CHARGE_MAXIMA_PER_WEEK = { scharge: { private_registered_provider: { general_needs: 800, @@ -181,22 +181,30 @@ private PROVIDER_TYPE = { 1 => :local_authority, 2 => :private_registered_provider }.freeze NEEDSTYPE_VALUES = { 2 => :supported_housing, 1 => :general_needs }.freeze + CHARGE_NAMES = { scharge: "service charge", pscharge: "personal service charge", supcharg: "support charge" }.freeze def validate_charges(record) return unless record.owning_organisation provider_type = record.owning_organisation.provider_type_before_type_cast %i[scharge pscharge supcharg].each do |charge| - maximum = CHARGE_MAXIMUMS.dig(charge, PROVIDER_TYPE[provider_type], NEEDSTYPE_VALUES[record.needstype]) + maximum_per_week = CHARGE_MAXIMA_PER_WEEK.dig(charge, PROVIDER_TYPE[provider_type], NEEDSTYPE_VALUES[record.needstype]) - if maximum.present? && record[:period].present? && record[charge].present? && !weekly_value_in_range(record, charge, 0.0, maximum) - record.errors.add charge, :outside_the_range, message: I18n.t("validations.financial.rent.#{charge}.#{PROVIDER_TYPE[provider_type]}.#{NEEDSTYPE_VALUES[record.needstype]}") - end + next unless maximum_per_week.present? && record[:period].present? && record[charge].present? && !weekly_value_in_range(record, charge, 0.0, maximum_per_week) + + charge_name = CHARGE_NAMES[charge] + frequency = record.form.get_question("period", record).label_from_value(record.period).downcase + letting_type = NEEDSTYPE_VALUES[record.needstype].to_s.humanize(capitalize: false) + provider_type_label = PROVIDER_TYPE[provider_type].to_s.humanize(capitalize: false) + maximum_per_period = record.weekly_to_value_per_period(maximum_per_week) + + record.errors.add charge, :outside_the_range, message: I18n.t("validations.financial.rent.out_of_range", charge_name:, maximum_per_period:, frequency:, letting_type:, provider_type: provider_type_label) + record.errors.add :period, :outside_the_range, message: I18n.t("validations.financial.rent.out_of_range", charge_name:, maximum_per_period:, frequency:, letting_type:, provider_type: provider_type_label) end end def weekly_value_in_range(record, field, min, max) - record[field].present? && record.weekly_value(record[field]).present? && record.weekly_value(record[field]).between?(min, max) + record.weekly_value(record[field])&.between?(min, max) end def validate_rent_range(record) diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 8bf17f398..dfdf808de 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -73,7 +73,6 @@ module Validations::HouseholdValidations # 13 Children's home / Foster Care # 14 Bed and breakfast # 19 Rough Sleeping - # 21 Refuge # 23 Mobile home / Caravan # 24 Home Office Asylum Support # 25 Other @@ -81,7 +80,7 @@ module Validations::HouseholdValidations # 27 Owner occupation (low-cost home ownership) # 28 Living with Friends or Family # 29 Prison / Approved Probation Hostel - if record.is_internal_transfer? && [3, 4, 7, 10, 13, 14, 19, 21, 23, 24, 25, 26, 27, 28, 29].include?(record.prevten) + if record.is_internal_transfer? && [3, 4, 7, 10, 13, 14, 19, 23, 24, 25, 26, 27, 28, 29].include?(record.prevten) label = record.form.get_question("prevten", record).present? ? record.form.get_question("prevten", record).label_from_value(record.prevten) : "" record.errors.add :prevten, :internal_transfer_non_social_housing, message: I18n.t("validations.household.prevten.internal_transfer", prevten: label) record.errors.add :referral, :internal_transfer_non_social_housing, message: I18n.t("validations.household.referral.prevten_invalid", prevten: label) diff --git a/app/models/validations/sales/setup_validations.rb b/app/models/validations/sales/setup_validations.rb index bb99f02ed..d52af8f9b 100644 --- a/app/models/validations/sales/setup_validations.rb +++ b/app/models/validations/sales/setup_validations.rb @@ -37,7 +37,7 @@ module Validations::Sales::SetupValidations if absorbing_owning_organisation_inactive?(record) record.errors.add :saledate, I18n.t("validations.setup.saledate.invalid_absorbing_organisations_saledate", owning_organisation: record.owning_organisation.name, - owning_organisation_available_from: record.owning_organisation.created_at.to_formatted_s(:govuk_date)) + owning_organisation_available_from: record.owning_organisation.available_from.to_formatted_s(:govuk_date)) end end @@ -50,10 +50,10 @@ module Validations::Sales::SetupValidations owning_organisation: record.owning_organisation.name, owning_organisation_merge_date: record.owning_organisation.merge_date.to_formatted_s(:govuk_date), owning_absorbing_organisation: record.owning_organisation.absorbing_organisation.name) - elsif record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.created_at.to_date > record.saledate.to_date + elsif record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.available_from.present? && record.owning_organisation.available_from.to_date > record.saledate.to_date record.errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.inactive_absorbing_organisation_sales", owning_organisation: record.owning_organisation.name, - owning_organisation_available_from: record.owning_organisation.created_at.to_formatted_s(:govuk_date)) + owning_organisation_available_from: record.owning_organisation.available_from.to_formatted_s(:govuk_date)) end end end @@ -104,6 +104,6 @@ private end def absorbing_owning_organisation_inactive?(record) - record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.created_at.to_date > record.saledate.to_date + record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.available_from.present? && record.owning_organisation.available_from.to_date > record.saledate.to_date end end diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index e826c6302..3fd760c30 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -61,10 +61,10 @@ module Validations::SetupValidations owning_organisation: record.owning_organisation.name, owning_organisation_merge_date: record.owning_organisation.merge_date.to_formatted_s(:govuk_date), owning_absorbing_organisation: record.owning_organisation.absorbing_organisation.name) - elsif owning_organisation&.absorbed_organisations.present? && owning_organisation.created_at.to_date > record.startdate.to_date + elsif owning_organisation&.absorbed_organisations.present? && owning_organisation.available_from.present? && owning_organisation.available_from.to_date > record.startdate.to_date record.errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.inactive_absorbing_organisation", owning_organisation: record.owning_organisation.name, - owning_organisation_available_from: record.owning_organisation.created_at.to_formatted_s(:govuk_date)) + owning_organisation_available_from: record.owning_organisation.available_from.to_formatted_s(:govuk_date)) end end @@ -74,10 +74,10 @@ module Validations::SetupValidations managing_organisation: record.managing_organisation.name, managing_organisation_merge_date: record.managing_organisation.merge_date.to_formatted_s(:govuk_date), managing_absorbing_organisation: record.managing_organisation.absorbing_organisation.name) - elsif managing_organisation&.absorbed_organisations.present? && managing_organisation.created_at.to_date > record.startdate.to_date + elsif managing_organisation&.absorbed_organisations.present? && managing_organisation.available_from.present? && managing_organisation.available_from.to_date > record.startdate.to_date record.errors.add :managing_organisation_id, I18n.t("validations.setup.managing_organisation.inactive_absorbing_organisation", managing_organisation: record.managing_organisation.name, - managing_organisation_available_from: record.managing_organisation.created_at.to_formatted_s(:govuk_date)) + managing_organisation_available_from: record.managing_organisation.available_from.to_formatted_s(:govuk_date)) end end end @@ -194,20 +194,20 @@ private if absorbing_owning_organisation_inactive?(record) && absorbing_managing_organisation_inactive?(record) record.errors.add :startdate, I18n.t("validations.setup.startdate.invalid_absorbing_organisations_start_date.different_organisations", owning_organisation: record.owning_organisation.name, - owning_organisation_active_from: record.owning_organisation.created_at.to_formatted_s(:govuk_date), + owning_organisation_active_from: record.owning_organisation.available_from.to_formatted_s(:govuk_date), managing_organisation: record.managing_organisation.name, - managing_organisation_active_from: record.managing_organisation.created_at.to_formatted_s(:govuk_date)) + managing_organisation_active_from: record.managing_organisation.available_from.to_formatted_s(:govuk_date)) else if absorbing_owning_organisation_inactive?(record) record.errors.add :startdate, I18n.t("validations.setup.startdate.invalid_absorbing_organisations_start_date.owning_organisation", owning_organisation: record.owning_organisation.name, - owning_organisation_available_from: record.owning_organisation.created_at.to_formatted_s(:govuk_date)) + owning_organisation_available_from: record.owning_organisation.available_from.to_formatted_s(:govuk_date)) end if absorbing_managing_organisation_inactive?(record) record.errors.add :startdate, I18n.t("validations.setup.startdate.invalid_absorbing_organisations_start_date.managing_organisation", managing_organisation: record.managing_organisation.name, - managing_organisation_available_from: record.managing_organisation.created_at.to_formatted_s(:govuk_date)) + managing_organisation_available_from: record.managing_organisation.available_from.to_formatted_s(:govuk_date)) end end end @@ -221,11 +221,11 @@ private end def absorbing_owning_organisation_inactive?(record) - record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.created_at.to_date > record.startdate.to_date + record.owning_organisation&.absorbed_organisations.present? && record.owning_organisation.available_from.present? && record.owning_organisation.available_from.to_date > record.startdate.to_date end def absorbing_managing_organisation_inactive?(record) - record.managing_organisation&.absorbed_organisations.present? && record.managing_organisation.created_at.to_date > record.startdate.to_date + record.managing_organisation&.absorbed_organisations.present? && record.managing_organisation.available_from.present? && record.managing_organisation.available_from.to_date > record.startdate.to_date end def organisations_belong_to_same_merge?(organisation_a, organisation_b) diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb index 81bda79de..c171231d9 100644 --- a/app/models/validations/shared_validations.rb +++ b/app/models/validations/shared_validations.rb @@ -90,7 +90,7 @@ module Validations::SharedValidations status = resource.status_at(date) return unless %i[reactivating_soon activating_soon deactivated].include?(status) - closest_reactivation = resource.recent_deactivation + closest_reactivation = resource.last_deactivation_before(date) open_deactivation = resource.open_deactivation date = case status diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index ce950b6db..5a9ef579c 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -354,12 +354,10 @@ class BulkUpload::Lettings::Year2022::RowParser validate :validate_managing_org_exists, on: :after_log validate :validate_managing_org_related, on: :after_log - validate :validate_scheme_related, on: :after_log - validate :validate_scheme_exists, on: :after_log + validate :validate_related_scheme_exists, on: :after_log validate :validate_scheme_data_given, on: :after_log - validate :validate_location_related, on: :after_log - validate :validate_location_exists, on: :after_log + validate :validate_related_location_exists, on: :after_log validate :validate_location_data_given, on: :after_log validate :validate_created_by_exists, on: :after_log @@ -513,7 +511,7 @@ private end def created_by - @created_by ||= User.find_by(email: field_112) + @created_by ||= User.where("lower(email) = ?", field_112&.downcase).first end def duplicate_check_fields @@ -530,53 +528,36 @@ private ].compact end - def validate_location_related - return if scheme.blank? || location.blank? - - unless location.scheme == scheme - block_log_creation! - errors.add(:field_5, "Scheme code must relate to a location that is owned by owning organisation or managing organisation") - end - end - def location return if scheme.nil? @location ||= scheme.locations.find_by_id_on_multiple_fields(field_5) end - def validate_location_exists + def validate_related_location_exists if scheme && field_5.present? && location.nil? - errors.add(:field_5, "Location could not be found with the provided scheme code", category: :setup) + block_log_creation! + errors.add(:field_5, "Scheme code must relate to a scheme that is owned by the owning organisation or managing organisation", category: :setup) end end def validate_location_data_given if bulk_upload.supported_housing? && field_5.blank? + block_log_creation! errors.add(:field_5, I18n.t("validations.not_answered", question: "scheme code"), category: :setup) end end - def validate_scheme_related - return unless field_4.present? && scheme.present? - - owned_by_owning_org = owning_organisation && scheme.owning_organisation == owning_organisation - owned_by_managing_org = managing_organisation && scheme.owning_organisation == managing_organisation - - unless owned_by_owning_org || owned_by_managing_org + def validate_related_scheme_exists + if field_4.present? && owning_organisation.present? && managing_organisation.present? && scheme.nil? block_log_creation! - errors.add(:field_4, "This management group code does not belong to your organisation, or any of your stock owners / managing agents", category: :setup) - end - end - - def validate_scheme_exists - if field_4.present? && scheme.nil? - errors.add(:field_4, "The management group code is not correct", category: :setup) + errors.add(:field_4, "This management group code does not belong to the owning organisation or managing organisation", category: :setup) end end def validate_scheme_data_given if bulk_upload.supported_housing? && field_4.blank? + block_log_creation! errors.add(:field_4, I18n.t("validations.not_answered", question: "management group code"), category: :setup) end end @@ -1488,6 +1469,8 @@ private end def scheme - @scheme ||= Scheme.find_by_id_on_multiple_fields(field_4) + return if field_4.nil? || owning_organisation.nil? || managing_organisation.nil? + + @scheme ||= Scheme.where(id: (owning_organisation.owned_schemes + managing_organisation.owned_schemes).map(&:id)).find_by_id_on_multiple_fields(field_4, field_5) end end diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index 413e0b10f..0ba078efc 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -387,12 +387,10 @@ class BulkUpload::Lettings::Year2023::RowParser validate :validate_managing_org_exists, on: :after_log validate :validate_managing_org_related, on: :after_log - validate :validate_scheme_related, on: :after_log - validate :validate_scheme_exists, on: :after_log + validate :validate_related_scheme_exists, on: :after_log validate :validate_scheme_data_given, on: :after_log - validate :validate_location_related, on: :after_log - validate :validate_location_exists, on: :after_log + validate :validate_related_location_exists, on: :after_log validate :validate_location_data_given, on: :after_log validate :validate_created_by_exists, on: :after_log @@ -402,7 +400,7 @@ class BulkUpload::Lettings::Year2023::RowParser validate :validate_nulls, on: :after_log - validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log + validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log, unless: -> { supported_housing? } validate :validate_incomplete_soft_validations, on: :after_log @@ -542,7 +540,7 @@ private end def created_by - @created_by ||= User.find_by(email: field_3) + @created_by ||= User.where("lower(email) = ?", field_3&.downcase).first end def validate_uprn_exists_if_any_key_address_fields_are_blank @@ -746,47 +744,30 @@ private end end - def validate_location_related - return if scheme.blank? || location.blank? - - if location.scheme != scheme && location_field.present? - block_log_creation! - errors.add(location_field, "#{scheme_or_management_group.capitalize} code must relate to a #{location_or_scheme} that is owned by owning organisation or managing organisation", category: :setup) - end - end - - def validate_location_exists + def validate_related_location_exists if scheme && location_id.present? && location.nil? && location_field.present? - errors.add(location_field, "#{location_or_scheme.capitalize} could not be found with the provided #{scheme_or_management_group} code", category: :setup) + block_log_creation! + errors.add(location_field, "#{location_or_scheme.capitalize} code must relate to a #{location_or_scheme} that is owned by the owning organisation or managing organisation", category: :setup) end end def validate_location_data_given if supported_housing? && location_id.blank? && location_field.present? + block_log_creation! errors.add(location_field, I18n.t("validations.not_answered", question: "#{location_or_scheme} code"), category: "setup") end end - def validate_scheme_related - return unless scheme_id.present? && scheme.present? - - owned_by_owning_org = owning_organisation && scheme.owning_organisation == owning_organisation - owned_by_managing_org = managing_organisation && scheme.owning_organisation == managing_organisation - - if !(owned_by_owning_org || owned_by_managing_org) && scheme_field.present? + def validate_related_scheme_exists + if scheme_id.present? && scheme_field.present? && owning_organisation.present? && managing_organisation.present? && scheme.nil? block_log_creation! - errors.add(scheme_field, "This #{scheme_or_management_group} code does not belong to your organisation, or any of your stock owners / managing agents", category: :setup) - end - end - - def validate_scheme_exists - if scheme_id.present? && scheme_field.present? && scheme.nil? - errors.add(scheme_field, "The #{scheme_or_management_group} code is not correct", category: :setup) + errors.add(scheme_field, "This #{scheme_or_management_group} code does not belong to the owning organisation or managing organisation", category: :setup) end end def validate_scheme_data_given if supported_housing? && scheme_field.present? && scheme_id.blank? + block_log_creation! errors.add(scheme_field, I18n.t("validations.not_answered", question: "#{scheme_or_management_group} code"), category: "setup") end end @@ -1276,9 +1257,9 @@ private end def scheme - return if field_16.nil? + return if scheme_id.nil? || owning_organisation.nil? || managing_organisation.nil? - @scheme ||= Scheme.find_by_id_on_multiple_fields(scheme_id) + @scheme ||= Scheme.where(id: (owning_organisation.owned_schemes + managing_organisation.owned_schemes).map(&:id)).find_by_id_on_multiple_fields(scheme_id, location_id) end def location diff --git a/app/services/bulk_upload/sales/year2022/row_parser.rb b/app/services/bulk_upload/sales/year2022/row_parser.rb index a1663fafc..55f5f0ed1 100644 --- a/app/services/bulk_upload/sales/year2022/row_parser.rb +++ b/app/services/bulk_upload/sales/year2022/row_parser.rb @@ -934,7 +934,7 @@ private end def created_by - @created_by ||= User.find_by(email: field_93) + @created_by ||= User.where("lower(email) = ?", field_93&.downcase).first end def hhregres diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb index 17303346f..6ce207abf 100644 --- a/app/services/bulk_upload/sales/year2023/row_parser.rb +++ b/app/services/bulk_upload/sales/year2023/row_parser.rb @@ -1112,7 +1112,7 @@ private end def created_by - @created_by ||= User.find_by(email: field_2) + @created_by ||= User.where("lower(email) = ?", field_2&.downcase).first end def previous_la_known diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb index 89bfdeb8c..e5b866038 100644 --- a/app/services/csv/sales_log_csv_service.rb +++ b/app/services/csv/sales_log_csv_service.rb @@ -58,12 +58,6 @@ module Csv end }.freeze - AGE_KNOWN_FIELDS = {}.tap { |hash| - (1..6).each do |i| - hash["age#{i}"] = { "age_known_field" => "age#{i}_known" } - end - }.freeze - FIELDS_ALWAYS_EXPORTED_AS_CODES = %w[ la prevloc diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb index 379f51905..3cad5dadb 100644 --- a/app/services/feature_toggle.rb +++ b/app/services/feature_toggle.rb @@ -37,4 +37,8 @@ class FeatureToggle def self.duplicate_summary_enabled? !Rails.env.production? end + + def self.maintenance_mode_enabled? + false + end end diff --git a/app/services/merge/merge_organisations_service.rb b/app/services/merge/merge_organisations_service.rb index 42da7823a..46426a119 100644 --- a/app/services/merge/merge_organisations_service.rb +++ b/app/services/merge/merge_organisations_service.rb @@ -1,7 +1,9 @@ class Merge::MergeOrganisationsService - def initialize(absorbing_organisation_id:, merging_organisation_ids:) + def initialize(absorbing_organisation_id:, merging_organisation_ids:, merge_date: Time.zone.today, absorbing_organisation_active_from_merge_date: false) @absorbing_organisation = Organisation.find(absorbing_organisation_id) @merging_organisations = Organisation.find(merging_organisation_ids) + @merge_date = merge_date || Time.zone.today + @absorbing_organisation_active_from_merge_date = absorbing_organisation_active_from_merge_date end def call @@ -18,6 +20,7 @@ class Merge::MergeOrganisationsService merge_sales_logs(merging_organisation) mark_organisation_as_merged(merging_organisation) end + @absorbing_organisation.available_from = @merge_date if @absorbing_organisation_active_from_merge_date @absorbing_organisation.save! log_success_message rescue ActiveRecord::RecordInvalid => e @@ -65,17 +68,17 @@ private merging_organisation.owned_schemes.each do |scheme| next if scheme.deactivated? - new_scheme = Scheme.create!(scheme.attributes.except("id", "owning_organisation_id").merge(owning_organisation: @absorbing_organisation)) + new_scheme = Scheme.create!(scheme.attributes.except("id", "owning_organisation_id", "old_id", "old_visible_id").merge(owning_organisation: @absorbing_organisation)) scheme.locations.each do |location| - new_scheme.locations << Location.new(location.attributes.except("id", "scheme_id")) unless location.deactivated? + new_scheme.locations << Location.new(location.attributes.except("id", "scheme_id", "old_id", "old_visible_id")) unless location.deactivated? end @merged_schemes[merging_organisation.name] << { name: new_scheme.service_name, code: new_scheme.id } - SchemeDeactivationPeriod.create!(scheme:, deactivation_date: Time.zone.now) + SchemeDeactivationPeriod.create!(scheme:, deactivation_date: @merge_date) end end def merge_lettings_logs(merging_organisation) - merging_organisation.owned_lettings_logs.after_date(Time.zone.today).each do |lettings_log| + merging_organisation.owned_lettings_logs.after_date(@merge_date.to_time).each do |lettings_log| if lettings_log.scheme.present? scheme_to_set = @absorbing_organisation.owned_schemes.find_by(service_name: lettings_log.scheme.service_name) location_to_set = scheme_to_set.locations.find_by(name: lettings_log.location&.name, postcode: lettings_log.location&.postcode) @@ -84,22 +87,23 @@ private lettings_log.location = location_to_set if location_to_set.present? end lettings_log.owning_organisation = @absorbing_organisation - lettings_log.save! + lettings_log.save!(validate: false) end - merging_organisation.managed_lettings_logs.after_date(Time.zone.today).each do |lettings_log| + merging_organisation.managed_lettings_logs.after_date(@merge_date.to_time).each do |lettings_log| lettings_log.managing_organisation = @absorbing_organisation - lettings_log.save! + lettings_log.save!(validate: false) end end def merge_sales_logs(merging_organisation) - merging_organisation.sales_logs.after_date(Time.zone.today).each do |sales_log| - sales_log.update(owning_organisation: @absorbing_organisation) + merging_organisation.sales_logs.after_date(@merge_date.to_time).each do |sales_log| + sales_log.owning_organisation = @absorbing_organisation + sales_log.save!(validate: false) end end def mark_organisation_as_merged(merging_organisation) - merging_organisation.update(merge_date: Time.zone.today, absorbing_organisation: @absorbing_organisation) + merging_organisation.update(merge_date: @merge_date, absorbing_organisation: @absorbing_organisation) end def log_success_message diff --git a/app/views/duplicate_logs/_duplicate_log_check_answers.erb b/app/views/duplicate_logs/_duplicate_log_check_answers.erb index ee350545b..44b788959 100644 --- a/app/views/duplicate_logs/_duplicate_log_check_answers.erb +++ b/app/views/duplicate_logs/_duplicate_log_check_answers.erb @@ -1,28 +1,26 @@
<%= govuk_summary_list do |summary_list| %> - <% @duplicate_check_questions.each do |question| %> + <% log.duplicate_check_questions(current_user).each do |question| %> <% summary_list.row do |row| %> - <% row.key { get_question_label(question) } %> + <% row.key { duplicate_log_question_label(question) } %> <% row.value do %> <%= simple_format( - get_answer_label(question, log), + duplicate_log_answer_label(question, log), wrapper_tag: "span", class: "govuk-!-margin-right-4", ) %> - <% extra_value = question.get_extra_check_answer_value(log) %> - - <% if extra_value && question.answer_label(log, current_user).present? %> + <% if duplicate_log_extra_value(question, log) && duplicate_log_answer_label_present(question, log, current_user) %> <%= simple_format( - extra_value, + duplicate_log_extra_value(question, log), wrapper_tag: "span", class: "govuk-!-font-weight-regular app-!-colour-muted", ) %> <% end %> - <% question.get_inferred_answers(log).each do |inferred_answer| %> + <% duplicate_log_inferred_answers(question, log).each do |inferred_answer| %> <%= inferred_answer %> <% end %> <% end %> diff --git a/app/views/duplicate_logs/index.html.erb b/app/views/duplicate_logs/index.html.erb index f8a81cc29..d38e433e8 100644 --- a/app/views/duplicate_logs/index.html.erb +++ b/app/views/duplicate_logs/index.html.erb @@ -24,7 +24,7 @@ <% row.cell text: "Lettings" %> <% row.cell text: duplicate_set.map { |id| "Log #{id}" }.join(", ") %> <% row.cell do %> - <%= govuk_link_to "Review logs", lettings_log_duplicate_logs_path(duplicate_set.first, original_log_id: duplicate_set.first) %> + <%= govuk_link_to "Review logs", lettings_log_duplicate_logs_path(duplicate_set.first, original_log_id: duplicate_set.first, referrer: params[:referrer], organisation_id: params[:organisation_id]) %> <% end %> <% end %> <% end %> @@ -33,7 +33,7 @@ <% row.cell text: "Sales" %> <% row.cell text: duplicate_set.map { |id| "Log #{id}" }.join(", ") %> <% row.cell do %> - <%= govuk_link_to "Review logs", sales_log_duplicate_logs_path(duplicate_set.first, original_log_id: duplicate_set.first) %> + <%= govuk_link_to "Review logs", sales_log_duplicate_logs_path(duplicate_set.first, original_log_id: duplicate_set.first, referrer: params[:referrer], organisation_id: params[:organisation_id]) %> <% end %> <% end %> <% end %> diff --git a/app/views/duplicate_logs/no_more_duplicates.html.erb b/app/views/duplicate_logs/no_more_duplicates.html.erb new file mode 100644 index 000000000..48bc50790 --- /dev/null +++ b/app/views/duplicate_logs/no_more_duplicates.html.erb @@ -0,0 +1,11 @@ +
+
+

There are no more duplicate logs

+
+
+ +

+ You have either changed or deleted all the duplicate logs. +

+ +<%= govuk_button_link_to "Back to all logs", lettings_logs_path %> diff --git a/app/views/form/guidance/_finding_location.erb b/app/views/form/guidance/_finding_location.erb new file mode 100644 index 000000000..4107519b3 --- /dev/null +++ b/app/views/form/guidance/_finding_location.erb @@ -0,0 +1,4 @@ +<%= govuk_details(summary_text: "What is a location?") do %> +

A location is a postcode where supported housing is provided under a scheme. A scheme can have multiple locations, and a location can have multiple units at the same postcode.

+

<%= govuk_link_to("Read more about schemes and locations", scheme_changes_path) %>

+<% end %> diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index b5ce2ead7..7781129d3 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -63,17 +63,19 @@ <%= f.hidden_field :interruption_page_referrer_type, value: @interruption_page_referrer_type %>
- <% if !@page.interruption_screen? && if request.query_parameters["referrer"] != "check_answers" %> - <%= f.govuk_submit "Save and continue" %> + <% if accessed_from_duplicate_logs?(request.query_parameters["referrer"]) %> + <%= f.govuk_submit "Save changes" %> + <%= govuk_link_to "Cancel", send("#{@log.class.name.underscore}_duplicate_logs_path", @log, original_log_id: request.query_parameters["original_log_id"]) %> + <% elsif returning_to_question_page?(@page, request.query_parameters["referrer"]) %> + <%= f.govuk_submit "Save changes" %> + <%= govuk_link_to "Cancel", send(@log.form.cancel_path(@page, @log), @log) %> + <% else %> + <%= f.govuk_submit "Save and continue" %> <%= govuk_link_to( (@page.skip_text || "Skip for now"), (@page.skip_href(@log) || send(@log.form.next_page_redirect_path(@page, @log, current_user), @log)), ) %> - <% else %> - <%= f.govuk_submit "Save changes" %> - <%= govuk_link_to "Cancel", send(@log.form.cancel_path(@page, @log), @log) %> - <% end %> - <% end %> + <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ead90793a..d70c1e09a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -91,11 +91,13 @@ navigation_classes: "govuk-header__navigation--end", ) do |component| component.product_name(name: t("service_name")) - if current_user.nil? - component.navigation_item(text: "Sign in", href: user_session_path) - else - component.navigation_item(text: "Your account", href: account_path) - component.navigation_item(text: "Sign out", href: destroy_user_session_path) + unless FeatureToggle.maintenance_mode_enabled? + if current_user.nil? + component.navigation_item(text: "Sign in", href: user_session_path) + else + component.navigation_item(text: "Your account", href: account_path) + component.navigation_item(text: "Sign out", href: destroy_user_session_path) + end end end %> diff --git a/app/views/locations/_location_filters.html.erb b/app/views/locations/_location_filters.html.erb index d5bdeb156..f19d8a17b 100644 --- a/app/views/locations/_location_filters.html.erb +++ b/app/views/locations/_location_filters.html.erb @@ -11,7 +11,7 @@ <%= filters_applied_text(@filter_type) %>

- <%= reset_filters_link(@filter_type, { scheme_id: @scheme.id }) %> + <%= reset_filters_link(@filter_type, { scheme_id: @scheme.id, search: request.params["search"] }.compact) %>

@@ -23,6 +23,10 @@ category: "status", } %> + <% if request.params["search"].present? %> + <%= f.hidden_field :search, value: request.params["search"] %> + <% end %> + <%= f.govuk_submit "Apply filters", class: "govuk-!-margin-bottom-0" %> <% end %> diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb index ac6e3a0df..ae35d55f6 100644 --- a/app/views/locations/index.html.erb +++ b/app/views/locations/index.html.erb @@ -24,7 +24,7 @@ <%= govuk_table do |table| %> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> - <%= render(SearchResultCaptionComponent.new(searched: @searched, count: @pagy.count, item_label:, total_count: @total_count, item: "locations", path: request.path)) %> + <%= render(SearchResultCaptionComponent.new(searched: @searched, count: @pagy.count, item_label:, total_count: @total_count, item: "locations", filters_count: applied_filters_count(@filter_type))) %> <% end %> <%= table.head do |head| %> <%= head.row do |row| %> diff --git a/app/views/logs/_log_filters.html.erb b/app/views/logs/_log_filters.html.erb index 1034379db..96e9eeeff 100644 --- a/app/views/logs/_log_filters.html.erb +++ b/app/views/logs/_log_filters.html.erb @@ -12,7 +12,7 @@ <%= filters_applied_text(@filter_type) %>

- <%= reset_filters_link(@filter_type) %> + <%= reset_filters_link(@filter_type, { search: request.params["search"] }.compact) %>

<% if bulk_upload_options(@bulk_upload).present? %> @@ -41,29 +41,39 @@ label: "Status", category: "status", } %> + + <% if logs_for_both_needstypes_present?(@organisation) && user_or_org_lettings_path? %> + <%= render partial: "filters/checkbox_filter", + locals: { + f:, + options: needstype_filters, + label: "Needs type", + category: "needstypes", + } %> + <% end %> <% end %> - <%= render partial: "filters/radio_filter", - locals: { - f:, - options: { - "all": { label: "Any user" }, - "you": { label: "You" }, - "specific_user": { - label: "Specific user", - conditional_filter: { - type: "select", - label: "User", - category: "user", - options: assigned_to_filter_options(current_user), - }, + <%= render partial: "filters/radio_filter", + locals: { + f:, + options: { + "all": { label: "Any user" }, + "you": { label: "You" }, + "specific_user": { + label: "Specific user", + conditional_filter: { + type: "select", + label: "User", + category: "user", + options: assigned_to_filter_options(current_user), }, }, - label: "Assigned to", - category: "assigned_to", - } %> + }, + label: "Assigned to", + category: "assigned_to", + } %> - <% if current_user.support? || current_user.organisation.stock_owners.count > 1 && request.path == "/lettings-logs" %> + <% if current_user.support? || non_support_with_multiple_owning_orgs? %> <%= render partial: "filters/radio_filter", locals: { f:, options: { @@ -83,7 +93,7 @@ } %> <% end %> - <% if (current_user.support? || current_user.organisation.managing_agents.count > 1) && request.path == "/lettings-logs" %> + <% if (current_user.support? || non_support_with_multiple_managing_orgs?) && user_or_org_lettings_path? %> <%= render partial: "filters/radio_filter", locals: { f:, options: { @@ -103,6 +113,10 @@ } %> <% end %> + <% if request.params["search"].present? %> + <%= f.hidden_field :search, value: request.params["search"] %> + <% end %> + <%= f.govuk_submit "Apply filters", class: "govuk-!-margin-bottom-0" %> <% end %> diff --git a/app/views/logs/_log_list.html.erb b/app/views/logs/_log_list.html.erb index 6b9e30bfc..74dde785d 100644 --- a/app/views/logs/_log_list.html.erb +++ b/app/views/logs/_log_list.html.erb @@ -1,19 +1,22 @@

-
- <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "logs", path: request.path)) %> - <% if logs&.any? %> - <%= govuk_link_to "Download (CSV)", csv_download_url, type: "text/csv", class: "govuk-!-margin-right-4" %> - <% if @current_user.support? %> - <%= govuk_link_to "Download (CSV, codes only)", csv_codes_only_download_url, type: "text/csv", class: "govuk-!-margin-right-4" %> +
+ <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "logs", filters_count: applied_filters_count(@filter_type))) %> + <% if logs&.any? %> + <%= govuk_link_to "Download (CSV)", csv_download_url, type: "text/csv", class: "govuk-!-margin-right-4" %> + <% if @current_user.support? %> + <%= govuk_link_to "Download (CSV, codes only)", csv_codes_only_download_url, type: "text/csv", class: "govuk-!-margin-right-4" %> + <% end %> <% end %> - <% end %> -
-
- <% if logs&.any? && (display_delete_logs?(@current_user, searched, filter_type) || in_organisations_tab?) %> - <%= govuk_link_to "Delete logs", delete_logs_path, class: "app-!-colour-red" %> - <% end %> -
+
+
+ <% if searched || applied_filters_count(@filter_type).positive? %> +
+ <% end %> + <% if logs&.any? && (display_delete_logs?(@current_user, searched, filter_type) || in_organisations_tab?) %> + <%= govuk_link_to "Delete logs", delete_logs_path, class: "app-!-colour-red" %> + <% end %> +

<% logs.map do |log| %> diff --git a/app/views/logs/delete_duplicates.html.erb b/app/views/logs/delete_duplicates.html.erb index 4acfc2314..912b3491d 100644 --- a/app/views/logs/delete_duplicates.html.erb +++ b/app/views/logs/delete_duplicates.html.erb @@ -1,6 +1,6 @@ <% content_for :before_content do %> <% content_for :title, "Are you sure you want to delete #{@duplicate_logs.count == 1 ? 'this duplicate log' : 'these duplicate logs'}?" %> - <%= govuk_back_link href: @log.lettings? ? lettings_log_duplicate_logs_path(@original_log, original_log_id: @original_log.id) : sales_log_duplicate_logs_path(@original_log, original_log_id: @original_log.id) %> + <%= govuk_back_link href: @log.lettings? ? lettings_log_duplicate_logs_path(@original_log, original_log_id: @original_log.id, referrer: params[:referrer], organisation_id: params[:organisation_id]) : sales_log_duplicate_logs_path(@original_log, original_log_id: @original_log.id, referrer: params[:referrer], organisation_id: params[:organisation_id]) %> <% end %>
@@ -29,10 +29,10 @@ <%= govuk_button_to @duplicate_logs.count == 1 ? "Delete this log" : "Delete these logs", send("delete_logs_#{@log.class.name.underscore}s_path"), method: "delete", - params: { ids: @duplicate_logs.map(&:id), original_log_id: @original_log.id, remaining_log_id: @log.id } %> + params: { ids: @duplicate_logs.map(&:id), original_log_id: @original_log.id, remaining_log_id: @log.id, referrer: params[:referrer], organisation_id: params[:organisation_id] } %> <%= govuk_button_link_to( "Cancel", - send("#{@log.class.name.underscore}_duplicate_logs_path", @original_log, original_log_id: @original_log.id), + send("#{@log.class.name.underscore}_duplicate_logs_path", @original_log, original_log_id: @original_log.id, referrer: params[:referrer], organisation_id: params[:organisation_id]), secondary: true, ) %>
diff --git a/app/views/logs/download_csv.html.erb b/app/views/logs/download_csv.html.erb index 5aeea8173..6da8b46fd 100644 --- a/app/views/logs/download_csv.html.erb +++ b/app/views/logs/download_csv.html.erb @@ -6,7 +6,7 @@
-

Download CSV

+

Download CSV

We'll send a secure download link to your email address <%= @current_user.email %>.

You've selected <%= count %> logs.

diff --git a/app/views/logs/index.html.erb b/app/views/logs/index.html.erb index b7c6ee4b0..6d1a886f0 100644 --- a/app/views/logs/index.html.erb +++ b/app/views/logs/index.html.erb @@ -9,7 +9,7 @@ ) %> <% if @duplicate_sets_count&.positive? %> - <%= govuk_notification_banner(title_text: "Important", text: govuk_link_to("Review logs", duplicate_logs_path)) do |banner| %> + <%= govuk_notification_banner(title_text: "Important", text: govuk_link_to("Review logs", duplicate_logs_path(referrer: "duplicate_logs_banner"))) do |banner| %> <% banner.with_heading(text: I18n.t("notification.duplicate_sets", count: @duplicate_sets_count)) %> <% end %> <% end %> diff --git a/app/views/maintenance/service_unavailable.html.erb b/app/views/maintenance/service_unavailable.html.erb new file mode 100644 index 000000000..cb106ce8d --- /dev/null +++ b/app/views/maintenance/service_unavailable.html.erb @@ -0,0 +1,11 @@ +

+ Sorry, the service is unavailable +

+ +
+
+

You will be able to use the service from 9am on Thursday 16 November 2023.

+

Changes from the page you were on have not been saved. Changes on pages where you have selected 'save and continue' have been saved.

+

<%= govuk_link_to "Contact the helpdesk", "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11" %> if you need help.

+
+
diff --git a/app/views/organisation_relationships/_managing_agent_list.erb b/app/views/organisation_relationships/_managing_agent_list.erb index 65195033c..fd5862b8c 100644 --- a/app/views/organisation_relationships/_managing_agent_list.erb +++ b/app/views/organisation_relationships/_managing_agent_list.erb @@ -1,7 +1,7 @@
<%= govuk_table do |table| %> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> - <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "agents", path: request.path)) %> + <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "agents", filters_count: 0)) %> <% end %> <% @managing_agents.each do |managing_agent| %> <%= table.body do |body| %> diff --git a/app/views/organisation_relationships/_stock_owner_list.erb b/app/views/organisation_relationships/_stock_owner_list.erb index 0120c553b..63725c2e2 100644 --- a/app/views/organisation_relationships/_stock_owner_list.erb +++ b/app/views/organisation_relationships/_stock_owner_list.erb @@ -1,7 +1,7 @@
<%= govuk_table do |table| %> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> - <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "stock owners", path: request.path)) %> + <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "stock owners", filters_count: 0)) %> <% end %> <% @stock_owners.each do |stock_owner| %> <%= table.body do |body| %> diff --git a/app/views/organisations/_merged_organisation_details.html.erb b/app/views/organisations/_merged_organisation_details.html.erb new file mode 100644 index 000000000..0f35b5f4a --- /dev/null +++ b/app/views/organisations/_merged_organisation_details.html.erb @@ -0,0 +1,34 @@ +<% if @organisation.recently_absorbed_organisations_grouped_by_merge_date.present? %> + <%= govuk_details(summary_text: "View all organisations that were merged into #{@organisation.name}") do %> + <% @organisation.recently_absorbed_organisations_grouped_by_merge_date.each do |merge_date, organisations| %> +

Merge date: <%= merge_date&.to_formatted_s(:govuk_date) %>

+ <%= govuk_table do |table| %> + <%= table.head do |head| %> + <%= head.row do |row| %> + <% row.cell(header: true, text: "Organisation name", html_attributes: { scope: "col", class: "govuk-!-width-one-half" }) %> + <% row.cell(header: true, text: "Organisation ID", html_attributes: { scope: "col", class: "govuk-!-width-one-half" }) %> + <% end %> + <% end %> + <% organisations.each do |absorbed_org| %> + <%= table.body do |body| %> + <%= body.row do |row| %> + <% if current_user.support? %> + <% row.cell(text: simple_format(govuk_link_to(absorbed_org.name, organisation_path(absorbed_org)), { class: "govuk-!-font-weight-bold scheme-name-cell" }, wrapper_tag: "div")) %> + <% else %> + <% row.cell(text: absorbed_org.name) %> + <% end %> + <% row.cell(text: "ORG#{absorbed_org.id}") %> + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> +<% end %> +<% if @organisation.absorbing_organisation.present? %> + <% if current_user.support? %> +

<%= @organisation.name %> was merged into <%= govuk_link_to(@organisation.absorbing_organisation.name, organisation_path(@organisation.absorbing_organisation)) %><%= @organisation.merge_date ? " on #{@organisation.merge_date.to_formatted_s(:govuk_date)}" : "" %>.

+ <% else %> +

<%= @organisation.name %> was merged into <%= @organisation.absorbing_organisation.name %><%= @organisation.merge_date ? " on #{@organisation.merge_date.to_formatted_s(:govuk_date)}" : "" %>.

+ <% end %> +<% end %> diff --git a/app/views/organisations/_organisation_list.html.erb b/app/views/organisations/_organisation_list.html.erb index 6a68433be..7c871a125 100644 --- a/app/views/organisations/_organisation_list.html.erb +++ b/app/views/organisations/_organisation_list.html.erb @@ -1,7 +1,7 @@
<%= govuk_table do |table| %> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> - <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "organisations", path: request.path)) %> + <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "organisations", filters_count: applied_filters_count(@filter_type))) %> <% end %> <%= table.head do |head| %> <%= head.row do |row| %> diff --git a/app/views/organisations/logs.html.erb b/app/views/organisations/logs.html.erb index 241621996..c4f897832 100644 --- a/app/views/organisations/logs.html.erb +++ b/app/views/organisations/logs.html.erb @@ -11,7 +11,7 @@ ) %> <% if @duplicate_sets_count&.positive? %> - <%= govuk_notification_banner(title_text: "Important", text: govuk_link_to("Review logs", organisation_duplicates_path(@organisation))) do |banner| %> + <%= govuk_notification_banner(title_text: "Important", text: govuk_link_to("Review logs", organisation_duplicates_path(@organisation, referrer: "duplicate_logs_banner"))) do |banner| %> <% banner.with_heading(text: I18n.t("notification.duplicate_sets", count: @duplicate_sets_count)) %> <% end %> <% end %> diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb index 47b023fbd..fa0bd9e0a 100644 --- a/app/views/organisations/show.html.erb +++ b/app/views/organisations/show.html.erb @@ -39,6 +39,7 @@ <% if FeatureToggle.merge_organisations_enabled? %>

To report a merge or update your organisation details, <%= govuk_link_to "contact the helpdesk", "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11" %>.

<% end %> + <%= render partial: "organisations/merged_organisation_details" %>
diff --git a/app/views/schemes/_scheme_filters.html.erb b/app/views/schemes/_scheme_filters.html.erb index e723f7469..6e66e38ba 100644 --- a/app/views/schemes/_scheme_filters.html.erb +++ b/app/views/schemes/_scheme_filters.html.erb @@ -11,7 +11,7 @@ <%= filters_applied_text(@filter_type) %>

- <%= reset_filters_link(@filter_type) %> + <%= reset_filters_link(@filter_type, { search: request.params["search"] }.compact) %>

@@ -43,6 +43,10 @@ } %> <% end %> + <% if request.params["search"].present? %> + <%= f.hidden_field :search, value: request.params["search"] %> + <% end %> + <%= f.govuk_submit "Apply filters", class: "govuk-!-margin-bottom-0" %> <% end %>
diff --git a/app/views/schemes/_scheme_list.html.erb b/app/views/schemes/_scheme_list.html.erb index eefa10589..b898e6018 100644 --- a/app/views/schemes/_scheme_list.html.erb +++ b/app/views/schemes/_scheme_list.html.erb @@ -1,7 +1,7 @@
<%= govuk_table do |table| %> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> - <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "schemes", path: request.path)) %> + <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "schemes", filters_count: applied_filters_count(@filter_type))) %> <% end %> <%= table.head do |head| %> <%= head.row do |row| %> diff --git a/app/views/schemes/support.html.erb b/app/views/schemes/support.html.erb index 23948978b..be4587617 100644 --- a/app/views/schemes/support.html.erb +++ b/app/views/schemes/support.html.erb @@ -15,7 +15,7 @@ <% support_level_options_hints = { "Low level": "Staff visiting once a week, fortnightly or less.", "Medium level": "Staff on site daily or making frequent visits with some out-of-hours cover.", "High level": "Intensive level of staffing provided on a 24-hour basis." } %> - <% support_level_options_with_hints = Scheme.support_types.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: support_level_options_hints[key.to_sym]) } %> + <% support_level_options_with_hints = Scheme.support_types.keys.excluding("Missing").excluding("Floating support").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: support_level_options_hints[key.to_sym]) } %> <%= f.govuk_collection_radio_buttons :support_type, support_level_options_with_hints, diff --git a/app/views/users/_user_filters.html.erb b/app/views/users/_user_filters.html.erb index 41280b3ae..9547cbc86 100644 --- a/app/views/users/_user_filters.html.erb +++ b/app/views/users/_user_filters.html.erb @@ -11,7 +11,7 @@ <%= filters_applied_text(@filter_type) %>

- <%= reset_filters_link(@filter_type) %> + <%= reset_filters_link(@filter_type, { search: request.params["search"] }.compact) %>

@@ -22,6 +22,11 @@ label: "Status", category: "status", } %> + + <% if request.params["search"].present? %> + <%= f.hidden_field :search, value: request.params["search"] %> + <% end %> + <%= f.govuk_submit "Apply filters", class: "govuk-!-margin-bottom-0" %> <% end %> diff --git a/app/views/users/_user_list.html.erb b/app/views/users/_user_list.html.erb index 100f45929..389053294 100644 --- a/app/views/users/_user_list.html.erb +++ b/app/views/users/_user_list.html.erb @@ -1,7 +1,7 @@
<%= govuk_table do |table| %> <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> - <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "users", path: request.path)) %> + <%= render(SearchResultCaptionComponent.new(searched:, count: pagy.count, item_label:, total_count:, item: "users", filters_count: applied_filters_count(@filter_type))) %> <% if current_user.support? %> <% query = searched.present? ? "?search=#{searched}" : nil %> <%= govuk_link_to "Download (CSV)", "#{request.path}.csv#{query}", type: "text/csv" %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index fc66bcad8..0465f67bb 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -4,7 +4,7 @@ <%= govuk_back_link(href: :back) %> <% end %> -<%= form_for(@resource, as: :user, html: { method: :post }) do |f| %> +<%= form_for(@user, as: :user, html: { method: :post }) do |f| %>
<%= f.govuk_error_summary %> @@ -21,13 +21,13 @@ label: { text: "Email address", size: "m" }, autocomplete: "email", spellcheck: "false", - value: @resource.email %> + value: @user.email %> <%= f.govuk_phone_field :phone, label: { text: "Telephone number", size: "m" }, autocomplete: "phone", spellcheck: "false", - value: @resource.phone %> + value: @user.phone %> <% if current_user.support? %> <% null_option = [OpenStruct.new(id: "", name: "Select an option")] %> diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 006a716de..37e796e04 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -7074,7 +7074,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no referral or nomination)" @@ -7131,7 +7132,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no nomination)" @@ -7194,7 +7196,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no referral)" @@ -7254,7 +7257,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no referral or nomination)" diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index 5dc249050..affc18971 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -6991,7 +6991,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no referral or nomination)" @@ -7048,7 +7049,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no nomination)" @@ -7056,8 +7058,8 @@ "3": { "value": "Nominated by a local housing authority" }, - "4" : { - "value" : "Referred by local authority housing department" + "4" : { + "value" : "Referred by local authority housing department" }, "8": { "value": "Re-located through official housing mobility scheme" @@ -7111,7 +7113,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no referral)" @@ -7171,7 +7174,8 @@ "type": "radio", "answer_options": { "1": { - "value": "Internal transfer" + "value": "Internal transfer", + "hint": "Where the tenant has moved to another social property owned by the same landlord." }, "2": { "value": "Tenant applied directly (no referral or nomination)" @@ -8316,7 +8320,7 @@ } } }, - "interruption_screen_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"] + "interruption_screen_question_ids": ["brent", "period", "startdate", "la", "beds", "rent_type", "needstype"] }, "max_rent_value_check": { "depends_on": [ @@ -8361,7 +8365,7 @@ } } }, - "interruption_screen_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"] + "interruption_screen_question_ids": ["brent", "period", "startdate", "la", "beds", "rent_type", "needstype"] }, "scharge_value_check": { "depends_on": [ diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 74e6ce9a2..60cc29b3a 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -32,7 +32,10 @@ Redis.silence_deprecations = true Sidekiq.configure_server do |config| config.on(:startup) do - Sidekiq::Cron::Job.load_from_hash YAML.load_file("config/sidekiq_cron_schedule.yml") + Sidekiq::Cron::Job.all.each(&:destroy) + unless FeatureToggle.maintenance_mode_enabled? + Sidekiq::Cron::Job.load_from_hash YAML.load_file("config/sidekiq_cron_schedule.yml") + end end config.on(:shutdown) do diff --git a/config/locales/en.yml b/config/locales/en.yml index 2890f3bde..69a4a8bb9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -265,7 +265,7 @@ en: owning_organisation: "Enter a date when the owning organisation was active. %{owning_organisation} became inactive on %{owning_organisation_merge_date} and was replaced by %{owning_absorbing_organisation}." managing_organisation: "Enter a date when the managing organisation was active. %{managing_organisation} became inactive on %{managing_organisation_merge_date} and was replaced by %{managing_absorbing_organisation}." different_merge: "Enter a date when the owning and managing organisations were active. %{owning_organisation} became inactive on %{owning_organisation_merge_date} and was replaced by %{owning_absorbing_organisation}. %{managing_organisation} became inactive on %{managing_organisation_merge_date} and was replaced by %{managing_absorbing_organisation}." - invalid_absorbing_organisations_start_date: + invalid_absorbing_organisations_start_date: same_organisation: "Enter a date when the owning and managing organisation was active. %{owning_organisation} became active on %{owning_organisation_available_from}." owning_organisation: "Enter a date when the owning organisation was active. %{owning_organisation} became active on %{owning_organisation_available_from}." managing_organisation: "Enter a date when the managing organisation was active. %{managing_organisation} became active on %{managing_organisation_available_from}." @@ -367,27 +367,7 @@ en: negative_currency: "Enter an amount above 0" rent: less_than_shortfall: "Enter an amount that is more than the shortfall in basic rent" - scharge: - private_registered_provider: - general_needs: "Enter a value for the service charge between £0 and £800 per week if the landlord is a private registered provider and it is a general needs letting" - supported_housing: "Enter a value for the service charge between £0 and £800 per week if the landlord is a private registered provider and it is a supported housing letting" - local_authority: - general_needs: "Enter a value for the service charge between £0 and £500 per week if the landlord is a local authority and it is a general needs letting" - supported_housing: "Enter a value for the service charge between £0 and £500 per week if the landlord is a local authority and it is a supported housing letting" - pscharge: - private_registered_provider: - general_needs: "Enter a value for the personal service charge between £0 and £700 per week if the landlord is a private registered provider and it is a general needs letting" - supported_housing: "Enter a value for the personal service charge between £0 and £700 per week if the landlord is a private registered provider and it is a supported housing letting" - local_authority: - general_needs: "Enter a value for the personal service charge between £0 and £200 per week if the landlord is a local authority and it is a general needs letting" - supported_housing: "Enter a value for the personal service charge between £0 and £200 per week if the landlord is a local authority and it is a supported housing letting" - supcharg: - private_registered_provider: - general_needs: "Enter a value for the support charge between £0 and £800 per week if the landlord is a private registered provider and it is a general needs letting" - supported_housing: "Enter a value for the support charge between £0 and £800 per week if the landlord is a private registered provider and it is a supported housing letting" - local_authority: - general_needs: "Enter a value for the support charge between £0 and £200 per week if the landlord is a local authority and it is a general needs letting" - supported_housing: "Enter a value for the support charge between £0 and £200 per week if the landlord is a local authority and it is a supported housing letting" + out_of_range: "Enter a value for the %{charge_name} between £0 and %{maximum_per_period} paid %{frequency}. %{maximum_per_period} is the max limit for rent and charges paid %{frequency} for %{letting_type} lettings owned by a %{provider_type}." ecstat: over_hard_max: "Net income of %{hard_max} per week is too high given the tenant’s working situation" brent: @@ -722,7 +702,7 @@ Make sure these answers are correct." charges: informative_text: "This is higher than we would expect." hint_text: "Check the following:
  • the decimal point
  • the frequency, for example every week or every calendar month
  • the needs type
" - + devise: email: diff --git a/config/routes.rb b/config/routes.rb index 621ee820c..498e7d9a2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,6 +35,7 @@ Rails.application.routes.draw do get "/accessibility-statement", to: "content#accessibility_statement" get "/privacy-notice", to: "content#privacy_notice" get "/data-sharing-agreement", to: "content#data_sharing_agreement" + get "/service-unavailable", to: "maintenance#service_unavailable" get "/download-23-24-lettings-form", to: "start#download_23_24_lettings_form" get "/download-22-23-lettings-form", to: "start#download_22_23_lettings_form" diff --git a/db/migrate/20231023142854_add_available_from_to_org.rb b/db/migrate/20231023142854_add_available_from_to_org.rb new file mode 100644 index 000000000..7cfb4b1aa --- /dev/null +++ b/db/migrate/20231023142854_add_available_from_to_org.rb @@ -0,0 +1,5 @@ +class AddAvailableFromToOrg < ActiveRecord::Migration[7.0] + def change + add_column :organisations, :available_from, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index e353ff9c7..7eda570d1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_09_13_093443) do +ActiveRecord::Schema[7.0].define(version: 2023_10_23_142854) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -440,6 +440,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_09_13_093443) do t.string "old_visible_id" t.datetime "merge_date" t.bigint "absorbing_organisation_id" + t.datetime "available_from" t.index ["absorbing_organisation_id"], name: "index_organisations_on_absorbing_organisation_id" t.index ["old_visible_id"], name: "index_organisations_on_old_visible_id", unique: true end diff --git a/docs/adr/index.md b/docs/adr/index.md index 13abde54b..edb60b688 100644 --- a/docs/adr/index.md +++ b/docs/adr/index.md @@ -1,6 +1,6 @@ --- has_children: true -nav_order: 9 +nav_order: 10 --- # Architecture decisions diff --git a/docs/app_api.md b/docs/app_api.md new file mode 100644 index 000000000..093fd918f --- /dev/null +++ b/docs/app_api.md @@ -0,0 +1,15 @@ +--- +nav_order: 8 +--- + +# Using the App API + +In order to use the app as an API, you will need to configure requests to the API as so: + +* Configure your request with Basic Auth. Set the username to be the same as `API_USER` and password as the `API_KEY` (`API_USER` and `API_KEY` are environment variables that should be set for the application) +* Check the endpoint you are calling is an action that is `create`, `show` or `update` +* Check you are setting the following request headers: + * `Content-Type = application/json` + * `Action = application/json` N.B. If you use `*/*` instead, the request won't be recognised as an API request` + +Currently only the logs controller is configured to accept and authenticate API requests, when the above API environment variables are set. diff --git a/docs/documentation_website.md b/docs/documentation_website.md index ed1f1633e..9eb763050 100644 --- a/docs/documentation_website.md +++ b/docs/documentation_website.md @@ -1,5 +1,5 @@ --- -nav_order: 10 +nav_order: 11 --- # This documentation website diff --git a/docs/form/index.md b/docs/form/index.md index 148ffb1c4..664b136c7 100644 --- a/docs/form/index.md +++ b/docs/form/index.md @@ -1,6 +1,6 @@ --- has_children: true -nav_order: 8 +nav_order: 9 --- # Generating forms diff --git a/docs/setup.md b/docs/setup.md index 9b5c049c1..25d28dcf4 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -1,5 +1,5 @@ --- -nav_order: 2 +nav_order: 3 --- # Local development diff --git a/lib/tasks/correct_illness_from_csv.rake b/lib/tasks/correct_illness_from_csv.rake index 2fc3eec74..92bbb8921 100644 --- a/lib/tasks/correct_illness_from_csv.rake +++ b/lib/tasks/correct_illness_from_csv.rake @@ -20,7 +20,9 @@ namespace :correct_illness do raise "Usage: rake correct_illness:correct_illness_from_csv['csv_file_name']" if file_name.blank? s3_service = Storage::S3Service.new(PlatformHelper.is_paas? ? Configuration::PaasConfigurationService.new : Configuration::EnvConfigurationService.new, ENV["IMPORT_PAAS_INSTANCE"]) - illness_csv = CSV.parse(s3_service.get_file_io(file_name), headers: false) + file_io = s3_service.get_file_io(file_name) + file_io.set_encoding_by_bom + illness_csv = CSV.parse(file_io, headers: false) illness_csv.each_with_index do |row, index| next if index < 3 diff --git a/lib/tasks/import_address_from_csv.rake b/lib/tasks/import_address_from_csv.rake index 57496a56c..c81cc2162 100644 --- a/lib/tasks/import_address_from_csv.rake +++ b/lib/tasks/import_address_from_csv.rake @@ -6,7 +6,9 @@ namespace :data_import do raise "Usage: rake data_import:import_lettings_addresses_from_csv['csv_file_name']" if file_name.blank? s3_service = Storage::S3Service.new(PlatformHelper.is_paas? ? Configuration::PaasConfigurationService.new : Configuration::EnvConfigurationService.new, ENV["IMPORT_PAAS_INSTANCE"]) - addresses_csv = CSV.parse(s3_service.get_file_io(file_name), headers: true) + file_io = s3_service.get_file_io(file_name) + file_io.set_encoding_by_bom + addresses_csv = CSV.parse(file_io, headers: true) contains_issue_type = addresses_csv.headers.include?("Issue type") addresses_csv.each do |row| @@ -53,8 +55,11 @@ namespace :data_import do lettings_log.send("process_postcode_changes!") lettings_log.values_updated_at = Time.zone.now - lettings_log.save! - Rails.logger.info("Updated lettings log #{lettings_log_id}, with address: #{[lettings_log.address_line1, lettings_log.address_line2, lettings_log.town_or_city, lettings_log.county, lettings_log.postcode_full].join(', ')}") + if lettings_log.save + Rails.logger.info("Updated lettings log #{lettings_log_id}, with address: #{[lettings_log.address_line1, lettings_log.address_line2, lettings_log.town_or_city, lettings_log.county, lettings_log.postcode_full].join(', ')}") + else + Rails.logger.error("Validation failed for lettings log with ID #{lettings_log.id}: #{lettings_log.errors.full_messages.join(', ')}}") + end end end @@ -65,7 +70,9 @@ namespace :data_import do raise "Usage: rake data_import:import_sales_addresses_from_csv['csv_file_name']" if file_name.blank? s3_service = Storage::S3Service.new(PlatformHelper.is_paas? ? Configuration::PaasConfigurationService.new : Configuration::EnvConfigurationService.new, ENV["IMPORT_PAAS_INSTANCE"]) - addresses_csv = CSV.parse(s3_service.get_file_io(file_name), headers: true) + file_io = s3_service.get_file_io(file_name) + file_io.set_encoding_by_bom + addresses_csv = CSV.parse(file_io, headers: true) contains_issue_type = addresses_csv.headers.include?("Issue type") addresses_csv.each do |row| @@ -112,8 +119,11 @@ namespace :data_import do sales_log.send("process_postcode_changes!") sales_log.values_updated_at = Time.zone.now - sales_log.save! - Rails.logger.info("Updated sales log #{sales_log_id}, with address: #{[sales_log.address_line1, sales_log.address_line2, sales_log.town_or_city, sales_log.county, sales_log.postcode_full].join(', ')}") + if sales_log.save + Rails.logger.info("Updated sales log #{sales_log_id}, with address: #{[sales_log.address_line1, sales_log.address_line2, sales_log.town_or_city, sales_log.county, sales_log.postcode_full].join(', ')}") + else + Rails.logger.error("Validation failed for sales log with ID #{sales_log.id}: #{sales_log.errors.full_messages.join(', ')}}") + end end end end diff --git a/lib/tasks/merge_organisations.rake b/lib/tasks/merge_organisations.rake index 820343883..07b17dffd 100644 --- a/lib/tasks/merge_organisations.rake +++ b/lib/tasks/merge_organisations.rake @@ -1,12 +1,37 @@ namespace :merge do - desc "Merge organisations into one" - task :merge_organisations, %i[absorbing_organisation_id merging_organisation_ids] => :environment do |_task, args| + desc "Merge organisations into an existing organisation" + task :merge_organisations, %i[absorbing_organisation_id merging_organisation_ids merge_date] => :environment do |_task, args| absorbing_organisation_id = args[:absorbing_organisation_id] merging_organisation_ids = args[:merging_organisation_ids]&.split(" ")&.map(&:to_i) + begin + merge_date = args[:merge_date].present? ? Date.parse(args[:merge_date]) : nil + rescue StandardError + raise "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids, merge_date]. Merge date must be in format YYYY-MM-DD" + end - raise "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids]" if merging_organisation_ids.blank? || absorbing_organisation_id.blank? + if merging_organisation_ids.blank? || absorbing_organisation_id.blank? + raise "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids, merge_date]" + end - service = Merge::MergeOrganisationsService.new(absorbing_organisation_id:, merging_organisation_ids:) + service = Merge::MergeOrganisationsService.new(absorbing_organisation_id:, merging_organisation_ids:, merge_date:) + service.call + end + + desc "Merge organisations into an existing organisation, make the absorbing organisation active from merge date only" + task :merge_organisations_into_new_organisation, %i[absorbing_organisation_id merging_organisation_ids merge_date] => :environment do |_task, args| + absorbing_organisation_id = args[:absorbing_organisation_id] + merging_organisation_ids = args[:merging_organisation_ids]&.split(" ")&.map(&:to_i) + begin + merge_date = args[:merge_date].present? ? Date.parse(args[:merge_date]) : nil + rescue StandardError + raise "Usage: rake merge:merge_organisations_into_new_organisation[absorbing_organisation_id, merging_organisation_ids, merge_date]. Merge date must be in format YYYY-MM-DD" + end + + if merging_organisation_ids.blank? || absorbing_organisation_id.blank? + raise "Usage: rake merge:merge_organisations_into_new_organisation[absorbing_organisation_id, merging_organisation_ids, merge_date]" + end + + service = Merge::MergeOrganisationsService.new(absorbing_organisation_id:, merging_organisation_ids:, merge_date:, absorbing_organisation_active_from_merge_date: true) service.call end end diff --git a/lib/tasks/recalculate_irproduct_values.rake b/lib/tasks/recalculate_irproduct_values.rake new file mode 100644 index 000000000..751eae432 --- /dev/null +++ b/lib/tasks/recalculate_irproduct_values.rake @@ -0,0 +1,18 @@ +desc "Forces to recalculate irproduct values" +task recalculate_irproduct_values: :environment do + LettingsLog.exportable.where(rent_type: [3, 4, 5]).where(irproduct: nil).each do |log| # irproduct was never set + Rails.logger.info("Could not update irproduct for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end + LettingsLog.exportable.where(rent_type: 3).where.not(irproduct: 1).each do |log| # irproduct was set wrong + Rails.logger.info("Could not update irproduct for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end + LettingsLog.exportable.where(rent_type: 4).where.not(irproduct: 2).each do |log| # irproduct was set wrong + Rails.logger.info("Could not update irproduct for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end + LettingsLog.exportable.where(rent_type: 5).where.not(irproduct: 3).each do |log| # irproduct was set wrong + Rails.logger.info("Could not update irproduct for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end + LettingsLog.exportable.where.not(rent_type: [3, 4, 5]).where.not(irproduct: nil).each do |log| # irproduct was set when it should have been nil + Rails.logger.info("Could not update irproduct for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end +end diff --git a/lib/tasks/recalculate_lar_values.rake b/lib/tasks/recalculate_lar_values.rake new file mode 100644 index 000000000..f08a38726 --- /dev/null +++ b/lib/tasks/recalculate_lar_values.rake @@ -0,0 +1,13 @@ +desc "Forces to recalculate lar values for affordable rent types and clears irrelevant lar values" +task recalculate_lar_values: :environment do + LettingsLog.exportable.where(rent_type: [1, 2], lar: nil).each do |log| # lar was never set + Rails.logger.info("Could not update lar for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end + LettingsLog.exportable.where(rent_type: 1).where.not(lar: 2).each do |log| # lar was set wrong + Rails.logger.info("Could not update lar for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end + LettingsLog.exportable.where(rent_type: 2).where.not(lar: 1).each do |log| # lar was set wrong + Rails.logger.info("Could not update lar for LettingsLog #{log.id}") unless log.update(values_updated_at: Time.zone.now) + end + LettingsLog.exportable.where.not(rent_type: [1, 2]).where.not(lar: nil).update_all(lar: nil) # lar was set to 2 but should never have been set +end diff --git a/lib/tasks/squish_names.rake b/lib/tasks/squish_names.rake new file mode 100644 index 000000000..697bc7d7b --- /dev/null +++ b/lib/tasks/squish_names.rake @@ -0,0 +1,35 @@ +desc "Squish names of locations, schemes, users, and organisations" +task squish_names: :environment do + Location.where("name LIKE ?", "% %").each do |location| + location.name&.squish! + begin + location.save! + rescue StandardError => e + Sentry.capture_exception(e) + end + end + Scheme.where("service_name LIKE ?", "% %").each do |scheme| + scheme.service_name&.squish! + begin + scheme.save! + rescue StandardError => e + Sentry.capture_exception(e) + end + end + User.where("name LIKE ?", "% %").each do |user| + user.name&.squish! + begin + user.save! + rescue StandardError => e + Sentry.capture_exception(e) + end + end + Organisation.where("name LIKE ?", "% %").each do |organisation| + organisation.name&.squish! + begin + organisation.save! + rescue StandardError => e + Sentry.capture_exception(e) + end + end +end diff --git a/spec/components/search_result_caption_component_spec.rb b/spec/components/search_result_caption_component_spec.rb index ed4934633..3e6baaada 100644 --- a/spec/components/search_result_caption_component_spec.rb +++ b/spec/components/search_result_caption_component_spec.rb @@ -6,20 +6,53 @@ RSpec.describe SearchResultCaptionComponent, type: :component do let(:item_label) { "user" } let(:total_count) { 3 } let(:item) { "schemes" } - let(:path) { "path" } + let(:filters_count) { 1 } + let(:result) { render_inline(described_class.new(searched:, count:, item_label:, total_count:, item:, filters_count:)) } - it "renders table caption including the search results and total" do - result = render_inline(described_class.new(searched:, count:, item_label:, total_count:, item:, path:)) - expect(result.to_html).to eq("\n #{count} #{item_label} found matching ‘#{searched}’ of #{total_count} total #{item}. Clear search\n\n") + context "when search and filter results are found" do + it "renders table caption including the search results and total" do + expect(result.to_html).to eq("\n 2 users matching search and filters
\n\n") + end + end + + context "when search results are found" do + let(:filters_count) { nil } + + it "renders table caption including the search results and total" do + expect(result.to_html).to eq("\n 2 users matching search
\n\n") + end + end + + context "when filter results are found" do + let(:searched) { nil } + + it "renders table caption including the search results and total" do + expect(result.to_html).to eq("\n 2 users matching filters
\n\n") + end end - context "when no search results are found" do + context "when no search/filter is applied" do let(:searched) { nil } + let(:filters_count) { nil } it "renders table caption with total count only" do - result = render_inline(described_class.new(searched:, count:, item_label:, total_count:, item:, path:)) + expect(result.to_html).to eq("\n #{count} matching #{item}\n\n") + end + end + + context "when nothing is found" do + let(:count) { 0 } - expect(result.to_html).to eq("\n #{count} total #{item}\n\n") + it "renders table caption with total count only" do + expect(result.to_html).to eq("\n 0 users matching search and filters
\n\n") + end + end + + context "when 1 record is found" do + let(:count) { 1 } + + it "renders table caption with total count only" do + expect(result.to_html).to eq("\n 1 user matching search and filters
\n\n") end end end diff --git a/spec/controllers/maintenance_controller_spec.rb b/spec/controllers/maintenance_controller_spec.rb new file mode 100644 index 000000000..032ac4858 --- /dev/null +++ b/spec/controllers/maintenance_controller_spec.rb @@ -0,0 +1,27 @@ +require "rails_helper" + +RSpec.describe MaintenanceController do + let(:user) { FactoryBot.create(:user) } + + describe "GET #service_unavailable" do + context "when maintenance mode is enabled" do + it "logs the user out" do + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + sign_in user + expect(controller).to be_user_signed_in + get :service_unavailable + expect(controller).not_to be_user_signed_in + end + end + + context "when maintenance mode is disabled" do + it "doesn't log the user out" do + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(false) + sign_in user + expect(controller).to be_user_signed_in + get :service_unavailable + expect(controller).to be_user_signed_in + end + end + end +end diff --git a/spec/factories/lettings_log.rb b/spec/factories/lettings_log.rb index e661645c7..f01d6b4a4 100644 --- a/spec/factories/lettings_log.rb +++ b/spec/factories/lettings_log.rb @@ -3,7 +3,10 @@ FactoryBot.define do created_by { FactoryBot.create(:user) } owning_organisation { created_by.organisation } managing_organisation { created_by.organisation } + created_at { Time.zone.today } + updated_at { Time.zone.today } trait :setup_completed do + startdate_today renewal { 0 } needstype { 1 } rent_type { 1 } @@ -206,7 +209,5 @@ FactoryBot.define do illness_type_9 { false } illness_type_10 { false } end - created_at { Time.zone.today } - updated_at { Time.zone.today } end end diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 7f9b45932..935bd30f6 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -5,6 +5,7 @@ FactoryBot.define do password { "pAssword1" } organisation role { "data_provider" } + phone { "1234512345123" } trait :data_coordinator do role { "data_coordinator" } end diff --git a/spec/features/form/form_navigation_spec.rb b/spec/features/form/form_navigation_spec.rb index 9a9f14383..a5784d1ec 100644 --- a/spec/features/form/form_navigation_spec.rb +++ b/spec/features/form/form_navigation_spec.rb @@ -176,4 +176,18 @@ RSpec.describe "Form Navigation" do end end end + + describe "fixing duplicate logs" do + it "shows a correct cancel link" do + visit("lettings-logs/#{id}/tenant-code-test?first_remaining_duplicate_id=x&original_log_id=#{id}&referrer=duplicate_logs") + click_link(text: "Cancel") + expect(page).to have_current_path("/lettings-logs/#{id}/duplicate-logs?original_log_id=#{id}") + end + + it "shows a correct Save Changes buttons" do + visit("lettings-logs/#{id}/tenant-code-test?first_remaining_duplicate_id=#{id}&original_log_id=#{id}&referrer=duplicate_logs") + click_button(text: "Save changes") + expect(page).to have_current_path("/lettings-logs/#{id}/duplicate-logs?original_log_id=#{id}&referrer=duplicate_logs") + end + end end diff --git a/spec/features/lettings_log_spec.rb b/spec/features/lettings_log_spec.rb index 9f8cfbb77..5790ed1f6 100644 --- a/spec/features/lettings_log_spec.rb +++ b/spec/features/lettings_log_spec.rb @@ -79,7 +79,7 @@ RSpec.describe "Lettings Log Features" do context "when no filters are selected" do it "displays the filters component with no clear button" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=lettings_logs") end end @@ -97,7 +97,7 @@ RSpec.describe "Lettings Log Features" do it "displays the filters component with a correct count and clear button" do expect(page).to have_content("5 filters applied") - expect(page).to have_content("Clear") + expect(page).to have_link("Clear", href: "/clear-filters?filter_type=lettings_logs") end context "when clearing the filters" do @@ -107,7 +107,7 @@ RSpec.describe "Lettings Log Features" do it "clears the filters and displays the filter component as before" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=lettings_logs") end end end @@ -467,7 +467,7 @@ RSpec.describe "Lettings Log Features" do expect(duplicate_log.deleted?).to be true expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{duplicate_log.id} has been deleted.") - expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") + expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?organisation_id=&original_log_id=#{lettings_log.id}&referrer=") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") expect(page).to have_link("Back to Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") @@ -491,7 +491,7 @@ RSpec.describe "Lettings Log Features" do expect(lettings_log.status).to eq("deleted") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{lettings_log.id} has been deleted.") - expect(page).to have_current_path("/lettings-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") + expect(page).to have_current_path("/lettings-logs/#{duplicate_log.id}/duplicate-logs?organisation_id=&original_log_id=#{lettings_log.id}&referrer=") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") expect(page).to have_link("Back to lettings logs", href: "/lettings-logs") @@ -510,8 +510,8 @@ RSpec.describe "Lettings Log Features" do expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") click_link("Change", href: "/lettings-logs/#{duplicate_log.id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") fill_in("lettings-log-tenancycode-field", with: "something else") - click_button("Save and continue") - expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") + click_button("Save changes") + expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}&referrer=duplicate_logs") expect(page).to have_link("Back to Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{duplicate_log.id} is no longer a duplicate and has been removed from the list") @@ -521,8 +521,8 @@ RSpec.describe "Lettings Log Features" do it "allows deduplicating logs by changing the answers on the original log" do click_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") fill_in("lettings-log-tenancycode-field", with: "something else") - click_button("Save and continue") - expect(page).to have_current_path("/lettings-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") + click_button("Save changes") + expect(page).to have_current_path("/lettings-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}&referrer=duplicate_logs") expect(page).to have_link("Back to Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{lettings_log.id} is no longer a duplicate and has been removed from the list") diff --git a/spec/features/organisation_spec.rb b/spec/features/organisation_spec.rb index 6b4efb80c..9c24f2470 100644 --- a/spec/features/organisation_spec.rb +++ b/spec/features/organisation_spec.rb @@ -126,7 +126,8 @@ RSpec.describe "User Features" do context "when viewing lettings logs for specific organisation" do let(:first_log) { organisation.lettings_logs.first } let!(:log_to_search) { FactoryBot.create(:lettings_log, created_by: user) } - let!(:other_logs) { FactoryBot.create_list(:lettings_log, 4, created_by: user) } + let!(:other_general_needs_logs) { FactoryBot.create_list(:lettings_log, 4, created_by: user, needstype: 1) } + let!(:other_supported_housing_logs) { FactoryBot.create_list(:lettings_log, 4, created_by: user, needstype: 2) } let(:number_of_lettings_logs) { LettingsLog.count } before do @@ -148,7 +149,7 @@ RSpec.describe "User Features" do context "when searching for specific logs" do it "displays the logs belonging to the same organisation" do expect(page).to have_content(log_to_search.id) - other_logs.each do |log| + (other_general_needs_logs + other_supported_housing_logs).each do |log| expect(page).to have_content(log.id) end end @@ -168,7 +169,7 @@ RSpec.describe "User Features" do it "displays log matching the log ID" do expect(page).to have_link(log_to_search.id.to_s) - other_logs.each do |log| + (other_general_needs_logs + other_supported_housing_logs).each do |log| expect(page).not_to have_link(log.id.to_s) end end @@ -187,16 +188,31 @@ RSpec.describe "User Features" do end end - it "can filter lettings logs" do - expect(page).to have_content("#{number_of_lettings_logs} total logs") + it "has correct page details" do + expect(page).to have_content("#{number_of_lettings_logs} matching logs") organisation.lettings_logs.map(&:id).each do |lettings_log_id| expect(page).to have_link lettings_log_id.to_s, href: "/lettings-logs/#{lettings_log_id}" end + end + + it "can filter lettings logs by year" do check("years-2021-field") click_button("Apply filters") - expect(page).to have_current_path("/organisations/#{org_id}/lettings-logs?years[]=&years[]=2021&status[]=&assigned_to=all&user=&owning_organisation_select=all&owning_organisation=") + expect(page).to have_current_path("/organisations/#{org_id}/lettings-logs?years[]=&years[]=2021&status[]=&needstypes[]=&assigned_to=all&user=&owning_organisation_select=all&owning_organisation=&managing_organisation_select=all&managing_organisation=") expect(page).not_to have_link first_log.id.to_s, href: "/lettings-logs/#{first_log.id}" end + + it "can filter lettings logs by needstype" do + check("needstypes-1-field") + click_button("Apply filters") + expect(page).to have_current_path("/organisations/#{org_id}/lettings-logs?years[]=&status[]=&needstypes[]=&needstypes[]=1&assigned_to=all&user=&owning_organisation_select=all&owning_organisation=&managing_organisation_select=all&managing_organisation=") + other_general_needs_logs.each do |general_needs_log| + expect(page).to have_link general_needs_log.id.to_s, href: "/lettings-logs/#{general_needs_log.id}" + end + other_supported_housing_logs.each do |supported_housing_log| + expect(page).not_to have_link supported_housing_log.id.to_s, href: "/lettings-logs/#{supported_housing_log.id}" + end + end end context "when viewing sales logs for specific organisation" do @@ -221,7 +237,7 @@ RSpec.describe "User Features" do end it "can filter sales logs" do - expect(page).to have_content("#{number_of_sales_logs} total logs") + expect(page).to have_content("#{number_of_sales_logs} matching logs") organisation.sales_logs.map(&:id).each do |sales_log_id| expect(page).to have_link sales_log_id.to_s, href: "/sales-logs/#{sales_log_id}" end diff --git a/spec/features/sales_log_spec.rb b/spec/features/sales_log_spec.rb index f03287723..9e12082a7 100644 --- a/spec/features/sales_log_spec.rb +++ b/spec/features/sales_log_spec.rb @@ -108,7 +108,7 @@ RSpec.describe "Sales Log Features" do context "when no filters are selected" do it "displays the filters component with no clear button" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=sales_logs") end end @@ -122,7 +122,7 @@ RSpec.describe "Sales Log Features" do it "displays the filters component with a correct count and clear button" do expect(page).to have_content("3 filters applied") - expect(page).to have_content("Clear") + expect(page).to have_link("Clear", href: "/clear-filters?filter_type=sales_logs") end context "when clearing the filters" do @@ -132,7 +132,7 @@ RSpec.describe "Sales Log Features" do it "clears the filters and displays the filter component as before" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=sales_logs") end end end @@ -206,7 +206,7 @@ RSpec.describe "Sales Log Features" do expect(duplicate_log.deleted?).to be true expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{duplicate_log.id} has been deleted.") - expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") + expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?organisation_id=&original_log_id=#{sales_log.id}&referrer=") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") @@ -230,7 +230,7 @@ RSpec.describe "Sales Log Features" do expect(sales_log.status).to eq("deleted") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{sales_log.id} has been deleted.") - expect(page).to have_current_path("/sales-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") + expect(page).to have_current_path("/sales-logs/#{duplicate_log.id}/duplicate-logs?organisation_id=&original_log_id=#{sales_log.id}&referrer=") expect(page).not_to have_content("These logs are duplicates") expect(page).not_to have_link("Keep this log and delete duplicates") expect(page).to have_link("Back to sales logs", href: "/sales-logs") @@ -249,8 +249,8 @@ RSpec.describe "Sales Log Features" do expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") click_link("Change", href: "/sales-logs/#{duplicate_log.id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") fill_in("sales-log-purchid-field", with: "something else") - click_button("Save and continue") - expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") + click_button("Save changes") + expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{duplicate_log.id} is no longer a duplicate and has been removed from the list") @@ -260,8 +260,8 @@ RSpec.describe "Sales Log Features" do it "allows deduplicating logs by changing the answers on the original log" do click_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") fill_in("sales-log-purchid-field", with: "something else") - click_button("Save and continue") - expect(page).to have_current_path("/sales-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") + click_button("Save changes") + expect(page).to have_current_path("/sales-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&referrer=duplicate_logs") expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") expect(page).to have_content("Log #{sales_log.id} is no longer a duplicate and has been removed from the list") diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb index b293171d6..d7a9609f8 100644 --- a/spec/features/schemes_spec.rb +++ b/spec/features/schemes_spec.rb @@ -68,7 +68,7 @@ RSpec.describe "Schemes scheme Features" do context "when no filters are selected" do it "displays the filters component with no clear button" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=schemes") end end @@ -81,7 +81,7 @@ RSpec.describe "Schemes scheme Features" do it "displays the filters component with a correct count and clear button" do expect(page).to have_content("2 filters applied") - expect(page).to have_content("Clear") + expect(page).to have_link("Clear", href: "/clear-filters?filter_type=schemes") end context "when clearing the filters" do @@ -91,7 +91,7 @@ RSpec.describe "Schemes scheme Features" do it "clears the filters and displays the filter component as before" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=schemes") end end end @@ -292,7 +292,7 @@ RSpec.describe "Schemes scheme Features" do context "when no filters are selected" do it "displays the filters component with no clear button" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: /\/clear-filters\?filter_type=scheme_locations/) end end @@ -305,7 +305,7 @@ RSpec.describe "Schemes scheme Features" do it "displays the filters component with a correct count and clear button" do expect(page).to have_content("2 filters applied") - expect(page).to have_content("Clear") + expect(page).to have_link("Clear", href: /\/clear-filters\?filter_type=scheme_locations/) end context "when clearing the filters" do @@ -315,7 +315,7 @@ RSpec.describe "Schemes scheme Features" do it "clears the filters and displays the filter component as before" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: /\/clear-filters\?filter_type=scheme_locations/) end end end @@ -572,7 +572,7 @@ RSpec.describe "Schemes scheme Features" do it "displays information about a single location" do expect(page).to have_content "Locations" - expect(page).to have_content "#{scheme.locations.count} total location" + expect(page).to have_content "#{scheme.locations.count} matching location" end it "displays information about the first created location" do @@ -585,7 +585,7 @@ RSpec.describe "Schemes scheme Features" do fill_in_and_save_second_location click_button "Save and return to locations" expect(page).to have_content "Locations" - expect(page).to have_content "#{scheme.locations.count} total location" + expect(page).to have_content "#{scheme.locations.count} matching location" end it "displays information about newly created location" do diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb index b3ee773d1..ca4e01ac6 100644 --- a/spec/features/user_spec.rb +++ b/spec/features/user_spec.rb @@ -139,6 +139,12 @@ RSpec.describe "User Features" do visit("/users/#{user.id}") expect(page).to have_content("Sign in to your account to submit CORE data") end + + it "does not show 'Sign in' link if maintenance mode is enabled" do + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + visit("/lettings-logs") + expect(page).not_to have_link("Sign in") + end end context "when the user is trying to log in with incorrect credentials" do @@ -233,7 +239,7 @@ RSpec.describe "User Features" do context "when no filters are selected" do it "displays the filters component with no clear button" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=users") end end @@ -246,7 +252,7 @@ RSpec.describe "User Features" do it "displays the filters component with a correct count and clear button" do expect(page).to have_content("2 filters applied") - expect(page).to have_content("Clear") + expect(page).to have_link("Clear", href: "/clear-filters?filter_type=users") end context "when clearing the filters" do @@ -256,7 +262,7 @@ RSpec.describe "User Features" do it "clears the filters and displays the filter component as before" do expect(page).to have_content("No filters applied") - expect(page).not_to have_content("Clear") + expect(page).not_to have_link("Clear", href: "/clear-filters?filter_type=users") end end end @@ -324,6 +330,13 @@ RSpec.describe "User Features" do expect(page).to have_selector('[data-qa="change-data-protection-officer"]') expect(page).to have_selector('[data-qa="change-key-contact"]') end + + it "does not show 'Your account' or 'Sign out' links if maintenance mode is enabled" do + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + visit("/lettings-logs") + expect(page).not_to have_link("Your account") + expect(page).not_to have_link("Sign out") + end end context "when adding a new user" do @@ -756,10 +769,10 @@ RSpec.describe "User Features" do expect(page).to have_field("owning-organisation-field", with: "") find("#owning-organisation-field").click.native.send_keys("F", "i", "l", "t", :down, :enter) click_button("Apply filters") - expect(page).to have_current_path("/lettings-logs?%5Byears%5D%5B%5D=&%5Bstatus%5D%5B%5D=&assigned_to=all&owning_organisation_select=specific_org&owning_organisation=#{parent_organisation.id}&managing_organisation_select=all") + expect(page).to have_current_path("/lettings-logs?%5Byears%5D%5B%5D=&%5Bstatus%5D%5B%5D=&%5Bneedstypes%5D%5B%5D=&assigned_to=all&owning_organisation_select=specific_org&owning_organisation=#{parent_organisation.id}&managing_organisation_select=all") choose("owning-organisation-select-all-field", allow_label_click: true) click_button("Apply filters") - expect(page).to have_current_path("/lettings-logs?%5Byears%5D%5B%5D=&%5Bstatus%5D%5B%5D=&assigned_to=all&owning_organisation_select=all&managing_organisation_select=all") + expect(page).to have_current_path("/lettings-logs?%5Byears%5D%5B%5D=&%5Bstatus%5D%5B%5D=&%5Bneedstypes%5D%5B%5D=&assigned_to=all&owning_organisation_select=all&managing_organisation_select=all") end end end diff --git a/spec/fixtures/exports/general_needs_log.xml b/spec/fixtures/exports/general_needs_log.xml index 27a995304..fe7985668 100644 --- a/spec/fixtures/exports/general_needs_log.xml +++ b/spec/fixtures/exports/general_needs_log.xml @@ -129,7 +129,7 @@ - + 2 4 diff --git a/spec/fixtures/exports/general_needs_log_23_24.xml b/spec/fixtures/exports/general_needs_log_23_24.xml index aa3ca758a..ab4871a94 100644 --- a/spec/fixtures/exports/general_needs_log_23_24.xml +++ b/spec/fixtures/exports/general_needs_log_23_24.xml @@ -129,7 +129,7 @@ - + 2 3 diff --git a/spec/fixtures/exports/supported_housing_logs.xml b/spec/fixtures/exports/supported_housing_logs.xml index 0f7065b62..c05f2c76a 100644 --- a/spec/fixtures/exports/supported_housing_logs.xml +++ b/spec/fixtures/exports/supported_housing_logs.xml @@ -128,7 +128,7 @@ - + 2 1 4 diff --git a/spec/fixtures/files/lettings_log_csv_export_codes.csv b/spec/fixtures/files/lettings_log_csv_export_codes.csv index 1a6292a3b..54ac02412 100644 --- a/spec/fixtures/files/lettings_log_csv_export_codes.csv +++ b/spec/fixtures/files/lettings_log_csv_export_codes.csv @@ -1,2 +1,2 @@ id,status,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,old_id,old_form_id,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,rent_type_detail,irproduct,irproduct_other,lar,tenancycode,propcode,uprn_known,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sex1,ethnic_group,ethnic,national,ecstat1,details_known_2,relat2,age2,sex2,ecstat2,details_known_3,relat3,age3,sex3,ecstat3,details_known_4,relat4,age4,sex4,ecstat4,details_known_5,relat5,age5,sex5,ecstat5,details_known_6,relat6,age6,sex6,ecstat6,details_known_7,relat7,age7,sex7,ecstat7,details_known_8,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,new_old,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_unknown,referral,referral_value_check,net_income_known,incref,earnings,incfreq,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate -,completed,s.port@jeemayle.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,1,,,2023,DLUHC,DLUHC,1,7,0,2023-06-26,2,1,,,,HIJKLMN,ABCDEFG,0,,,fake address,,London,,NW9 5LL,false,Barnet,E09000003,0,2,6,2,2,7,1,1,3,2023-06-24,,,1,2023-06-25,,3,1,4,,2,,1,4,,1,4,0,0,2,35,,F,0,2,13,0,0,P,32,M,6,1,R,-9,R,10,0,R,-9,R,10,,,,,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,2,1,0,TN23 6LZ,1,false,Ashford,E07000105,1,0,1,0,0,0,0,0,1,,2,,0,0,68,1,,6,1,1,,0,2,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,1,0,12.0,6.0,,,,,,,,,,,,,,,,,,,, +,completed,s.port@jeemayle.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,1,,,2023,DLUHC,DLUHC,1,7,0,2023-06-26,2,1,,,2,HIJKLMN,ABCDEFG,0,,,fake address,,London,,NW9 5LL,false,Barnet,E09000003,0,2,6,2,2,7,1,1,3,2023-06-24,,,1,2023-06-25,,3,1,4,,2,,1,4,,1,4,0,0,2,35,,F,0,2,13,0,0,P,32,M,6,1,R,-9,R,10,0,R,-9,R,10,,,,,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,2,1,0,TN23 6LZ,1,false,Ashford,E07000105,1,0,1,0,0,0,0,0,1,,2,,0,0,68,1,,6,1,1,,0,2,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,1,0,12.0,6.0,,,,,,,,,,,,,,,,,,,, diff --git a/spec/fixtures/files/lettings_log_csv_export_labels.csv b/spec/fixtures/files/lettings_log_csv_export_labels.csv index fd93b4015..8d9a2d240 100644 --- a/spec/fixtures/files/lettings_log_csv_export_labels.csv +++ b/spec/fixtures/files/lettings_log_csv_export_labels.csv @@ -1,2 +1,2 @@ id,status,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,old_id,old_form_id,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,rent_type_detail,irproduct,irproduct_other,lar,tenancycode,propcode,uprn_known,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sex1,ethnic_group,ethnic,national,ecstat1,details_known_2,relat2,age2,sex2,ecstat2,details_known_3,relat3,age3,sex3,ecstat3,details_known_4,relat4,age4,sex4,ecstat4,details_known_5,relat5,age5,sex5,ecstat5,details_known_6,relat6,age6,sex6,ecstat6,details_known_7,relat7,age7,sex7,ecstat7,details_known_8,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,new_old,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_unknown,referral,referral_value_check,net_income_known,incref,earnings,incfreq,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate -,completed,s.port@jeemayle.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,single log,,,2023,DLUHC,DLUHC,General needs,7,No,2023-06-26,2,Affordable Rent,,,,HIJKLMN,ABCDEFG,No,,,fake address,,London,,NW9 5LL,No,Barnet,E09000003,No,Affordable rent basis,Tenant abandoned property,2,2,House,Purpose built,Yes,3,2023-06-24,,,Yes,2023-06-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,1,4,,1,4,0,0,2,35,,Female,White,Irish,Tenant prefers not to say,Other,Yes,Partner,32,Male,Not seeking work,No,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Yes,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,1,0,0,0,0,0,No,Yes,0,0,1,0,0,0,0,0,0,0,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,2,No,Yes,TN23 6LZ,Yes,No,Ashford,E07000105,Yes,0,1,0,0,0,0,0,1,,Tenant applied directly (no referral or nomination),,Yes,0,68,Weekly,,Universal Credit housing element,1,All,,0,Every 2 weeks,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,Yes,Yes,12.0,6.0,,,,,,,,,,,,,,,,,,,, +,completed,s.port@jeemayle.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,single log,,,2023,DLUHC,DLUHC,General needs,7,No,2023-06-26,2,Affordable Rent,,,2,HIJKLMN,ABCDEFG,No,,,fake address,,London,,NW9 5LL,No,Barnet,E09000003,No,Affordable rent basis,Tenant abandoned property,2,2,House,Purpose built,Yes,3,2023-06-24,,,Yes,2023-06-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,1,4,,1,4,0,0,2,35,,Female,White,Irish,Tenant prefers not to say,Other,Yes,Partner,32,Male,Not seeking work,No,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Yes,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,1,0,0,0,0,0,No,Yes,0,0,1,0,0,0,0,0,0,0,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,2,No,Yes,TN23 6LZ,Yes,No,Ashford,E07000105,Yes,0,1,0,0,0,0,0,1,,Tenant applied directly (no referral or nomination),,Yes,0,68,Weekly,,Universal Credit housing element,1,All,,0,Every 2 weeks,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,Yes,Yes,12.0,6.0,,,,,,,,,,,,,,,,,,,, diff --git a/spec/fixtures/files/lettings_log_csv_export_non_support_codes.csv b/spec/fixtures/files/lettings_log_csv_export_non_support_codes.csv index 20629ded7..5e47f5fe8 100644 --- a/spec/fixtures/files/lettings_log_csv_export_non_support_codes.csv +++ b/spec/fixtures/files/lettings_log_csv_export_non_support_codes.csv @@ -1,2 +1,2 @@ id,status,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,owning_organisation_name,managing_organisation_name,lettype,renewal,startdate,irproduct,irproduct_other,lar,tenancycode,propcode,uprn_known,uprn,address_line1,address_line2,town_or_city,county,postcode_full,la_label,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,refused,age1,sex1,ethnic_group,ethnic,national,ecstat1,relat2,age2,sex2,ecstat2,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,relat7,age7,sex7,ecstat7,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,homeless,ppcodenk,ppostcode_full,prevloc_label,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,referral,referral_value_check,incref,earnings,incfreq,hb,has_benefits,benefits,household_charge,nocharge,period,chcharge,wchchrg,carehome_charges_value_check,brent,scharge,pscharge,supcharg,tcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate -,completed,choreographer@owtluk.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,1,2023,DLUHC,DLUHC,7,0,2023-06-26,,,,HIJKLMN,ABCDEFG,0,,fake address,,London,,NW9 5LL,Barnet,2,6,2,2,7,1,1,3,2023-06-24,1,,1,2023-06-25,,3,1,4,,2,,1,1,35,F,0,2,13,0,P,32,M,6,R,-9,R,10,R,-9,R,10,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,1,0,TN23 6LZ,Ashford,1,0,1,0,0,0,0,0,1,2,,0,68,1,6,1,1,,0,2,,,,200.0,50.0,40.0,35.0,325.0,,,,1,12.0,,,,,,,,,,,,,,,,,,,, +,completed,choreographer@owtluk.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,1,2023,DLUHC,DLUHC,7,0,2023-06-26,,,2,HIJKLMN,ABCDEFG,0,,fake address,,London,,NW9 5LL,Barnet,2,6,2,2,7,1,1,3,2023-06-24,1,,1,2023-06-25,,3,1,4,,2,,1,1,35,F,0,2,13,0,P,32,M,6,R,-9,R,10,R,-9,R,10,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,1,0,TN23 6LZ,Ashford,1,0,1,0,0,0,0,0,1,2,,0,68,1,6,1,1,,0,2,,,,200.0,50.0,40.0,35.0,325.0,,,,1,12.0,,,,,,,,,,,,,,,,,,,, diff --git a/spec/fixtures/files/lettings_log_csv_export_non_support_labels.csv b/spec/fixtures/files/lettings_log_csv_export_non_support_labels.csv index 5fd2c3cf1..57e395cd1 100644 --- a/spec/fixtures/files/lettings_log_csv_export_non_support_labels.csv +++ b/spec/fixtures/files/lettings_log_csv_export_non_support_labels.csv @@ -1,2 +1,2 @@ id,status,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,owning_organisation_name,managing_organisation_name,lettype,renewal,startdate,irproduct,irproduct_other,lar,tenancycode,propcode,uprn_known,uprn,address_line1,address_line2,town_or_city,county,postcode_full,la_label,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,refused,age1,sex1,ethnic_group,ethnic,national,ecstat1,relat2,age2,sex2,ecstat2,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,relat7,age7,sex7,ecstat7,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,homeless,ppcodenk,ppostcode_full,prevloc_label,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,referral,referral_value_check,incref,earnings,incfreq,hb,has_benefits,benefits,household_charge,nocharge,period,chcharge,wchchrg,carehome_charges_value_check,brent,scharge,pscharge,supcharg,tcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate -,completed,choreographer@owtluk.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,single log,2023,DLUHC,DLUHC,7,No,2023-06-26,,,,HIJKLMN,ABCDEFG,No,,fake address,,London,,NW9 5LL,Barnet,Affordable rent basis,Tenant abandoned property,2,2,House,Purpose built,Yes,3,2023-06-24,1,,Yes,2023-06-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,1,1,35,Female,White,Irish,Tenant prefers not to say,Other,Partner,32,Male,Not seeking work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,1,0,0,0,0,0,No,Yes,0,0,1,0,0,0,0,0,0,0,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,No,Yes,TN23 6LZ,Ashford,Yes,0,1,0,0,0,0,0,1,Tenant applied directly (no referral or nomination),,0,68,Weekly,Universal Credit housing element,1,All,,0,Every 2 weeks,,,,200.0,50.0,40.0,35.0,325.0,,,,Yes,12.0,,,,,,,,,,,,,,,,,,,, +,completed,choreographer@owtluk.com,false,2023-06-26T00:00:00+01:00,,2023-06-26T00:00:00+01:00,single log,2023,DLUHC,DLUHC,7,No,2023-06-26,,,2,HIJKLMN,ABCDEFG,No,,fake address,,London,,NW9 5LL,Barnet,Affordable rent basis,Tenant abandoned property,2,2,House,Purpose built,Yes,3,2023-06-24,1,,Yes,2023-06-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,1,1,35,Female,White,Irish,Tenant prefers not to say,Other,Partner,32,Male,Not seeking work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,1,0,0,0,0,0,No,Yes,0,0,1,0,0,0,0,0,0,0,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,No,Yes,TN23 6LZ,Ashford,Yes,0,1,0,0,0,0,0,1,Tenant applied directly (no referral or nomination),,0,68,Weekly,Universal Credit housing element,1,All,,0,Every 2 weeks,,,,200.0,50.0,40.0,35.0,325.0,,,,Yes,12.0,,,,,,,,,,,,,,,,,,,, diff --git a/spec/lib/tasks/correct_address_from_csv_spec.rb b/spec/lib/tasks/correct_address_from_csv_spec.rb index 294ce535b..fca5b79fb 100644 --- a/spec/lib/tasks/correct_address_from_csv_spec.rb +++ b/spec/lib/tasks/correct_address_from_csv_spec.rb @@ -91,11 +91,11 @@ RSpec.describe "data_import" do before do allow(storage_service).to receive(:get_file_io) .with("addresses_reimport_123.csv") - .and_return(replace_entity_ids(lettings_log, lettings_logs[0], lettings_logs[1], lettings_logs[2], File.open("./spec/fixtures/files/addresses_reimport.csv").read)) + .and_return(StringIO.new(replace_entity_ids(lettings_log, lettings_logs[0], lettings_logs[1], lettings_logs[2], File.open("./spec/fixtures/files/addresses_reimport.csv").read))) allow(storage_service).to receive(:get_file_io) .with("all_addresses_reimport_123.csv") - .and_return(replace_entity_ids(lettings_log, lettings_logs[0], lettings_logs[1], lettings_logs[2], File.open("./spec/fixtures/files/addresses_reimport_all_logs.csv").read)) + .and_return(StringIO.new(replace_entity_ids(lettings_log, lettings_logs[0], lettings_logs[1], lettings_logs[2], File.open("./spec/fixtures/files/addresses_reimport_all_logs.csv").read))) end context "when the file contains issue type column" do @@ -184,6 +184,14 @@ RSpec.describe "data_import" do it "raises an error when no path is given" do expect { task.invoke(nil) }.to raise_error(RuntimeError, "Usage: rake data_import:import_lettings_addresses_from_csv['csv_file_name']") end + + it "logs an error if a validation fails" do + lettings_log.ppcodenk = 0 + lettings_log.ppostcode_full = "invalid_format" + lettings_log.save!(validate: false) + expect(Rails.logger).to receive(:error).with(/Validation failed for lettings log with ID #{lettings_log.id}: Ppostcode full/) + task.invoke(addresses_csv_path) + end end context "when the file does not contain issue type column" do @@ -272,6 +280,14 @@ RSpec.describe "data_import" do it "raises an error when no path is given" do expect { task.invoke(nil) }.to raise_error(RuntimeError, "Usage: rake data_import:import_lettings_addresses_from_csv['csv_file_name']") end + + it "logs an error if a validation fails" do + lettings_log.ppcodenk = 0 + lettings_log.ppostcode_full = "invalid_format" + lettings_log.save!(validate: false) + expect(Rails.logger).to receive(:error).with(/Validation failed for lettings log with ID #{lettings_log.id}: Ppostcode full/) + task.invoke(addresses_csv_path) + end end end end @@ -312,11 +328,11 @@ RSpec.describe "data_import" do before do allow(storage_service).to receive(:get_file_io) .with("addresses_reimport_123.csv") - .and_return(replace_entity_ids(sales_log, sales_logs[0], sales_logs[1], sales_logs[2], File.open("./spec/fixtures/files/sales_addresses_reimport.csv").read)) + .and_return(StringIO.new(replace_entity_ids(sales_log, sales_logs[0], sales_logs[1], sales_logs[2], File.open("./spec/fixtures/files/sales_addresses_reimport.csv").read))) allow(storage_service).to receive(:get_file_io) .with("all_addresses_reimport_123.csv") - .and_return(replace_entity_ids(sales_log, sales_logs[0], sales_logs[1], sales_logs[2], File.open("./spec/fixtures/files/sales_addresses_reimport_all_logs.csv").read)) + .and_return(StringIO.new(replace_entity_ids(sales_log, sales_logs[0], sales_logs[1], sales_logs[2], File.open("./spec/fixtures/files/sales_addresses_reimport_all_logs.csv").read))) end context "when the file contains issue type column" do @@ -405,6 +421,14 @@ RSpec.describe "data_import" do it "raises an error when no path is given" do expect { task.invoke(nil) }.to raise_error(RuntimeError, "Usage: rake data_import:import_sales_addresses_from_csv['csv_file_name']") end + + it "logs an error if a validation fails" do + sales_log.ppcodenk = 0 + sales_log.ppostcode_full = "invalid_format" + sales_log.save!(validate: false) + expect(Rails.logger).to receive(:error).with(/Validation failed for sales log with ID #{sales_log.id}: Ppostcode full/) + task.invoke(addresses_csv_path) + end end context "when the file does not contain issue type column" do @@ -493,6 +517,14 @@ RSpec.describe "data_import" do it "raises an error when no path is given" do expect { task.invoke(nil) }.to raise_error(RuntimeError, "Usage: rake data_import:import_sales_addresses_from_csv['csv_file_name']") end + + it "logs an error if a validation fails" do + sales_log.ppcodenk = 0 + sales_log.ppostcode_full = "invalid_format" + sales_log.save!(validate: false) + expect(Rails.logger).to receive(:error).with(/Validation failed for sales log with ID #{sales_log.id}: Ppostcode full/) + task.invoke(addresses_csv_path) + end end end end diff --git a/spec/lib/tasks/correct_illness_from_csv_spec.rb b/spec/lib/tasks/correct_illness_from_csv_spec.rb index ef7e82a65..e7b9f3c72 100644 --- a/spec/lib/tasks/correct_illness_from_csv_spec.rb +++ b/spec/lib/tasks/correct_illness_from_csv_spec.rb @@ -96,7 +96,7 @@ RSpec.describe "correct_illness" do before do allow(storage_service).to receive(:get_file_io) .with("illness_123.csv") - .and_return(replace_entity_ids(lettings_log, second_lettings_log, third_lettings_log, File.open("./spec/fixtures/files/illness_update.csv").read)) + .and_return(StringIO.new(replace_entity_ids(lettings_log, second_lettings_log, third_lettings_log, File.open("./spec/fixtures/files/illness_update.csv").read))) end it "sets illness to yes and sets correct illness type" do diff --git a/spec/lib/tasks/merge_organisations_spec.rb b/spec/lib/tasks/merge_organisations_spec.rb index 4155a4389..d78b3d32e 100644 --- a/spec/lib/tasks/merge_organisations_spec.rb +++ b/spec/lib/tasks/merge_organisations_spec.rb @@ -20,22 +20,79 @@ RSpec.describe "emails" do context "when the rake task is run" do it "raises an error when no parameters are given" do - expect { task.invoke(nil) }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids]") + expect { task.invoke(nil) }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids, merge_date]") end it "raises an error when only absorbing organisation is given" do - expect { task.invoke(1, nil) }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids]") + expect { task.invoke(1, nil) }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids, merge_date]") end it "raises an error when only merging organisations are given" do - expect { task.invoke(nil, "1 2") }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids]") + expect { task.invoke(nil, "1 2") }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids, merge_date]") end - it "raises runs the service with correct organisation IDs" do - expect(Merge::MergeOrganisationsService).to receive(:new).with(absorbing_organisation_id: 1, merging_organisation_ids: [2, 3]).once + it "raises an error when the merge date given is not valid" do + expect { task.invoke("3", "1 2", "invalid_date") }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations[absorbing_organisation_id, merging_organisation_ids, merge_date]. Merge date must be in format YYYY-MM-DD") + end + + it "runs the service with correct organisation IDs" do + expect(Merge::MergeOrganisationsService).to receive(:new).with(absorbing_organisation_id: 1, merging_organisation_ids: [2, 3], merge_date: nil).once + expect(merge_organisations_service).to receive(:call).once + task.invoke(1, "2 3") + end + + it "runs the service with correct date when date is given" do + expect(Merge::MergeOrganisationsService).to receive(:new).with(absorbing_organisation_id: 1, merging_organisation_ids: [2, 3], merge_date: Time.zone.local(2021, 1, 13)).once + expect(merge_organisations_service).to receive(:call).once + task.invoke(1, "2 3", "2021-01-13") + end + end + end + + describe ":merge_organisations_into_new_organisation", type: :task do + subject(:task) { Rake::Task["merge:merge_organisations_into_new_organisation"] } + + let(:organisation) { create(:organisation) } + let(:merging_organisation) { create(:organisation) } + + let(:merge_organisations_service) { Merge::MergeOrganisationsService.new(absorbing_organisation_id: organisation.id, merging_organisation_ids: [merging_organisation.id]) } + + before do + allow(Merge::MergeOrganisationsService).to receive(:new).and_return(merge_organisations_service) + allow(merge_organisations_service).to receive(:call).and_return(nil) + Rake.application.rake_require("tasks/merge_organisations") + Rake::Task.define_task(:environment) + task.reenable + end + + context "when the rake task is run" do + it "raises an error when no parameters are given" do + expect { task.invoke(nil) }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations_into_new_organisation[absorbing_organisation_id, merging_organisation_ids, merge_date]") + end + + it "raises an error when only absorbing organisation is given" do + expect { task.invoke(1, nil) }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations_into_new_organisation[absorbing_organisation_id, merging_organisation_ids, merge_date]") + end + + it "raises an error when only merging organisations are given" do + expect { task.invoke(nil, "1 2") }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations_into_new_organisation[absorbing_organisation_id, merging_organisation_ids, merge_date]") + end + + it "raises an error when the merge date given is not valid" do + expect { task.invoke("3", "1 2", "invalid_date") }.to raise_error(RuntimeError, "Usage: rake merge:merge_organisations_into_new_organisation[absorbing_organisation_id, merging_organisation_ids, merge_date]. Merge date must be in format YYYY-MM-DD") + end + + it "runs the service with correct organisation IDs" do + expect(Merge::MergeOrganisationsService).to receive(:new).with(absorbing_organisation_id: 1, merging_organisation_ids: [2, 3], merge_date: nil, absorbing_organisation_active_from_merge_date: true).once expect(merge_organisations_service).to receive(:call).once task.invoke(1, "2 3") end + + it "runs the service with correct date when date is given" do + expect(Merge::MergeOrganisationsService).to receive(:new).with(absorbing_organisation_id: 1, merging_organisation_ids: [2, 3], merge_date: Time.zone.local(2021, 1, 13), absorbing_organisation_active_from_merge_date: true).once + expect(merge_organisations_service).to receive(:call).once + task.invoke(1, "2 3", "2021-01-13") + end end end end diff --git a/spec/lib/tasks/recalculate_irproduct_values_spec.rb b/spec/lib/tasks/recalculate_irproduct_values_spec.rb new file mode 100644 index 000000000..957496fa0 --- /dev/null +++ b/spec/lib/tasks/recalculate_irproduct_values_spec.rb @@ -0,0 +1,132 @@ +require "rails_helper" +require "rake" + +RSpec.describe "recalculate_irproduct_values" do + describe ":recalculate_irproduct_values", type: :task do + subject(:task) { Rake::Task["recalculate_irproduct_values"] } + + before do + Rake.application.rake_require("tasks/recalculate_irproduct_values") + Rake::Task.define_task(:environment) + task.reenable + end + + context "when the rake task is run" do + let!(:lettings_log) { create(:lettings_log, :completed, values_updated_at: nil) } + + it "updates irproduct to nil if it's set to 1 but rent type is not 3, 4 or 5" do + lettings_log.irproduct = 1 + lettings_log.rent_type = 2 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(nil) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to nil if it's set to 2 but rent type is not 3, 4 or 5" do + lettings_log.irproduct = 2 + lettings_log.rent_type = 2 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(nil) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to nil if it's set to 3 but rent type is not 3, 4 or 5" do + lettings_log.irproduct = 3 + lettings_log.rent_type = 2 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(nil) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to 1 if it's set to nil but rent type is 3" do + lettings_log.irproduct = nil + lettings_log.rent_type = 3 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(1) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to 1 if it's set to something else but rent type is 3" do + lettings_log.irproduct = 2 + lettings_log.rent_type = 3 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(1) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to 2 if it's set to nil but rent type is 4" do + lettings_log.irproduct = nil + lettings_log.rent_type = 4 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(2) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to 2 if it's set to something else but rent type is 4" do + lettings_log.irproduct = 1 + lettings_log.rent_type = 4 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(2) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to 3 if it's set to nil but rent type is 5" do + lettings_log.irproduct = nil + lettings_log.rent_type = 5 + lettings_log.irproduct_other = "other" + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(3) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates irproduct to 3 if it's set to something else but rent type is 5" do + lettings_log.irproduct = 2 + lettings_log.rent_type = 5 + lettings_log.irproduct_other = "other" + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(3) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "does not update irproduct if rent_type is not 3, 4 or 5 and irproduct is nil" do + lettings_log.irproduct = nil + lettings_log.rent_type = 2 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(nil) + expect(lettings_log.values_updated_at).to be_nil + end + + it "does not update irproduct if a different validation is triggering" do + lettings_log.irproduct = 2 + lettings_log.rent_type = 5 + lettings_log.postcode_full = "invalid" + lettings_log.save!(validate: false) + expect(Rails.logger).to receive(:info).with("Could not update irproduct for LettingsLog #{lettings_log.id}") + task.invoke + lettings_log.reload + expect(lettings_log.irproduct).to eq(2) + expect(lettings_log.values_updated_at).to be_nil + end + end + end +end diff --git a/spec/lib/tasks/recalculate_lar_values_spec.rb b/spec/lib/tasks/recalculate_lar_values_spec.rb new file mode 100644 index 000000000..7831e34d2 --- /dev/null +++ b/spec/lib/tasks/recalculate_lar_values_spec.rb @@ -0,0 +1,100 @@ +require "rails_helper" +require "rake" + +RSpec.describe "recalculate_lar_values" do + describe ":recalculate_lar_values", type: :task do + subject(:task) { Rake::Task["recalculate_lar_values"] } + + before do + Rake.application.rake_require("tasks/recalculate_lar_values") + Rake::Task.define_task(:environment) + task.reenable + end + + context "when the rake task is run" do + let!(:lettings_log) { create(:lettings_log, :completed, values_updated_at: nil) } + + it "updates lar to nil if it's not afordable rent or london afordable rent and lar is 1 but does not set it to export" do + lettings_log.lar = 1 + lettings_log.rent_type = 3 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(nil) + expect(lettings_log.values_updated_at).to be_nil + end + + it "updates lar to nil if it's not afordable rent or london afordable rent and lar is 2 but does not set it to export" do + lettings_log.lar = 2 + lettings_log.rent_type = 4 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(nil) + expect(lettings_log.values_updated_at).to be_nil + end + + it "does not update lar if it's not london afordable rent or affordable rent and lar is nil" do + lettings_log.lar = nil + lettings_log.rent_type = 3 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(nil) + expect(lettings_log.values_updated_at).to be_nil + end + + it "updates lar to 1 if it's london afordable rent and lar is currently nil" do + lettings_log.lar = nil + lettings_log.rent_type = 2 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(1) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates lar to 1 if it's london afordable rent and lar is currently 2" do + lettings_log.lar = 2 + lettings_log.rent_type = 2 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(1) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates lar to 2 if it's afordable rent and lar is currently nil" do + lettings_log.lar = nil + lettings_log.rent_type = 1 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(2) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "updates lar to 2 if it's afordable rent and lar is currently 1" do + lettings_log.lar = 1 + lettings_log.rent_type = 1 + lettings_log.save!(validate: false) + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(2) + expect(lettings_log.values_updated_at).not_to be_nil + end + + it "does not update lar if a different validation is triggering" do + lettings_log.lar = 1 + lettings_log.rent_type = 1 + lettings_log.postcode_full = "invalid" + lettings_log.save!(validate: false) + expect(Rails.logger).to receive(:info).with("Could not update lar for LettingsLog #{lettings_log.id}") + task.invoke + lettings_log.reload + expect(lettings_log.lar).to eq(1) + expect(lettings_log.values_updated_at).to be_nil + end + end + end +end diff --git a/spec/lib/tasks/send_missing_addresses_csv_spec.rb b/spec/lib/tasks/send_missing_addresses_csv_spec.rb index dab36f1ad..640faf374 100644 --- a/spec/lib/tasks/send_missing_addresses_csv_spec.rb +++ b/spec/lib/tasks/send_missing_addresses_csv_spec.rb @@ -2,6 +2,13 @@ require "rails_helper" require "rake" RSpec.describe "correct_addresses" do + around do |example| + Timecop.freeze(Time.zone.local(2023, 10, 10)) do + Singleton.__init__(FormHandler) + example.run + end + end + describe ":send_missing_addresses_lettings_csv", type: :task do subject(:task) { Rake::Task["correct_addresses:send_missing_addresses_lettings_csv"] } diff --git a/spec/lib/tasks/squish_names_spec.rb b/spec/lib/tasks/squish_names_spec.rb new file mode 100644 index 000000000..5b1fcb028 --- /dev/null +++ b/spec/lib/tasks/squish_names_spec.rb @@ -0,0 +1,65 @@ +require "rails_helper" +require "rake" + +RSpec.describe "squish_names" do + describe ":squish_names", type: :task do + subject(:task) { Rake::Task["squish_names"] } + + before do + Rake.application.rake_require("tasks/squish_names") + Rake::Task.define_task(:environment) + task.reenable + end + + context "when the rake task is run" do + let!(:scheme) { create(:scheme) } + let!(:location) { create(:location) } + let!(:user) { create(:user) } + let!(:organisation) { create(:organisation) } + + it "updates names with multiple spaces to only have one" do + scheme.service_name = "test test" + location.name = "test test test" + user.name = "test test" + organisation.name = "test test test" + + scheme.save!(validate: false) + location.save!(validate: false) + user.save!(validate: false) + organisation.save!(validate: false) + + task.invoke + scheme.reload + location.reload + user.reload + organisation.reload + expect(scheme.service_name).to eq("test test") + expect(location.name).to eq("test test test") + expect(user.name).to eq("test test") + expect(organisation.name).to eq("test test test") + end + + it "does not update names without multiple spaces" do + scheme.service_name = "test test" + location.name = "test test test" + user.name = "test test" + organisation.name = "test test test" + + scheme.save!(validate: false) + location.save!(validate: false) + user.save!(validate: false) + organisation.save!(validate: false) + + task.invoke + scheme.reload + location.reload + user.reload + organisation.reload + expect(scheme.service_name).to eq("test test") + expect(location.name).to eq("test test test") + expect(user.name).to eq("test test") + expect(organisation.name).to eq("test test test") + end + end + end +end diff --git a/spec/models/form/lettings/pages/address_spec.rb b/spec/models/form/lettings/pages/address_spec.rb index 276b5c756..71f61d2e8 100644 --- a/spec/models/form/lettings/pages/address_spec.rb +++ b/spec/models/form/lettings/pages/address_spec.rb @@ -35,14 +35,14 @@ RSpec.describe Form::Lettings::Pages::Address, type: :model do context "when uprn_known == nil" do let(:log) { create(:lettings_log, uprn_known: nil) } - it "returns false" do - expect(page.routed_to?(log)).to eq(false) + it "returns true" do + expect(page.routed_to?(log)).to eq(true) end end context "when uprn_confirmed != 1" do let(:log) do - create(:lettings_log, uprn_known: 1, uprn_confirmed: 0) + create(:lettings_log, uprn_known: 1, uprn: "12345", uprn_confirmed: 0) end it "returns true" do @@ -62,10 +62,10 @@ RSpec.describe Form::Lettings::Pages::Address, type: :model do context "when uprn_confirmed == 1 && uprn_known != 0" do let(:log) do - create(:lettings_log, uprn_known: 1, uprn_confirmed: 1, uprn: "123456789") + create(:lettings_log, uprn_known: 1, uprn: "12345", uprn_confirmed: 1) end - it "returns true" do + it "returns false" do expect(page.routed_to?(log)).to eq(false) end end diff --git a/spec/models/form/lettings/pages/location_spec.rb b/spec/models/form/lettings/pages/location_spec.rb index 659a4dd26..65bca4636 100644 --- a/spec/models/form/lettings/pages/location_spec.rb +++ b/spec/models/form/lettings/pages/location_spec.rb @@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Pages::Location, type: :model do end it "has the correct header" do - expect(page.header).to be_nil + expect(page.header).to eq("Location") end it "has the correct description" do diff --git a/spec/models/form/lettings/pages/max_rent_value_check_spec.rb b/spec/models/form/lettings/pages/max_rent_value_check_spec.rb index 4bbe3d18f..45caf16a3 100644 --- a/spec/models/form/lettings/pages/max_rent_value_check_spec.rb +++ b/spec/models/form/lettings/pages/max_rent_value_check_spec.rb @@ -32,6 +32,6 @@ RSpec.describe Form::Lettings::Pages::MaxRentValueCheck, type: :model do end it "has the correct interruption_screen_question_ids" do - expect(page.interruption_screen_question_ids).to eq(%w[brent startdate uprn postcode_full la beds rent_type needstype]) + expect(page.interruption_screen_question_ids).to eq(%w[brent period startdate uprn postcode_full la beds rent_type needstype]) end end diff --git a/spec/models/form/lettings/pages/min_rent_value_check_spec.rb b/spec/models/form/lettings/pages/min_rent_value_check_spec.rb index 613c907e9..2f953c4cb 100644 --- a/spec/models/form/lettings/pages/min_rent_value_check_spec.rb +++ b/spec/models/form/lettings/pages/min_rent_value_check_spec.rb @@ -41,6 +41,6 @@ RSpec.describe Form::Lettings::Pages::MinRentValueCheck, type: :model do end it "has the correct interruption_screen_question_ids" do - expect(page.interruption_screen_question_ids).to eq(%w[brent startdate uprn postcode_full la beds rent_type needstype]) + expect(page.interruption_screen_question_ids).to eq(%w[brent period startdate uprn postcode_full la beds rent_type needstype]) end end diff --git a/spec/models/form/lettings/questions/location_id_spec.rb b/spec/models/form/lettings/questions/location_id_spec.rb index f31e16806..0d3f8d1c8 100644 --- a/spec/models/form/lettings/questions/location_id_spec.rb +++ b/spec/models/form/lettings/questions/location_id_spec.rb @@ -151,4 +151,15 @@ RSpec.describe Form::Lettings::Questions::LocationId, type: :model do expect(question.header).to eq("Which location is this letting for?") end end + + describe "partial guidance" do + it "shows shows correct top_guidance_partial" do + expect(question.top_guidance_partial).to eq("finding_location") + end + + it "is at the top" do + expect(question.top_guidance?).to eq(true) + expect(question.bottom_guidance?).to eq(false) + end + end end diff --git a/spec/models/form/lettings/questions/managing_organisation_spec.rb b/spec/models/form/lettings/questions/managing_organisation_spec.rb index 64bb84181..dcd142151 100644 --- a/spec/models/form/lettings/questions/managing_organisation_spec.rb +++ b/spec/models/form/lettings/questions/managing_organisation_spec.rb @@ -163,7 +163,7 @@ RSpec.describe Form::Lettings::Questions::ManagingOrganisation, type: :model do end context "when organisation has merged" do - let(:absorbing_org) { create(:organisation, name: "Absorbing org", holds_own_stock: true, created_at: Time.zone.local(2023, 8, 3)) } + let(:absorbing_org) { create(:organisation, name: "Absorbing org", holds_own_stock: true) } let!(:merged_org) { create(:organisation, name: "Merged org", holds_own_stock: false) } let(:user) { create(:user, :data_coordinator, organisation: absorbing_org) } @@ -173,6 +173,17 @@ RSpec.describe Form::Lettings::Questions::ManagingOrganisation, type: :model do end it "displays merged organisation on the list of choices" do + options = { + "" => "Select an option", + absorbing_org.id => "Absorbing org (Your organisation)", + merged_org.id => "Merged org (inactive as of 2 August 2023)", + merged_org.id => "Merged org (inactive as of 2 August 2023)", + } + expect(question.displayed_answer_options(log, user)).to eq(options) + end + + it "displays active date for absorbing organisation if available from is given" do + absorbing_org.update!(available_from: Time.zone.local(2023, 8, 3)) options = { "" => "Select an option", absorbing_org.id => "Absorbing org (Your organisation, active as of 3 August 2023)", @@ -189,7 +200,7 @@ RSpec.describe Form::Lettings::Questions::ManagingOrganisation, type: :model do options = { "" => "Select an option", merged_org.id => "Merged org (inactive as of 2 August 2023)", - absorbing_org.id => "Absorbing org (Your organisation, active as of 3 August 2023)", + absorbing_org.id => "Absorbing org (Your organisation)", managing_agent.id => "Managing org 1", } diff --git a/spec/models/form/lettings/questions/stock_owner_spec.rb b/spec/models/form/lettings/questions/stock_owner_spec.rb index ed05c5139..6957a293a 100644 --- a/spec/models/form/lettings/questions/stock_owner_spec.rb +++ b/spec/models/form/lettings/questions/stock_owner_spec.rb @@ -100,6 +100,93 @@ RSpec.describe Form::Lettings::Questions::StockOwner, type: :model do expect(question.displayed_answer_options(log, user)).to eq(options) end end + + context "when user's org has recently absorbed other orgs and has available_from date" do + let(:merged_organisation) { create(:organisation, name: "Merged org") } + let(:options) do + { + "" => "Select an option", + user.organisation.id => "User org (Your organisation, active as of 2 February 2021)", + owning_org_2.id => "Owning org 2", + owning_org_1.id => "Owning org 1", + merged_organisation.id => "Merged org (inactive as of 2 February 2023)", + } + end + + before do + merged_organisation.update!(merge_date: Time.zone.local(2023, 2, 2), absorbing_organisation: user.organisation) + user.organisation.update!(available_from: Time.zone.local(2021, 2, 2)) + end + + it "shows merged organisation as an option" do + expect(question.displayed_answer_options(log, user)).to eq(options) + end + end + + context "when user's org has recently absorbed other orgs and does not have available from date" do + let(:merged_organisation) { create(:organisation, name: "Merged org") } + let(:options) do + { + "" => "Select an option", + user.organisation.id => "User org (Your organisation)", + owning_org_2.id => "Owning org 2", + owning_org_1.id => "Owning org 1", + merged_organisation.id => "Merged org (inactive as of 2 February 2023)", + } + end + + before do + merged_organisation.update!(merge_date: Time.zone.local(2023, 2, 2), absorbing_organisation: user.organisation) + end + + it "shows merged organisation as an option" do + expect(question.displayed_answer_options(log, user)).to eq(options) + end + end + + context "when user's org has recently absorbed other orgs with parent organisations" do + let(:merged_organisation) { create(:organisation, name: "Merged org") } + let(:options) do + { + "" => "Select an option", + user.organisation.id => "User org (Your organisation, active as of 2 February 2021)", + owning_org_1.id => "Owning org 1", + merged_organisation.id => "Merged org (inactive as of 2 February 2023)", + } + end + + before do + org_rel.update!(child_organisation: merged_organisation) + merged_organisation.update!(merge_date: Time.zone.local(2023, 2, 2), absorbing_organisation: user.organisation) + user.organisation.update!(available_from: Time.zone.local(2021, 2, 2)) + end + + it "does not show merged organisations stock owners as options" do + expect(question.displayed_answer_options(log, user)).to eq(options) + end + end + + context "when user's org has absorbed other orgs with parent organisations during closed collection periods" do + let(:merged_organisation) { create(:organisation, name: "Merged org") } + let(:options) do + { + "" => "Select an option", + user.organisation.id => "User org (Your organisation)", + owning_org_1.id => "Owning org 1", + } + end + + before do + Timecop.freeze(Time.zone.local(2023, 4, 2)) + org_rel.update!(child_organisation: merged_organisation) + merged_organisation.update!(merge_date: Time.zone.local(2021, 6, 2), absorbing_organisation: user.organisation) + user.organisation.update!(available_from: Time.zone.local(2021, 2, 2)) + end + + it "shows merged organisation as an option" do + expect(question.displayed_answer_options(log, user)).to eq(options) + end + end end context "when user is support" do diff --git a/spec/models/form/sales/pages/address_spec.rb b/spec/models/form/sales/pages/address_spec.rb index 165952cfb..9bdd5f432 100644 --- a/spec/models/form/sales/pages/address_spec.rb +++ b/spec/models/form/sales/pages/address_spec.rb @@ -35,8 +35,8 @@ RSpec.describe Form::Sales::Pages::Address, type: :model do context "when uprn_known == nil" do let(:log) { create(:sales_log, uprn_known: nil) } - it "returns false" do - expect(page.routed_to?(log)).to eq(false) + it "returns true" do + expect(page.routed_to?(log)).to eq(true) end end @@ -66,7 +66,7 @@ RSpec.describe Form::Sales::Pages::Address, type: :model do create(:sales_log, uprn_known: 1, uprn: "12345", uprn_confirmed: 1) end - it "returns true" do + it "returns false" do expect(page.routed_to?(log)).to eq(false) end end diff --git a/spec/models/form/sales/questions/owning_organisation_id_spec.rb b/spec/models/form/sales/questions/owning_organisation_id_spec.rb index 9cfefbf8b..c82508324 100644 --- a/spec/models/form/sales/questions/owning_organisation_id_spec.rb +++ b/spec/models/form/sales/questions/owning_organisation_id_spec.rb @@ -98,7 +98,7 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do let(:options) do { "" => "Select an option", - user.organisation.id => "User org (Your organisation, active as of 2 February 2021)", + user.organisation.id => "User org (Your organisation)", owning_org_1.id => "Owning org 1", merged_organisation.id => "Merged org (inactive as of 2 February 2023)", } @@ -106,7 +106,6 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do before do merged_organisation.update!(merge_date: Time.zone.local(2023, 2, 2), absorbing_organisation: user.organisation) - user.organisation.update!(created_at: Time.zone.local(2021, 2, 2)) end it "shows merged organisation as an option" do @@ -114,7 +113,7 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do end end - context "when user's org has recently absorbed other orgs with parent organisations" do + context "when user's org has recently absorbed other orgs and it has available from date" do let(:merged_organisation) { create(:organisation, name: "Merged org") } let(:options) do { @@ -125,10 +124,30 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do } end + before do + merged_organisation.update!(merge_date: Time.zone.local(2023, 2, 2), absorbing_organisation: user.organisation) + user.organisation.update!(available_from: Time.zone.local(2021, 2, 2)) + end + + it "shows available from date if it is given" do + expect(question.displayed_answer_options(log, user)).to eq(options) + end + end + + context "when user's org has recently absorbed other orgs with parent organisations" do + let(:merged_organisation) { create(:organisation, name: "Merged org") } + let(:options) do + { + "" => "Select an option", + user.organisation.id => "User org (Your organisation)", + owning_org_1.id => "Owning org 1", + merged_organisation.id => "Merged org (inactive as of 2 February 2023)", + } + end + before do org_rel.update!(child_organisation: merged_organisation) merged_organisation.update!(merge_date: Time.zone.local(2023, 2, 2), absorbing_organisation: user.organisation) - user.organisation.update!(created_at: Time.zone.local(2021, 2, 2)) end it "does not show merged organisations stock owners as options" do @@ -150,7 +169,7 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do Timecop.freeze(Time.zone.local(2023, 4, 2)) org_rel.update!(child_organisation: merged_organisation) merged_organisation.update!(merge_date: Time.zone.local(2021, 6, 2), absorbing_organisation: user.organisation) - user.organisation.update!(created_at: Time.zone.local(2021, 2, 2)) + user.organisation.update!(available_from: Time.zone.local(2021, 2, 2)) end it "shows merged organisation as an option" do diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb index 82cc254cb..6c4d9b1e0 100644 --- a/spec/models/lettings_log_spec.rb +++ b/spec/models/lettings_log_spec.rb @@ -2270,6 +2270,58 @@ RSpec.describe LettingsLog do expect(lettings_log["housingneeds_g"]).to eq(1) end end + + context "when saving rent_type" do + it "derives lar as yes (1) if rent_type is london affordable rent" do + lettings_log.update!({ rent_type: 2 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["lar"]).to eq(1) + end + + it "derives lar as no (2) if rent_type is affordable rent" do + lettings_log.update!({ rent_type: 1 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["lar"]).to eq(2) + end + + it "clears previously set lar if rent_type is not affordable rent" do + lettings_log.update!({ rent_type: 2 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["lar"]).to eq(1) + + lettings_log.update!({ rent_type: 3 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["lar"]).to eq(nil) + end + + it "derives irproduct as rent_to_buy (1) if rent_type is rent_to_buy (3)" do + lettings_log.update!({ rent_type: 3 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["irproduct"]).to eq(1) + end + + it "derives irproduct as london_living_rent (2) if rent_type is london_living_rent (4)" do + lettings_log.update!({ rent_type: 4 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["irproduct"]).to eq(2) + end + + it "derives irproduct as other_intermediate_rent_product (3) if rent_type is other_intermediate_rent_product (5)" do + lettings_log.update!({ rent_type: 5, irproduct_other: "other" }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["irproduct"]).to eq(3) + end + + it "clears previously set irproduct if rent_type is intermediate rent" do + lettings_log.update!({ rent_type: 4 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["irproduct"]).to eq(2) + + lettings_log.update!({ rent_type: 2 }) + record_from_db = described_class.find(lettings_log.id) + expect(record_from_db["irproduct"]).to eq(nil) + end + end end describe "optional fields" do diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb index 4425e1a6c..1b9edb9bf 100644 --- a/spec/models/location_spec.rb +++ b/spec/models/location_spec.rb @@ -930,6 +930,29 @@ RSpec.describe Location, type: :model do end end + describe "status_at" do + let(:location) { FactoryBot.build(:location, startdate: Time.zone.local(2022, 4, 1)) } + + before do + Timecop.freeze(2022, 6, 7) + end + + after do + Timecop.unfreeze + end + + context "when there have been previous deactivations" do + before do + FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 5, 4), reactivation_date: Time.zone.local(2022, 6, 5), location:) + location.save! + end + + it "returns active if the location has no relevant deactivation records" do + expect(location.status_at(Time.zone.local(2022, 4, 4))).to eq(:active) + end + end + end + describe "filter by status" do let!(:incomplete_location) { FactoryBot.create(:location, :incomplete, startdate: Time.zone.local(2022, 4, 1)) } let!(:incomplete_location_with_nil_confirmed) { FactoryBot.create(:location, :incomplete, startdate: Time.zone.local(2022, 4, 1), confirmed: nil) } diff --git a/spec/models/scheme_spec.rb b/spec/models/scheme_spec.rb index b63866675..70eccc5c2 100644 --- a/spec/models/scheme_spec.rb +++ b/spec/models/scheme_spec.rb @@ -290,6 +290,29 @@ RSpec.describe Scheme, type: :model do end end + describe "status_at" do + let(:scheme) { FactoryBot.build(:scheme) } + + before do + FactoryBot.create(:location, scheme:) + Timecop.freeze(2022, 6, 7) + end + + after do + Timecop.unfreeze + end + + context "when there have been previous deactivations" do + before do + FactoryBot.create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 6, 5), scheme:) + end + + it "returns active if the scheme has no relevant deactivation records" do + expect(scheme.status_at(Time.zone.local(2022, 5, 5))).to eq(:active) + end + end + end + describe "available_from" do context "when the scheme was created at the start of the 2022/23 collection window" do let(:scheme) { FactoryBot.build(:scheme, created_at: Time.zone.local(2022, 4, 6)) } diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 63ea72dca..c272320b2 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -163,7 +163,7 @@ RSpec.describe User, type: :model do end it "can filter lettings logs by user, year and status" do - expect(user.logs_filters).to eq(%w[status years assigned_to user bulk_upload_id]) + expect(user.logs_filters).to match_array(%w[years status needstypes assigned_to user bulk_upload_id]) end end @@ -173,7 +173,7 @@ RSpec.describe User, type: :model do end it "can filter lettings logs by user, year, status, managing_organisation and owning_organisation" do - expect(user.logs_filters).to match_array(%w[status years assigned_to user managing_organisation owning_organisation bulk_upload_id]) + expect(user.logs_filters).to match_array(%w[years status needstypes assigned_to user managing_organisation owning_organisation bulk_upload_id]) end end end @@ -214,7 +214,7 @@ RSpec.describe User, type: :model do end it "can filter lettings logs by user, year, status, managing_organisation and owning_organisation" do - expect(user.logs_filters).to match_array(%w[status years assigned_to user owning_organisation managing_organisation bulk_upload_id]) + expect(user.logs_filters).to match_array(%w[years status needstypes assigned_to user owning_organisation managing_organisation bulk_upload_id]) end end diff --git a/spec/models/validations/financial_validations_spec.rb b/spec/models/validations/financial_validations_spec.rb index 3e645f164..f419137a2 100644 --- a/spec/models/validations/financial_validations_spec.rb +++ b/spec/models/validations/financial_validations_spec.rb @@ -262,56 +262,74 @@ RSpec.describe Validations::FinancialValidations do before { record.needstype = 1 } [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 801 }, + charge_name: "service charge", + maximum_per_period: "£800.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 3471 }, + charge_name: "service charge", + maximum_per_period: "£3,466.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "scharge", value: 1601 }, + charge_name: "service charge", + maximum_per_period: "£1,600.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 701 }, + charge_name: "personal service charge", + maximum_per_period: "£700.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 3200 }, + charge_name: "personal service charge", + maximum_per_period: "£3,033.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "pscharge", value: 1401 }, + charge_name: "personal service charge", + maximum_per_period: "£1,400.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 801 }, + charge_name: "support charge", + maximum_per_period: "£800.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 3471 }, + charge_name: "support charge", + maximum_per_period: "£3,466.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "supcharg", value: 1601 }, + charge_name: "support charge", + maximum_per_period: "£1,600.00", }].each do |test_case| it "does not allow charges outside the range when period is #{test_case[:period][:label]}" do record.period = test_case[:period][:value] record[test_case[:charge][:field]] = test_case[:charge][:value] financial_validator.validate_rent_amount(record) expect(record.errors[test_case[:charge][:field]]) - .to include(match I18n.t("validations.financial.rent.#{test_case[:charge][:field]}.private_registered_provider.general_needs")) + .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "general needs", provider_type: "private registered provider")) end end [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 799 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 3400 }, }, { @@ -319,11 +337,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "scharge", value: 1599 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 699 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 2500 }, }, { @@ -331,11 +349,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "pscharge", value: 1399 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 799 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 3000 }, }, { @@ -356,56 +374,74 @@ RSpec.describe Validations::FinancialValidations do before { record.needstype = 2 } [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 801 }, + charge_name: "service charge", + maximum_per_period: "£800.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 3471 }, + charge_name: "service charge", + maximum_per_period: "£3,466.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "scharge", value: 1601 }, + charge_name: "service charge", + maximum_per_period: "£1,600.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 701 }, + charge_name: "personal service charge", + maximum_per_period: "£700.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 3200 }, + charge_name: "personal service charge", + maximum_per_period: "£3,033.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "pscharge", value: 1401 }, + charge_name: "personal service charge", + maximum_per_period: "£1,400.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 801 }, + charge_name: "support charge", + maximum_per_period: "£800.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 3471 }, + charge_name: "support charge", + maximum_per_period: "£3,466.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "supcharg", value: 1601 }, + charge_name: "support charge", + maximum_per_period: "£1,600.00", }].each do |test_case| it "does not allow charges outside the range when period is #{test_case[:period][:label]}" do record.period = test_case[:period][:value] record[test_case[:charge][:field]] = test_case[:charge][:value] financial_validator.validate_rent_amount(record) expect(record.errors[test_case[:charge][:field]]) - .to include(match I18n.t("validations.financial.rent.#{test_case[:charge][:field]}.private_registered_provider.supported_housing")) + .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "supported housing", provider_type: "private registered provider")) end end [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 799 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 3400 }, }, { @@ -413,11 +449,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "scharge", value: 1599 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 699 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 2500 }, }, { @@ -425,11 +461,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "pscharge", value: 1399 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 799 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 3400 }, }, { @@ -454,56 +490,74 @@ RSpec.describe Validations::FinancialValidations do before { record.needstype = 1 } [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 501 }, + charge_name: "service charge", + maximum_per_period: "£500.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 2300 }, + charge_name: "service charge", + maximum_per_period: "£2,166.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "scharge", value: 1001 }, + charge_name: "service charge", + maximum_per_period: "£1,000.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 201 }, + charge_name: "personal service charge", + maximum_per_period: "£200.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 1000 }, + charge_name: "personal service charge", + maximum_per_period: "£866.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "pscharge", value: 401 }, + charge_name: "personal service charge", + maximum_per_period: "£400.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 201 }, + charge_name: "support charge", + maximum_per_period: "£200.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 1000 }, + charge_name: "support charge", + maximum_per_period: "£866.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "supcharg", value: 401 }, + charge_name: "support charge", + maximum_per_period: "£400.00", }].each do |test_case| it "does not allow charges outside the range when period is #{test_case[:period][:label]}" do record.period = test_case[:period][:value] record[test_case[:charge][:field]] = test_case[:charge][:value] financial_validator.validate_rent_amount(record) expect(record.errors[test_case[:charge][:field]]) - .to include(match I18n.t("validations.financial.rent.#{test_case[:charge][:field]}.local_authority.general_needs")) + .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "general needs", provider_type: "local authority")) end end [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 499 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 2000 }, }, { @@ -511,11 +565,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "scharge", value: 999 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 199 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 800 }, }, { @@ -523,11 +577,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "pscharge", value: 399 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 199.99 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 800 }, }, { @@ -548,61 +602,79 @@ RSpec.describe Validations::FinancialValidations do before { record.needstype = 2 } [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 501 }, + charge_name: "service charge", + maximum_per_period: "£500.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 2300 }, + charge_name: "service charge", + maximum_per_period: "£2,166.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "scharge", value: 1001 }, + charge_name: "service charge", + maximum_per_period: "£1,000.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 201 }, + charge_name: "personal service charge", + maximum_per_period: "£200.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 1000 }, + charge_name: "personal service charge", + maximum_per_period: "£866.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "pscharge", value: 401 }, + charge_name: "personal service charge", + maximum_per_period: "£400.00", }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 201 }, + charge_name: "support charge", + maximum_per_period: "£200.00", }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 1000 }, + charge_name: "support charge", + maximum_per_period: "£866.00", }, { period: { label: "every 2 weeks", value: 2 }, charge: { field: "supcharg", value: 401 }, + charge_name: "support charge", + maximum_per_period: "£400.00", }].each do |test_case| it "does not allow charges outside the range when period is #{test_case[:period][:label]}" do record.period = test_case[:period][:value] record[test_case[:charge][:field]] = test_case[:charge][:value] financial_validator.validate_rent_amount(record) expect(record.errors[test_case[:charge][:field]]) - .to include(match I18n.t("validations.financial.rent.#{test_case[:charge][:field]}.local_authority.supported_housing")) + .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "supported housing", provider_type: "local authority")) end end context "when charges are not given" do [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: nil }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: nil }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: nil }, }].each do |test_case| it "does not error" do @@ -616,11 +688,11 @@ RSpec.describe Validations::FinancialValidations do end [{ - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "scharge", value: 499 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "scharge", value: 2000 }, }, { @@ -628,11 +700,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "scharge", value: 999 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "pscharge", value: 199 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "pscharge", value: 800 }, }, { @@ -640,11 +712,11 @@ RSpec.describe Validations::FinancialValidations do charge: { field: "pscharge", value: 399 }, }, { - period: { label: "weekly", value: 1 }, + period: { label: "weekly for 52 weeks", value: 1 }, charge: { field: "supcharg", value: 199.99 }, }, { - period: { label: "monthly", value: 4 }, + period: { label: "every calendar month", value: 4 }, charge: { field: "supcharg", value: 800 }, }, { diff --git a/spec/models/validations/sales/setup_validations_spec.rb b/spec/models/validations/sales/setup_validations_spec.rb index f7f01eaf7..526024ae3 100644 --- a/spec/models/validations/sales/setup_validations_spec.rb +++ b/spec/models/validations/sales/setup_validations_spec.rb @@ -188,7 +188,7 @@ RSpec.describe Validations::Sales::SetupValidations do describe "#validate_merged_organisations_saledate" do let(:record) { build(:sales_log) } - let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1), name: "Absorbing org") } + let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1), available_from: Time.zone.local(2023, 2, 1), name: "Absorbing org") } let(:merged_organisation) { create(:organisation, name: "Merged org") } around do |example| @@ -218,19 +218,27 @@ RSpec.describe Validations::Sales::SetupValidations do end context "and owning organisation is not yet active during the saledate" do - it "does not allow saledate before absorbing organisation has been created" do + it "does not allow saledate before absorbing organisation has become available" do record.saledate = Time.zone.local(2023, 1, 1) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_merged_organisations_saledate(record) expect(record.errors["saledate"]).to include(match "Enter a date when the owning organisation was active. Absorbing org became active on 1 February 2023.") end - it "allows saledate after absorbing organisation has been created" do + it "allows saledate after absorbing organisation has become available" do record.saledate = Time.zone.local(2023, 2, 2) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_merged_organisations_saledate(record) expect(record.errors["saledate"]).to be_empty end + + it "allows saledate if available from is not given" do + record.saledate = Time.zone.local(2023, 1, 1) + absorbing_organisation.update!(available_from: nil) + record.owning_organisation_id = absorbing_organisation.id + setup_validator.validate_merged_organisations_saledate(record) + expect(record.errors["saledate"]).to be_empty + end end end @@ -238,7 +246,7 @@ RSpec.describe Validations::Sales::SetupValidations do let(:record) { build(:sales_log) } context "when organisations are merged" do - let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1), name: "Absorbing org") } + let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1), available_from: Time.zone.local(2023, 2, 1), name: "Absorbing org") } let(:merged_organisation) { create(:organisation, name: "Merged org") } around do |example| @@ -265,19 +273,27 @@ RSpec.describe Validations::Sales::SetupValidations do end context "and owning organisation is not yet active during the saledate" do - it "does not allow absorbing organisation before it had been created" do + it "does not allow absorbing organisation before it has become available" do record.saledate = Time.zone.local(2023, 1, 1) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_organisation(record) expect(record.errors["owning_organisation_id"]).to include(match "The owning organisation must be active on the sale completion date. Absorbing org became active on 1 February 2023.") end - it "allows absorbing organisation after it has been created" do + it "allows absorbing organisation after it has become available" do record.saledate = Time.zone.local(2023, 2, 2) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_organisation(record) expect(record.errors["owning_organisation_id"]).to be_empty end + + it "allows absorbing organisation if available from is not given" do + record.saledate = Time.zone.local(2023, 1, 1) + absorbing_organisation.update!(available_from: nil) + record.owning_organisation_id = absorbing_organisation.id + setup_validator.validate_organisation(record) + expect(record.errors["owning_organisation_id"]).to be_empty + end end end end diff --git a/spec/models/validations/setup_validations_spec.rb b/spec/models/validations/setup_validations_spec.rb index 75b890b24..9228e2ee4 100644 --- a/spec/models/validations/setup_validations_spec.rb +++ b/spec/models/validations/setup_validations_spec.rb @@ -136,8 +136,8 @@ RSpec.describe Validations::SetupValidations do Timecop.return end - let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1, 4, 5, 6), name: "Absorbing org") } - let(:absorbing_organisation_2) { create(:organisation, created_at: Time.zone.local(2023, 2, 1), name: "Absorbing org 2") } + let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1, 4, 5, 6), available_from: Time.zone.local(2023, 2, 1, 4, 5, 6), name: "Absorbing org") } + let(:absorbing_organisation_2) { create(:organisation, created_at: Time.zone.local(2023, 2, 1), available_from: Time.zone.local(2023, 2, 1), name: "Absorbing org 2") } let(:merged_organisation) { create(:organisation, name: "Merged org") } let(:merged_organisation_2) { create(:organisation, name: "Merged org 2") } @@ -147,14 +147,14 @@ RSpec.describe Validations::SetupValidations do end context "and owning organisation is no longer active" do - it "does not allow startate after organisation has been merged" do + it "does not allow startdate after organisation has been merged" do record.startdate = Time.zone.local(2023, 3, 1) record.owning_organisation_id = merged_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to include(match "Enter a date when the owning organisation was active. Merged org became inactive on 2 February 2023 and was replaced by Absorbing org.") end - it "allows startate before organisation has been merged" do + it "allows startdate before organisation has been merged" do record.startdate = Time.zone.local(2023, 1, 1) record.owning_organisation_id = merged_organisation.id setup_validator.validate_startdate_setup(record) @@ -163,30 +163,38 @@ RSpec.describe Validations::SetupValidations do end context "and owning organisation is not yet active during the startdate" do - it "does not allow startate before absorbing organisation has been created" do + it "does not allow startdate before absorbing organisation has become available" do record.startdate = Time.zone.local(2023, 1, 1) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to include(match "Enter a date when the owning organisation was active. Absorbing org became active on 1 February 2023.") end - it "allows startate after absorbing organisation has been created" do + it "allows startdate after absorbing organisation has become available" do record.startdate = Time.zone.local(2023, 2, 2) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to be_empty end + + it "allows startdate if organisation does not have available from date" do + record.startdate = Time.zone.local(2023, 1, 1) + absorbing_organisation.update!(available_from: nil) + record.owning_organisation_id = absorbing_organisation.id + setup_validator.validate_startdate_setup(record) + expect(record.errors["startdate"]).to be_empty + end end context "and managing organisation is no longer active during the startdate" do - it "does not allow startate after organisation has been merged" do + it "does not allow startdate after organisation has been merged" do record.startdate = Time.zone.local(2023, 3, 1) record.managing_organisation_id = merged_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to include(match "Enter a date when the managing organisation was active. Merged org became inactive on 2 February 2023 and was replaced by Absorbing org.") end - it "allows startate before organisation has been merged" do + it "allows startdate before organisation has been merged" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = merged_organisation.id setup_validator.validate_startdate_setup(record) @@ -195,23 +203,31 @@ RSpec.describe Validations::SetupValidations do end context "and managing organisation is not yet active during the startdate" do - it "does not allow startate before absorbing organisation has been created" do + it "does not allow startdate before absorbing organisation has become available'" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = absorbing_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to include(match "Enter a date when the managing organisation was active. Absorbing org became active on 1 February 2023.") end - it "allows startate after absorbing organisation has been created" do + it "allows startdate after absorbing organisation has become available" do record.startdate = Time.zone.local(2023, 2, 2) record.managing_organisation_id = absorbing_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to be_empty end + + it "allows startdate if organisation does not have available from date" do + record.startdate = Time.zone.local(2023, 1, 1) + absorbing_organisation.update!(available_from: nil) + record.managing_organisation_id = absorbing_organisation.id + setup_validator.validate_startdate_setup(record) + expect(record.errors["startdate"]).to be_empty + end end context "and owning and managing organisation is no longer active during the startdate" do - it "does not allow startate after organisation has been merged" do + it "does not allow startdate after organisation has been merged" do record.startdate = Time.zone.local(2023, 3, 1) record.managing_organisation_id = merged_organisation.id record.owning_organisation_id = merged_organisation.id @@ -219,7 +235,7 @@ RSpec.describe Validations::SetupValidations do expect(record.errors["startdate"]).to include(match "Enter a date when the owning and managing organisation was active. Merged org became inactive on 2 February 2023 and was replaced by Absorbing org.") end - it "allows startate before organisation has been merged" do + it "allows startdate before organisation has been merged" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = merged_organisation.id record.owning_organisation_id = merged_organisation.id @@ -229,7 +245,7 @@ RSpec.describe Validations::SetupValidations do end context "and owning and managing organisation is not yet active during the startdate" do - it "does not allow startate before absorbing organisation has been created" do + it "does not allow startdate before absorbing organisation has become available" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = absorbing_organisation.id record.owning_organisation_id = absorbing_organisation.id @@ -237,17 +253,26 @@ RSpec.describe Validations::SetupValidations do expect(record.errors["startdate"]).to include(match "Enter a date when the owning and managing organisation was active. Absorbing org became active on 1 February 2023.") end - it "allows startate after absorbing organisation has been created" do + it "allows startdate after absorbing organisation has become available" do record.startdate = Time.zone.local(2023, 2, 1) record.managing_organisation_id = absorbing_organisation.id record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to be_empty end + + it "allows startdate if organisation does not have available from date" do + record.startdate = Time.zone.local(2023, 1, 1) + absorbing_organisation.update!(available_from: nil) + record.managing_organisation_id = absorbing_organisation.id + record.owning_organisation_id = absorbing_organisation.id + setup_validator.validate_startdate_setup(record) + expect(record.errors["startdate"]).to be_empty + end end context "and owning and managing organisations are no longer active during the startdate" do - it "does not allow startate after organisation have been merged" do + it "does not allow startdate after organisation have been merged" do record.startdate = Time.zone.local(2023, 2, 2) record.managing_organisation_id = merged_organisation.id record.owning_organisation_id = merged_organisation_2.id @@ -255,7 +280,7 @@ RSpec.describe Validations::SetupValidations do expect(record.errors["startdate"]).to include(match "Enter a date when the owning and managing organisations were active. Merged org 2 and Merged org became inactive on 2 February 2023 and were replaced by Absorbing org.") end - it "allows startate before organisations have been merged" do + it "allows startdate before organisations have been merged" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = merged_organisation.id record.owning_organisation_id = merged_organisation_2.id @@ -269,7 +294,7 @@ RSpec.describe Validations::SetupValidations do merged_organisation_2.update!(absorbing_organisation: absorbing_organisation_2, merge_date: Time.zone.local(2023, 2, 2)) end - it "does not allow startate after organisations have been merged" do + it "does not allow startdate after organisations have been merged" do record.startdate = Time.zone.local(2023, 3, 1) record.managing_organisation_id = merged_organisation.id record.owning_organisation_id = merged_organisation_2.id @@ -277,7 +302,7 @@ RSpec.describe Validations::SetupValidations do expect(record.errors["startdate"]).to include(match "Enter a date when the owning and managing organisations were active. Merged org 2 became inactive on 2 February 2023 and was replaced by Absorbing org 2. Merged org became inactive on 2 February 2023 and was replaced by Absorbing org.") end - it "allows startate before organisations have been merged" do + it "allows startdate before organisations have been merged" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = merged_organisation.id record.owning_organisation_id = merged_organisation_2.id @@ -291,7 +316,7 @@ RSpec.describe Validations::SetupValidations do merged_organisation_2.update!(absorbing_organisation: absorbing_organisation_2, merge_date: Time.zone.local(2023, 2, 2)) end - it "does not allow startate before absorbing organisation has been created" do + it "does not allow startdate before absorbing organisation has become available" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = absorbing_organisation.id record.owning_organisation_id = absorbing_organisation_2.id @@ -299,13 +324,22 @@ RSpec.describe Validations::SetupValidations do expect(record.errors["startdate"]).to include(match "Enter a date when the owning and managing organisations were active. Absorbing org 2 became active on 1 February 2023, and Absorbing org became active on 1 February 2023.") end - it "allows startate after absorbing organisation has been created" do + it "allows startdate after absorbing organisation has become available" do record.startdate = Time.zone.local(2023, 2, 2) record.managing_organisation_id = absorbing_organisation.id record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_startdate_setup(record) expect(record.errors["startdate"]).to be_empty end + + it "allows startdate if organisation does not have available from date" do + absorbing_organisation.update!(available_from: nil) + record.startdate = Time.zone.local(2023, 1, 1) + record.managing_organisation_id = absorbing_organisation.id + record.owning_organisation_id = absorbing_organisation.id + setup_validator.validate_startdate_setup(record) + expect(record.errors["startdate"]).to be_empty + end end end end @@ -723,7 +757,7 @@ RSpec.describe Validations::SetupValidations do end context "when organisations are merged" do - let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1, 4, 5, 6), name: "Absorbing org") } + let(:absorbing_organisation) { create(:organisation, created_at: Time.zone.local(2023, 2, 1, 4, 5, 6), available_from: Time.zone.local(2023, 2, 1, 4, 5, 6), name: "Absorbing org") } let(:merged_organisation) { create(:organisation, name: "Merged org") } around do |example| @@ -750,19 +784,27 @@ RSpec.describe Validations::SetupValidations do end context "and owning organisation is not yet active during the startdate" do - it "does not allow absorbing organisation before it had been created" do + it "does not allow absorbing organisation before it has become available'" do record.startdate = Time.zone.local(2023, 1, 1) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_organisation(record) expect(record.errors["owning_organisation_id"]).to include(match "The owning organisation must be active on the tenancy start date. Absorbing org became active on 1 February 2023.") end - it "allows absorbing organisation after it has been created" do + it "allows absorbing organisation after it has become available" do record.startdate = Time.zone.local(2023, 2, 2) record.owning_organisation_id = absorbing_organisation.id setup_validator.validate_organisation(record) expect(record.errors["owning_organisation_id"]).to be_empty end + + it "allows startdate if organisation does not have available from date" do + absorbing_organisation.update!(available_from: nil) + record.startdate = Time.zone.local(2023, 1, 1) + record.owning_organisation_id = absorbing_organisation.id + setup_validator.validate_organisation(record) + expect(record.errors["owning_organisation_id"]).to be_empty + end end context "when managing organisation is no longer active" do @@ -782,19 +824,27 @@ RSpec.describe Validations::SetupValidations do end context "when managing organisation is not yet active during the startdate" do - it "does not allow absorbing organisation before it had been created" do + it "does not allow absorbing organisation before it has become available" do record.startdate = Time.zone.local(2023, 1, 1) record.managing_organisation_id = absorbing_organisation.id setup_validator.validate_organisation(record) expect(record.errors["managing_organisation_id"]).to include(match "The managing organisation must be active on the tenancy start date. Absorbing org became active on 1 February 2023.") end - it "allows absorbing organisation after it has been created" do + it "allows absorbing organisation after it has become available'" do record.startdate = Time.zone.local(2023, 2, 2) record.managing_organisation_id = absorbing_organisation.id setup_validator.validate_organisation(record) expect(record.errors["managing_organisation_id"]).to be_empty end + + it "allows startdate if organisation does not have available from date" do + absorbing_organisation.update!(available_from: nil) + record.startdate = Time.zone.local(2023, 1, 1) + record.managing_organisation_id = absorbing_organisation.id + setup_validator.validate_organisation(record) + expect(record.errors["managing_organisation_id"]).to be_empty + end end end end diff --git a/spec/requests/content_controller_spec.rb b/spec/requests/content_controller_spec.rb index 07be4256b..c978ecaa9 100644 --- a/spec/requests/content_controller_spec.rb +++ b/spec/requests/content_controller_spec.rb @@ -4,45 +4,81 @@ RSpec.describe ContentController, type: :request do let(:headers) { { "Accept" => "text/html" } } let(:page) { Capybara::Node::Simple.new(response.body) } - describe "render privacy notice content page" do - before do - get "/privacy-notice", headers:, params: {} - end + describe "when maintenance mode is disabled" do + describe "render privacy notice content page" do + before do + get "/privacy-notice", headers:, params: {} + end - it "returns a 200" do - expect(response).to have_http_status(:success) - end + it "returns a 200" do + expect(response).to have_http_status(:success) + end - it "returns the page" do - expect(page).to have_title("Privacy notice") + it "returns the page" do + expect(page).to have_title("Privacy notice") + end end - end - describe "render accessibility statement content page" do - before do - get "/accessibility-statement", headers:, params: {} - end + describe "render accessibility statement content page" do + before do + get "/accessibility-statement", headers:, params: {} + end + + it "returns a 200" do + expect(response).to have_http_status(:success) + end - it "returns a 200" do - expect(response).to have_http_status(:success) + it "returns the page" do + expect(page).to have_title("Accessibility statement") + end end - it "returns the page" do - expect(page).to have_title("Accessibility statement") + describe "render data sharing agreement" do + before do + get "/data-sharing-agreement", headers:, params: {} + end + + it "returns a 200" do + expect(response).to have_http_status(:success) + end + + it "returns the page" do + expect(page).to have_title("Data sharing agreement") + end end end - describe "render data sharing agreement" do + describe "when maintenance mode is enabled" do before do - get "/data-sharing-agreement", headers:, params: {} + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) end - it "returns a 200" do - expect(response).to have_http_status(:success) + describe "render privacy notice content page" do + before do + get "/privacy-notice", headers:, params: {} + end + + it "returns a 200" do + expect(response).to have_http_status(:success) + end + + it "returns the page" do + expect(page).to have_title("Privacy notice") + end end - it "returns the page" do - expect(page).to have_title("Data sharing agreement") + describe "render accessibility statement content page" do + before do + get "/accessibility-statement", headers:, params: {} + end + + it "returns a 200" do + expect(response).to have_http_status(:success) + end + + it "returns the page" do + expect(page).to have_title("Accessibility statement") + end end end end diff --git a/spec/requests/cookies_controller_spec.rb b/spec/requests/cookies_controller_spec.rb new file mode 100644 index 000000000..82cf06a10 --- /dev/null +++ b/spec/requests/cookies_controller_spec.rb @@ -0,0 +1,42 @@ +require "rails_helper" + +RSpec.describe CookiesController, type: :request do + let(:headers) { { "Accept" => "text/html" } } + let(:page) { Capybara::Node::Simple.new(response.body) } + + describe "when maintenance mode is disabled" do + describe "render cookies page" do + before do + get "/cookies", headers:, params: {} + end + + it "returns a 200" do + expect(response).to have_http_status(:success) + end + + it "returns the page" do + expect(page).to have_title("Cookies") + end + end + end + + describe "when maintenance mode is enabled" do + before do + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + end + + describe "render cookies page" do + before do + get "/cookies", headers:, params: {} + end + + it "returns a 200" do + expect(response).to have_http_status(:success) + end + + it "returns the page" do + expect(page).to have_title("Cookies") + end + end + end +end diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb index 9df134e76..933a0f54d 100644 --- a/spec/requests/duplicate_logs_controller_spec.rb +++ b/spec/requests/duplicate_logs_controller_spec.rb @@ -30,144 +30,452 @@ RSpec.describe DuplicateLogsController, type: :request do context "when user is signed in" do before do - allow(user).to receive(:need_two_factor_authentication?).and_return(false) - sign_in user + body = { + results: [ + { + DPA: { + "POSTCODE": "LS16 6FT", + "POST_TOWN": "Westminster", + "PO_BOX_NUMBER": "321", + "DOUBLE_DEPENDENT_LOCALITY": "Double Dependent Locality", + }, + }, + ], + }.to_json + + stub_request(:get, "https://api.os.uk/search/places/v1/uprn?key=OS_DATA_KEY&uprn=123") + .to_return(status: 200, body:, headers: {}) end - context "when viewing lettings logs duplicates" do - context "when there are multiple duplicate logs" do - let(:duplicate_logs) { create_list(:lettings_log, 2, :completed) } + context "when user is support" do + let(:support_user_org) { create(:organisation) } + let(:user) { create(:user, :support, organisation: support_user_org) } - before do - allow(LettingsLog).to receive(:duplicate_logs).and_return(duplicate_logs) - get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}" - end - - it "displays links to all the duplicate logs" do - expect(page).to have_link("Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") - expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/lettings-logs/#{duplicate_logs.first.id}") - expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/lettings-logs/#{duplicate_logs.second.id}") - end - - it "displays check your answers for each log with correct questions" do - expect(page).to have_content("Q5 - Tenancy start date", count: 3) - expect(page).to have_content("Q7 - Tenant code", count: 3) - expect(page).to have_content("Q12 - Postcode", count: 3) - expect(page).to have_content("Q32 - Lead tenant’s age", count: 3) - expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 3) - expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3) - expect(page).to have_content("Household rent and charges", count: 3) - expect(page).to have_link("Change", count: 21) - expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") - expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[0].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") - expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[1].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") - end - - it "displays buttons to delete" do - expect(page).to have_link("Keep this log and delete duplicates", count: 3) - expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{lettings_log.id}/delete-duplicates?original_log_id=#{lettings_log.id}") - expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.first.id}/delete-duplicates?original_log_id=#{lettings_log.id}") - expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.second.id}/delete-duplicates?original_log_id=#{lettings_log.id}") - end + before do + allow(user).to receive(:need_two_factor_authentication?).and_return(false) + sign_in user end - context "when there are no more duplicate logs" do - before do - allow(LettingsLog).to receive(:duplicate_logs).and_return(LettingsLog.none) - get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}" + context "when viewing lettings logs duplicates" do + context "when there are multiple duplicate logs" do + let(:duplicate_logs) { create_list(:lettings_log, 2, :completed) } + + before do + allow(LettingsLog).to receive(:duplicate_logs).and_return(duplicate_logs) + get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}&organisation_id=#{lettings_log.owning_organisation_id}" + end + + it "displays links to all the duplicate logs" do + expect(page).to have_link("Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") + expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/lettings-logs/#{duplicate_logs.first.id}") + expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/lettings-logs/#{duplicate_logs.second.id}") + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q5 - Tenancy start date", count: 3) + expect(page).to have_content("Q7 - Tenant code", count: 3) + expect(page).to have_content("Q12 - Postcode", count: 3) + expect(page).to have_content("Q32 - Lead tenant’s age", count: 3) + expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 3) + expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3) + expect(page).to have_content("Household rent and charges", count: 3) + expect(page).to have_link("Change", count: 24) + expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&organisation_id=#{lettings_log.owning_organisation_id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[0].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&organisation_id=#{lettings_log.owning_organisation_id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[1].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&organisation_id=#{lettings_log.owning_organisation_id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + end + + it "displays check your answers for each log with correct questions where UPRN is given" do + lettings_log.update!(uprn: "123", uprn_known: 1, uprn_confirmed: 1) + duplicate_logs[0].update!(uprn: "123", uprn_known: 1, uprn_confirmed: 1) + get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}" + + expect(page).to have_content("Q5 - Tenancy start date", count: 3) + expect(page).to have_content("Q7 - Tenant code", count: 3) + expect(page).to have_content("Q12 - Postcode", count: 1) + expect(page).to have_content("Postcode (from UPRN)", count: 2) + expect(page).to have_content("Q32 - Lead tenant’s age", count: 3) + expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 3) + expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3) + expect(page).to have_content("Household rent and charges", count: 3) + expect(page).to have_link("Change", count: 24) + expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[0].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[1].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + end + + it "displays buttons to delete" do + expect(page).to have_link("Keep this log and delete duplicates", count: 3) + expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{lettings_log.id}/delete-duplicates?organisation_id=#{lettings_log.owning_organisation_id}&original_log_id=#{lettings_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.first.id}/delete-duplicates?organisation_id=#{lettings_log.owning_organisation_id}&original_log_id=#{lettings_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.second.id}/delete-duplicates?organisation_id=#{lettings_log.owning_organisation_id}&original_log_id=#{lettings_log.id}") + end end - it "displays check your answers for each log with correct questions" do - expect(page).to have_content("Q5 - Tenancy start date", count: 1) - expect(page).to have_content("Q7 - Tenant code", count: 1) - expect(page).to have_content("Q12 - Postcode", count: 1) - expect(page).to have_content("Q32 - Lead tenant’s age", count: 1) - expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 1) - expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 1) - expect(page).to have_content("Household rent and charges", count: 1) - expect(page).to have_link("Change", count: 7) - expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen") + context "when there are no more duplicate logs" do + context "when accessed from the duplicate logs banner flow" do + before do + allow(LettingsLog).to receive(:duplicate_logs).and_return(LettingsLog.none) + get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}&organisation_id=#{lettings_log.owning_organisation_id}&referrer=duplicate_logs_banner" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q5 - Tenancy start date", count: 1) + expect(page).to have_content("Q7 - Tenant code", count: 1) + expect(page).to have_content("Q12 - Postcode", count: 1) + expect(page).to have_content("Q32 - Lead tenant’s age", count: 1) + expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 1) + expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 1) + expect(page).to have_content("Household rent and charges", count: 1) + expect(page).to have_link("Change", count: 8) + expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen") + end + + it "displays button to review other duplicates" do + expect(page).to have_link("Review other duplicates", href: "/organisations/#{lettings_log.owning_organisation_id}/duplicates?referrer=duplicate_logs_banner") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end + + context "when accessed from the single log submission flow" do + before do + allow(LettingsLog).to receive(:duplicate_logs).and_return(LettingsLog.none) + get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}&organisation_id=#{lettings_log.owning_organisation_id}" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q5 - Tenancy start date", count: 1) + expect(page).to have_content("Q7 - Tenant code", count: 1) + expect(page).to have_content("Q12 - Postcode", count: 1) + expect(page).to have_content("Q32 - Lead tenant’s age", count: 1) + expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 1) + expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 1) + expect(page).to have_content("Household rent and charges", count: 1) + expect(page).to have_link("Change", count: 8) + expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen") + end + + it "displays button to return to log" do + expect(page).to have_link("Back to Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end end + end - it "displays buttons to return to log" do - expect(page).to have_link("Back to Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") + context "when viewing sales logs duplicates" do + context "when there are multiple duplicate logs" do + let(:duplicate_logs) { create_list(:sales_log, 2, :completed) } + + before do + allow(SalesLog).to receive(:duplicate_logs).and_return(duplicate_logs) + get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&organisation_id=#{sales_log.owning_organisation_id}" + end + + it "displays links to all the duplicate logs" do + expect(page).to have_link("Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") + expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/sales-logs/#{duplicate_logs.first.id}") + expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/sales-logs/#{duplicate_logs.second.id}") + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q1 - Sale completion date", count: 3) + expect(page).to have_content("Q2 - Purchaser code", count: 3) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 3) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 3) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 3) + expect(page).to have_content("Q15 - Postcode", count: 3) + expect(page).to have_link("Change", count: 21) + expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + end + + it "displays check your answers for each log with correct questions when UPRN is given" do + sales_log.update!(uprn: "123", uprn_known: 1) + duplicate_logs[0].update!(uprn: "123", uprn_known: 1) + duplicate_logs[1].update!(uprn: "123", uprn_known: 1) + get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}" + + expect(page).to have_content("Q1 - Sale completion date", count: 3) + expect(page).to have_content("Q2 - Purchaser code", count: 3) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 3) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 3) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 3) + expect(page).to have_content("Postcode (from UPRN)", count: 3) + expect(page).to have_link("Change", count: 21) + expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + end + + it "displays buttons to delete" do + expect(page).to have_link("Keep this log and delete duplicates", count: 3) + expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{sales_log.id}/delete-duplicates?organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.first.id}/delete-duplicates?organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.second.id}/delete-duplicates?organisation_id=#{sales_log.owning_organisation_id}&original_log_id=#{sales_log.id}") + end end - it "displays no duplicates banner" do - expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + context "when there are no more duplicate logs" do + context "when accessed from the duplicate logs banner flow" do + before do + allow(SalesLog).to receive(:duplicate_logs).and_return(SalesLog.none) + get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&referrer=duplicate_logs_banner&organisation_id=#{sales_log.owning_organisation_id}" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q1 - Sale completion date", count: 1) + expect(page).to have_content("Q2 - Purchaser code", count: 1) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 1) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 1) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 1) + expect(page).to have_content("Q15 - Postcode", count: 1) + expect(page).to have_link("Change", count: 7) + expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") + end + + it "displays button to review other duplicates" do + expect(page).to have_link("Review other duplicates", href: "/organisations/#{sales_log.owning_organisation_id}/duplicates?referrer=duplicate_logs_banner") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end + + context "when accessed from the single log submission flow" do + before do + allow(SalesLog).to receive(:duplicate_logs).and_return(SalesLog.none) + get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&organisation_id=#{sales_log.owning_organisation_id}" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q1 - Sale completion date", count: 1) + expect(page).to have_content("Q2 - Purchaser code", count: 1) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 1) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 1) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 1) + expect(page).to have_content("Q15 - Postcode", count: 1) + expect(page).to have_link("Change", count: 7) + expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") + end + + it "displays button to return to log" do + expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end end end end - context "when viewing sales logs duplicates" do - context "when there are multiple duplicate logs" do - let(:duplicate_logs) { create_list(:sales_log, 2, :completed) } - - before do - allow(SalesLog).to receive(:duplicate_logs).and_return(duplicate_logs) - get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}" - end - - it "displays links to all the duplicate logs" do - expect(page).to have_link("Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") - expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/sales-logs/#{duplicate_logs.first.id}") - expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/sales-logs/#{duplicate_logs.second.id}") - end - - it "displays check your answers for each log with correct questions" do - expect(page).to have_content("Q1 - Sale completion date", count: 3) - expect(page).to have_content("Q2 - Purchaser code", count: 3) - expect(page).to have_content("Q20 - Lead buyer’s age", count: 3) - expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 3) - expect(page).to have_content("Q25 - Buyer 1's working situation", count: 3) - expect(page).to have_content("Q15 - Postcode", count: 3) - expect(page).to have_link("Change", count: 18) - expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") - expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") - expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") - end - - it "displays buttons to delete" do - expect(page).to have_link("Keep this log and delete duplicates", count: 3) - expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{sales_log.id}/delete-duplicates?original_log_id=#{sales_log.id}") - expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.first.id}/delete-duplicates?original_log_id=#{sales_log.id}") - expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.second.id}/delete-duplicates?original_log_id=#{sales_log.id}") - end + context "when user is a data provider" do + before do + allow(user).to receive(:need_two_factor_authentication?).and_return(false) + sign_in user end - context "when there are no more duplicate logs" do - before do - allow(SalesLog).to receive(:duplicate_logs).and_return(SalesLog.none) - get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}" + context "when viewing lettings logs duplicates" do + context "when there are multiple duplicate logs" do + let(:duplicate_logs) { create_list(:lettings_log, 2, :completed) } + + before do + allow(LettingsLog).to receive(:duplicate_logs).and_return(duplicate_logs) + get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}" + end + + it "displays links to all the duplicate logs" do + expect(page).to have_link("Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") + expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/lettings-logs/#{duplicate_logs.first.id}") + expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/lettings-logs/#{duplicate_logs.second.id}") + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q5 - Tenancy start date", count: 3) + expect(page).to have_content("Q7 - Tenant code", count: 3) + expect(page).to have_content("Q12 - Postcode", count: 3) + expect(page).to have_content("Q32 - Lead tenant’s age", count: 3) + expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 3) + expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3) + expect(page).to have_content("Household rent and charges", count: 3) + expect(page).to have_link("Change", count: 21) + expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[0].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[1].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs") + end + + it "displays buttons to delete" do + expect(page).to have_link("Keep this log and delete duplicates", count: 3) + expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{lettings_log.id}/delete-duplicates?original_log_id=#{lettings_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.first.id}/delete-duplicates?original_log_id=#{lettings_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/lettings-logs/#{duplicate_logs.second.id}/delete-duplicates?original_log_id=#{lettings_log.id}") + end end - it "displays check your answers for each log with correct questions" do - expect(page).to have_content("Q1 - Sale completion date", count: 1) - expect(page).to have_content("Q2 - Purchaser code", count: 1) - expect(page).to have_content("Q20 - Lead buyer’s age", count: 1) - expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 1) - expect(page).to have_content("Q25 - Buyer 1's working situation", count: 1) - expect(page).to have_content("Q15 - Postcode", count: 1) - expect(page).to have_link("Change", count: 6) - expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") + context "when there are no more duplicate logs" do + context "when accessed from the duplicate logs banner flow" do + before do + allow(LettingsLog).to receive(:duplicate_logs).and_return(LettingsLog.none) + get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}&referrer=duplicate_logs_banner" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q5 - Tenancy start date", count: 1) + expect(page).to have_content("Q7 - Tenant code", count: 1) + expect(page).to have_content("Q12 - Postcode", count: 1) + expect(page).to have_content("Q32 - Lead tenant’s age", count: 1) + expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 1) + expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 1) + expect(page).to have_content("Household rent and charges", count: 1) + expect(page).to have_link("Change", count: 7) + expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen") + end + + it "displays button to review other duplicates" do + expect(page).to have_link("Review other duplicates", href: "/duplicate-logs?referrer=duplicate_logs_banner") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end + + context "when accessed from the single log submission flow" do + before do + allow(LettingsLog).to receive(:duplicate_logs).and_return(LettingsLog.none) + get "/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q5 - Tenancy start date", count: 1) + expect(page).to have_content("Q7 - Tenant code", count: 1) + expect(page).to have_content("Q12 - Postcode", count: 1) + expect(page).to have_content("Q32 - Lead tenant’s age", count: 1) + expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 1) + expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 1) + expect(page).to have_content("Household rent and charges", count: 1) + expect(page).to have_link("Change", count: 7) + expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=interruption_screen") + end + + it "displays button to return to log" do + expect(page).to have_link("Back to Log #{lettings_log.id}", href: "/lettings-logs/#{lettings_log.id}") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end end + end - it "displays buttons to return to log" do - expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") + context "when viewing sales logs duplicates" do + context "when there are multiple duplicate logs" do + let(:duplicate_logs) { create_list(:sales_log, 2, :completed) } + + before do + allow(SalesLog).to receive(:duplicate_logs).and_return(duplicate_logs) + get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}" + end + + it "displays links to all the duplicate logs" do + expect(page).to have_link("Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") + expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/sales-logs/#{duplicate_logs.first.id}") + expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/sales-logs/#{duplicate_logs.second.id}") + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q1 - Sale completion date", count: 3) + expect(page).to have_content("Q2 - Purchaser code", count: 3) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 3) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 3) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 3) + expect(page).to have_content("Q15 - Postcode", count: 3) + expect(page).to have_link("Change", count: 18) + expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs") + end + + it "displays buttons to delete" do + expect(page).to have_link("Keep this log and delete duplicates", count: 3) + expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{sales_log.id}/delete-duplicates?original_log_id=#{sales_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.first.id}/delete-duplicates?original_log_id=#{sales_log.id}") + expect(page).to have_link("Keep this log and delete duplicates", href: "/sales-logs/#{duplicate_logs.second.id}/delete-duplicates?original_log_id=#{sales_log.id}") + end end - it "displays no duplicates banner" do - expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + context "when there are no more duplicate logs" do + context "when accessed from the duplicate logs banner flow" do + before do + allow(SalesLog).to receive(:duplicate_logs).and_return(SalesLog.none) + get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}&referrer=duplicate_logs_banner" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q1 - Sale completion date", count: 1) + expect(page).to have_content("Q2 - Purchaser code", count: 1) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 1) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 1) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 1) + expect(page).to have_content("Q15 - Postcode", count: 1) + expect(page).to have_link("Change", count: 6) + expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") + end + + it "displays button to review other duplicates" do + expect(page).to have_link("Review other duplicates", href: "/duplicate-logs?referrer=duplicate_logs_banner") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end + + context "when accessed from the single log submission flow" do + before do + allow(SalesLog).to receive(:duplicate_logs).and_return(SalesLog.none) + get "/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}" + end + + it "displays check your answers for each log with correct questions" do + expect(page).to have_content("Q1 - Sale completion date", count: 1) + expect(page).to have_content("Q2 - Purchaser code", count: 1) + expect(page).to have_content("Q20 - Lead buyer’s age", count: 1) + expect(page).to have_content("Q21 - Buyer 1’s gender identity", count: 1) + expect(page).to have_content("Q25 - Buyer 1's working situation", count: 1) + expect(page).to have_content("Q15 - Postcode", count: 1) + expect(page).to have_link("Change", count: 6) + expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=interruption_screen") + end + + it "displays button to return to log" do + expect(page).to have_link("Back to Log #{sales_log.id}", href: "/sales-logs/#{sales_log.id}") + end + + it "displays no duplicates banner" do + expect(page).to have_content("This log had the same answers but it is no longer a duplicate. Make sure the answers are correct.") + end + end end end end end end - describe "GET sales delete-duplicates" do - let(:headers) { { "Accept" => "text/html" } } - let(:id) { sales_log.id } - let(:request) { get "/sales-logs/#{id}/delete-duplicates?original_log_id=#{id}" } + describe "GET lettings delete-duplicates" do + let(:id) { lettings_log.id } + let(:request) { get "/lettings-logs/#{id}/delete-duplicates?original_log_id=#{id}" } before do allow(user).to receive(:need_two_factor_authentication?).and_return(false) @@ -175,43 +483,85 @@ RSpec.describe DuplicateLogsController, type: :request do end context "when there are no duplicate logs" do - it "renders not found" do + it "renders page not found" do request expect(response).to have_http_status(:not_found) end end - context "when there is 1 duplicate log being deleted" do - let!(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) } + context "when accessed from the duplicate logs banner flow" do + let(:request) { get "/lettings-logs/#{id}/delete-duplicates?original_log_id=#{id}&referrer=duplicate_logs_banner" } - it "renders page" do - request - expect(response).to have_http_status(:ok) - - expect(page).to have_content("Are you sure you want to delete this duplicate log?") - expect(page).to have_button(text: "Delete this log") - expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id)) - expect(page).not_to have_link(text: "Log #{id}", href: sales_log_path(id)) - expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id, original_log_id: id)) - expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id, original_log_id: id)) + context "when there is 1 duplicate log being deleted" do + let!(:duplicate_log) { create(:lettings_log, :duplicate, created_by: user) } + + it "renders page with correct link params" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete this duplicate log?") + expect(page).to have_content("This log will be deleted:") + expect(page).to have_button(text: "Delete this log") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) + expect(page).not_to have_link(text: "Log #{id}", href: lettings_log_path(id)) + expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + end + end + + context "when there are multiple duplicate logs being deleted" do + let!(:duplicate_log) { create(:lettings_log, :duplicate, created_by: user) } + let!(:duplicate_log_2) { create(:lettings_log, :duplicate, created_by: user) } + + it "renders page with correct link params" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete these duplicate logs?") + expect(page).to have_content("These logs will be deleted:") + expect(page).to have_button(text: "Delete these logs") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) + expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: lettings_log_path(duplicate_log_2.id)) + expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + end end end - context "when there are multiple duplicate logs being deleted" do - let!(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) } - let!(:duplicate_log_2) { create(:sales_log, :duplicate, created_by: user) } + context "when accessed from the single log submission flow" do + context "when there is 1 duplicate log being deleted" do + let!(:duplicate_log) { create(:lettings_log, :duplicate, created_by: user) } + + it "renders page" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete this duplicate log?") + expect(page).to have_content("This log will be deleted:") + expect(page).to have_button(text: "Delete this log") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) + expect(page).not_to have_link(text: "Log #{id}", href: lettings_log_path(id)) + expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) + expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) + end + end - it "renders page" do - request - expect(response).to have_http_status(:ok) - - expect(page).to have_content("Are you sure you want to delete these duplicate logs?") - expect(page).to have_content("These logs will be deleted:") - expect(page).to have_button(text: "Delete these logs") - expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id)) - expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: sales_log_path(duplicate_log_2.id)) - expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id, original_log_id: id)) - expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id, original_log_id: id)) + context "when there are multiple duplicate logs being deleted" do + let!(:duplicate_log) { create(:lettings_log, :duplicate, created_by: user) } + let!(:duplicate_log_2) { create(:lettings_log, :duplicate, created_by: user) } + + it "renders page" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete these duplicate logs?") + expect(page).to have_content("These logs will be deleted:") + expect(page).to have_button(text: "Delete these logs") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) + expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: lettings_log_path(duplicate_log_2.id)) + expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) + expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) + end end end @@ -239,9 +589,10 @@ RSpec.describe DuplicateLogsController, type: :request do end end - describe "GET lettings delete-duplicates" do - let(:id) { lettings_log.id } - let(:request) { get "/lettings-logs/#{id}/delete-duplicates?original_log_id=#{id}" } + describe "GET sales delete-duplicates" do + let(:headers) { { "Accept" => "text/html" } } + let(:id) { sales_log.id } + let(:request) { get "/sales-logs/#{id}/delete-duplicates?original_log_id=#{id}" } before do allow(user).to receive(:need_two_factor_authentication?).and_return(false) @@ -249,44 +600,85 @@ RSpec.describe DuplicateLogsController, type: :request do end context "when there are no duplicate logs" do - it "renders page not found" do + it "renders not found" do request expect(response).to have_http_status(:not_found) end end - context "when there is 1 duplicate log being deleted" do - let!(:duplicate_log) { create(:lettings_log, :duplicate, created_by: user) } + context "when accessed from the duplicate logs banner flow" do + let(:request) { get "/sales-logs/#{id}/delete-duplicates?original_log_id=#{id}&referrer=duplicate_logs_banner" } - it "renders page" do - request - expect(response).to have_http_status(:ok) - - expect(page).to have_content("Are you sure you want to delete this duplicate log?") - expect(page).to have_content("This log will be deleted:") - expect(page).to have_button(text: "Delete this log") - expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) - expect(page).not_to have_link(text: "Log #{id}", href: lettings_log_path(id)) - expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) - expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) + context "when there is 1 duplicate log being deleted" do + let!(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) } + + it "renders page with correct link params" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete this duplicate log?") + expect(page).to have_content("This log will be deleted:") + expect(page).to have_button(text: "Delete this log") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id)) + expect(page).not_to have_link(text: "Log #{id}", href: sales_log_path(id)) + expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + end + end + + context "when there are multiple duplicate logs being deleted" do + let!(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) } + let!(:duplicate_log_2) { create(:sales_log, :duplicate, created_by: user) } + + it "renders page with correct link params" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete these duplicate logs?") + expect(page).to have_content("These logs will be deleted:") + expect(page).to have_button(text: "Delete these logs") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id)) + expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: sales_log_path(duplicate_log_2.id)) + expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id, original_log_id: id, referrer: "duplicate_logs_banner")) + end end end - context "when there are multiple duplicate logs being deleted" do - let!(:duplicate_log) { create(:lettings_log, :duplicate, created_by: user) } - let!(:duplicate_log_2) { create(:lettings_log, :duplicate, created_by: user) } + context "when accessed from the single log submission flow" do + context "when there is 1 duplicate log being deleted" do + let!(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) } + + it "renders page" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete this duplicate log?") + expect(page).to have_content("This log will be deleted:") + expect(page).to have_button(text: "Delete this log") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id)) + expect(page).not_to have_link(text: "Log #{id}", href: sales_log_path(id)) + expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id, original_log_id: id)) + expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id, original_log_id: id)) + end + end - it "renders page" do - request - expect(response).to have_http_status(:ok) - - expect(page).to have_content("Are you sure you want to delete these duplicate logs?") - expect(page).to have_content("These logs will be deleted:") - expect(page).to have_button(text: "Delete these logs") - expect(page).to have_link(text: "Log #{duplicate_log.id}", href: lettings_log_path(duplicate_log.id)) - expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: lettings_log_path(duplicate_log_2.id)) - expect(page).to have_link(text: "Cancel", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) - expect(page).to have_link(text: "Back", href: lettings_log_duplicate_logs_path(id, original_log_id: id)) + context "when there are multiple duplicate logs being deleted" do + let!(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) } + let!(:duplicate_log_2) { create(:sales_log, :duplicate, created_by: user) } + + it "renders page" do + request + expect(response).to have_http_status(:ok) + + expect(page).to have_content("Are you sure you want to delete these duplicate logs?") + expect(page).to have_content("These logs will be deleted:") + expect(page).to have_button(text: "Delete these logs") + expect(page).to have_link(text: "Log #{duplicate_log.id}", href: sales_log_path(duplicate_log.id)) + expect(page).to have_link(text: "Log #{duplicate_log_2.id}", href: sales_log_path(duplicate_log_2.id)) + expect(page).to have_link(text: "Cancel", href: sales_log_duplicate_logs_path(id, original_log_id: id)) + expect(page).to have_link(text: "Back", href: sales_log_duplicate_logs_path(id, original_log_id: id)) + end end end @@ -323,9 +715,64 @@ RSpec.describe DuplicateLogsController, type: :request do context "when the user is support" do let(:user) { create(:user, :support) } - it "renders not found" do - get duplicate_logs_path(organisation_id: user.organisation.id) - expect(response).to have_http_status(:not_found) + before do + allow(Organisation).to receive(:find).with(user.organisation_id.to_s).and_return(user.organisation) + allow(user.organisation).to receive(:duplicate_lettings_logs_sets).and_return([[1, 2], [3, 4, 5]]) + allow(user.organisation).to receive(:duplicate_sales_logs_sets).and_return([[11, 12]]) + end + + it "gets organisation duplicates" do + expect(user.organisation).to receive(:duplicate_lettings_logs_sets) + expect(user.organisation).to receive(:duplicate_sales_logs_sets) + get organisation_duplicates_path(organisation_id: user.organisation_id) + end + + describe "viewing the page" do + context "when there are duplicate logs" do + before do + get organisation_duplicates_path(organisation_id: user.organisation_id) + end + + it "has the correct headers" do + expect(page).to have_content("Type of logs") + expect(page).to have_content("Log IDs") + end + + it "has the correct number of rows for each log type" do + expect(page).to have_selector("tbody tr td", text: "Lettings", count: 2) + expect(page).to have_selector("tbody tr td", text: "Sales", count: 1) + end + + it "shows the log ids for each set of duplicates" do + expect(page).to have_content("Log 1, Log 2") + expect(page).to have_content("Log 3, Log 4, Log 5") + expect(page).to have_content("Log 11, Log 12") + end + + it "shows links for each set of duplicates" do + expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(1, original_log_id: 1, organisation_id: user.organisation_id)) + expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(3, original_log_id: 3, organisation_id: user.organisation_id)) + expect(page).to have_link("Review logs", href: sales_log_duplicate_logs_path(11, original_log_id: 11, organisation_id: user.organisation_id)) + end + end + + context "when there are no duplicate logs" do + before do + allow(Organisation).to receive(:find).with(user.organisation_id.to_s).and_return(user.organisation) + allow(user.organisation).to receive(:duplicate_lettings_logs_sets).and_return([]) + allow(user.organisation).to receive(:duplicate_sales_logs_sets).and_return([]) + get organisation_duplicates_path(organisation_id: user.organisation_id) + end + + it "has the correct headers" do + expect(page).to have_content("There are no more duplicate logs") + expect(page).to have_content("You have either changed or deleted all the duplicate logs.") + end + + it "shows back to all logs button" do + expect(page).to have_link("Back to all logs", href: lettings_logs_path) + end + end end end @@ -359,30 +806,49 @@ RSpec.describe DuplicateLogsController, type: :request do end describe "viewing the page" do - before do - get duplicate_logs_path - end + context "when there are duplicate logs" do + before do + get duplicate_logs_path + end - it "has the correct headers" do - expect(page).to have_content("Type of logs") - expect(page).to have_content("Log IDs") - end + it "has the correct headers" do + expect(page).to have_content("Type of logs") + expect(page).to have_content("Log IDs") + end - it "has the correct number of rows for each log type" do - expect(page).to have_selector("tbody tr td", text: "Lettings", count: 2) - expect(page).to have_selector("tbody tr td", text: "Sales", count: 1) - end + it "has the correct number of rows for each log type" do + expect(page).to have_selector("tbody tr td", text: "Lettings", count: 2) + expect(page).to have_selector("tbody tr td", text: "Sales", count: 1) + end + + it "shows the log ids for each set of duplicates" do + expect(page).to have_content("Log 1, Log 2") + expect(page).to have_content("Log 3, Log 4, Log 5") + expect(page).to have_content("Log 11, Log 12") + end - it "shows the log ids for each set of duplicates" do - expect(page).to have_content("Log 1, Log 2") - expect(page).to have_content("Log 3, Log 4, Log 5") - expect(page).to have_content("Log 11, Log 12") + it "shows links for each set of duplicates" do + expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(1, original_log_id: 1)) + expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(3, original_log_id: 3)) + expect(page).to have_link("Review logs", href: sales_log_duplicate_logs_path(11, original_log_id: 11)) + end end - it "shows links for each set of duplciates" do - expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(1, original_log_id: 1)) - expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(3, original_log_id: 3)) - expect(page).to have_link("Review logs", href: sales_log_duplicate_logs_path(11, original_log_id: 11)) + context "when there are no duplicate logs" do + before do + allow(user).to receive(:duplicate_lettings_logs_sets).and_return([]) + allow(user).to receive(:duplicate_sales_logs_sets).and_return([]) + get duplicate_logs_path + end + + it "has the correct headers" do + expect(page).to have_content("There are no more duplicate logs") + expect(page).to have_content("You have either changed or deleted all the duplicate logs.") + end + + it "shows back to all logs button" do + expect(page).to have_link("Back to all logs", href: lettings_logs_path) + end end end end diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index b4701517f..ea9debdc1 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -774,7 +774,7 @@ RSpec.describe LettingsLogsController, type: :request do end it "shows the total log count" do - expect(CGI.unescape_html(response.body)).to match("1 total logs") + expect(CGI.unescape_html(response.body)).to match("1 matching logs") end it "does not show the pagination links" do @@ -868,7 +868,7 @@ RSpec.describe LettingsLogsController, type: :request do end it "shows the total log count" do - expect(CGI.unescape_html(response.body)).to match("26 total logs") + expect(CGI.unescape_html(response.body)).to match("26 matching logs") end it "has pagination links" do diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb index fd3bd48e5..2570866cf 100644 --- a/spec/requests/locations_controller_spec.rb +++ b/spec/requests/locations_controller_spec.rb @@ -274,7 +274,7 @@ RSpec.describe LocationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 location found matching ‘#{search_param}’") + expect(page).to have_content("1 location matching search") end it "has search in the title" do @@ -402,7 +402,7 @@ RSpec.describe LocationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 location found matching ‘#{search_param}’") + expect(page).to have_content("1 location matching search") end it "has search in the title" do diff --git a/spec/requests/maintenance_controller_spec.rb b/spec/requests/maintenance_controller_spec.rb new file mode 100644 index 000000000..d900df3c5 --- /dev/null +++ b/spec/requests/maintenance_controller_spec.rb @@ -0,0 +1,85 @@ +require "rails_helper" + +RSpec.describe MaintenanceController, type: :request do + let(:page) { Capybara::Node::Simple.new(response.body) } + let(:user) { FactoryBot.create(:user) } + + before do + sign_in user + end + + describe "when maintenance mode is enabled" do + before do + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(true) + end + + context "when a user visits a page other than the maintenance page" do + before do + get "/lettings-logs" + end + + it "redirects the user to the maintenance page" do + expect(response).to redirect_to(service_unavailable_path) + follow_redirect! + expect(page).to have_content("Sorry, the service is unavailable") + end + + it "the cookie banner is visible" do + follow_redirect! + expect(page).to have_content("We’d like to use analytics cookies so we can understand how you use the service and make improvements.") + end + end + + context "when a user visits the maintenance page" do + before do + get "/service-unavailable" + end + + it "keeps the user on the maintenance page" do + expect(response).not_to redirect_to(service_unavailable_path) + expect(page).to have_content("Sorry, the service is unavailable") + end + + it "the cookie banner is visible" do + expect(page).to have_content("We’d like to use analytics cookies so we can understand how you use the service and make improvements.") + end + end + end + + describe "when maintenance mode is disabled" do + before do + allow(FeatureToggle).to receive(:maintenance_mode_enabled?).and_return(false) + end + + context "when a user visits a page other than the maintenance page" do + before do + get "/lettings-logs" + end + + it "doesn't redirect the user to the maintenance page" do + expect(response).not_to redirect_to(service_unavailable_path) + expect(page).to have_content("Create a new lettings log") + end + + it "the cookie banner is visible" do + expect(page).to have_content("We’d like to use analytics cookies so we can understand how you use the service and make improvements.") + end + end + + context "when a user visits the maintenance page" do + before do + get "/service-unavailable" + end + + it "redirects the user to the start page" do + expect(response).to redirect_to(root_path) + end + + it "the cookie banner is visible" do + follow_redirect! + follow_redirect! + expect(page).to have_content("We’d like to use analytics cookies so we can understand how you use the service and make improvements.") + end + end + end +end diff --git a/spec/requests/organisation_relationships_controller_spec.rb b/spec/requests/organisation_relationships_controller_spec.rb index a93e77d76..dcf99efce 100644 --- a/spec/requests/organisation_relationships_controller_spec.rb +++ b/spec/requests/organisation_relationships_controller_spec.rb @@ -47,7 +47,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("1 total stock owners") + expect(page).to have_content("1 matching stock owners") end context "when adding a stock owner" do @@ -113,7 +113,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("1 total agents") + expect(page).to have_content("1 matching agents") end end @@ -285,7 +285,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("1 total stock owners") + expect(page).to have_content("1 matching stock owners") end end @@ -421,7 +421,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("1 total agents") + expect(page).to have_content("1 matching agents") end end @@ -587,7 +587,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("1 total stock owners") + expect(page).to have_content("1 matching stock owners") end context "when adding a stock owner" do @@ -637,7 +637,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("1 total agents") + expect(page).to have_content("1 matching agents") end it "shows remove link(s)" do diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index cbc5a7f49..340f1facf 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -89,7 +89,7 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 scheme found matching ‘#{search_param}’") + expect(page).to have_content("1 scheme matching search") end it "has search in the title" do @@ -171,7 +171,7 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 scheme found matching ‘#{search_param}’") + expect(page).to have_content("1 scheme matching search") end it "has search in the title" do @@ -279,6 +279,89 @@ RSpec.describe OrganisationsController, type: :request do expect(page).to have_content("To report a merge or update your organisation details, ") expect(page).to have_link("contact the helpdesk", href: "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11") end + + it "does not display merge history if there is none" do + expect(page).not_to have_content("View all organisations that were merged into #{organisation.name}") + end + + context "when the organisation has absorbed other organisations" do + let!(:absorbed_organisation) { create(:organisation, name: "First Absorbed Organisation") } + let!(:other_absorbed_organisation) { create(:organisation, name: "Other Absorbed Organisation") } + let!(:previously_absorbed_organisation) { create(:organisation, name: "Previously Absorbed Organisation") } + + before do + absorbed_organisation.update!(merge_date: Time.zone.local(2023, 4, 3), absorbing_organisation: organisation) + other_absorbed_organisation.update!(merge_date: Time.zone.local(2023, 4, 3), absorbing_organisation: organisation) + previously_absorbed_organisation.update!(merge_date: Time.zone.local(2023, 4, 2), absorbing_organisation: organisation) + get "/organisations/#{organisation.id}/details", headers:, params: {} + end + + it "displays separate lists of absorbed organisations" do + expect(page).to have_content("View all organisations that were merged into #{organisation.name}") + expect(page).to have_content("Merge date: 3 April 2023") + expect(page).to have_content("First Absorbed Organisation") + expect(page).to have_content("Other Absorbed Organisation") + expect(page).to have_content("Previously Absorbed Organisation") + expect(page).to have_content("ORG#{absorbed_organisation.id}") + expect(page).to have_content("ORG#{other_absorbed_organisation.id}") + expect(page).to have_content("Merge date: 2 April 2023") + expect(page).to have_content("ORG#{previously_absorbed_organisation.id}") + end + end + + context "when the organisation has absorbed other organisations during a closed collection period" do + let!(:absorbed_organisation) { create(:organisation, name: "First Absorbed Organisation") } + let!(:other_absorbed_organisation) { create(:organisation, name: "Other Absorbed Organisation") } + + before do + absorbed_organisation.update!(merge_date: Time.zone.local(2021, 4, 3), absorbing_organisation: organisation) + other_absorbed_organisation.update!(merge_date: Time.zone.local(2021, 4, 3), absorbing_organisation: organisation) + get "/organisations/#{organisation.id}/details", headers:, params: {} + end + + it "does not display absorbed organisations" do + expect(page).not_to have_content("View all organisations that were merged into #{organisation.name}") + expect(page).not_to have_content("Merge date: 3 April 2021") + expect(page).not_to have_content("First Absorbed Organisation") + expect(page).not_to have_content("Other Absorbed Organisation") + end + end + + context "when the organisation has absorbed other organisations without merge dates" do + let!(:absorbed_organisation) { create(:organisation, name: "First Absorbed Organisation") } + let!(:other_absorbed_organisation) { create(:organisation, name: "Other Absorbed Organisation") } + + before do + absorbed_organisation.update!(merge_date: Time.zone.local(2023, 4, 3), absorbing_organisation: organisation) + other_absorbed_organisation.update!(merge_date: Time.zone.local(2023, 4, 3), absorbing_organisation: organisation) + get "/organisations/#{organisation.id}/details", headers:, params: {} + end + + it "displays a list of absorbed organisations" do + expect(page).to have_content("View all organisations that were merged into #{organisation.name}") + expect(page).to have_content("Merge date:") + expect(page).to have_content("First Absorbed Organisation") + expect(page).to have_content("Other Absorbed Organisation") + expect(page).to have_content("ORG#{absorbed_organisation.id}") + expect(page).to have_content("ORG#{other_absorbed_organisation.id}") + end + end + + context "when viewing absorbed organisation" do + let(:absorbing_organisation) { create(:organisation, name: "First Absorbing Organisation") } + + context "and your organisation was absorbed" do + before do + organisation.update!(merge_date: Time.zone.local(2023, 4, 3), absorbing_organisation:) + get "/organisations/#{organisation.id}/details", headers:, params: {} + end + + it "displays the organisation merge details" do + expect(response).not_to have_http_status(:not_found) + expect(page).to have_content("#{organisation.name} was merged into First Absorbing Organisation on 3 April 2023.") + end + end + end end context "with organisation that are not in scope for the user, i.e. that they do not belong to" do @@ -332,7 +415,7 @@ RSpec.describe OrganisationsController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("#{user.organisation.users.count} total users") + expect(page).to have_content("#{user.organisation.users.count} matching users") end end @@ -716,7 +799,7 @@ RSpec.describe OrganisationsController, type: :request do total_number_of_orgs = Organisation.all.count expect(page).to have_link organisation.name, href: "organisations/#{organisation.id}/lettings-logs" expect(page).to have_link unauthorised_organisation.name, href: "organisations/#{unauthorised_organisation.id}/lettings-logs" - expect(page).to have_content("#{total_number_of_orgs} total organisations") + expect(page).to have_content("#{total_number_of_orgs} matching organisations") end it "shows a search bar" do @@ -745,7 +828,7 @@ RSpec.describe OrganisationsController, type: :request do end it "only shows logs for that organisation" do - expect(page).to have_content("#{total_number_of_org1_logs} total logs") + expect(page).to have_content("#{total_number_of_org1_logs} matching logs") organisation.lettings_logs.visible.map(&:id).each do |lettings_log_id| expect(page).to have_link lettings_log_id.to_s, href: "/lettings-logs/#{lettings_log_id}" @@ -784,6 +867,11 @@ RSpec.describe OrganisationsController, type: :request do expect(page).to have_title("#{organisation.name} (1 logs matching ‘#{log_to_search.id}’) - Submit social housing lettings and sales data (CORE) - GOV.UK") end + it "has search term in the search box" do + get "/organisations/#{organisation.id}/lettings-logs?search=#{log_to_search.id}", headers: headers, params: {} + expect(page).to have_field("search", with: log_to_search.id.to_s) + end + it "shows lettings logs matching the id" do get "/organisations/#{organisation.id}/lettings-logs?search=#{log_to_search.id}", headers: headers, params: {} expect(page).to have_link(log_to_search.id.to_s) @@ -894,7 +982,7 @@ RSpec.describe OrganisationsController, type: :request do end it "only shows logs for that organisation" do - expect(page).to have_content("#{number_of_org1_sales_logs} total logs") + expect(page).to have_content("#{number_of_org1_sales_logs} matching logs") organisation.sales_logs.map(&:id).each do |sales_log_id| expect(page).to have_link sales_log_id.to_s, href: "/sales-logs/#{sales_log_id}" end @@ -1028,7 +1116,7 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 user found matching ‘#{search_param}’ of #{org_user_count} total users.") + expect(page).to have_content("1 user matching search") end context "when we need case insensitive search" do @@ -1048,7 +1136,7 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 user found matching ‘#{search_param}’ of #{org_user_count} total users.") + expect(page).to have_content("1 user matching search") end end end @@ -1070,13 +1158,13 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 user found matching ‘#{search_param}’ of #{org_user_count} total users.") + expect(page).to have_content("1 user matching search") end context "when our search term matches an email and a name" do let!(:matching_user) { create(:user, organisation:, name: "Foobar", email: "some@example.com") } let!(:another_matching_user) { create(:user, organisation:, name: "Joe", email: "foobar@example.com") } - let!(:org_user_count) { User.where(organisation:).count } + let(:org_user_count) { User.where(organisation:).count } let(:search_param) { "Foobar" } before do @@ -1098,7 +1186,7 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("2 users found matching ‘#{search_param}’ of #{org_user_count} total users.") + expect(page).to have_content("2 users matching search") end end end @@ -1155,7 +1243,7 @@ RSpec.describe OrganisationsController, type: :request do end it "shows the total organisations count" do - expect(CGI.unescape_html(response.body)).to match("#{total_organisations_count} total organisations") + expect(CGI.unescape_html(response.body)).to match("#{total_organisations_count} matching organisations") end it "has pagination links" do @@ -1189,7 +1277,7 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 organisations found matching ‘#{search_param}’") + expect(page).to have_content("1 organisations matching search") end it "has search in the title" do @@ -1205,7 +1293,7 @@ RSpec.describe OrganisationsController, type: :request do end it "updates the table caption" do - expect(page).to have_content("2 organisations found matching ‘#{search_param}’") + expect(page).to have_content("2 organisations matching search") end it "has search in the title" do diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb index 919f70725..97c5851fd 100644 --- a/spec/requests/sales_logs_controller_spec.rb +++ b/spec/requests/sales_logs_controller_spec.rb @@ -655,7 +655,7 @@ RSpec.describe SalesLogsController, type: :request do end it "shows the total log count" do - expect(CGI.unescape_html(response.body)).to match("1 total logs") + expect(CGI.unescape_html(response.body)).to match("1 matching logs") end it "does not show the pagination links" do @@ -708,7 +708,7 @@ RSpec.describe SalesLogsController, type: :request do end it "shows the total log count" do - expect(CGI.unescape_html(response.body)).to match("26 total logs") + expect(CGI.unescape_html(response.body)).to match("26 matching logs") end it "has pagination links" do diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb index 33e0dcfd5..9ba00aa43 100644 --- a/spec/requests/schemes_controller_spec.rb +++ b/spec/requests/schemes_controller_spec.rb @@ -234,7 +234,7 @@ RSpec.describe SchemesController, type: :request do end it "shows the total organisations count" do - expect(CGI.unescape_html(response.body)).to match("#{schemes.count} total schemes") + expect(CGI.unescape_html(response.body)).to match("#{schemes.count} matching schemes") end context "when paginating over 20 results" do @@ -250,7 +250,7 @@ RSpec.describe SchemesController, type: :request do end it "shows the total schemes count" do - expect(CGI.unescape_html(response.body)).to match("#{total_schemes_count} total schemes") + expect(CGI.unescape_html(response.body)).to match("#{total_schemes_count} matching schemes") end it "shows which schemes are being shown on the current page" do @@ -275,7 +275,7 @@ RSpec.describe SchemesController, type: :request do end it "shows the total schemes count" do - expect(CGI.unescape_html(response.body)).to match("#{total_schemes_count} total schemes") + expect(CGI.unescape_html(response.body)).to match("#{total_schemes_count} matching schemes") end it "has pagination links" do @@ -321,7 +321,7 @@ RSpec.describe SchemesController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 scheme found matching ‘#{search_param}’") + expect(page).to have_content("1 scheme matching search") end it "has search in the title" do diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index f35be6b0e..958f2187a 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -430,7 +430,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 user found matching ‘filter’ of 4 total users.") + expect(page).to have_content("1 user matching search") end end @@ -466,7 +466,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("2 users found matching ‘joe’ of 4 total users.") + expect(page).to have_content("2 users matching search") end end end @@ -894,6 +894,64 @@ RSpec.describe UsersController, type: :request do expect(response).to have_http_status(:unprocessable_entity) end end + + context "when updating telephone numbers" do + let(:params) do + { + "user": { + phone:, + }, + } + end + + before do + sign_in user + patch "/users/#{user.id}", headers:, params: + end + + context "when telephone number is not given" do + let(:phone) { "" } + + it "validates telephone number" do + expect(response).to have_http_status(:unprocessable_entity) + expect(page).to have_content(I18n.t("activerecord.errors.models.user.attributes.phone.blank")) + end + end + + context "when telephone number is not numeric" do + let(:phone) { "randomstring" } + + it "validates telephone number" do + expect(response).to have_http_status(:unprocessable_entity) + expect(page).to have_content(I18n.t("activerecord.errors.models.user.attributes.phone.invalid")) + end + end + + context "when telephone number is shorter than 11 digits" do + let(:phone) { "123" } + + it "validates telephone number" do + expect(response).to have_http_status(:unprocessable_entity) + expect(page).to have_content(I18n.t("activerecord.errors.models.user.attributes.phone.invalid")) + end + end + + context "when telephone number is in correct format" do + let(:phone) { "012345678919" } + + it "validates telephone number" do + expect(page).not_to have_content(I18n.t("activerecord.errors.models.user.attributes.phone.invalid")) + end + end + + context "when telephone number is in correct format and includes +" do + let(:phone) { "+12345678919" } + + it "validates telephone number" do + expect(page).not_to have_content(I18n.t("activerecord.errors.models.user.attributes.phone.invalid")) + end + end + end end describe "#create" do @@ -1136,7 +1194,7 @@ RSpec.describe UsersController, type: :request do end it "shows the pagination count" do - expect(page).to have_content("4 total users") + expect(page).to have_content("4 matching users") end it "shows the download csv link" do @@ -1164,7 +1222,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("1 user found matching ‘#{search_param}’ of 4 total users.") + expect(page).to have_content("1 user matching search") end it "includes the search term in the CSV download link" do @@ -1207,7 +1265,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("2 users found matching ‘joe’ of 4 total users.") + expect(page).to have_content("2 users matching search") end end end diff --git a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb index f699b730a..101a17b3b 100644 --- a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb @@ -269,7 +269,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do context "when a supported housing log already exists in the db" do let(:scheme) { create(:scheme, :with_old_visible_id, owning_organisation: owning_org) } let(:location) { create(:location, :with_old_visible_id, scheme:) } - let(:attributes) { valid_attributes.merge({ field_4: scheme.old_visible_id, field_5: location.old_visible_id, field_111: owning_org.old_visible_id }) } + let(:attributes) { valid_attributes.merge({ field_4: scheme.old_visible_id, field_5: location.old_visible_id, field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id }) } before do parser.bulk_upload.needstype = "2" @@ -639,7 +639,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do end context "when matching scheme cannot be found" do - let(:attributes) { { bulk_upload:, field_1: "1", field_4: "123" } } + let(:attributes) { { bulk_upload:, field_1: "1", field_4: "123", field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } it "returns an error" do expect(parser.errors.where(:field_4, category: :setup)).to be_present @@ -648,16 +648,16 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do context "when scheme belongs to someone else" do let(:other_scheme) { create(:scheme, :with_old_visible_id) } - let(:attributes) { { bulk_upload:, field_1: "1", field_4: other_scheme.old_visible_id, field_111: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_1: "1", field_4: other_scheme.old_visible_id, field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } it "returns an error" do - expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to include("This management group code does not belong to your organisation, or any of your stock owners / managing agents") + expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to include("This management group code does not belong to the owning organisation or managing organisation") end end context "when scheme belongs to owning org" do let(:scheme) { create(:scheme, :with_old_visible_id, owning_organisation: owning_org) } - let(:attributes) { { bulk_upload:, field_1: "1", field_4: scheme.old_visible_id, field_111: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_1: "1", field_4: scheme.old_visible_id, field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } it "does not return an error" do expect(parser.errors[:field_4]).to be_blank @@ -693,6 +693,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do field_4: scheme.old_visible_id, field_5: "dontexist", field_111: owning_org.old_visible_id, + field_113: owning_org.old_visible_id, } end @@ -710,6 +711,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do field_4: scheme.old_visible_id, field_5: location.old_visible_id, field_111: owning_org.old_visible_id, + field_113: owning_org.old_visible_id, } end @@ -719,7 +721,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do end context "when location exists but not related" do - let(:location) { create(:scheme, :with_old_visible_id) } + let(:location) { create(:location, :with_old_visible_id) } let(:attributes) do { bulk_upload:, @@ -727,11 +729,12 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do field_4: scheme.old_visible_id, field_5: location.old_visible_id, field_111: owning_org.old_visible_id, + field_113: owning_org.old_visible_id, } end it "returns as setup error" do - expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to eql(["Location could not be found with the provided scheme code"]) + expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to eql(["Scheme code must relate to a scheme that is owned by the owning organisation or managing organisation"]) end end end @@ -880,7 +883,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do describe "#field_78" do # referral context "when 3 ie PRP nominated by LA and owning org is LA" do - let(:attributes) { { bulk_upload:, field_78: "3", field_111: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_78: "3", field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } it "is not permitted" do expect(parser.errors[:field_78]).to be_present @@ -888,7 +891,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do end context "when 4 ie referred by LA and is general needs and owning org is LA" do - let(:attributes) { { bulk_upload:, field_78: "4", field_111: owning_org.old_visible_id.to_s } } + let(:attributes) { { bulk_upload:, field_78: "4", field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } it "is not permitted" do expect(parser.errors[:field_78]).to be_present @@ -898,7 +901,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do context "when 4 ie referred by LA and is general needs and owning org is PRP" do let(:owning_org) { create(:organisation, :prp, :with_old_visible_id) } - let(:attributes) { { bulk_upload:, field_78: "4", field_111: owning_org.old_visible_id.to_s } } + let(:attributes) { { bulk_upload:, field_78: "4", field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } it "is permitted" do expect(parser.errors[:field_78]).to be_blank @@ -1125,6 +1128,16 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do end end + context "when email matches other than casing" do + let(:other_user) { create(:user, organisation: owning_org) } + + let(:attributes) { { bulk_upload:, field_111: owning_org.old_visible_id, field_112: other_user.email.upcase!, field_113: managing_org.old_visible_id } } + + it "is permitted" do + expect(parser.errors[:field_112]).to be_blank + end + end + context "when an user part of managing org" do let(:other_user) { create(:user, organisation: managing_org) } @@ -1364,21 +1377,89 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do describe "#location" do context "when lookup is via new core id" do - let(:attributes) { { bulk_upload:, field_4: scheme.old_visible_id, field_5: location.id, field_111: owning_org } } + let(:attributes) { { bulk_upload:, field_4: "S#{scheme.id}", field_5: location.id, field_111: "ORG#{owning_org.id}", field_113: "ORG#{owning_org.id}" } } it "assigns the correct location" do expect(parser.log.location).to eql(location) end end + + context "when lookup is via old core id" do + let(:attributes) { { bulk_upload:, field_4: scheme.old_visible_id, field_5: location.old_visible_id, field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } + + it "assigns the correct location" do + expect(parser.log.location).to eql(location) + end + + context "when location had leading zeroes in its id in Old CORE" do + let(:attributes) { { bulk_upload:, field_4: scheme.old_visible_id, field_5: "123", field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } + + before do + location.old_visible_id = "00123" + location.save! + end + + it "assigns the correct location" do + expect(parser.log.location).to eql(location) + end + end + + context "when the user provides an id with leading zeroes" do + let(:attributes) { { bulk_upload:, field_4: scheme.old_visible_id, field_5: "00123", field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } + + before do + location.old_visible_id = "123" + location.save! + end + + it "assigns the correct location" do + expect(parser.log.location).to eql(location) + end + end + end end describe "#scheme" do - context "when lookup is via id prefixed with S" do - let(:attributes) { { bulk_upload:, field_4: "S#{scheme.id}", field_111: owning_org } } + context "when lookup is via new core id" do + let(:attributes) { { bulk_upload:, field_4: "S#{scheme.id}", field_5: location.id, field_113: "ORG#{owning_org.id}", field_111: "ORG#{owning_org.id}" } } + + it "assigns the correct scheme" do + expect(parser.log.scheme).to eql(scheme) + end + end + + context "when lookup is via old core id" do + let(:attributes) { { bulk_upload:, field_4: scheme.old_visible_id, field_5: location.old_visible_id, field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } it "assigns the correct scheme" do expect(parser.log.scheme).to eql(scheme) end + + context "when scheme had leading zeroes in its id in Old CORE" do + let(:attributes) { { bulk_upload:, field_4: "10", field_5: location.old_visible_id, field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } + + before do + scheme.old_visible_id = "010" + scheme.save! + end + + it "assigns the correct scheme" do + expect(parser.log.scheme).to eql(scheme) + end + end + + context "when the user provides an id with leading zeroes" do + let(:attributes) { { bulk_upload:, field_4: "010", field_5: location.old_visible_id, field_111: owning_org.old_visible_id, field_113: owning_org.old_visible_id } } + + before do + scheme.old_visible_id = "10" + scheme.save! + end + + it "assigns the correct scheme" do + expect(parser.log.scheme).to eql(scheme) + end + end end end diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb index 6959dff29..f24fa5010 100644 --- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb @@ -753,6 +753,16 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end end + context "when email matches other than casing" do + let(:other_user) { create(:user, organisation: owning_org) } + + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_3: other_user.email.upcase!, field_2: managing_org.old_visible_id } } + + it "is permitted" do + expect(parser.errors[:field_3]).to be_blank + end + end + context "when an user part of managing org" do let(:other_user) { create(:user, organisation: managing_org) } @@ -862,17 +872,17 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do let(:location) { create(:location, :with_old_visible_id, scheme:) } context "when matching scheme cannot be found" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S123", field_17: location.id } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S123", field_17: location.id } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank - expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["The scheme code is not correct"]) + expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["This scheme code does not belong to the owning organisation or managing organisation"]) expect(parser.errors[:field_17]).to be_blank end end context "when missing location" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: nil } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: nil } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank @@ -882,17 +892,17 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end context "when matching location cannot be found" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: "123" } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: "123" } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank expect(parser.errors[:field_16]).to be_blank - expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq(["Location could not be found with the provided scheme code"]) + expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq(["Location code must relate to a location that is owned by the owning organisation or managing organisation"]) end end context "when matching location exists" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: location.id } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: location.id } } it "does not return an error" do expect(parser.errors[:field_15]).to be_blank @@ -904,29 +914,29 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do context "when location exists but not related" do let(:other_scheme) { create(:scheme, :with_old_visible_id) } let(:other_location) { create(:location, :with_old_visible_id, scheme: other_scheme) } - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: other_location.id } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: other_location.id } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank expect(parser.errors[:field_16]).to be_blank - expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq(["Location could not be found with the provided scheme code"]) + expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq(["Location code must relate to a location that is owned by the owning organisation or managing organisation"]) end end context "when scheme belongs to someone else" do let(:other_scheme) { create(:scheme, :with_old_visible_id) } let(:other_location) { create(:location, :with_old_visible_id, scheme: other_scheme) } - let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_16: "S#{other_scheme.id}", field_17: other_location.id, field_1: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_16: "S#{other_scheme.id}", field_17: other_location.id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank - expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["This scheme code does not belong to your organisation, or any of your stock owners / managing agents"]) + expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["This scheme code does not belong to the owning organisation or managing organisation"]) expect(parser.errors[:field_17]).to be_blank end end context "when scheme belongs to owning org" do - let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: location.id, field_1: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_16: "S#{scheme.id}", field_17: location.id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "does not return an error" do expect(parser.errors[:field_15]).to be_blank @@ -953,17 +963,17 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do let(:location) { create(:location, :with_old_visible_id, scheme:) } context "when matching scheme cannot be found" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: "123", field_16: location.old_visible_id } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: "123", field_16: location.old_visible_id } } it "returns a setup error" do - expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq(["The management group code is not correct"]) + expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq(["This management group code does not belong to the owning organisation or managing organisation"]) expect(parser.errors[:field_16]).to be_blank expect(parser.errors[:field_17]).to be_blank end end context "when missing location" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: nil } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: nil } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank @@ -973,17 +983,17 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end context "when matching location cannot be found" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: "123" } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: "123" } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank - expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["Scheme could not be found with the provided management group code"]) + expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["Scheme code must relate to a scheme that is owned by the owning organisation or managing organisation"]) expect(parser.errors[:field_17]).to be_blank end end context "when matching location exists" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: location.old_visible_id } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: location.old_visible_id } } it "does not return an error" do expect(parser.errors[:field_15]).to be_blank @@ -995,11 +1005,11 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do context "when location exists but not related" do let(:other_scheme) { create(:scheme, :with_old_visible_id) } let(:other_location) { create(:location, :with_old_visible_id, scheme: other_scheme) } - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: other_location.old_visible_id } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: other_location.old_visible_id } } it "returns a setup error" do expect(parser.errors[:field_15]).to be_blank - expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["Scheme could not be found with the provided management group code"]) + expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["Scheme code must relate to a scheme that is owned by the owning organisation or managing organisation"]) expect(parser.errors[:field_17]).to be_blank end end @@ -1007,17 +1017,17 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do context "when scheme belongs to someone else" do let(:other_scheme) { create(:scheme, :with_old_visible_id) } let(:other_location) { create(:location, :with_old_visible_id, scheme: other_scheme) } - let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_15: other_scheme.old_visible_id, field_16: other_location.old_visible_id, field_1: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_15: other_scheme.old_visible_id, field_16: other_location.old_visible_id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "returns a setup error" do - expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq(["This management group code does not belong to your organisation, or any of your stock owners / managing agents"]) + expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq(["This management group code does not belong to the owning organisation or managing organisation"]) expect(parser.errors[:field_16]).to be_blank expect(parser.errors[:field_17]).to be_blank end end context "when scheme belongs to owning org" do - let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: location.old_visible_id, field_1: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_4: "2", field_5: "2", field_15: scheme.old_visible_id, field_16: location.old_visible_id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "does not return an error" do expect(parser.errors[:field_15]).to be_blank @@ -1204,7 +1214,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do describe "#field_119" do # referral context "when 3 ie PRP nominated by LA and owning org is LA" do - let(:attributes) { { bulk_upload:, field_119: "3", field_1: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_119: "3", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "is not permitted" do expect(parser.errors[:field_119]).to be_present @@ -1212,7 +1222,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end context "when 4 ie referred by LA and is general needs and owning org is LA" do - let(:attributes) { { bulk_upload:, field_119: "4", field_1: owning_org.old_visible_id.to_s, field_4: "1" } } + let(:attributes) { { bulk_upload:, field_119: "4", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "1" } } it "is not permitted" do expect(parser.errors[:field_119]).to be_present @@ -1222,7 +1232,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do context "when 4 ie referred by LA and is general needs and owning org is PRP" do let(:owning_org) { create(:organisation, :prp, :with_old_visible_id) } - let(:attributes) { { bulk_upload:, field_119: "4", field_1: owning_org.old_visible_id.to_s } } + let(:attributes) { { bulk_upload:, field_119: "4", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "is permitted" do expect(parser.errors[:field_119]).to be_blank @@ -1327,7 +1337,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do context "when org is not stock owning" do let(:owning_org) { create(:organisation, :with_old_visible_id, :does_not_own_stock) } - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "is not permitted as setup error" do setup_errors = parser.errors.select { |e| e.options[:category] == :setup } @@ -1415,7 +1425,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do describe "#field_6" do # renewal context "when blank" do - let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_6: "" } } + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_6: "" } } it "has setup errors on the field" do expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eql(["You must answer property renewal"]) @@ -1455,6 +1465,24 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end end + context "when neither UPRN nor address fields are given for a supported housing record" do + let(:bulk_upload) { create(:bulk_upload, :lettings, user:, needstype: 2) } + let(:attributes) do + { bulk_upload:, + field_15: scheme.old_visible_id, + field_4: "2", + field_5: "2", + field_16: location.old_visible_id, + field_1: "1" } + end + + it "does not add UPRN errors" do + expect(parser.errors[:field_18]).to be_empty + expect(parser.errors[:field_19]).to be_empty + expect(parser.errors[:field_21]).to be_empty + end + end + context "when UPRN is given but address fields are not" do let(:attributes) do { @@ -1692,7 +1720,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do describe "#location" do context "when lookup is via new core id" do - let(:attributes) { { bulk_upload:, field_16: "S#{scheme.id}", field_17: location.id, field_1: owning_org } } + let(:attributes) { { bulk_upload:, field_16: "S#{scheme.id}", field_17: location.id, field_1: "ORG#{owning_org.id}", field_2: "ORG#{owning_org.id}" } } it "assigns the correct location" do expect(parser.log.location).to eql(location) @@ -1700,17 +1728,43 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end context "when lookup is via old core id" do - let(:attributes) { { bulk_upload:, field_15: scheme.old_visible_id, field_16: location.old_visible_id, field_1: owning_org } } + let(:attributes) { { bulk_upload:, field_15: scheme.old_visible_id, field_16: location.old_visible_id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "assigns the correct location" do expect(parser.log.location).to eql(location) end + + context "when location had leading zeroes in its id in Old CORE" do + let(:attributes) { { bulk_upload:, field_15: scheme.old_visible_id, field_16: "123", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } + + before do + location.old_visible_id = "00123" + location.save! + end + + it "assigns the correct location" do + expect(parser.log.location).to eql(location) + end + end + + context "when the user provides an id with leading zeroes" do + let(:attributes) { { bulk_upload:, field_15: scheme.old_visible_id, field_16: "00123", field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } + + before do + location.old_visible_id = "123" + location.save! + end + + it "assigns the correct location" do + expect(parser.log.location).to eql(location) + end + end end end describe "#scheme" do context "when lookup is via new core id" do - let(:attributes) { { bulk_upload:, field_16: "S#{scheme.id}", field_1: owning_org } } + let(:attributes) { { bulk_upload:, field_16: "S#{scheme.id}", field_1: "ORG#{owning_org.id}", field_2: "ORG#{owning_org.id}" } } it "assigns the correct scheme" do expect(parser.log.scheme).to eql(scheme) @@ -1718,11 +1772,37 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end context "when lookup is via old core id" do - let(:attributes) { { bulk_upload:, field_15: scheme.old_visible_id, field_16: location.old_visible_id, field_1: owning_org } } + let(:attributes) { { bulk_upload:, field_15: scheme.old_visible_id, field_16: location.old_visible_id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } it "assigns the correct scheme" do expect(parser.log.scheme).to eql(scheme) end + + context "when scheme had leading zeroes in its id in Old CORE" do + let(:attributes) { { bulk_upload:, field_15: "10", field_16: location.old_visible_id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } + + before do + scheme.old_visible_id = "010" + scheme.save! + end + + it "assigns the correct scheme" do + expect(parser.log.scheme).to eql(scheme) + end + end + + context "when the user provides an id with leading zeroes" do + let(:attributes) { { bulk_upload:, field_15: "010", field_16: location.old_visible_id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } } + + before do + scheme.old_visible_id = "10" + scheme.save! + end + + it "assigns the correct scheme" do + expect(parser.log.scheme).to eql(scheme) + end + end end end diff --git a/spec/services/bulk_upload/sales/year2022/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2022/row_parser_spec.rb index 3b18333df..c305c67ed 100644 --- a/spec/services/bulk_upload/sales/year2022/row_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2022/row_parser_spec.rb @@ -510,6 +510,16 @@ RSpec.describe BulkUpload::Sales::Year2022::RowParser do expect(parser.errors[:field_93]).to be_blank end end + + context "when email matches other than casing" do + let(:other_user) { create(:user, organisation: owning_org) } + + let(:attributes) { { bulk_upload:, field_92: owning_org.old_visible_id, field_93: other_user.email.upcase! } } + + it "is permitted" do + expect(parser.errors[:field_93]).to be_blank + end + end end [ diff --git a/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb index e1137ea84..2e38e4f2c 100644 --- a/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb @@ -459,6 +459,16 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do expect(parser.errors[:field_2]).to be_blank end end + + context "when email matches other than casing" do + let(:other_user) { create(:user, organisation: owning_org) } + + let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: other_user.email.upcase! } } + + it "is permitted" do + expect(parser.errors[:field_2]).to be_blank + end + end end describe "fields 3, 4, 5 => saledate" do diff --git a/spec/services/imports/scheme_location_import_service_spec.rb b/spec/services/imports/scheme_location_import_service_spec.rb index f0cbde6fe..603e572d1 100644 --- a/spec/services/imports/scheme_location_import_service_spec.rb +++ b/spec/services/imports/scheme_location_import_service_spec.rb @@ -229,6 +229,15 @@ RSpec.describe Imports::SchemeLocationImportService do end end + context "and support_type is floating support" do + before { location_xml.at_xpath("//scheme:support-type").content = "6" } + + it "correctly sets the support type" do + location = location_service.create_scheme_location(location_xml) + expect(location.scheme.support_type).to eq("Floating support") + end + end + context "and postcode does not return a location code" do before { location_xml.at_xpath("//scheme:postcode").content = "A1 1AA" } diff --git a/spec/services/merge/merge_organisations_service_spec.rb b/spec/services/merge/merge_organisations_service_spec.rb index 2c2af0f3e..ad15975ad 100644 --- a/spec/services/merge/merge_organisations_service_spec.rb +++ b/spec/services/merge/merge_organisations_service_spec.rb @@ -1,13 +1,13 @@ require "rails_helper" RSpec.describe Merge::MergeOrganisationsService do - subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids]) } - - let(:absorbing_organisation) { create(:organisation, holds_own_stock: false) } - let(:absorbing_organisation_user) { create(:user, organisation: absorbing_organisation) } - describe "#call" do context "when merging a single organisation into an existing organisation" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: nil) } + + let(:absorbing_organisation) { create(:organisation, holds_own_stock: false) } + let(:absorbing_organisation_user) { create(:user, organisation: absorbing_organisation) } + let(:merging_organisation) { create(:organisation, holds_own_stock: true, name: "fake org") } let(:merging_organisation_ids) { [merging_organisation.id] } @@ -54,6 +54,13 @@ RSpec.describe Merge::MergeOrganisationsService do expect(merging_organisation_user.organisation).to eq(merging_organisation) end + it "does not set available_from for absorbing organisation" do + merge_organisations_service.call + + absorbing_organisation.reload + expect(absorbing_organisation.available_from).to be_nil + end + context "and merging organisation rent periods" do before do OrganisationRentPeriod.create!(organisation: absorbing_organisation, rent_period: 1) @@ -126,15 +133,14 @@ RSpec.describe Merge::MergeOrganisationsService do end context "and merging organisation schemes and locations" do - let!(:scheme) { create(:scheme, owning_organisation: merging_organisation) } - let!(:location) { create(:location, scheme:) } + let!(:scheme) { create(:scheme, owning_organisation: merging_organisation, old_id: "scheme_old_id", old_visible_id: "scheme_old_visible_id") } + let!(:location) { create(:location, scheme:, old_id: "location_old_id", old_visible_id: "location_old_visible_id") } let!(:deactivated_location) { create(:location, scheme:) } let!(:deactivated_scheme) { create(:scheme, owning_organisation: merging_organisation) } let!(:owned_lettings_log) { create(:lettings_log, :sh, scheme:, location:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } let!(:owned_lettings_log_no_location) { create(:lettings_log, :sh, scheme:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } before do - create(:location, scheme:, name: "fake location", postcode: "A1 1AA") create(:location, scheme: deactivated_scheme) create(:scheme_deactivation_period, scheme: deactivated_scheme, deactivation_date: Time.zone.today - 1.month) create(:location_deactivation_period, location: deactivated_location, deactivation_date: Time.zone.today - 1.month) @@ -153,8 +159,12 @@ RSpec.describe Merge::MergeOrganisationsService do absorbing_organisation.reload expect(absorbing_organisation.owned_schemes.count).to eq(1) expect(absorbing_organisation.owned_schemes.first.service_name).to eq(scheme.service_name) - expect(absorbing_organisation.owned_schemes.first.locations.count).to eq(2) + expect(absorbing_organisation.owned_schemes.first.old_id).to be_nil + expect(absorbing_organisation.owned_schemes.first.old_visible_id).to be_nil + expect(absorbing_organisation.owned_schemes.first.locations.count).to eq(1) expect(absorbing_organisation.owned_schemes.first.locations.first.postcode).to eq(location.postcode) + expect(absorbing_organisation.owned_schemes.first.locations.first.old_id).to be_nil + expect(absorbing_organisation.owned_schemes.first.locations.first.old_visible_id).to be_nil expect(scheme.scheme_deactivation_periods.count).to eq(1) expect(scheme.scheme_deactivation_periods.first.deactivation_date.to_date).to eq(Time.zone.today) end @@ -215,9 +225,175 @@ RSpec.describe Merge::MergeOrganisationsService do expect(sales_log.owning_organisation).to eq(merging_organisation) end end + + context "and merge date is provided" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: Time.zone.yesterday) } + + it "sets merge date on merged organisation" do + merge_organisations_service.call + + merging_organisation.reload + expect(merging_organisation.merge_date.to_date).to eq(Time.zone.yesterday) + expect(merging_organisation.absorbing_organisation_id).to eq(absorbing_organisation.id) + end + + context "and merging sales logs" do + let!(:sales_log) { create(:sales_log, saledate: Time.zone.today, owning_organisation: merging_organisation) } + + before do + create(:sales_log, saledate: Time.zone.today - 2.days, owning_organisation: merging_organisation) + end + + it "moves relevant logs" do + merge_organisations_service.call + + absorbing_organisation.reload + expect(SalesLog.filter_by_owning_organisation(absorbing_organisation).count).to eq(1) + expect(SalesLog.filter_by_owning_organisation(absorbing_organisation).first).to eq(sales_log) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) + allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + absorbing_organisation.reload + expect(absorbing_organisation.sales_logs.count).to eq(0) + expect(sales_log.owning_organisation).to eq(merging_organisation) + end + end + + context "and merging lettings logs" do + let(:owning_organisation) { create(:organisation, holds_own_stock: true) } + let!(:owned_lettings_log) { create(:lettings_log, startdate: Time.zone.today, owning_organisation: merging_organisation, created_by: merging_organisation_user) } + let!(:managed_lettings_log) { create(:lettings_log, startdate: Time.zone.today) } + + before do + create(:organisation_relationship) { create(:organisation_relationship, parent_organisation: owning_organisation, child_organisation: merging_organisation) } + managed_lettings_log.update!(owning_organisation:, managing_organisation: merging_organisation, created_by: merging_organisation_user) + create(:lettings_log, startdate: Time.zone.today - 2.days, owning_organisation: merging_organisation, created_by: merging_organisation_user) + create(:lettings_log, startdate: Time.zone.today - 2.days, owning_organisation:, managing_organisation: merging_organisation, created_by: merging_organisation_user) + end + + it "moves relevant logs" do + merge_organisations_service.call + + absorbing_organisation.reload + expect(LettingsLog.filter_by_owning_organisation(absorbing_organisation).count).to eq(1) + expect(LettingsLog.filter_by_owning_organisation(absorbing_organisation).first).to eq(owned_lettings_log) + expect(LettingsLog.filter_by_managing_organisation(absorbing_organisation).count).to eq(2) + expect(LettingsLog.filter_by_managing_organisation(absorbing_organisation)).to include(managed_lettings_log) + expect(LettingsLog.filter_by_managing_organisation(absorbing_organisation)).to include(owned_lettings_log) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) + allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + absorbing_organisation.reload + expect(absorbing_organisation.lettings_logs.count).to eq(0) + expect(owned_lettings_log.owning_organisation).to eq(merging_organisation) + expect(managed_lettings_log.managing_organisation).to eq(merging_organisation) + end + end + + context "and merging organisation schemes and locations" do + let!(:scheme) { create(:scheme, owning_organisation: merging_organisation) } + let!(:location) { create(:location, scheme:) } + let!(:deactivated_location) { create(:location, scheme:) } + let!(:deactivated_scheme) { create(:scheme, owning_organisation: merging_organisation) } + let!(:owned_lettings_log) { create(:lettings_log, :sh, scheme:, location:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } + let!(:owned_lettings_log_no_location) { create(:lettings_log, :sh, scheme:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } + + before do + create(:location, scheme: deactivated_scheme) + create(:scheme_deactivation_period, scheme: deactivated_scheme, deactivation_date: Time.zone.today - 1.month) + create(:location_deactivation_period, location: deactivated_location, deactivation_date: Time.zone.today - 1.month) + create(:lettings_log, scheme:, location:, startdate: Time.zone.yesterday) + create(:lettings_log, startdate: Time.zone.tomorrow, managing_organisation: merging_organisation) + end + + it "combines organisation schemes and locations" do + expect(Rails.logger).to receive(:info).with("Merged users from fake org:") + expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})") + expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)") + expect(Rails.logger).to receive(:info).with("New schemes from fake org:") + expect(Rails.logger).to receive(:info).with(/\t#{scheme.service_name} \(S/) + merge_organisations_service.call + + absorbing_organisation.reload + expect(absorbing_organisation.owned_schemes.count).to eq(1) + expect(absorbing_organisation.owned_schemes.first.service_name).to eq(scheme.service_name) + expect(absorbing_organisation.owned_schemes.first.locations.count).to eq(1) + expect(absorbing_organisation.owned_schemes.first.locations.first.postcode).to eq(location.postcode) + expect(scheme.scheme_deactivation_periods.count).to eq(1) + expect(scheme.scheme_deactivation_periods.first.deactivation_date.to_date).to eq(Time.zone.yesterday) + end + + it "moves relevant logs and assigns the new scheme" do + merge_organisations_service.call + + absorbing_organisation.reload + merging_organisation.reload + expect(absorbing_organisation.owned_lettings_logs.count).to eq(2) + expect(absorbing_organisation.managed_lettings_logs.count).to eq(1) + expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(absorbing_organisation.owned_schemes.first) + expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(absorbing_organisation.owned_schemes.first.locations.first) + expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(absorbing_organisation.owned_schemes.first) + expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) + allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + absorbing_organisation.reload + merging_organisation.reload + expect(absorbing_organisation.owned_schemes.count).to eq(0) + expect(scheme.scheme_deactivation_periods.count).to eq(0) + expect(owned_lettings_log.owning_organisation).to eq(merging_organisation) + expect(owned_lettings_log_no_location.owning_organisation).to eq(merging_organisation) + end + end + + context "and absorbing_organisation_active_from_merge_date is true" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: Time.zone.yesterday, absorbing_organisation_active_from_merge_date: true) } + + it "sets available from to merge_date for absorbing organisation" do + merge_organisations_service.call + + absorbing_organisation.reload + expect(absorbing_organisation.available_from.to_date).to eq(Time.zone.yesterday) + end + end + end + + context "and absorbing_organisation_active_from_merge_date is true" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], absorbing_organisation_active_from_merge_date: true) } + + it "sets available from to merge_date (today) for absorbing organisation" do + merge_organisations_service.call + + absorbing_organisation.reload + expect(absorbing_organisation.available_from.to_date).to eq(Time.zone.today) + end + end end context "when merging a multiple organisations into an existing organisation" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: nil) } + + let(:absorbing_organisation) { create(:organisation, holds_own_stock: false) } + let(:absorbing_organisation_user) { create(:user, organisation: absorbing_organisation) } + let(:merging_organisation) { create(:organisation, holds_own_stock: true, name: "fake org") } let(:merging_organisation_too) { create(:organisation, holds_own_stock: true, name: "second org") } @@ -318,6 +494,530 @@ RSpec.describe Merge::MergeOrganisationsService do expect(absorbing_organisation.child_organisations).to include(absorbing_organisation_relationship.child_organisation) end end + + context "and merge date is provided" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: Time.zone.yesterday) } + + it "sets merge date and absorbing organisation on merged organisations" do + merge_organisations_service.call + + merging_organisation.reload + merging_organisation_too.reload + expect(merging_organisation.merge_date.to_date).to eq(Time.zone.yesterday) + expect(merging_organisation.absorbing_organisation_id).to eq(absorbing_organisation.id) + expect(merging_organisation_too.merge_date.to_date).to eq(Time.zone.yesterday) + expect(merging_organisation_too.absorbing_organisation_id).to eq(absorbing_organisation.id) + end + end + end + + context "when merging a single organisation into a new organisation" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: new_absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: nil) } + + let(:new_absorbing_organisation) { create(:organisation, :without_dpc, holds_own_stock: false) } + let(:new_absorbing_organisation_user) { create(:user, organisation: new_absorbing_organisation) } + + let(:merging_organisation) { create(:organisation, holds_own_stock: true, name: "fake org") } + + let(:merging_organisation_ids) { [merging_organisation.id] } + let!(:merging_organisation_user) { create(:user, organisation: merging_organisation, name: "fake name", email: "fake@email.com") } + + it "moves the users from merging organisation to absorbing organisation" do + expect(Rails.logger).to receive(:info).with("Merged users from fake org:") + expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})") + expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)") + expect(Rails.logger).to receive(:info).with("New schemes from fake org:") + merge_organisations_service.call + + merging_organisation_user.reload + expect(merging_organisation_user.organisation).to eq(new_absorbing_organisation) + end + + it "sets merge date on merged organisation" do + merge_organisations_service.call + + merging_organisation.reload + expect(merging_organisation.merge_date.to_date).to eq(Time.zone.today) + expect(merging_organisation.absorbing_organisation_id).to eq(new_absorbing_organisation.id) + end + + it "combines organisation data" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.holds_own_stock).to eq(true) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.holds_own_stock).to eq(false) + expect(merging_organisation.merge_date).to eq(nil) + expect(merging_organisation.absorbing_organisation_id).to eq(nil) + expect(merging_organisation_user.organisation).to eq(merging_organisation) + end + + it "does not set available_from for absorbing organisation" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.available_from).to be_nil + end + + context "and merging organisation rent periods" do + before do + OrganisationRentPeriod.create!(organisation: new_absorbing_organisation, rent_period: 1) + OrganisationRentPeriod.create!(organisation: new_absorbing_organisation, rent_period: 3) + OrganisationRentPeriod.create!(organisation: merging_organisation, rent_period: 1) + OrganisationRentPeriod.create!(organisation: merging_organisation, rent_period: 2) + end + + it "combines organisation rent periods" do + expect(new_absorbing_organisation.rent_periods.count).to eq(2) + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.rent_periods.count).to eq(3) + expect(new_absorbing_organisation.rent_periods).to include(1) + expect(new_absorbing_organisation.rent_periods).to include(2) + expect(new_absorbing_organisation.rent_periods).to include(3) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.rent_periods.count).to eq(2) + expect(merging_organisation.rent_periods.count).to eq(2) + end + end + + context "and merging organisation relationships" do + let(:other_organisation) { create(:organisation) } + let!(:merging_organisation_relationship) { create(:organisation_relationship, parent_organisation: merging_organisation) } + let!(:new_absorbing_organisation_relationship) { create(:organisation_relationship, parent_organisation: new_absorbing_organisation) } + + before do + create(:organisation_relationship, parent_organisation: new_absorbing_organisation, child_organisation: merging_organisation) + create(:organisation_relationship, parent_organisation: merging_organisation, child_organisation: other_organisation) + create(:organisation_relationship, parent_organisation: new_absorbing_organisation, child_organisation: other_organisation) + end + + it "combines organisation relationships" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.child_organisations).to include(other_organisation) + expect(new_absorbing_organisation.child_organisations).to include(new_absorbing_organisation_relationship.child_organisation) + expect(new_absorbing_organisation.child_organisations).to include(merging_organisation_relationship.child_organisation) + expect(new_absorbing_organisation.child_organisations).not_to include(merging_organisation) + expect(new_absorbing_organisation.parent_organisations.count).to eq(0) + expect(new_absorbing_organisation.child_organisations.count).to eq(3) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.child_organisations.count).to eq(3) + expect(new_absorbing_organisation.child_organisations).to include(other_organisation) + expect(new_absorbing_organisation.child_organisations).to include(merging_organisation) + expect(new_absorbing_organisation.child_organisations).to include(new_absorbing_organisation_relationship.child_organisation) + end + end + + context "and merging organisation schemes and locations" do + let!(:scheme) { create(:scheme, owning_organisation: merging_organisation, old_id: "scheme_old_id", old_visible_id: "scheme_old_visible_id") } + let!(:location) { create(:location, scheme:, old_id: "location_old_id", old_visible_id: "location_old_visible_id") } + let!(:deactivated_location) { create(:location, scheme:) } + let!(:deactivated_scheme) { create(:scheme, owning_organisation: merging_organisation) } + let!(:owned_lettings_log) { create(:lettings_log, :sh, scheme:, location:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } + let!(:owned_lettings_log_no_location) { create(:lettings_log, :sh, scheme:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } + + before do + create(:location, scheme: deactivated_scheme) + create(:scheme_deactivation_period, scheme: deactivated_scheme, deactivation_date: Time.zone.today - 1.month) + create(:location_deactivation_period, location: deactivated_location, deactivation_date: Time.zone.today - 1.month) + create(:lettings_log, scheme:, location:, startdate: Time.zone.yesterday) + create(:lettings_log, startdate: Time.zone.tomorrow, managing_organisation: merging_organisation) + end + + it "combines organisation schemes and locations" do + expect(Rails.logger).to receive(:info).with("Merged users from fake org:") + expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})") + expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)") + expect(Rails.logger).to receive(:info).with("New schemes from fake org:") + expect(Rails.logger).to receive(:info).with(/\t#{scheme.service_name} \(S/) + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.owned_schemes.count).to eq(1) + expect(new_absorbing_organisation.owned_schemes.first.service_name).to eq(scheme.service_name) + expect(new_absorbing_organisation.owned_schemes.first.old_id).to be_nil + expect(new_absorbing_organisation.owned_schemes.first.old_visible_id).to be_nil + expect(new_absorbing_organisation.owned_schemes.first.locations.count).to eq(1) + expect(new_absorbing_organisation.owned_schemes.first.locations.first.postcode).to eq(location.postcode) + expect(new_absorbing_organisation.owned_schemes.first.locations.first.old_id).to be_nil + expect(new_absorbing_organisation.owned_schemes.first.locations.first.old_visible_id).to be_nil + expect(scheme.scheme_deactivation_periods.count).to eq(1) + expect(scheme.scheme_deactivation_periods.first.deactivation_date.to_date).to eq(Time.zone.today) + end + + it "moves relevant logs and assigns the new scheme" do + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.owned_lettings_logs.count).to eq(2) + expect(new_absorbing_organisation.managed_lettings_logs.count).to eq(1) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(new_absorbing_organisation.owned_schemes.first) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(new_absorbing_organisation.owned_schemes.first.locations.first) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(new_absorbing_organisation.owned_schemes.first) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.owned_schemes.count).to eq(0) + expect(scheme.scheme_deactivation_periods.count).to eq(0) + expect(owned_lettings_log.owning_organisation).to eq(merging_organisation) + expect(owned_lettings_log_no_location.owning_organisation).to eq(merging_organisation) + end + end + + context "and merging sales logs" do + let!(:sales_log) { create(:sales_log, saledate: Time.zone.tomorrow, owning_organisation: merging_organisation) } + + before do + create(:sales_log, saledate: Time.zone.yesterday, owning_organisation: merging_organisation) + end + + it "moves relevant logs" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(SalesLog.filter_by_owning_organisation(new_absorbing_organisation).count).to eq(1) + expect(SalesLog.filter_by_owning_organisation(new_absorbing_organisation).first).to eq(sales_log) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.sales_logs.count).to eq(0) + expect(sales_log.owning_organisation).to eq(merging_organisation) + end + end + + context "and merge date is provided" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: new_absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: Time.zone.yesterday) } + + it "sets merge date on merged organisation" do + merge_organisations_service.call + + merging_organisation.reload + expect(merging_organisation.merge_date.to_date).to eq(Time.zone.yesterday) + expect(merging_organisation.absorbing_organisation_id).to eq(new_absorbing_organisation.id) + end + + context "and merging sales logs" do + let!(:sales_log) { create(:sales_log, saledate: Time.zone.today, owning_organisation: merging_organisation) } + + before do + create(:sales_log, saledate: Time.zone.today - 2.days, owning_organisation: merging_organisation) + end + + it "moves relevant logs" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(SalesLog.filter_by_owning_organisation(new_absorbing_organisation).count).to eq(1) + expect(SalesLog.filter_by_owning_organisation(new_absorbing_organisation).first).to eq(sales_log) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.sales_logs.count).to eq(0) + expect(sales_log.owning_organisation).to eq(merging_organisation) + end + end + + context "and merging lettings logs" do + let(:owning_organisation) { create(:organisation, holds_own_stock: true) } + let!(:owned_lettings_log) { create(:lettings_log, startdate: Time.zone.today, owning_organisation: merging_organisation, created_by: merging_organisation_user) } + let!(:managed_lettings_log) { create(:lettings_log, startdate: Time.zone.today) } + + before do + create(:organisation_relationship) { create(:organisation_relationship, parent_organisation: owning_organisation, child_organisation: merging_organisation) } + managed_lettings_log.update!(owning_organisation:, managing_organisation: merging_organisation, created_by: merging_organisation_user) + create(:lettings_log, startdate: Time.zone.today - 2.days, owning_organisation: merging_organisation, created_by: merging_organisation_user) + create(:lettings_log, startdate: Time.zone.today - 2.days, owning_organisation:, managing_organisation: merging_organisation, created_by: merging_organisation_user) + end + + it "moves relevant logs" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(LettingsLog.filter_by_owning_organisation(new_absorbing_organisation).count).to eq(1) + expect(LettingsLog.filter_by_owning_organisation(new_absorbing_organisation).first).to eq(owned_lettings_log) + expect(LettingsLog.filter_by_managing_organisation(new_absorbing_organisation).count).to eq(2) + expect(LettingsLog.filter_by_managing_organisation(new_absorbing_organisation)).to include(managed_lettings_log) + expect(LettingsLog.filter_by_managing_organisation(new_absorbing_organisation)).to include(owned_lettings_log) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.lettings_logs.count).to eq(0) + expect(owned_lettings_log.owning_organisation).to eq(merging_organisation) + expect(managed_lettings_log.managing_organisation).to eq(merging_organisation) + end + end + + context "and merging organisation schemes and locations" do + let!(:scheme) { create(:scheme, owning_organisation: merging_organisation) } + let!(:location) { create(:location, scheme:) } + let!(:deactivated_location) { create(:location, scheme:) } + let!(:deactivated_scheme) { create(:scheme, owning_organisation: merging_organisation) } + let!(:owned_lettings_log) { create(:lettings_log, :sh, scheme:, location:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } + let!(:owned_lettings_log_no_location) { create(:lettings_log, :sh, scheme:, startdate: Time.zone.tomorrow, owning_organisation: merging_organisation) } + + before do + create(:location, scheme: deactivated_scheme) + create(:scheme_deactivation_period, scheme: deactivated_scheme, deactivation_date: Time.zone.today - 1.month) + create(:location_deactivation_period, location: deactivated_location, deactivation_date: Time.zone.today - 1.month) + create(:lettings_log, scheme:, location:, startdate: Time.zone.yesterday) + create(:lettings_log, startdate: Time.zone.tomorrow, managing_organisation: merging_organisation) + end + + it "combines organisation schemes and locations" do + expect(Rails.logger).to receive(:info).with("Merged users from fake org:") + expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})") + expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)") + expect(Rails.logger).to receive(:info).with("New schemes from fake org:") + expect(Rails.logger).to receive(:info).with(/\t#{scheme.service_name} \(S/) + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.owned_schemes.count).to eq(1) + expect(new_absorbing_organisation.owned_schemes.first.service_name).to eq(scheme.service_name) + expect(new_absorbing_organisation.owned_schemes.first.locations.count).to eq(1) + expect(new_absorbing_organisation.owned_schemes.first.locations.first.postcode).to eq(location.postcode) + expect(scheme.scheme_deactivation_periods.count).to eq(1) + expect(scheme.scheme_deactivation_periods.first.deactivation_date.to_date).to eq(Time.zone.yesterday) + end + + it "moves relevant logs and assigns the new scheme" do + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.owned_lettings_logs.count).to eq(2) + expect(new_absorbing_organisation.managed_lettings_logs.count).to eq(1) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(new_absorbing_organisation.owned_schemes.first) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(new_absorbing_organisation.owned_schemes.first.locations.first) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(new_absorbing_organisation.owned_schemes.first) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.owned_schemes.count).to eq(0) + expect(scheme.scheme_deactivation_periods.count).to eq(0) + expect(owned_lettings_log.owning_organisation).to eq(merging_organisation) + expect(owned_lettings_log_no_location.owning_organisation).to eq(merging_organisation) + end + end + + context "and absorbing_organisation_active_from_merge_date is true" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: new_absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: Time.zone.yesterday, absorbing_organisation_active_from_merge_date: true) } + + it "sets available from to merge_date for absorbing organisation" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.available_from.to_date).to eq(Time.zone.yesterday) + end + end + end + + context "and absorbing_organisation_active_from_merge_date is true" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: new_absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], absorbing_organisation_active_from_merge_date: true) } + + it "sets available from to merge_date (today) for absorbing organisation" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.available_from.to_date).to eq(Time.zone.today) + end + end + end + + context "when merging multiple organisations into a new organisation" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: new_absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: nil) } + + let(:new_absorbing_organisation) { create(:organisation, :without_dpc, holds_own_stock: false) } + let(:new_absorbing_organisation_user) { create(:user, organisation: new_absorbing_organisation) } + + let(:merging_organisation) { create(:organisation, holds_own_stock: true, name: "fake org") } + let(:merging_organisation_too) { create(:organisation, holds_own_stock: true, name: "second org") } + + let(:merging_organisation_ids) { [merging_organisation.id, merging_organisation_too.id] } + let!(:merging_organisation_user) { create(:user, organisation: merging_organisation, name: "fake name", email: "fake@email.com") } + + before do + create_list(:user, 5, organisation: merging_organisation_too) + end + + it "moves the users from merging organisations to absorbing organisation" do + expect(Rails.logger).to receive(:info).with("Merged users from fake org:") + expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})") + expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)") + expect(Rails.logger).to receive(:info).with("Merged users from second org:") + expect(Rails.logger).to receive(:info).with(/\tDanny Rojas/).exactly(6).times + expect(Rails.logger).to receive(:info).with("New schemes from fake org:") + expect(Rails.logger).to receive(:info).with("New schemes from second org:") + merge_organisations_service.call + + merging_organisation_user.reload + expect(merging_organisation_user.organisation).to eq(new_absorbing_organisation) + end + + it "sets merge date and absorbing organisation on merged organisations" do + merge_organisations_service.call + + merging_organisation.reload + merging_organisation_too.reload + expect(merging_organisation.merge_date.to_date).to eq(Time.zone.today) + expect(merging_organisation.absorbing_organisation_id).to eq(new_absorbing_organisation.id) + expect(merging_organisation_too.merge_date.to_date).to eq(Time.zone.today) + expect(merging_organisation_too.absorbing_organisation_id).to eq(new_absorbing_organisation.id) + end + + it "combines organisation data" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.holds_own_stock).to eq(true) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.holds_own_stock).to eq(false) + expect(merging_organisation.merge_date).to eq(nil) + expect(merging_organisation.absorbing_organisation_id).to eq(nil) + expect(merging_organisation_user.organisation).to eq(merging_organisation) + end + + context "and merging organisation relationships" do + let(:other_organisation) { create(:organisation) } + let!(:merging_organisation_relationship) { create(:organisation_relationship, parent_organisation: merging_organisation) } + let!(:new_absorbing_organisation_relationship) { create(:organisation_relationship, parent_organisation: new_absorbing_organisation) } + + before do + create(:organisation_relationship, parent_organisation: merging_organisation, child_organisation: new_absorbing_organisation) + create(:organisation_relationship, parent_organisation: merging_organisation, child_organisation: other_organisation) + create(:organisation_relationship, parent_organisation: new_absorbing_organisation, child_organisation: other_organisation) + create(:organisation_relationship, parent_organisation: merging_organisation, child_organisation: merging_organisation_too) + end + + it "combines organisation relationships" do + merge_organisations_service.call + + new_absorbing_organisation.reload + expect(new_absorbing_organisation.child_organisations).to include(other_organisation) + expect(new_absorbing_organisation.child_organisations).to include(new_absorbing_organisation_relationship.child_organisation) + expect(new_absorbing_organisation.child_organisations).to include(merging_organisation_relationship.child_organisation) + expect(new_absorbing_organisation.child_organisations).not_to include(merging_organisation) + expect(new_absorbing_organisation.parent_organisations).not_to include(merging_organisation) + expect(new_absorbing_organisation.child_organisations).not_to include(merging_organisation_too) + expect(new_absorbing_organisation.parent_organisations).not_to include(merging_organisation_too) + expect(new_absorbing_organisation.parent_organisations.count).to eq(0) + expect(new_absorbing_organisation.child_organisations.count).to eq(3) + end + + it "rolls back if there's an error" do + allow(Organisation).to receive(:find).with([merging_organisation_ids]).and_return(Organisation.find(merging_organisation_ids)) + allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) + allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) + expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") + merge_organisations_service.call + + new_absorbing_organisation.reload + merging_organisation.reload + expect(new_absorbing_organisation.child_organisations.count).to eq(2) + expect(new_absorbing_organisation.parent_organisations.count).to eq(1) + expect(new_absorbing_organisation.child_organisations).to include(other_organisation) + expect(new_absorbing_organisation.parent_organisations).to include(merging_organisation) + expect(new_absorbing_organisation.child_organisations).to include(new_absorbing_organisation_relationship.child_organisation) + end + end + + context "and merge date is provided" do + subject(:merge_organisations_service) { described_class.new(absorbing_organisation_id: new_absorbing_organisation.id, merging_organisation_ids: [merging_organisation_ids], merge_date: Time.zone.yesterday) } + + it "sets merge date and absorbing organisation on merged organisations" do + merge_organisations_service.call + + merging_organisation.reload + merging_organisation_too.reload + expect(merging_organisation.merge_date.to_date).to eq(Time.zone.yesterday) + expect(merging_organisation.absorbing_organisation_id).to eq(new_absorbing_organisation.id) + expect(merging_organisation_too.merge_date.to_date).to eq(Time.zone.yesterday) + expect(merging_organisation_too.absorbing_organisation_id).to eq(new_absorbing_organisation.id) + end + end end end end