Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(DTFS2-6892): commonise london timezone #3672

Merged
merged 22 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
99dc56d
feat(dtfs2-6892): commonise entra id user schema, update all tests
AlexBramhill Oct 11, 2024
788ad4b
feat(dtfs2-6892): update schemas to screaming snake case
AlexBramhill Oct 11, 2024
2f2245f
feat(dtfs2-6892): commonise iana timezone type
AlexBramhill Oct 11, 2024
b4a745f
Merge branch 'main' into feat/DTFS2-6892/commonise-entra-user-schema-…
AlexBramhill Oct 15, 2024
1dd345a
feat(dtfs2-6892): review comments
AlexBramhill Oct 15, 2024
f6c1f23
Merge branch 'feat/DTFS2-6892/commonise-entra-user-schema-and-refacto…
AlexBramhill Oct 15, 2024
f9d1388
Merge branch 'main' into feat/DTFS2-6892/commonise-london-timezone
AlexBramhill Oct 15, 2024
eef11cb
feat(dtfs2-6892): fix tests
AlexBramhill Oct 15, 2024
a8b54be
feat(dtfs2-6892): update to default timezone using env var as per rev…
AlexBramhill Oct 15, 2024
547b64d
Merge branch 'main' into feat/DTFS2-6892/commonise-london-timezone
AlexBramhill Oct 15, 2024
3343ed2
feat(dtfs2-6892): update to default timezone using env var as per rev…
AlexBramhill Oct 15, 2024
6c1a745
Merge branch 'feat/DTFS2-6892/commonise-london-timezone' of https://g…
AlexBramhill Oct 15, 2024
1391ef9
feat(dtfs2-6892): update to default timezone using env var as per rev…
AlexBramhill Oct 15, 2024
5c64ab3
feat(dtfs2-6892): update deployment scripts with TZ
AlexBramhill Oct 16, 2024
1e2e3a2
feat(dtfs2-6892): update e2e tests config
AlexBramhill Oct 16, 2024
71ab73d
feat(dtfs2-6892): update TZ var to not cast to string as per review c…
AlexBramhill Oct 16, 2024
f603ffc
feat(dtfs2-6892): update e2e test config
AlexBramhill Oct 16, 2024
9da499e
feat(dtfs2-6892): update test file
AlexBramhill Oct 16, 2024
dbc336b
feat(dtfs2-6892): update test file
AlexBramhill Oct 16, 2024
789f360
fix(DTFS2-6892): timezone support on e2e tests
abhi-markan Oct 16, 2024
4860d4e
fix(DTFS2-6892): added default value to timezone env variable
abhi-markan Oct 17, 2024
81316cb
feat(dtfs2-6892): fix issue with timezone config
AlexBramhill Oct 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions .github/workflows/development_infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [infrastructure]
paths:
- ".github/workflows/development_infrastructure.yml"
- '.github/workflows/development_infrastructure.yml'

env:
# Environment
Expand All @@ -20,7 +20,7 @@ env:
app_service_plan_egress_cidr: 172.16.42.0/28
vm_cidr: 172.16.43.0/28
aca_clam_av_cidr: 172.16.42.32/27
vnet_address_prefixes: "172.16.40.0/22 172.16.60.0/23"
vnet_address_prefixes: '172.16.40.0/22 172.16.60.0/23'
production_subnet_cidr: 10.60.0.0/16
palo_alto_next_hop: 10.50.0.100
api_portal_access_port: 44232
Expand Down Expand Up @@ -1126,7 +1126,8 @@ jobs:
GOV_NOTIFY_API_KEY="${{ secrets.GOV_NOTIFY_API_KEY }}" \
MONGO_INITDB_DATABASE="${{ env.database_name }}" \
MONGODB_URI="$mongo_connection_string" \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }}
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
TZ=${{ vars.TZ }}

dtfs-central-api:
name: DTFS Central API
Expand Down Expand Up @@ -1265,7 +1266,8 @@ jobs:
WEBSITES_PORT=5000 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}"
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1301,7 +1303,7 @@ jobs:
dtfs-central-api,
file-storage,
trade-finance-manager-api,
]
]
environment:
name: ${{ needs.set-environment.outputs.environment }}
runs-on: [self-hosted, linux, deployment]
Expand Down Expand Up @@ -1448,7 +1450,8 @@ jobs:
CLAMAV_PORT="$clamav_port" \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }}
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1635,7 +1638,8 @@ jobs:
WEBSITES_PORT=5000 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}"
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1684,7 +1688,7 @@ jobs:
portal-api,
external-api,
redis,
]
]
environment:
name: ${{ needs.set-environment.outputs.environment }}
runs-on: [self-hosted, linux, deployment]
Expand Down Expand Up @@ -1836,7 +1840,8 @@ jobs:
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
UTILISATION_REPORT_MAX_FILE_SIZE_BYTES=${{ vars.UTILISATION_REPORT_MAX_FILE_SIZE_BYTES }} \
CLAMAV_HOST="$clamav_host" \
CLAMAV_PORT="$clamav_port"
CLAMAV_PORT="$clamav_port" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -2000,7 +2005,8 @@ jobs:
ESTORE_CRON_MANAGER_SCHEDULE="${{ vars.ESTORE_CRON_MANAGER_SCHEDULE }}" \
HTTPS=1 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
FF_TFM_SSO_ENABLED="${{ vars.FF_TFM_SSO_ENABLED }}"
FF_TFM_SSO_ENABLED="${{ vars.FF_TFM_SSO_ENABLED }}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -2160,7 +2166,8 @@ jobs:
EXTERNAL_API_URL="http://$EXTERNAL_API_URL" \
HTTPS=1 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }}
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/production_infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [infrastructure]
paths:
- ".github/workflows/production_infrastructure.yml"
- '.github/workflows/production_infrastructure.yml'

env:
# Environment
Expand All @@ -20,7 +20,7 @@ env:
app_service_plan_egress_cidr: 172.16.32.0/28
vm_cidr: 172.16.33.0/28
aca_clam_av_cidr: 172.16.32.32/27
vnet_address_prefixes: "172.16.30.0/23 172.16.32.0/23"
vnet_address_prefixes: '172.16.30.0/23 172.16.32.0/23'
production_subnet_cidr: 10.60.0.0/16
palo_alto_next_hop: 10.50.0.100

Expand Down Expand Up @@ -1128,7 +1128,8 @@ jobs:
GOV_NOTIFY_API_KEY="${{ secrets.GOV_NOTIFY_API_KEY }}" \
MONGO_INITDB_DATABASE="${{ env.database_name }}" \
MONGODB_URI="$mongo_connection_string" \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }}
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
TZ=${{ vars.TZ }}

dtfs-central-api:
name: DTFS Central API
Expand Down Expand Up @@ -1267,7 +1268,8 @@ jobs:
WEBSITES_PORT=5000 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}"
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1449,7 +1451,8 @@ jobs:
CLAMAV_PORT="$clamav_port" \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }}
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1636,7 +1639,8 @@ jobs:
WEBSITES_PORT=5000 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}"
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1823,7 +1827,8 @@ jobs:
EXTERNAL_API_URL="http://$EXTERNAL_API_URL" \
HTTPS=1 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
UTILISATION_REPORT_MAX_FILE_SIZE_BYTES=${{ vars.UTILISATION_REPORT_MAX_FILE_SIZE_BYTES }}
UTILISATION_REPORT_MAX_FILE_SIZE_BYTES=${{ vars.UTILISATION_REPORT_MAX_FILE_SIZE_BYTES }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1992,7 +1997,8 @@ jobs:
ENTRA_ID_CLOUD_INSTANCE="${{ vars.ENTRA_ID_CLOUD_INSTANCE }}" \
ENTRA_ID_TENANT_ID="${{ vars.ENTRA_ID_TENANT_ID }}" \
ENTRA_ID_CLIENT_SECRET="${{ vars.ENTRA_ID_CLIENT_SECRET }}" \
ENTRA_ID_REDIRECT_URL="${{ vars.ENTRA_ID_REDIRECT_URL }}"
ENTRA_ID_REDIRECT_URL="${{ vars.ENTRA_ID_REDIRECT_URL }}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -2152,7 +2158,8 @@ jobs:
EXTERNAL_API_URL="http://$EXTERNAL_API_URL" \
HTTPS=1 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }}
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/staging_infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [infrastructure]
paths:
- ".github/workflows/staging_infrastructure.yml"
- '.github/workflows/staging_infrastructure.yml'

env:
# Environment
Expand All @@ -20,7 +20,7 @@ env:
app_service_plan_egress_cidr: 172.16.52.0/28
vm_cidr: 172.16.53.0/28
aca_clam_av_cidr: 172.16.52.32/27
vnet_address_prefixes: "172.16.50.0/23 172.16.52.0/23 172.16.70.0/23" # App service settings
vnet_address_prefixes: '172.16.50.0/23 172.16.52.0/23 172.16.70.0/23' # App service settings
production_subnet_cidr: 10.60.0.0/16
palo_alto_next_hop: 10.50.0.100

Expand Down Expand Up @@ -1128,7 +1128,8 @@ jobs:
GOV_NOTIFY_API_KEY="${{ secrets.GOV_NOTIFY_API_KEY }}" \
MONGO_INITDB_DATABASE="${{ env.database_name }}" \
MONGODB_URI="$mongo_connection_string" \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }}
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
TZ=${{ vars.TZ }}

dtfs-central-api:
name: DTFS Central API
Expand Down Expand Up @@ -1267,7 +1268,8 @@ jobs:
WEBSITES_PORT=5000 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}"
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1449,7 +1451,8 @@ jobs:
CLAMAV_PORT="$clamav_port" \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }}
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1636,7 +1639,8 @@ jobs:
WEBSITES_PORT=5000 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
CHANGE_STREAM_ENABLED="${{ vars.CHANGE_STREAM_ENABLED}}" \
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}"
DELETION_AUDIT_LOGS_TTL_SECONDS="${{ vars.DELETION_AUDIT_LOGS_TTL_SECONDS}}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1823,7 +1827,8 @@ jobs:
EXTERNAL_API_URL="http://$EXTERNAL_API_URL" \
HTTPS=1 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
UTILISATION_REPORT_MAX_FILE_SIZE_BYTES=${{ vars.UTILISATION_REPORT_MAX_FILE_SIZE_BYTES }}
UTILISATION_REPORT_MAX_FILE_SIZE_BYTES=${{ vars.UTILISATION_REPORT_MAX_FILE_SIZE_BYTES }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -1992,7 +1997,8 @@ jobs:
ENTRA_ID_CLOUD_INSTANCE="${{ vars.ENTRA_ID_CLOUD_INSTANCE }}" \
ENTRA_ID_TENANT_ID="${{ vars.ENTRA_ID_TENANT_ID }}" \
ENTRA_ID_CLIENT_SECRET="${{ vars.ENTRA_ID_CLIENT_SECRET }}" \
ENTRA_ID_REDIRECT_URL="${{ vars.ENTRA_ID_REDIRECT_URL }}"
ENTRA_ID_REDIRECT_URL="${{ vars.ENTRA_ID_REDIRECT_URL }}" \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down Expand Up @@ -2152,7 +2158,8 @@ jobs:
EXTERNAL_API_URL="http://$EXTERNAL_API_URL" \
HTTPS=1 \
RATE_LIMIT_THRESHOLD=${{ vars.RATE_LIMIT_THRESHOLD }} \
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }}
GEF_DEAL_VERSION=${{ vars.GEF_DEAL_VERSION }} \
TZ=${{ vars.TZ }}

- name: Secrets
uses: azure/cli@v2
Expand Down
28 changes: 13 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,24 @@

## [2.4.0](https://github.com/UK-Export-Finance/dtfs2/compare/v2.3.0...v2.4.0) (2024-10-14)


### Features

* **dtfs2-6892:** create and auto submit accept sso redirect form ([#3659](https://github.com/UK-Export-Finance/dtfs2/issues/3659)) ([2a18fde](https://github.com/UK-Export-Finance/dtfs2/commit/2a18fde59a59715d7b9e699036a07608279a2958))
* **dtfs2-6892:** handle entra redirect to accept sso redirect form ([#3637](https://github.com/UK-Export-Finance/dtfs2/issues/3637)) ([e8e746f](https://github.com/UK-Export-Finance/dtfs2/commit/e8e746f32c71c85032d89016d669458fb3b02594))
* **DTFS2-7303:** change links on deal cancellation summary page ([#3647](https://github.com/UK-Export-Finance/dtfs2/issues/3647)) ([09c34a1](https://github.com/UK-Export-Finance/dtfs2/commit/09c34a1091d38598d18aacd2f6b387c4129a0a27))
* **DTFS2-7450:** add e2e tests for cancel cancellation ([#3661](https://github.com/UK-Export-Finance/dtfs2/issues/3661)) ([51f2481](https://github.com/UK-Export-Finance/dtfs2/commit/51f24810377a06c1fe890f7a3bfe10ed4d272660))
* **DTFS2-7454:** redirect from cancellation pages if no cancellation in draft ([#3649](https://github.com/UK-Export-Finance/dtfs2/issues/3649)) ([dc81c48](https://github.com/UK-Export-Finance/dtfs2/commit/dc81c4866d1a4e9d116179dc031fb8e9739642f9))
* **FN-2294:** send email to bank if report reconciled ([#3648](https://github.com/UK-Export-Finance/dtfs2/issues/3648)) ([3ff1e91](https://github.com/UK-Export-Finance/dtfs2/commit/3ff1e913ab9122dcd104d50e99ea13af4d50f06c))
* **FN-2311:** add frontend payment details filtering logic ([#3646](https://github.com/UK-Export-Finance/dtfs2/issues/3646)) ([f265852](https://github.com/UK-Export-Finance/dtfs2/commit/f2658529c9883611edc5fb90c898b2af4877cb9b))
* **FN-2976:** add match success notification to template ([#3662](https://github.com/UK-Export-Finance/dtfs2/issues/3662)) ([74086af](https://github.com/UK-Export-Finance/dtfs2/commit/74086af31255ba36ef2f2aaf8a2671de89038054))
* **FN-3272:** store initial utilisation and fee based on supplied and facility values ([#3589](https://github.com/UK-Export-Finance/dtfs2/issues/3589)) ([0ab38f7](https://github.com/UK-Export-Finance/dtfs2/commit/0ab38f7978763ccc63cacb6605fed47aa8d08b41))
* **FN-3447:** add utilisation tab data to response ([#3651](https://github.com/UK-Export-Finance/dtfs2/issues/3651)) ([5f1a9e7](https://github.com/UK-Export-Finance/dtfs2/commit/5f1a9e729b853619d490309f9ea8f493f022a02d))
* **FN-3447:** utilisation tab e2e tests ([#3666](https://github.com/UK-Export-Finance/dtfs2/issues/3666)) ([d717e6e](https://github.com/UK-Export-Finance/dtfs2/commit/d717e6e46d36997705aec73a89ef32838c20b85e))
* **FN-3447:** utilisation tab table ([#3652](https://github.com/UK-Export-Finance/dtfs2/issues/3652)) ([005f64a](https://github.com/UK-Export-Finance/dtfs2/commit/005f64a70a3a276f3693037fc8d793ed45085d5e))

- **dtfs2-6892:** create and auto submit accept sso redirect form ([#3659](https://github.com/UK-Export-Finance/dtfs2/issues/3659)) ([2a18fde](https://github.com/UK-Export-Finance/dtfs2/commit/2a18fde59a59715d7b9e699036a07608279a2958))
- **dtfs2-6892:** handle entra redirect to accept sso redirect form ([#3637](https://github.com/UK-Export-Finance/dtfs2/issues/3637)) ([e8e746f](https://github.com/UK-Export-Finance/dtfs2/commit/e8e746f32c71c85032d89016d669458fb3b02594))
- **DTFS2-7303:** change links on deal cancellation summary page ([#3647](https://github.com/UK-Export-Finance/dtfs2/issues/3647)) ([09c34a1](https://github.com/UK-Export-Finance/dtfs2/commit/09c34a1091d38598d18aacd2f6b387c4129a0a27))
- **DTFS2-7450:** add e2e tests for cancel cancellation ([#3661](https://github.com/UK-Export-Finance/dtfs2/issues/3661)) ([51f2481](https://github.com/UK-Export-Finance/dtfs2/commit/51f24810377a06c1fe890f7a3bfe10ed4d272660))
- **DTFS2-7454:** redirect from cancellation pages if no cancellation in draft ([#3649](https://github.com/UK-Export-Finance/dtfs2/issues/3649)) ([dc81c48](https://github.com/UK-Export-Finance/dtfs2/commit/dc81c4866d1a4e9d116179dc031fb8e9739642f9))
- **FN-2294:** send email to bank if report reconciled ([#3648](https://github.com/UK-Export-Finance/dtfs2/issues/3648)) ([3ff1e91](https://github.com/UK-Export-Finance/dtfs2/commit/3ff1e913ab9122dcd104d50e99ea13af4d50f06c))
- **FN-2311:** add frontend payment details filtering logic ([#3646](https://github.com/UK-Export-Finance/dtfs2/issues/3646)) ([f265852](https://github.com/UK-Export-Finance/dtfs2/commit/f2658529c9883611edc5fb90c898b2af4877cb9b))
- **FN-2976:** add match success notification to template ([#3662](https://github.com/UK-Export-Finance/dtfs2/issues/3662)) ([74086af](https://github.com/UK-Export-Finance/dtfs2/commit/74086af31255ba36ef2f2aaf8a2671de89038054))
- **FN-3272:** store initial utilisation and fee based on supplied and facility values ([#3589](https://github.com/UK-Export-Finance/dtfs2/issues/3589)) ([0ab38f7](https://github.com/UK-Export-Finance/dtfs2/commit/0ab38f7978763ccc63cacb6605fed47aa8d08b41))
- **FN-3447:** add utilisation tab data to response ([#3651](https://github.com/UK-Export-Finance/dtfs2/issues/3651)) ([5f1a9e7](https://github.com/UK-Export-Finance/dtfs2/commit/5f1a9e729b853619d490309f9ea8f493f022a02d))
- **FN-3447:** utilisation tab e2e tests ([#3666](https://github.com/UK-Export-Finance/dtfs2/issues/3666)) ([d717e6e](https://github.com/UK-Export-Finance/dtfs2/commit/d717e6e46d36997705aec73a89ef32838c20b85e))
- **FN-3447:** utilisation tab table ([#3652](https://github.com/UK-Export-Finance/dtfs2/issues/3652)) ([005f64a](https://github.com/UK-Export-Finance/dtfs2/commit/005f64a70a3a276f3693037fc8d793ed45085d5e))

### Bug Fixes

* **FN-3422:** calculate fixed fee from report period end date ([#3650](https://github.com/UK-Export-Finance/dtfs2/issues/3650)) ([92b22f2](https://github.com/UK-Export-Finance/dtfs2/commit/92b22f204d52019e67f2e814e77e7befa97a165c))
- **FN-3422:** calculate fixed fee from report period end date ([#3650](https://github.com/UK-Export-Finance/dtfs2/issues/3650)) ([92b22f2](https://github.com/UK-Export-Finance/dtfs2/commit/92b22f204d52019e67f2e814e77e7befa97a165c))

## 2.3.0 (2024-10-09)

Expand Down
5 changes: 4 additions & 1 deletion e2e-tests/gef/cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ const { createTasks } = require('../support/tasks');
// Read from root `./.env` directory
dotenv.config({ path: path.resolve(__dirname, '../../.env') });

const { PORTAL_API_KEY } = process.env;
const { PORTAL_API_KEY, TZ } = process.env;

module.exports = defineConfig({
env: {
TZ,
},
dealApiProtocol: 'http://',
dealApiHost: 'localhost',
dealApiPort: '5001',
Expand Down
9 changes: 5 additions & 4 deletions e2e-tests/portal/cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ const { createTasks } = require('../support/tasks');
// Read from root `./.env` directory
dotenv.config({ path: path.resolve(__dirname, '../../.env') });

const { CONTACT_US_EMAIL_ADDRESS, PORTAL_API_KEY } = process.env;
const { CONTACT_US_EMAIL_ADDRESS, PORTAL_API_KEY, TZ } = process.env;

module.exports = defineConfig({
env: {
TZ,
CONTACT_US_EMAIL_ADDRESS,
},
apiProtocol: 'http://',
apiHost: 'localhost',
apiPort: '5001',
Expand All @@ -35,9 +39,6 @@ module.exports = defineConfig({
setupNodeEvents(on) {
on('task', createTasks());
},
env: {
CONTACT_US_EMAIL_ADDRESS,
},
},
experimentalCspAllowList: ['child-src', 'default-src', 'frame-src', 'form-action', 'script-src', 'script-src-elem'],
});
5 changes: 4 additions & 1 deletion e2e-tests/tfm/cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ const { createTasks } = require('../support/tasks');
// Read from root `./.env` directory
dotenv.config({ path: path.resolve(__dirname, '../../.env') });

const { TFM_API_KEY } = process.env;
const { TFM_API_KEY, TZ } = process.env;

module.exports = defineConfig({
env: {
TZ,
},
dealApiProtocol: 'http://',
dealApiHost: 'localhost',
dealApiPort: '5001',
Expand Down
5 changes: 4 additions & 1 deletion e2e-tests/ukef/cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ const { createTasks } = require('../support/tasks');
// Read from root `./.env` directory
dotenv.config({ path: path.resolve(__dirname, '../../.env') });

const { PORTAL_API_KEY, TFM_API_KEY } = process.env;
const { PORTAL_API_KEY, TFM_API_KEY, TZ } = process.env;

module.exports = defineConfig({
env: {
TZ,
},
centralApiProtocol: 'http://',
centralApiHost: 'localhost',
centralApiPort: '5005',
Expand Down
Loading
Loading