From 932e766cf82c58cb91759c31813cad60c44a5de4 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:42:44 +0100 Subject: [PATCH] CLDC-3518 Add collection resources page (#2673) * Dynamically display collection resources for years * Display mandatory resources on collection resources page * Move download resources to collection resources controller and refactor routes * Put managing resources button behind a feature flag * Everyone should be able to download mandatory resources * Remove mentions of legacy template and update bu path methods * Update styling * Update tests and routes * CLDC-3518 Allow updating mandatory collection resources (#2676) * Add update resource page * Allow updating mandatory collection resources * CLDC-3518 Add file validation to collection resources (#2678) * Add file validation to collection resources * Move some tests to feature tests * Extract validations into translations file * Rebase changes * More rebase updates * Read file * Update tests --- .../collection_resources_controller.rb | 112 +++++++ app/controllers/start_controller.rb | 67 +--- app/helpers/collection_resources_helper.rb | 47 +++ app/models/collection_resource.rb | 10 + .../forms/bulk_upload_lettings/guidance.rb | 8 - .../bulk_upload_lettings/prepare_your_file.rb | 21 +- .../forms/bulk_upload_sales/guidance.rb | 8 - .../bulk_upload_sales/prepare_your_file.rb | 21 +- app/services/collection_resources_service.rb | 8 + app/services/feature_toggle.rb | 8 + .../mandatory_collection_resources_service.rb | 56 ++++ app/services/storage/s3_service.rb | 7 + .../forms/prepare_your_file_2023.html.erb | 4 - .../forms/prepare_your_file_2023.html.erb | 1 - .../bulk_upload_shared/guidance.html.erb | 2 - .../_collection_resource_summary_list.erb | 32 ++ app/views/collection_resources/edit.html.erb | 28 ++ app/views/collection_resources/index.html.erb | 21 ++ .../layouts/_collection_resources.html.erb | 117 +------ config/locales/en.yml | 8 + config/routes.rb | 25 +- spec/factories/collection_resource.rb | 10 + spec/features/collection_resources_spec.rb | 168 ++++++++++ spec/fixtures/files/excel_file.xlsx | Bin 0 -> 8884 bytes spec/fixtures/files/pdf_file.pdf | Bin 0 -> 11871 bytes .../collection_resources_helper_spec.rb | 132 ++++++++ .../collection_resources_controller_spec.rb | 302 ++++++++++++++++++ spec/requests/start_controller_spec.rb | 24 +- .../collection_resources_service_spec.rb | 19 ++ ...atory_collection_resources_service_spec.rb | 42 +++ 30 files changed, 1058 insertions(+), 250 deletions(-) create mode 100644 app/controllers/collection_resources_controller.rb create mode 100644 app/models/collection_resource.rb create mode 100644 app/services/mandatory_collection_resources_service.rb create mode 100644 app/views/collection_resources/_collection_resource_summary_list.erb create mode 100644 app/views/collection_resources/edit.html.erb create mode 100644 app/views/collection_resources/index.html.erb create mode 100644 spec/factories/collection_resource.rb create mode 100644 spec/features/collection_resources_spec.rb create mode 100644 spec/fixtures/files/excel_file.xlsx create mode 100644 spec/fixtures/files/pdf_file.pdf create mode 100644 spec/requests/collection_resources_controller_spec.rb create mode 100644 spec/services/collection_resources_service_spec.rb create mode 100644 spec/services/mandatory_collection_resources_service_spec.rb diff --git a/app/controllers/collection_resources_controller.rb b/app/controllers/collection_resources_controller.rb new file mode 100644 index 000000000..f1fd6de07 --- /dev/null +++ b/app/controllers/collection_resources_controller.rb @@ -0,0 +1,112 @@ +class CollectionResourcesController < ApplicationController + include CollectionResourcesHelper + + before_action :authenticate_user!, except: %i[download_mandatory_collection_resource] + + def index + render_not_found unless current_user.support? + + @mandatory_lettings_collection_resources_per_year = MandatoryCollectionResourcesService.generate_resources("lettings", editable_collection_resource_years) + @mandatory_sales_collection_resources_per_year = MandatoryCollectionResourcesService.generate_resources("sales", editable_collection_resource_years) + end + + def download_mandatory_collection_resource + log_type = params[:log_type] + year = params[:year].to_i + resource_type = params[:resource_type] + + return render_not_found unless resource_for_year_can_be_downloaded?(year) + + resource = MandatoryCollectionResourcesService.generate_resource(log_type, year, resource_type) + return render_not_found unless resource + + download_resource(resource.download_filename) + end + + def edit + return render_not_found unless current_user.support? + + year = params[:year].to_i + resource_type = params[:resource_type] + log_type = params[:log_type] + + return render_not_found unless resource_for_year_can_be_updated?(year) + + @collection_resource = MandatoryCollectionResourcesService.generate_resource(log_type, year, resource_type) + + return render_not_found unless @collection_resource + + render "collection_resources/edit" + end + + def update + return render_not_found unless current_user.support? + + year = resource_params[:year].to_i + resource_type = resource_params[:resource_type] + log_type = resource_params[:log_type] + file = resource_params[:file] + + return render_not_found unless resource_for_year_can_be_updated?(year) + + @collection_resource = MandatoryCollectionResourcesService.generate_resource(log_type, year, resource_type) + render_not_found unless @collection_resource + + validate_file(file) + + return render "collection_resources/edit" if @collection_resource.errors.any? + + filename = @collection_resource.download_filename + begin + CollectionResourcesService.new.upload_collection_resource(filename, file) + rescue StandardError + @collection_resource.errors.add(:file, :error_uploading) + return render "collection_resources/edit" + end + + flash[:notice] = "The #{log_type} #{text_year_range_format(year)} #{@collection_resource.short_display_name.downcase} has been updated" + redirect_to collection_resources_path + end + +private + + def resource_params + params.require(:collection_resource).permit(:year, :log_type, :resource_type, :file) + end + + def download_resource(filename) + file = CollectionResourcesService.new.get_file(filename) + return render_not_found unless file + + send_data(file, disposition: "attachment", filename:) + end + + def resource_for_year_can_be_downloaded?(year) + return true if current_user&.support? && editable_collection_resource_years.include?(year) + + displayed_collection_resource_years.include?(year) + end + + def resource_for_year_can_be_updated?(year) + editable_collection_resource_years.include?(year) + end + + def validate_file(file) + return @collection_resource.errors.add(:file, :blank) unless file + return @collection_resource.errors.add(:file, :above_100_mb) if file.size > 100.megabytes + + argv = %W[file --brief --mime-type -- #{file.path}] + output = `#{argv.shelljoin}` + + case @collection_resource.resource_type + when "paper_form" + unless output.match?(/application\/pdf/) + @collection_resource.errors.add(:file, :must_be_pdf) + end + when "bulk_upload_template", "bulk_upload_specification" + unless output.match?(/application\/vnd\.ms-excel|application\/vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet/) + @collection_resource.errors.add(:file, :must_be_xlsx, resource: @collection_resource.short_display_name.downcase) + end + end + end +end diff --git a/app/controllers/start_controller.rb b/app/controllers/start_controller.rb index dd4232b7b..5bd49df3f 100644 --- a/app/controllers/start_controller.rb +++ b/app/controllers/start_controller.rb @@ -2,74 +2,11 @@ class StartController < ApplicationController include CollectionResourcesHelper def index + @mandatory_lettings_collection_resources_per_year = MandatoryCollectionResourcesService.generate_resources("lettings", displayed_collection_resource_years) + @mandatory_sales_collection_resources_per_year = MandatoryCollectionResourcesService.generate_resources("sales", displayed_collection_resource_years) if current_user @homepage_presenter = HomepagePresenter.new(current_user) render "home/index" end end - - def download_24_25_sales_form - download_resource("2024_25_sales_paper_form.pdf", "2024-25 Sales paper form.pdf") - end - - def download_23_24_sales_form - download_resource("2023_24_sales_paper_form.pdf", "2023-24 Sales paper form.pdf") - end - - def download_24_25_lettings_form - download_resource("2024_25_lettings_paper_form.pdf", "2024-25 Lettings paper form.pdf") - end - - def download_23_24_lettings_form - download_resource("2023_24_lettings_paper_form.pdf", "2023-24 Lettings paper form.pdf") - end - - def download_24_25_lettings_bulk_upload_template - download_resource("bulk-upload-lettings-template-2024-25.xlsx", "2024-25-lettings-bulk-upload-template.xlsx") - end - - def download_24_25_lettings_bulk_upload_specification - download_resource("bulk-upload-lettings-specification-2024-25.xlsx", "2024-25-lettings-bulk-upload-specification.xlsx") - end - - def download_24_25_sales_bulk_upload_template - download_resource("bulk-upload-sales-template-2024-25.xlsx", "2024-25-sales-bulk-upload-template.xlsx") - end - - def download_24_25_sales_bulk_upload_specification - download_resource("bulk-upload-sales-specification-2024-25.xlsx", "2024-25-sales-bulk-upload-specification.xlsx") - end - - def download_23_24_lettings_bulk_upload_template - download_resource("bulk-upload-lettings-template-2023-24.xlsx", "2023-24-lettings-bulk-upload-template.xlsx") - end - - def download_23_24_lettings_bulk_upload_legacy_template - download_resource("bulk-upload-lettings-legacy-template-2023-24.xlsx", "2023-24-lettings-bulk-upload-legacy-template.xlsx") - end - - def download_23_24_lettings_bulk_upload_specification - download_resource("bulk-upload-lettings-specification-2023-24.xlsx", "2023-24-lettings-bulk-upload-specification.xlsx") - end - - def download_23_24_sales_bulk_upload_template - download_resource("bulk-upload-sales-template-2023-24.xlsx", "2023-24-sales-bulk-upload-template.xlsx") - end - - def download_23_24_sales_bulk_upload_legacy_template - download_resource("bulk-upload-sales-legacy-template-2023-24.xlsx", "2023-24-sales-bulk-upload-legacy-template.xlsx") - end - - def download_23_24_sales_bulk_upload_specification - download_resource("bulk-upload-sales-specification-2023-24.xlsx", "2023-24-sales-bulk-upload-specification.xlsx") - end - -private - - def download_resource(filename, download_filename) - file = CollectionResourcesService.new.get_file(filename) - return render_not_found unless file - - send_data(file, disposition: "attachment", filename: download_filename) - end end diff --git a/app/helpers/collection_resources_helper.rb b/app/helpers/collection_resources_helper.rb index 5ab539cde..e1fb6cf2b 100644 --- a/app/helpers/collection_resources_helper.rb +++ b/app/helpers/collection_resources_helper.rb @@ -1,4 +1,6 @@ module CollectionResourcesHelper + include CollectionTimeHelper + HUMAN_READABLE_CONTENT_TYPE = { "application/pdf": "PDF", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "Microsoft Excel", "application/vnd.ms-excel": "Microsoft Excel (Old Format)", @@ -19,4 +21,49 @@ module CollectionResourcesHelper file_type = HUMAN_READABLE_CONTENT_TYPE[metadata["content_type"].to_sym] || "Unknown File Type" [file_type, file_size, file_pages].compact.join(", ") end + + def displayed_collection_resource_years + return [previous_collection_start_year, current_collection_start_year] if FormHandler.instance.in_edit_crossover_period? + + [current_collection_start_year] + end + + def editable_collection_resource_years + return [previous_collection_start_year, current_collection_start_year] if FormHandler.instance.in_edit_crossover_period? + return [next_collection_start_year, current_collection_start_year] if (Time.zone.today >= Time.zone.local(Time.zone.today.year, 1, 1) && Time.zone.today < Time.zone.local(Time.zone.today.year, 4, 1)) || FeatureToggle.allow_future_resource_updates? + + [current_collection_start_year] + end + + def year_range_format(year) + "#{year % 100}/#{(year + 1) % 100}" + end + + def text_year_range_format(year) + "#{year} to #{year + 1}" + end + + def document_list_component_items(resources) + resources.map do |resource| + { + name: "Download the #{resource.display_name}", + href: resource.download_path, + metadata: file_type_size_and_pages(resource.download_filename), + } + end + end + + def document_list_edit_component_items(resources) + resources.map do |resource| + { + name: resource.download_filename, + href: resource.download_path, + metadata: file_type_size_and_pages(resource.download_filename), + } + end + end + + def file_exists_on_s3?(file) + CollectionResourcesService.new.file_exists_on_s3?(file) + end end diff --git a/app/models/collection_resource.rb b/app/models/collection_resource.rb new file mode 100644 index 000000000..d5c3c895b --- /dev/null +++ b/app/models/collection_resource.rb @@ -0,0 +1,10 @@ +class CollectionResource + include ActiveModel::Model + include Rails.application.routes.url_helpers + + attr_accessor :resource_type, :display_name, :short_display_name, :year, :log_type, :download_filename, :file + + def download_path + download_mandatory_collection_resource_path(log_type:, year:, resource_type:) + end +end diff --git a/app/models/forms/bulk_upload_lettings/guidance.rb b/app/models/forms/bulk_upload_lettings/guidance.rb index 24bc531f2..dc0de3271 100644 --- a/app/models/forms/bulk_upload_lettings/guidance.rb +++ b/app/models/forms/bulk_upload_lettings/guidance.rb @@ -24,10 +24,6 @@ module Forms end end - def lettings_legacy_template_path - Forms::BulkUploadLettings::PrepareYourFile.new.legacy_template_path - end - def lettings_template_path Forms::BulkUploadLettings::PrepareYourFile.new(year:).template_path end @@ -36,10 +32,6 @@ module Forms Forms::BulkUploadLettings::PrepareYourFile.new(year:).specification_path end - def sales_legacy_template_path - Forms::BulkUploadSales::PrepareYourFile.new.legacy_template_path - end - def sales_template_path Forms::BulkUploadSales::PrepareYourFile.new(year:).template_path end diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb index 984451dbb..b66c1649f 100644 --- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb @@ -32,29 +32,12 @@ module Forms bulk_upload_lettings_log_path(id: "upload-your-file", form: { year:, needstype:, organisation_id: }.compact) end - def legacy_template_path - case year - when 2023 - download_23_24_lettings_bulk_upload_legacy_template_path - end - end - def template_path - case year - when 2023 - download_23_24_lettings_bulk_upload_template_path - when 2024 - download_24_25_lettings_bulk_upload_template_path - end + download_mandatory_collection_resource_path(year:, log_type: "lettings", resource_type: "bulk_upload_template") end def specification_path - case year - when 2023 - download_23_24_lettings_bulk_upload_specification_path - when 2024 - download_24_25_lettings_bulk_upload_specification_path - end + download_mandatory_collection_resource_path(year:, log_type: "lettings", resource_type: "bulk_upload_specification") end def year_combo diff --git a/app/models/forms/bulk_upload_sales/guidance.rb b/app/models/forms/bulk_upload_sales/guidance.rb index ef792a3e4..be61ef650 100644 --- a/app/models/forms/bulk_upload_sales/guidance.rb +++ b/app/models/forms/bulk_upload_sales/guidance.rb @@ -24,10 +24,6 @@ module Forms end end - def lettings_legacy_template_path - Forms::BulkUploadLettings::PrepareYourFile.new.legacy_template_path - end - def lettings_template_path Forms::BulkUploadLettings::PrepareYourFile.new(year:).template_path end @@ -36,10 +32,6 @@ module Forms Forms::BulkUploadLettings::PrepareYourFile.new(year:).specification_path end - def sales_legacy_template_path - Forms::BulkUploadSales::PrepareYourFile.new.legacy_template_path - end - def sales_template_path Forms::BulkUploadSales::PrepareYourFile.new(year:).template_path end diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb index d6d5276c2..6bac024cc 100644 --- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb @@ -31,29 +31,12 @@ module Forms bulk_upload_sales_log_path(id: "upload-your-file", form: { year:, organisation_id: }.compact) end - def legacy_template_path - case year - when 2023 - download_23_24_sales_bulk_upload_legacy_template_path - end - end - def template_path - case year - when 2023 - download_23_24_sales_bulk_upload_template_path - when 2024 - download_24_25_sales_bulk_upload_template_path - end + download_mandatory_collection_resource_path(year:, log_type: "sales", resource_type: "bulk_upload_template") end def specification_path - case year - when 2023 - download_23_24_sales_bulk_upload_specification_path - when 2024 - download_24_25_sales_bulk_upload_specification_path - end + download_mandatory_collection_resource_path(year:, log_type: "sales", resource_type: "bulk_upload_specification") end def year_combo diff --git a/app/services/collection_resources_service.rb b/app/services/collection_resources_service.rb index f347a4ebf..81ab08254 100644 --- a/app/services/collection_resources_service.rb +++ b/app/services/collection_resources_service.rb @@ -18,4 +18,12 @@ class CollectionResourcesService rescue StandardError nil end + + def file_exists_on_s3?(file) + @storage_service.file_exists?(file) + end + + def upload_collection_resource(filename, file) + @storage_service.write_file(filename, file) + end end diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb index f63eceaef..5312d1964 100644 --- a/app/services/feature_toggle.rb +++ b/app/services/feature_toggle.rb @@ -38,4 +38,12 @@ class FeatureToggle def self.local_storage? Rails.env.development? end + + def self.allow_future_resource_updates? + !Rails.env.production? && !Rails.env.test? + end + + def self.managing_resources_enabled? + !Rails.env.production? + end end diff --git a/app/services/mandatory_collection_resources_service.rb b/app/services/mandatory_collection_resources_service.rb new file mode 100644 index 000000000..82a6bd41e --- /dev/null +++ b/app/services/mandatory_collection_resources_service.rb @@ -0,0 +1,56 @@ +class MandatoryCollectionResourcesService + MANDATORY_RESOURCES = %w[paper_form bulk_upload_template bulk_upload_specification].freeze + + def self.generate_resources(log_type, collection_years) + mandatory_resources_per_year = {} + collection_years.map do |year| + mandatory_resources_per_year[year] = resources_per_year(year, log_type) + end + mandatory_resources_per_year + end + + def self.resources_per_year(year, log_type) + MANDATORY_RESOURCES.map do |resource| + generate_resource(log_type, year, resource) + end + end + + def self.generate_resource(log_type, year, resource_type) + return unless log_type && year && resource_type + return unless %w[lettings sales].include?(log_type) + return unless MANDATORY_RESOURCES.include?(resource_type) + + CollectionResource.new( + resource_type:, + display_name: display_name(resource_type, year, log_type), + short_display_name: resource_type.humanize, + year:, + log_type:, + download_filename: download_filename(resource_type, year, log_type), + ) + end + + def self.display_name(resource, year, log_type) + year_range = "#{year} to #{year + 1}" + case resource + when "paper_form" + "#{log_type} log for tenants (#{year_range})" + when "bulk_upload_template" + "#{log_type} bulk upload template (#{year_range})" + when "bulk_upload_specification" + "#{log_type} bulk upload specification (#{year_range})" + end + end + + def self.download_filename(resource, year, log_type) + year_range = "#{year}_#{(year + 1) % 100}" + case resource + when "paper_form" + "#{year_range}_#{log_type}_paper_form.pdf" + when "bulk_upload_template" + "bulk-upload-#{log_type}-template-#{year_range.dasherize}.xlsx" + when "bulk_upload_specification" + "bulk-upload-#{log_type}-specification-#{year_range.dasherize}.xlsx" + end + end +end diff --git a/app/services/storage/s3_service.rb b/app/services/storage/s3_service.rb index 3329b2ea1..88199c0a0 100644 --- a/app/services/storage/s3_service.rb +++ b/app/services/storage/s3_service.rb @@ -48,6 +48,13 @@ module Storage @client.head_object(bucket: @configuration.bucket_name, key: file_name) end + def file_exists?(file_name) + @client.head_object(bucket: @configuration.bucket_name, key: file_name) + true + rescue Aws::S3::Errors::NotFound + false + end + private def create_configuration diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb index 21d19dba8..a07092278 100644 --- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb +++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb @@ -18,10 +18,6 @@
There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.
diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb index b9d0990be..427a835e8 100644 --- a/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb +++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb @@ -16,7 +16,6 @@Use one of these templates to upload logs for 2023/24:
There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.
diff --git a/app/views/bulk_upload_shared/guidance.html.erb b/app/views/bulk_upload_shared/guidance.html.erb index e530aa5b5..4cb8b76b4 100644 --- a/app/views/bulk_upload_shared/guidance.html.erb +++ b/app/views/bulk_upload_shared/guidance.html.erb @@ -52,8 +52,6 @@<%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – New question ordering", @form.sales_template_path %>
Legacy template: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end. Use this template if you have not updated your system to match the new template yet.
-<%= govuk_link_to "Download the lettings bulk upload template (2023 to 2024) - Legacy version", @form.lettings_legacy_template_path %>
-<%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – Legacy version", @form.sales_legacy_template_path %>
<% else %><%= govuk_link_to "Download the lettings bulk upload template (2024 to 2025)", @form.lettings_template_path %>
<%= govuk_link_to "Download the sales bulk upload template (2024 to 2025)", @form.sales_template_path %>
diff --git a/app/views/collection_resources/_collection_resource_summary_list.erb b/app/views/collection_resources/_collection_resource_summary_list.erb new file mode 100644 index 000000000..61c29865d --- /dev/null +++ b/app/views/collection_resources/_collection_resource_summary_list.erb @@ -0,0 +1,32 @@ +No file uploaded
+ <% end %> + <% row.with_action( + text: "Upload", + href: "/", + ) %> + <% end %> + <% end %> + <% end %> + <% end %> ++ This file will be available for all users to download. +
+ + <%= f.govuk_file_field :file, + label: { text: "Upload file", size: "m" } %> + + <%= f.govuk_submit "Save changes" %> + <%= govuk_button_link_to "Cancel", collection_resources_path, secondary: true %> + <% end %> +Use the 2024 to 2025 forms for lettings that start and sales that complete between 1 April 2024 and 31 March 2025.
-<% if FormHandler.instance.lettings_form_for_start_year(2023) && FormHandler.instance.lettings_form_for_start_year(2023).edit_end_date > Time.zone.today %> -Use the 2023 to 2024 forms for lettings that start and sales that complete between 1 April 2023 and 31 March 2024.
+<% displayed_collection_resource_years.each do |collection_start_year| %> +Use the <%= collection_start_year %> to <%= collection_start_year + 1 %> forms for lettings that start and sales that complete between 1 April <%= collection_start_year %> and 31 March <%= collection_start_year + 1 %>.
<% end %>CE3AGht8b(;WVD{#01g4
z)5AI8_DBTZfe+%6?@%bIlxkE-f<{tu@$sZuk!IErL2e)!NVkhK ;A+?usgyH7U=Hz!r%hD9W}k5L5`` L`U%mzsga?R^P$wI)Gn(Fp%&{h0HJYF6sx
zo*$D#hi$+KhfU~Lyi)43{Z-Ul3MbSJjB+We