Skip to content

Commit

Permalink
Merge pull request #4377 from unicef/develop
Browse files Browse the repository at this point in the history
dev2stg
  • Loading branch information
domdinicola authored Oct 31, 2024
2 parents 120c7ed + 3fe0d9b commit f174ad8
Show file tree
Hide file tree
Showing 1,281 changed files with 34,909 additions and 21,102 deletions.
4 changes: 0 additions & 4 deletions .github/helpers/.env-selenium
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ CELERY_BROKER_URL=redis://redis:6379/0
CELERY_RESULT_BACKEND=redis://redis:6379/0
CACHE_LOCATION=redis://redis:6379/1
DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
DATABASE_URL_HUB_MIS=postgis://postgres:postgres@db:5432/mis_datahub
DATABASE_URL_HUB_CA=postgis://postgres:postgres@db:5432/ca_datahub
DATABASE_URL_HUB_ERP=postgis://postgres:postgres@db:5432/erp_datahub
DATABASE_URL_HUB_REGISTRATION=postgis://postgres:postgres@db:5432/rdi_datahub
USE_DUMMY_EXCHANGE_RATES=yes
CELERY_TASK_ALWAYS_EAGER=true
4 changes: 0 additions & 4 deletions .github/helpers/.env-unit
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=postgres
DATABASE_URL=postgis://postgres:postgres@db:5432/postgres
DATABASE_URL_HUB_MIS=postgis://postgres:postgres@db:5432/mis_datahub
DATABASE_URL_HUB_CA=postgis://postgres:postgres@db:5432/ca_datahub
DATABASE_URL_HUB_ERP=postgis://postgres:postgres@db:5432/erp_datahub
DATABASE_URL_HUB_REGISTRATION=postgis://postgres:postgres@db:5432/rdi_datahub
POSTGRES_SSL_MODE=off
EMAIL_HOST=TBD
EMAIL_HOST_USER=TBD
Expand Down
1 change: 0 additions & 1 deletion .github/helpers/docker-compose.tst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ services:
volumes:
- ../../development_tools/postgres/init:/docker-entrypoint-initdb.d
environment:
- POSTGRES_MULTIPLE_DATABASES=unicef_hct_mis_cashassist,rdi_datahub,mis_datahub,erp_datahub,ca_datahub
- POSTGRES_DB=postgres
- POSTGRES_USER=postgres
- POSTGRES_PASS=postgres
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,15 @@ jobs:
-f ./.github/helpers/docker-compose.selenium.yml \
run backend bash -c "
waitforit -host=db -port=5432 -timeout=30
pytest -svvv $extra_options ./tests/selenium --cov-report xml:test-coverage/coverage.xml --html-report=./tests/selenium/output_data/report/report.html --randomly-seed=42
pytest -x -svvv $extra_options ./tests/selenium --cov-report xml:test-coverage/coverage.xml --html-report=./tests/selenium/output_data/report/report.html --randomly-seed=42
"
- name: Upload Artifact
uses: actions/upload-artifact@v4
if: always()
continue-on-error: true
with:
name: report
path: ./tests/report/
path: ./tests/selenium/output_data/report/
retention-days: 5
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
Expand Down
21 changes: 12 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,18 @@ Following the Principles for Digital Development, the “reuse and improve” an

### Why

* Put cash recipients at the center with secure personal data processing
* Unified consolidated reporting for beneficiary data
* Increase accountability beneficiaries and donors
* Financial Inclusion of Beneficiaries
* To Enhance Traceability
* Simplify current process in EMOPS
* Ensuring due diligence in-cash transfer
* Grow the use of effective cash program for children in a risk informed manner
* Eliminate redundancies and dupes in how we do things
|#| HOPE Functions | Added Value |
|---|--------------------------|----------------------------------------------|
|1|Registration of payees data | Quality Assurance for data collection, verification of eligibility |
|2|Deduplication of personal records|Mitigate the risk of duplicate records|
|3|Target payments|Ensure inclusion of relevant payees in payment plan|
|4|Entitlment Calculations|Ensure cash benefit entitlement rules are uphold|
|5|Payment Management|Approval, Authorization and Financial Release tracking|
|6|Reconciliation of Individual payment|Support liquidation or advance or reimbursement to Financial Service Provider|
|7|Payment Verification|Mitigate the risk of inaccurate FSP reports and fraud|
|8|Grievances Redressals and Payees Communications|Ensure payment quality and direct communication with payees|
|9|Roles base access|Uphold segragation of duties and data protection principles|
|10|Reporting|Access process and output indicators|

## Legal
Humanitarian cash Operations and Programme Ecosystem
Expand Down
10 changes: 10 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,13 @@ coverage:
- "hct_mis_api/conftest.py"
- "hct_mis_api/config/settings.py"
- "hct_mis_api/apps/core/management/commands/*"
- "pragma: no cover"
- "pragma: no-cover"
- "def __repr__"
- "raise AssertionError"
- "raise NotImplementedError"
- "except ImportError"
- "if __name__ == .__main__."
- "if TYPE_CHECKING"
- "^\\s*(import\\s.+|from\\s+.+import\\s+.+)"
- "logger.exception(e)"
5 changes: 5 additions & 0 deletions cypress/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"@cypress/request": "^3.0.5"
}
}
Loading

0 comments on commit f174ad8

Please sign in to comment.