-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update view to show retries, better pay response
- Loading branch information
1 parent
2c931d7
commit b925a59
Showing
5 changed files
with
146 additions
and
21 deletions.
There are no files selected for viewing
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
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
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
45 changes: 45 additions & 0 deletions
45
hasura.planx.uk/migrations/1715874150959_update submission services log/down.sql
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| create or replace view public.submission_services_log as | ||
| with payments as ( | ||
| select | ||
| session_id, | ||
| payment_id::text as event_id, | ||
| 'Pay' as event_type, | ||
| initcap(status) as status, | ||
| '{}'::jsonb as response, | ||
| created_at | ||
| from payment_status | ||
| where status != 'created' | ||
| and created_at >= '2024-01-01' | ||
| ), submissions as ( | ||
| select | ||
| (seil.request -> 'payload' -> 'payload' ->> 'sessionId')::uuid as session_id, | ||
| se.id as event_id, | ||
| case | ||
| when se.webhook_conf::text like '%bops%' then 'Submit to BOPS' | ||
| when se.webhook_conf::text like '%uniform%' then 'Submit to Uniform' | ||
| when se.webhook_conf::text like '%email-submission%' then 'Send to email' | ||
| when se.webhook_conf::text like '%upload-submission%' then 'Upload to AWS S3' | ||
| else se.webhook_conf::text | ||
| end as event_type, | ||
| case | ||
| when seil.status = 200 then 'Success' | ||
| else format('Failed (%s)', seil.status) | ||
| end as status, | ||
| seil.response::jsonb, | ||
| seil.created_at | ||
| from hdb_catalog.hdb_scheduled_events se | ||
| left join hdb_catalog.hdb_scheduled_event_invocation_logs seil on seil.event_id = se.id | ||
| where se.webhook_conf::text not like '%email/%' | ||
| and seil.created_at >= '2024-01-01' | ||
| ), all_events as ( | ||
| select * from payments | ||
| union all | ||
| select * from submissions | ||
| ) | ||
| SELECT | ||
| ls.flow_id, | ||
| ae.* | ||
| FROM all_events ae | ||
| left join public.lowcal_sessions ls on ls.id = ae.session_id | ||
| WHERE ls.flow_id is not null | ||
| order by ae.created_at desc; |
65 changes: 65 additions & 0 deletions
65
hasura.planx.uk/migrations/1715874150959_update submission services log/up.sql
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| create or replace view public.submission_services_log as | ||
| with payments as ( | ||
| select | ||
| ps.session_id, | ||
| ps.payment_id::text as event_id, | ||
| 'Pay' as event_type, | ||
| initcap(ps.status) as status, | ||
| jsonb_build_object( | ||
| 'status', ps.status, | ||
| 'description', pse.comment, | ||
| 'govuk_pay_reference', ps.payment_id::text | ||
| ) as response, | ||
| ps.created_at, | ||
| false as retry | ||
| from payment_status ps | ||
| left join payment_status_enum pse on pse.value = ps.status | ||
| where ps.status != 'created' | ||
| and ps.created_at >= '2024-01-01' | ||
| ), retries as ( | ||
| select | ||
| id | ||
| from hdb_catalog.hdb_scheduled_event_invocation_logs | ||
| where (event_id, created_at) in ( | ||
| select | ||
| seil.event_id, | ||
| max(seil.created_at) | ||
| from hdb_catalog.hdb_scheduled_event_invocation_logs seil | ||
| left join hdb_catalog.hdb_scheduled_events se on se.id = seil.event_id | ||
| where se.tries > 1 | ||
| group by seil.event_id | ||
| ) | ||
| ), submissions as ( | ||
| select | ||
| (seil.request -> 'payload' -> 'payload' ->> 'sessionId')::uuid as session_id, | ||
| se.id as event_id, | ||
| case | ||
| when se.webhook_conf::text like '%bops%' then 'Submit to BOPS' | ||
| when se.webhook_conf::text like '%uniform%' then 'Submit to Uniform' | ||
| when se.webhook_conf::text like '%email-submission%' then 'Send to email' | ||
| when se.webhook_conf::text like '%upload-submission%' then 'Upload to AWS S3' | ||
| else se.webhook_conf::text | ||
| end as event_type, | ||
| case | ||
| when seil.status = 200 then 'Success' | ||
| else format('Failed (%s)', seil.status) | ||
| end as status, | ||
| seil.response::jsonb, | ||
| seil.created_at, | ||
| exists(select 1 from retries r where r.id = seil.id) as retry | ||
| from hdb_catalog.hdb_scheduled_events se | ||
| left join hdb_catalog.hdb_scheduled_event_invocation_logs seil on seil.event_id = se.id | ||
| where se.webhook_conf::text not like '%email/%' | ||
| and seil.created_at >= '2024-01-01' | ||
| ), all_events as ( | ||
| select * from payments | ||
| union all | ||
| select * from submissions | ||
| ) | ||
| SELECT | ||
| ls.flow_id, | ||
| ae.* | ||
| FROM all_events ae | ||
| left join public.lowcal_sessions ls on ls.id = ae.session_id | ||
| WHERE ls.flow_id is not null | ||
| order by ae.created_at desc; |