* CLDC-4074 Updated sales log tests to use filters from the current year instead of a fixed one
* CLDC-4074: Update other sales log tests to use the current year instead of a fixed one
* CLDC-4074: Update more failing tests
* CLDC-4074: Remove some 2024 sales log tests
* CLDC-4074: Ignore a failing request test
* CLDC-4074: Fix lettings log services tests
* CLDC-4074: Fix merge request helper spec
* CLDC-4074: Fix rake tests for 2024 logs
* CLDC-4074: Fix guidance helper tests
* CLDC-4074: Fix skipped tests
* CLDC-4074: Update tests for 2023 edit closing (#3095)
* CLDC-4074: Fix model tests
* CLDC-4074: Fix requests tests
* CLDC-4074: Fix services tests
* CLDC-4074: Fix rake tasks tests
the broken ones only make sense for 2024 logs so feels like timecop is the only option
* CLDC-4074: Specify why some tests are not validated based on year
---------
Co-authored-by: Samuel Young <samuel.young@softwire.com>
* Add questions to page, wip
* Add select as conditional question in radio like in logs
* Add existing value
* Add blank default
* Add values to about this organisation page
* Move grabbing values out of view
* Update new org page with js
* Selecting the profit status dependent on the provider type
* Add to org edit page for support users
* Add group logic
* Fix bug on existing orgs when group remains unchanged
* Clear group details if no longer part of a group
* Lint
* JS Lint
* Restore schema
* Remove manual_address_selected
* Revert "Remove manual_address_selected"
This reverts commit 812787fd09.
* Revert "Revert "Remove manual_address_selected""
This reverts commit 8ebd56036f.
* Update migration
* Remove file
* Move update after save
* Move methods to controller
* Update xml export
* Lint
* Update test xml file
* Update current user logic
* Lint
* Lint
* Reorder org js controller
* Lint
* Add tests to helper
* Some tests on the organisation pages
* Fix label text for profit status question in forms
* Add CSV task to update organisation profit status and group member fields
* only associate group on update if validation passes
* Update import raketask to use provided csv
looking into it I couldn't see a use for skip_group_member_validation. it temporarily disables validation but since it's not saved to database it'll make the organisation invalid in the future
opted instead to make all properties valid when importing
* Update tests to check more cases of organisation import
* Make XML tests check unordered file contents
stops tests flakily failing on the order of cols which is not important in xml
* Fix final failing tests
* restore manual_address_selected migration
* fix it's to its
* show the user the group they originally selected if possible when editing group
else fallback to any (oldest) org in the group
* update csv for ingest
---------
Co-authored-by: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
* Fix flaky tests - date handling in generate_different_date_within_collection_year
* Update tests to include inclusive range checks for date generation
* Update test log creation to use dynamic dates within collection year within 14days
* Update app/controllers/test_data_controller.rb
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update test data start date to April and the year
* Refactor test log creation to eliminate redundant start_date variable
* Update test log creation to use current date for end date override
* Add validation for date overrides and implement tests for date generation within collection year
* Refactor date validation logic
* Add tests for date overrides in collection year logic
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Adjust staircase difference validation to exclude initial purchase
* Update tests
* Keep validation as is, add error to firststair also
* Add method to generate random dates within collection year for logs
* Revert "Update tests"
This reverts commit e708187160.
* Update financial validations tests to reflect new error messages for firststair
* Update sales log test only pick a date up to 14 days away
* Lint
* Adjust merge date for future dates
* Update La test
* Fix date range logic in generate_different_date_within_collection_year method
* Refactor generate_different_date_within_collection_year to use keyword arguments for start and end date overrides in tests
* Refactor sales_log_spec to use descriptive variable names for date overrides
* Refactor merge_requests_helper_spec to use generated merge dates for consistency in tests
* Refactor generate_different_date_within_collection_year
* Refactor sales_log_spec to use generated sale date for duplicate log creation
* Refactor sales_log_spec to use fixed date values for end date and date after end date, mimics change of year without changing year
* Refactor merge_requests_helper_spec to use a fixed merge date for consistency in tests
* Refactor generate_different_date_within_collection_year to handle edge cases and return nil if no available dates
* test tests in April
* update tests where 2014 is assumed
* update test where time moving is assumed
* update rake task tests that only affect 2024 logs
* update another 2024 assumption
* handle null period in validation
* give pages different ids in SharedOwnershipInitialPurchase and SharedOwnershipStaircasingTransaction sections
* refactor to remove unnecessary method
* delete some old rake tasks and tests
* CLDC-3899 remove flaky date comparison from tests
* CLDC-3899 fix flaky test occasionally picking bad input
* fix test year setup
* add relat mapping for log_to_csv
* temp disable fail-fast for ease of testing
* specify 2024 in 2024-specific test
* Revert "temp disable fail-fast for ease of testing"
This reverts commit 6993d29866.
* Revert "test tests in April"
This reverts commit f5635dba11.
* pass test in 2024 and 2025
* fix test to 2024
* temp disable fail-fast again
* Revert "temp disable fail-fast again"
This reverts commit 55d3e1c7d8.
---------
Co-authored-by: Carolyn <carolyn.barker@softwire.com>
* rename variable for clarity
* remove unused variable
* make reactivating_soon message refer to the soonest, not most recently created
* status check all deactivation periods instead of just one
* handle no open period to reactivate
* test deactivation period related behaviour
* fix reactivation message variable syntax
* use before do instead of let for unreferenced variables
* fix reactivation message syntax for location
* fix test indentation
* remove unused variable - part 2
* lint
* handle edge case of overlapping periods
* end unclosed Timecop freeze causing flaky tests
* remove unused around blocks superseded by befores
* tidying up
* reinstate setup needed to test default date
* fix typo
* explain deactivation period validation logic
* fix setup to test default date
---------
Co-authored-by: Carolyn <carolyn.barker@softwire.com>
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
* Add guidance link
* Add deadline text
* Add quarter to non overdue deadline
* Move styling
* Add test and fix cases when no quarters are returned
* Remove days of the week from copy
* Change some copy
* Different versions of details_html
* One version of details_html
* Replace you didnt answer with link
* Fix lint
* Update some tests
* Update some tests
* Add question marks to yes no questions - test
* Improve formatting helper
* Improve formatting helper
* Improve prompt message
* Revert "Add question marks to yes no questions - test"
This reverts commit 40bee289
* Rename question method
* Add check answer prompt method to question model and translation key
* Add translation key to soft validations
* Lettings custom prompts
* Update to handle new helpdesk ticket logic
* Update copy
* Update copy
* Update method names
* Add check answer prompt to soft validations
* Change copy
* Do not put error objects into cookies
* Hide change link for inferred or derived values not yet answered
* Revert "Hide change link for inferred or derived values not yet answered"
This reverts commit ec1fd1c9aa.
* Update lettings related check answer prompts
* Update some sales related check answer prompts
* Update some sales related check answer prompts
* Bug fix
* More sales prompts
* Replace text for bulk upload
* Update uprn known test with specific error message already used
* Translation file to CSV
* Revert "Translation file to CSV"
This reverts commit 0565fea717.
* Add a red link to show questions that still must be answered (after bulk upload)
* Lint
* Update feature tests
* Update component tests
* Update helper tests
* Update requests tests
* Update request test
* Refactor improvements
* Refactor improvements 0.2
* Lint
* Stay consistent with date question message
* Rename variable
* Add tests
* Improvements
* Refactor details table helper
* Remove action link not just hide
* Revert "Remove action link not just hide"
This reverts commit 59ecac5cf3.
* Users - remove action link
* Organisations - remove action link
* Merge requests - remove action link
* Revert "Refactor details table helper"
This reverts commit b74fd830f1.
* Schemes - remove action link
* Location - remove action link
* Logs - remove action link
* Lint
* Refactor V2 details table helper
* Allow respond_to? to see private methods
* Remove .presence duplication of logic
* Change "Answer if" to "Tell us if"
* Add missing CAP
* Update age questions sales and lettings
* Update postcode and la questions
* Update wording
* Updates and improvements
* Another update
* Fix bug
* typo
* typo
* update relat to buyer/lead prompts
* Update test
* Additional copy
* Additional copy
* Update copy "housing-related" to "housing related"
---------
Co-authored-by: Kat <54268893+kosiakkatrina@users.noreply.github.com>
* Add LA changes for 2025
* Add missing soft validation copy
* Add local authority links and update seed
* Only display name once in the locations if only Ecode has changed
* lint
* Update seeds
* Fix linting
* Update dsa bits
* Fix duplicate user/org variable names
* Fix create_list
* Set faker locale for development and review
* Update tests that relied on user factory default name
* Update more tests
* Add additional randomness to log factories
* Also create older logs
* Update tests and log randomness
* Ensure sufficient gap between child and parent ages
* More test fixes
* Specify names for users
* Fix more tests
* Fix lint
* More fixes
* More randomness in organisation generation
* Add some extra organisations
* Create future logs if future form use is enabled
* Update tests that expect fixed default org name
* Update more tests
* Fix typo
* Another tweak
* More test fixes
* More test fixes
* Another fix
* Update more tests
* More fixes
* Only create outright sale logs for relevant years
* Reduce max random age to avoid soft validations
* Don't allow sales logs to use no longer valid relat value
* Include fixed locations
* Stub some collection resource requests
* Rebase changes
* Add upload new resource page
* Allow adding custom collection resources
* Display and validate additional resources
* Allow downloading additional collection resources
* Allow updating additional resources
* Display additional resources on the homepage
* Add delete link to additional resources
* Update hint text
* Update tests
* Allow unauthenticated users to donwload additional collection resources
* Add some changes to copy and styling
* Add content type to the files
* Validate short display name at the same time as file
* Stub some collection resource requests
* Update upload new mandatory resource page
* Add next year resources banner
* Display next collection resources to users when released
* Add confirm_mandatory_collection_resources_release page
* Allow releasing resources to users
* Rebase changes
* Get collection resources from S3
* Remove resource files from codebase
* Stub some collection resource requests
* Use env var for bucket name
* Update some tests
* Extract methods into a service
* Make full stops consistent in error messages
* Fix test
* Update few hardcoded errors
* Update join in remaining row parsers
* Update some more tests
* Update more hard coded BU errors
* Fix typo I introduced - bedrooms to bedroom
---------
Co-authored-by: Kat <katrina@kosiak.co.uk>
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
* Allow support to change user organisation
* Redirect to log-reassignment page when updating organisation
* Add log reassignment page
* Allow setting log reassignment choice
* Add organisation change confirmation page
* Update logs based on log reassignment selection
* Skip log reassignment question if user has no logs
* Send organisation update email
* Update routes in accessibility tests
* Allo moving deactivated users
* Move org field above role
* Only display banner if email has changed
* rescue StandardError
* Only reassign visible logs
* Clean user error messages
* Update pluralization in email
* Mark related bulk uploads as cancelled by user
* Add moved user banner
* Update routing for fix-choice page
* Update pluralization again
* CLDC-2093 Merge organisations page - view all merge requests (#2561)
* CLDC-3585 Update absorbing organisation question (#2564)
* Update user permissions and absorbing org question order
* Update absorbing organisation question and routing
* CLDC 2094: View a merge request (#2565)
* CLDC-3584 Update merging orgs question (#2567)
* Update merging organisations question
* Update rebase tests
* Update routing between CYA and questions
* CLDC-3586 Update merge date merge request question (#2571)
* Remove unused paths and update merge date
* lint
* Create delete merge request functionality (#2568)
* CLDC-3588: Add helpdesk ticket question (#2572)
* Merge request fixes (#2578)
* Add cancel button to merging orgs and update merging orgs selection
* Update submit button text
* Update back buttons
* CLDC-2101 Add begin merge (#2575)
* Calculate merge request status
* Add start merge and merge request job
* Update merge request when it gets processed
* Refactor and display a banner for failed requests
* update test
* Update change links
* Update copy for error message (#2583)
* Do not display cancel button if there's no submit (#2584)
* Update hint date (#2588)
* CLDC-2100++ Add success notification after delete (#2589)
* Update helpdesk_ticket.html.erb
* CLDC-2094++ Merge details page adjustments (#2593)
* Change page name and hide buttons during processing status
* Update test
* Make merge request status dynamic (#2592)
* Make merge request status dynamic
* Update tests
* Keep check answers referrer when validation is hit (#2594)
* Keep check answers referrer when validation is hit
* Remove absorbing org from merging organisations list
* Update text to handle singular merge requests
* Add merge start confirmation page (#2601)
* Set merge request as non processing if it fails (#2598)
* Set merge request to no longer processing if it fails
* clear last_failed_attempt as soon as we start processing the merge
* CLDC-3603 View merged users outcomes (#2602)
* Update user outcomes view link
* Add user outcomes page
* Set user outcomes before merge and on merge fail
* Update hardcoded total user count
* Account for singular user numbers
* CLDC-3603 View scheme outcomes (#2604)
* Update scheme outcomes view link
* Add scheme outcomes page
* Update scheme outcome before merge and on merge fail
* Update back links in merge outcomes pages (#2611)
* CLDC-3605 View relationships page (#2606)
* CLDC-3609 Add existing absorbing organisation merge request question (#2600)
* Add existing absorbing organisation page and field
* Update status calculation and add new question to check answers
* Call correct merge service flow
* Update test
* Update test
* Return correct status when existing_absorbing_organisation is false (#2617)
* Change styling of relationship outcomes page (#2619)
* CLDC-3604 View logs outcomes (#2618)
* Update view logs outcomes link
* Add logs outcomes page
* Set logs outcome before merge and on merge fail
* Update logs outcomes text
* Update line break
* Fix incorrect filtering of relationships and count
* Fix test
* Fix test
* Fix test
* Make example date depend on collection year (#2620)
---------
Co-authored-by: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
* Add search controller
* Update on confirm
* lint
* Update search endpoint
* remove assigned to filter options
* Explicitly define host in the url
* Update search controller
* Allow searching organisations
* Allow filtering by user without js
* Allow filtering by org without js
* Add filter_type to method calls
* Update filter helpers
* Hide text search input when js is enabled
* Some feature test updates
* fix model test
* Delete a random file 👀
* lint
* Update more tests
* Update inner text for filter
* Keep csv filters the same
* Clear free text filters for csv dowloads
* User path helper
* Update scheme filters and log scopes
* Update which users we can filter by
* further fixes
* Fix date / crossover issues
* Try changing form end dates
* Revert "Try changing form end dates"
This reverts commit e027e29cf0.
* Make use of :ignore-validation-errors trait
* Try with end dates in past
* Revert "Try with end dates in past"
This reverts commit 6b87938d70.
---------
Co-authored-by: Rachael Booth <rachael.booth@softwire.com>
Samuel Young
David May-Miller
Manny Dinssa
carolynbarker
kosiakkatrina
Rachael Booth
Arthur Campbell