Recurring payments #1816

ScottDormand96 · 2023-11-02T09:24:59Z

https://eaflood.atlassian.net/browse/IWTF-3617

Recurring Payments Job to retrieve the recurring payments due on the current day

* Initial setup RP job https://eaflood.atlassian.net/browse/IWTF-3381 Setup recurring payment job * initial setup * Update docker/README.md Co-authored-by: Iris Faraway <[email protected]> * update readme * update license * add console log for when rp running * setup docker so picks up commands run tomprove running * LICENSE --------- Co-authored-by: Iris Faraway <[email protected]>

https://eaflood.atlassian.net/browse/IWTF-3617 Recurring Payments Job to retrieve the recurring payments due on the current day

…ents

jaucourt

Great progress here, and much closer to what we're after, but there's still work to do I'm afraid.

Additionally, I think you might be going beyond the initial scope of the ticket you're working on. You've got code in here amending the transaction queue processing that I don't think is necessary to delivering the ticket you're working on. Focus in on delivering the acceptance criteria for that ticket.

docker/env/recurring_payments_job.secrets.env.example

packages/connectors-lib/src/__tests__/sales-api-connector.spec.js

packages/dynamics-lib/src/entities/__tests__/recurring-payment.entity.spec.js

packages/dynamics-lib/src/queries/recurring-payment.queries.js

packages/recurring-payments-job/README.md

packages/sales-api-service/src/services/recurring-payments.service.js

jaucourt · 2023-11-08T12:44:04Z

packages/sales-api-service/src/services/recurring-payments.service.js

+  }
+
+  return recurringPaymentsWithPermission
+}


This isn't the way you should be getting related entities. Have a look at permission.queries.js in dynamics-lib, particularly the expand property of PredefinedQuery.

I don't understand why you're still retrieving Contact and Permission individually; the additional work you've done to retrieve related entities in dynamics-lib should mean you don't have to do this.

packages/sales-api-service/src/services/transactions/process-transaction-queue.js

…ents

jaucourt

Sorry, still a handful of things to resolve

packages/dynamics-lib/src/entities/__tests__/recurring-payment.entity.spec.js

jaucourt · 2023-11-15T09:38:00Z

packages/dynamics-lib/src/entities/__tests__/recurring-payment.entity.spec.js

    }

    expect(recurringPayment).toBeInstanceOf(RecurringPayment)
-    expect(recurringPayment).toMatchObject(expect.objectContaining({ etag: 'W/"53585133"', ...expectedFields }))
+    expect(recurringPayment).toMatchObject(expect.objectContaining({ etag: 'W/"11528905"', ...expectedFields }))


Again, here we have four assertions in a single test - see my comments further down

jaucourt · 2023-11-15T09:40:54Z

packages/dynamics-lib/src/entities/__tests__/recurring-payment.entity.spec.js

+        defra_publicid: '649-213',
+        statecode: 1,
+        _defra_contact_value: 'b3d33cln-2e83-ea11-a811-000d3a649213',
+        _defra_activepermission_value: 'a5b24adf-2e83-ea11-a811-000d3a649213'


This identical response is copied and pasted throughout this test - the only variation is when you set the cancelled date and reason. Therefore, it should be a function, where it's possible to pass in overrides, i.e.

const getRecurringPaymentResponse = overrides => ({ '@odata.etag': 'W/"11528905"', defra_recurringpaymentid: 'b5b24adf-2e83-ea11-a811-000d3a649213', defra_name: '18569ba8-094e-4e8c-9911-bfedd5ccc17a', defra_nextduedate: '2019-12-14T00:00:00Z', defra_cancelleddate: '2019-12-14T00:00:00Z', defra_cancelledreason: 910400195, defra_enddate: '2019-12-15T00:00:00Z', defra_agreementid: 'c9267c6e-573d-488b-99ab-ea18431fc472', defra_publicid: '649-213', statecode: 1, _defra_contact_value: 'b3d33cln-2e83-ea11-a811-000d3a649213', _defra_activepermission_value: 'a5b24adf-2e83-ea11-a811-000d3a649213', ...overrides })

jaucourt · 2023-11-15T12:05:46Z

packages/sales-api-service/src/services/recurring-payments.service.js

+  }
+
+  return recurringPaymentsWithPermission
+}


I don't understand why you're still retrieving Contact and Permission individually; the additional work you've done to retrieve related entities in dynamics-lib should mean you don't have to do this.

packages/recurring-payments-job/src/recurring-payments-processor.js

packages/sales-api-service/src/schema/transaction.schema.js

h, plus filter just on date when retrieving recurring payments

…ents

* Remove phone from content in text message option https://eaflood.atlassian.net/browse/IWTF-3861 Remove the word phone from the content for a text message option * added welsh

irisfaraway

Just a question about testing

packages/recurring-payments-job/src/__tests__/recurring-payments-processor.spec.js

sonarqubecloud · 2023-12-20T09:41:09Z

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

ScottDormand96 and others added 14 commits August 9, 2023 07:55

Feature branch rp job

1effd2f

Retrieve recurring payments

7ceddc4

https://eaflood.atlassian.net/browse/IWTF-3617 Recurring Payments Job to retrieve the recurring payments due on the current day

grab rp

e46d63e

working rpjob

5c0237c

update error in tranaction.schema

378b368

prettier readme

180093f

remove console logs

88ba56a

Updated following comments in PR, pushing to fix test

e9a3bd5

Merge branch 'develop' into feature/iwtf-3617-retrieve-recurring-paym…

a911ff5

…ents

Update dependencies, fix lint errors

d958125

push changes for support

8869c2d

update getRecurringPayments

95bcae1

updated env files, remove logs, add date, refactor tests

de3851b

ScottDormand96 added the enhancement New feature or request label Nov 2, 2023

ScottDormand96 added 12 commits November 2, 2023 10:10

lint errors

4c32b61

code smells

518c20d

remove console logs

62aaa81

fix broken test

02dc680

fix code smell

5569538

remove await

ec3bbee

code coverage

29efd7b

update tests and package.json

82a4181

npm install on rp job folder

d960a60

remove package-lock and run npm install

afc9f8f

Merge branch 'develop' into feature/iwtf-3617-retrieve-recurring-paym…

8a23820

…ents

update package-lock and package references

cecdd6e

jaucourt requested changes Nov 8, 2023

View reviewed changes

ScottDormand96 added 2 commits November 13, 2023 16:01

changes made following pr comments

8c154d2

Merge branch 'develop' into feature/iwtf-3617-retrieve-recurring-paym…

65850f6

…ents

update package.json

9ee6de1

jaucourt requested changes Nov 15, 2023

View reviewed changes

ScottDormand96 and others added 17 commits November 15, 2023 14:49

update entity tests, add comments where changes are needed

5e63bd1

Amend so that we expand contact and active permission in a single fetc

1f9533d

h, plus filter just on date when retrieving recurring payments

Fixed process transaction queue tests

46f814e

Fix recurring payment service tests

df27c1c

Update dependencies

72fa111

Fix more dependencies

db0aaaf

Dependencies. Yeah.

ac66f34

Merge branch 'develop' into feature/iwtf-3617-retrieve-recurring-paym…

7d86f30

…ents

new version of recurring-payments-job

4fe7f9a

Update package lock for recurring payments job

e34bee5

Remove automock and add manual mock to work around weird failure

6c750b6

Fix RP query test

fa68b2e

Fix code smell

7852f8b

Remove phone from content in text message option (#1826)

e00aed9

* Remove phone from content in text message option https://eaflood.atlassian.net/browse/IWTF-3861 Remove the word phone from the content for a text message option * added welsh

chore(release): publish v1.37.0-rc.7

ade8bb5

rename tests, change date format and update tests

db57e77

fix merge conflicts and update package json

a3df9f8

jaucourt approved these changes Dec 5, 2023

View reviewed changes

irisfaraway reviewed Dec 12, 2023

View reviewed changes

packages/recurring-payments-job/src/__tests__/recurring-payments-processor.spec.js Outdated Show resolved Hide resolved

remove mockRestore

66ed093

irisfaraway approved these changes Dec 21, 2023

View reviewed changes

ScottDormand96 merged commit 2d02548 into develop Jan 3, 2024
3 checks passed

jaucourt deleted the feature/iwtf-3617-retrieve-recurring-payments branch January 16, 2024 09:11

ScottDormand96 restored the feature/iwtf-3617-retrieve-recurring-payments branch January 19, 2024 12:40

ScottDormand96 deleted the feature/iwtf-3617-retrieve-recurring-payments branch January 19, 2024 12:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Recurring payments #1816

Recurring payments #1816

ScottDormand96 commented Nov 2, 2023

jaucourt left a comment •

edited

Loading

jaucourt Nov 8, 2023

jaucourt Nov 15, 2023

jaucourt left a comment

jaucourt Nov 15, 2023

jaucourt Nov 15, 2023

jaucourt Nov 15, 2023

irisfaraway left a comment

sonarqubecloud bot commented Dec 20, 2023

Recurring payments #1816

Recurring payments #1816

Conversation

ScottDormand96 commented Nov 2, 2023

jaucourt left a comment • edited Loading

Choose a reason for hiding this comment

jaucourt Nov 8, 2023

Choose a reason for hiding this comment

jaucourt Nov 15, 2023

Choose a reason for hiding this comment

jaucourt left a comment

Choose a reason for hiding this comment

jaucourt Nov 15, 2023

Choose a reason for hiding this comment

jaucourt Nov 15, 2023

Choose a reason for hiding this comment

jaucourt Nov 15, 2023

Choose a reason for hiding this comment

irisfaraway left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Dec 20, 2023

Quality Gate passed

jaucourt left a comment •

edited

Loading