Dev to stg 24 12 2024 #4536
Merged
Dev to stg 24 12 2024 #4536
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* upd fields * people changes * update IndividualDataUpdateService * fix update country * add edit people gf * size smol * add test * imports * fix text * build fix * fix country display --------- Co-authored-by: Maciej Szewczyk <[email protected]> Co-authored-by: Maciej Szewczyk <[email protected]>
* fix rdi import dmd data json * add migration * fix test * imports * more fixes Co-authored-by: Domenico <[email protected]>
* STG // Fix RDI import dmd json field (#4504) * fix rdi import dmd data json * add migration * fix test * imports * more fixes * remove generateroles from upgrade, update generateroles based on admin history for these roles * [STG] Payment Plan export xlsx: added FSP template doc types list (#4508) * upd get_column_value_from_payment & fsp template doc types * document_types ⭐ * fix 🌟 --------- Co-authored-by: Domenico <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]>
* chenged tests dir * fixed all linter problems * fix precomit * fix compose * fixed tests root dir * init speed improvements * fixes * changes to running tests * increased max connections in postgress compose * changes to running tests * changes to running tests * global program select fix * changes to running tests * fixes to reassigning * changes to running tests * changes to running tests * changes to running tests * changes to running tests fixed - test_grievance_tickets_edit_tickets_from_main_grievance_pag * changes to running tests fixed - test_create_feedback_mandatory_fields * changes to running tests * fixed file * Fix countries * linter fixes * fixing import * Tests fixes * black fixes * clean fronted * console logs removed * frontend fix build * mark unstable tests * change if to try except to avoid concurency problem * xfail more test * test fixes * fixes * xfail unstable tests * Fix for Upload Artifact * Fix for test_smoke_country_dashboard * added more tests * added more tests * Fix e2e tests * Black * more fixes more tests * added more as unstable * E2E Test stabilisation * Test without parallel execution * Test without extra_options * Fixed stability of test_managerial_console_smoke_test * Fixed stability of test_managerial_console_smoke_test * Delete transaction=True from pytest.mark.django_db; Fix test_payment_verification_delete * Fix test_edit_programme * Fix test_edit_programme * Fix test_edit_programme * Fix for User fixture * Fix test_create_targeting_with_pdu_date_criteria * Fix test_edit_programme * Fix test_edit_programme * Xfaile flaky tests * Xfaile flaky tests * Xfaile flaky tests * Xfaile flaky tests * add print 🖨️ * check test_create_targeting_for_normal_program * test test_periodic_data_template_create_and_download * test fix Upload Artifact on CI * fix some validation msgs inconsistency * fix tests more * TP⛺️ Changes (Collector filters, Merge Ids) (#4279) * init * add tp list rest * modify create target population add collector group * add collector filters blocks * add collector rule groups * upd query and input 'collector_rules' * remove collector ids * handl ind hh ids in create tp * add collector_block_filters * upd validation 1️⃣ * upd validation and models 2️⃣ * upd CreateTargetPopulationInput 3️⃣ * update one more time input * final upd input * remove program_id * add migrations refactor create TP * fix create TP * update schema & imports * more adjustments * fix tests & validation if no rules * upd snapshot * upd one more snapshot 🌟 * fix upd TP validation & upd snapshot ⭐ * black 🖤 * one more fix * one more fix again * black * more changes * upd input create * black * more changes * upd choices * fix table tp * Fix test_edit_targeting * upd filters & input * migrations * fix bool * upd TargetingCollectorBlockRuleFilterNode * fix criteria display * add data-cy * add label_en * upd query and add TargetingCollectorRuleFilterBlockBase 🌟 * black & isort ⭐ * more fixes * fix edit tp values * upd q for collector & fix node ihd hh ids 🌟 * fix display value or empty * fix copy tp & mypy & imports ⭐ * fix hh ind ids TPnode * fix ids * rm console log * ut update createTP snapshot * ut update 🌟 * add more tests 🌟 * imports * skip 💯 * unskip & add order_by 💯 * Fix e2e tests part2 * e2e fix: test_create_targeting_for_normal_program 🎉 * Fix e2e tests part3 * Fix e2e tests part4 * ut: add more 🎉 * ut: add one more 🌟 * ut: DeliveryMechanism add name 🌟 * ut update: test_copy_target 🌟 * fix test name --------- Co-authored-by: Maciej Szewczyk <[email protected]> Co-authored-by: marekbiczysko <[email protected]> Co-authored-by: pavlo-mk <[email protected]> Co-authored-by: Szymon Wyderka <[email protected]> * E2E speed improvement (#4288) * chenged tests dir * fixed all linter problems * fix precomit * fix compose * fixed tests root dir * init speed improvements * fixes * changes to running tests * increased max connections in postgress compose * changes to running tests * changes to running tests * global program select fix * changes to running tests * fixes to reassigning * changes to running tests * changes to running tests * changes to running tests * changes to running tests fixed - test_grievance_tickets_edit_tickets_from_main_grievance_pag * changes to running tests fixed - test_create_feedback_mandatory_fields * changes to running tests * fixed file * Fix countries * linter fixes * fixing import * Tests fixes * black fixes * clean fronted * console logs removed * frontend fix build * mark unstable tests * change if to try except to avoid concurency problem * xfail more test * test fixes * fixes * xfail unstable tests * Fix for Upload Artifact * Fix for test_smoke_country_dashboard * added more tests * added more tests * Fix e2e tests * Black * more fixes more tests * added more as unstable * E2E Test stabilisation * Test without parallel execution * Test without extra_options * Fixed stability of test_managerial_console_smoke_test * Fixed stability of test_managerial_console_smoke_test * Delete transaction=True from pytest.mark.django_db; Fix test_payment_verification_delete * Fix test_edit_programme * Fix test_edit_programme * Fix test_edit_programme * Fix for User fixture * Fix test_create_targeting_with_pdu_date_criteria * Fix test_edit_programme * Fix test_edit_programme * Xfaile flaky tests * Xfaile flaky tests * Xfaile flaky tests * Xfaile flaky tests * add print 🖨️ * cleanup & upd utests 🌟 * imports ⭐ --------- Co-authored-by: Szymon Wyderka <[email protected]> Co-authored-by: szymon-kellton <[email protected]> Co-authored-by: Pavlo Mokiichuk <[email protected]> * test fix Upload Artifact on CI * test fix Upload Artifact on CI * test fix Upload Artifact on CI * Fix test_grievance_dashboard_happy_path * test fix Upload Artifact on CI * test fix Upload Artifact on CI * test fix Upload Artifact on CI * Fix Upload Artifact on CI * Fix test_targeting_and_labels * Fix conftest.py * Fix people details tests * upd test_payment_plan_views ⭐ * e2e fix: test_targeting_and_labels * clean up * test with cache --------- Co-authored-by: Jan Romaniak <[email protected]> Co-authored-by: Jan Romaniak <[email protected]> Co-authored-by: johniak <[email protected]> Co-authored-by: Pavlo Mokiichuk <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> Co-authored-by: Maciej Szewczyk <[email protected]> Co-authored-by: Maciej Szewczyk <[email protected]> Co-authored-by: marekbiczysko <[email protected]>
# Conflicts: # src/hct_mis_api/migrations_script/main.py # tests/selenium/conftest.py
switched to use redis in e2e
* 2215787_drop_cash_assist_part_2 * fixture fix * ut * ut * ut * fix schnappy * migration fix * ut * ut * upd unit tests 🌟 * upd object_id_filter ⭐ * fix generate_report_service 💯 * fix filters & update tests 💯 ⭐ * upd migrations * upd migrations --------- Co-authored-by: marekbiczysko <[email protected]> Co-authored-by: Maciej Szewczyk <[email protected]> Co-authored-by: pavlo-mk <[email protected]>
rename es container name
* skip unstable * STG // Fix RDI import dmd json field (#4504) * fix rdi import dmd data json * add migration * fix test * imports * more fixes * remove generateroles from upgrade, update generateroles based on admin history for these roles * [STG] Payment Plan export xlsx: added FSP template doc types list (#4508) * upd get_column_value_from_payment & fsp template doc types * document_types ⭐ * fix 🌟 * Dashboard fix * 215787_drop_cash_assist_migration_script_fix (#4509) * 2226242_Payment_verification_page_not_accessible (#4514) * rollback generateroles to upgrade, skip updating existing roles * Back merge PROD > STG (#4516) * skip unstable * 2226242_Payment_verification_page_not_accessible (#4514) --------- Co-authored-by: Jan Romaniak <[email protected]> Co-authored-by: Marek Biczysko <[email protected]> * add correct permission for cycles page * fe fix * just new line * Master into stg (#4534) * AB#226656 Error Cannot read properties of undefined Grievance ticket * Fixes to managers for migretable models * added unicef id * fix frontend lint * unique unicef_id constraint * fix test_double_entries * fix household test_models * change exclusion for importing hh and inds to another program * fix test_create_pending_objects_from_objects * fix linters * fix test_create_targeting_for_people * add models for new constraints * fix test * remove one time scripts which are not valid with new contraint * fixed format * change unique name * fixed tests * fix more tests * fix laast e2e tests --------- Co-authored-by: Jan Romaniak <[email protected]> Co-authored-by: Jan Romaniak <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> * fix test & migration --------- Co-authored-by: Jan Romaniak <[email protected]> Co-authored-by: Domenico <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> Co-authored-by: Allan Stockman Rugano <[email protected]> Co-authored-by: Marek Biczysko <[email protected]> Co-authored-by: Allan Stockman RUGANO <[email protected]> Co-authored-by: Maciej Szewczyk <[email protected]> Co-authored-by: Jan Romaniak <[email protected]>
* skip unstable * STG // Fix RDI import dmd json field (#4504) * fix rdi import dmd data json * add migration * fix test * imports * more fixes * remove generateroles from upgrade, update generateroles based on admin history for these roles * [STG] Payment Plan export xlsx: added FSP template doc types list (#4508) * upd get_column_value_from_payment & fsp template doc types * document_types ⭐ * fix 🌟 * Dashboard fix * 215787_drop_cash_assist_migration_script_fix (#4509) * 2226242_Payment_verification_page_not_accessible (#4514) * add correct permission for cycles page * fe fix * just new line * AB#226656 Error Cannot read properties of undefined Grievance ticket * change to use replica db * fix tests --------- Co-authored-by: pavlo-mk <[email protected]> Co-authored-by: Domenico <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> Co-authored-by: Paulina Kujawa <[email protected]> Co-authored-by: Allan Stockman Rugano <[email protected]> Co-authored-by: Marek Biczysko <[email protected]> Co-authored-by: Allan Stockman RUGANO <[email protected]> Co-authored-by: Maciej Szewczyk <[email protected]>
pavlo-mk
approved these changes
Dec 24, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## staging #4536 +/- ##
===========================================
+ Coverage 84.67% 84.99% +0.31%
===========================================
Files 509 514 +5
Lines 36242 36269 +27
===========================================
+ Hits 30688 30826 +138
+ Misses 5554 5443 -111
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
emil-kellton
approved these changes
Dec 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.