From 0c8df69a3a848bbcacd0293cc9c5a287d0b3d873 Mon Sep 17 00:00:00 2001 From: edwin-jebaraj Date: Mon, 9 Dec 2024 11:26:29 +0000 Subject: [PATCH] updated is_upload_documents filed name to has_uploaded_documents --- .../support/cases/document_uploads_controller.rb | 6 +++--- app/models/support/case/document_uploader.rb | 6 +++--- .../support/cases/document_uploads/_form.html.erb | 8 ++++---- app/views/support/cases/show/_tasklist.html.erb | 4 ++-- config/locales/validation/support/en.yml | 2 +- ...3125911_add_is_upload_documents_to_support_cases.rb | 5 ----- ...4836_add_has_uploaded_documents_to_support_cases.rb | 5 +++++ db/schema.rb | 5 +++-- .../agent_can_upload_evaluation_documents_spec.rb | 10 +++++----- spec/models/support/case_spec.rb | 2 +- 10 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 db/migrate/20241203125911_add_is_upload_documents_to_support_cases.rb create mode 100644 db/migrate/20241209104836_add_has_uploaded_documents_to_support_cases.rb diff --git a/app/controllers/support/cases/document_uploads_controller.rb b/app/controllers/support/cases/document_uploads_controller.rb index 2bd71667f..cec33d605 100644 --- a/app/controllers/support/cases/document_uploads_controller.rb +++ b/app/controllers/support/cases/document_uploads_controller.rb @@ -42,15 +42,15 @@ def set_current_case end def document_uploader_params - params.fetch(:document_uploader, {}).permit(:is_upload_documents, files: []) + params.fetch(:document_uploader, {}).permit(:has_uploaded_documents, files: []) end def case_document_uploader_params - params.require(:document_uploader).permit(:is_upload_documents) + params.require(:document_uploader).permit(:has_uploaded_documents) end def reset_uploaded_documents - @current_case.update!(is_upload_documents: nil) + @current_case.update!(has_uploaded_documents: nil) end end end diff --git a/app/models/support/case/document_uploader.rb b/app/models/support/case/document_uploader.rb index e574f479c..249d7a469 100644 --- a/app/models/support/case/document_uploader.rb +++ b/app/models/support/case/document_uploader.rb @@ -6,11 +6,11 @@ class Support::Case::DocumentUploader attribute :files attribute :upload_document_files attribute :support_case - attribute :is_upload_documents + attribute :has_uploaded_documents - validates :files, presence: true, if: -> { support_case.is_upload_documents.nil? } + validates :files, presence: true, if: -> { support_case.has_uploaded_documents.nil? } validate :files_safe, if: -> { files.present? } - validates :is_upload_documents, presence: true + validates :has_uploaded_documents, presence: true def save! support_case.upload_document_files(files:) diff --git a/app/views/support/cases/document_uploads/_form.html.erb b/app/views/support/cases/document_uploads/_form.html.erb index 8cf0e0085..0d03f0d56 100644 --- a/app/views/support/cases/document_uploads/_form.html.erb +++ b/app/views/support/cases/document_uploads/_form.html.erb @@ -17,12 +17,12 @@ Have you uploaded all documents?
- <%= form.radio_button :is_upload_documents, true, checked: @current_case.is_upload_documents == true, class: "govuk-radios__input" %> - <%= form.label :is_upload_documents, "Yes, I have uploaded all documents", value: true, class: "govuk-label govuk-radios__label" %> + <%= form.radio_button :has_uploaded_documents, true, checked: @current_case.has_uploaded_documents == true, class: "govuk-radios__input" %> + <%= form.label :has_uploaded_documents, "Yes, I have uploaded all documents", value: true, class: "govuk-label govuk-radios__label" %>
- <%= form.radio_button :is_upload_documents, false, checked: @current_case.is_upload_documents == false, class: "govuk-radios__input" %> - <%= form.label :is_upload_documents, "No", value: false, class: "govuk-label govuk-radios__label" %> + <%= form.radio_button :has_uploaded_documents, false, checked: @current_case.has_uploaded_documents == false, class: "govuk-radios__input" %> + <%= form.label :has_uploaded_documents, "No", value: false, class: "govuk-label govuk-radios__label" %>
diff --git a/app/views/support/cases/show/_tasklist.html.erb b/app/views/support/cases/show/_tasklist.html.erb index e5808670e..955f5e55b 100644 --- a/app/views/support/cases/show/_tasklist.html.erb +++ b/app/views/support/cases/show/_tasklist.html.erb @@ -11,9 +11,9 @@ task_list.with_item(title: I18n.t("support.case.label.tasklist.item.add_evaluators"), href: '#', status: govuk_tag(text: I18n.t("support.case.label.tasklist.status.to_do"))) task_list.with_item(title: I18n.t("support.case.label.tasklist.item.set_due_date"), href: '#', status: govuk_tag(text: I18n.t("support.case.label.tasklist.status.to_do"))) - if @current_case.is_upload_documents == true + if @current_case.has_uploaded_documents == true document_upload_Status = govuk_tag(text: I18n.t("support.case.label.tasklist.status.complete"), colour: "green") - elsif @current_case.is_upload_documents == false + elsif @current_case.has_uploaded_documents == false document_upload_Status = govuk_tag(text: I18n.t("support.case.label.tasklist.status.in_progress")) else document_upload_Status = govuk_tag(text: I18n.t("support.case.label.tasklist.status.to_do")) diff --git a/config/locales/validation/support/en.yml b/config/locales/validation/support/en.yml index d61e18fa0..9ac2071ef 100644 --- a/config/locales/validation/support/en.yml +++ b/config/locales/validation/support/en.yml @@ -63,7 +63,7 @@ en: attributes: files: blank: Select files to upload - is_upload_documents: + has_uploaded_documents: blank: Please confirm that you uploaded all documents diff --git a/db/migrate/20241203125911_add_is_upload_documents_to_support_cases.rb b/db/migrate/20241203125911_add_is_upload_documents_to_support_cases.rb deleted file mode 100644 index acb276258..000000000 --- a/db/migrate/20241203125911_add_is_upload_documents_to_support_cases.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddIsUploadDocumentsToSupportCases < ActiveRecord::Migration[7.2] - def change - add_column :support_cases, :is_upload_documents, :boolean - end -end diff --git a/db/migrate/20241209104836_add_has_uploaded_documents_to_support_cases.rb b/db/migrate/20241209104836_add_has_uploaded_documents_to_support_cases.rb new file mode 100644 index 000000000..475190508 --- /dev/null +++ b/db/migrate/20241209104836_add_has_uploaded_documents_to_support_cases.rb @@ -0,0 +1,5 @@ +class AddHasUploadedDocumentsToSupportCases < ActiveRecord::Migration[7.2] + def change + add_column :support_cases, :has_uploaded_documents, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index a73c0597c..105518eea 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.2].define(version: 2024_12_03_125911) do +ActiveRecord::Schema[7.2].define(version: 2024_12_09_104836) do create_sequence "evaluation_refs" create_sequence "framework_refs" @@ -635,7 +635,8 @@ t.string "project" t.string "other_school_urns", default: [], array: true t.boolean "is_evaluator", default: false - t.boolean "is_upload_documents" + t.date "evaluation_due_date" + t.boolean "has_uploaded_documents" t.index ["category_id"], name: "index_support_cases_on_category_id" t.index ["existing_contract_id"], name: "index_support_cases_on_existing_contract_id" t.index ["new_contract_id"], name: "index_support_cases_on_new_contract_id" diff --git a/spec/features/support/agent_can_upload_evaluation_documents_spec.rb b/spec/features/support/agent_can_upload_evaluation_documents_spec.rb index 7145df2e9..f4038c15f 100644 --- a/spec/features/support/agent_can_upload_evaluation_documents_spec.rb +++ b/spec/features/support/agent_can_upload_evaluation_documents_spec.rb @@ -23,7 +23,7 @@ end specify "when files are uploaded and confirmation choosen as No (In progress)" do - support_case.update!(is_upload_documents: false) + support_case.update!(has_uploaded_documents: false) expect { document_uploader.save! }.to change { support_case.upload_documents.count }.from(0).to(2) expect(support_case.upload_documents.pluck(:file_name)).to contain_exactly("text-file.txt", "another-text-file.txt") @@ -35,7 +35,7 @@ end specify "when files are uploaded and confirmation choosen as Yes (Complete)" do - support_case.update!(is_upload_documents: true) + support_case.update!(has_uploaded_documents: true) expect { document_uploader.save! }.to change { support_case.upload_documents.count }.from(0).to(2) expect(support_case.upload_documents.pluck(:file_name)).to contain_exactly("text-file.txt", "another-text-file.txt") @@ -46,8 +46,8 @@ expect(find("#complete-evaluation-3-status")).to have_text("Complete") end - specify "viewing uploaded files and deleting files" do - support_case.update!(is_upload_documents: true) + specify "viewing uploaded files" do + support_case.update!(has_uploaded_documents: true) document_uploader.save! visit edit_support_case_document_uploads_path(case_id: support_case) @@ -69,7 +69,7 @@ support_case.reload - support_case.update!(is_upload_documents: nil) + support_case.update!(has_uploaded_documents: nil) expect(support_case.upload_documents.count).to eq(0) diff --git a/spec/models/support/case_spec.rb b/spec/models/support/case_spec.rb index 4c50f3e6a..a1f691c41 100644 --- a/spec/models/support/case_spec.rb +++ b/spec/models/support/case_spec.rb @@ -59,7 +59,7 @@ describe "#to_csv" do it "includes headers" do expect(described_class.to_csv).to eql( - "id,ref,category_id,request_text,support_level,status,state,created_at,updated_at,agent_id,first_name,last_name,email,phone_number,source,organisation_id,existing_contract_id,new_contract_id,procurement_id,savings_status,savings_estimate_method,savings_actual_method,savings_estimate,savings_actual,action_required,organisation_type,value,closure_reason,extension_number,other_category,other_query,procurement_amount,confidence_level,special_requirements,query_id,exit_survey_sent,detected_category_id,creation_source,user_selected_category,created_by_id,procurement_stage_id,initial_request_text,with_school,next_key_date,next_key_date_description,discovery_method,discovery_method_other_text,project,other_school_urns,is_evaluator,is_upload_documents\n", + "id,ref,category_id,request_text,support_level,status,state,created_at,updated_at,agent_id,first_name,last_name,email,phone_number,source,organisation_id,existing_contract_id,new_contract_id,procurement_id,savings_status,savings_estimate_method,savings_actual_method,savings_estimate,savings_actual,action_required,organisation_type,value,closure_reason,extension_number,other_category,other_query,procurement_amount,confidence_level,special_requirements,query_id,exit_survey_sent,detected_category_id,creation_source,user_selected_category,created_by_id,procurement_stage_id,initial_request_text,with_school,next_key_date,next_key_date_description,discovery_method,discovery_method_other_text,project,other_school_urns,is_evaluator,has_uploaded_documents\n", ) end end