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.

Sign up for GitHub

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

Jump to bottom

Validate fsp config and required attributes for Registration data refactor #5860

Merged
merged 7 commits into from
Oct 30, 2024
Merged

Validate fsp config and required attributes for Registration data refactor #5860

merged 7 commits into from
Oct 30, 2024

Conversation

RubenGeo
Copy link
Contributor

@RubenGeo RubenGeo commented Sep 26, 2024 •
edited by azure-boards bot
Loading

AB#30474 <!---
[AB#30781]

Describe your changes

Checklist before requesting a review

  • I have performed a self-review of my code
  • I have added tests wherever relevant
  • I have made sure that all automated checks pass before requesting a review
  • I do not need any deviation from our PR guidelines

@RubenGeo RubenGeo added the Refactor registration data PRs part of item AB#28961 to refactor registration data label Sep 26, 2024
@RubenGeo RubenGeo force-pushed the program-registration-attribute-portal branch from e64a6ca to 7171991 Compare October 15, 2024 07:52
@RubenGeo RubenGeo force-pushed the program-registration-attribute-validate-fsp-config branch from f6b1fcc to 274b99c Compare October 15, 2024 08:52
@RubenGeo RubenGeo force-pushed the program-registration-attribute-portal branch from 9a838cf to 4db5df2 Compare October 15, 2024 09:16
@RubenGeo RubenGeo force-pushed the program-registration-attribute-validate-fsp-config branch from 274b99c to 54464f7 Compare October 15, 2024 13:17
@RubenGeo RubenGeo force-pushed the program-registration-attribute-portal branch 2 times, most recently from 735c96b to 88905c6 Compare October 18, 2024 14:51
@RubenGeo RubenGeo force-pushed the program-registration-attribute-validate-fsp-config branch from 54464f7 to a224973 Compare October 22, 2024 12:03
@RubenGeo RubenGeo changed the title AB#30474 Validate fsp config and required attributes WIP AB#30474 Validate fsp config and required attributes Oct 22, 2024
@RubenGeo RubenGeo marked this pull request as ready for review October 22, 2024 13:43
Base automatically changed from program-registration-attribute-portal to program-registration-attribute-excel-fsp October 23, 2024 15:35
@RubenGeo RubenGeo force-pushed the program-registration-attribute-excel-fsp branch from 483a915 to a2941c7 Compare October 24, 2024 12:46
@RubenGeo RubenGeo force-pushed the program-registration-attribute-validate-fsp-config branch from a224973 to e1826f0 Compare October 24, 2024 13:19
Base automatically changed from program-registration-attribute-excel-fsp to feat.refactor-registration-data October 25, 2024 12:55
@RubenGeo RubenGeo force-pushed the program-registration-attribute-validate-fsp-config branch from e1826f0 to 98cda90 Compare October 25, 2024 14:45
@RubenGeo RubenGeo added the enhancement New feature or request that affects our end users label Oct 25, 2024
@diderikvw diderikvw changed the title AB#30474 Validate fsp config and required attributes Registration data refactor, validate fsp config and required attributes Oct 28, 2024
@diderikvw diderikvw changed the title Registration data refactor, validate fsp config and required attributes Validate fsp config and required attributes for Registration data refactor Oct 28, 2024
@RubenGeo
Migrate refactored registration data and program attributes (#5977)
7a741f9 
Migrations refactor registration data

Co-authored-by: Ruben <vandervalk@geoit.nl>
diderikvw
diderikvw requested changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@diderikvw diderikvw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments. For a more in-depth review of the changed code, I would need to learn a lot more of the code where the changes take place. I would like to, but may be out of scope for this item.

services/121-service/package.json Show resolved Hide resolved
services/121-service/src/payments/fsp-integration/excel/excel.service.ts Show resolved Hide resolved
services/121-service/src/payments/fsp-integration/intersolve-visa/intersolve-visa.service.ts Show resolved Hide resolved
services/121-service/src/registration/dto/validate-registration-error-object.dto.ts Outdated Show resolved Hide resolved
services/121-service/src/registration/interfaces/validate-registration-config.interface.ts Outdated Show resolved Hide resolved
services/121-service/src/registration/registrations.service.ts Show resolved Hide resolved
services/121-service/src/registration/registrations.service.ts Show resolved Hide resolved
services/121-service/src/registration/services/registrations-import.service.ts Outdated Show resolved Hide resolved
services/121-service/src/transaction-job-processors/transaction-job-processors.service.ts Outdated Show resolved Hide resolved
services/121-service/test/payment/do-payment-safaricom.test.ts Outdated Show resolved Hide resolved
diderikvw
diderikvw requested changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@diderikvw diderikvw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment.

@jannisvisser jannisvisser merged commit bbe979c into feat.refactor-registration-data Oct 30, 2024
2 of 8 checks passed
@jannisvisser jannisvisser deleted the program-registration-attribute-validate-fsp-config branch October 30, 2024 12:36
RubenGeo added a commit that referenced this pull request Oct 31, 2024
@RubenGeo @jannisvisser
Validate fsp config and required attributes for Registration data ref…
be6d4ef 
…actor (#5860)

* AB#30474 Validate fsp config and required attributes WIP

* AB#30474 & AB#30781 Validate registration with program registration attribute refactor

* Migrate refactored registration data and program attributes (#5977)

Migrations refactor registration data

Co-authored-by: Ruben <vandervalk@geoit.nl>

* Select the right kind of type while migrating program questions

* Changes based on comments on the new validation of registrations

* Expect required fsp attributes to be filled during payment

* chore: rm unused methods / unskip tests / typos (#6004)

---------

Co-authored-by: Ruben <vandervalk@geoit.nl>
Co-authored-by: jannisvisser <jannisvisser@redcross.nl>
RubenGeo pushed a commit that referenced this pull request Nov 1, 2024
Refactor registration data and attributes
169f6f7 
Excel FSP: multiple per program (#5848)

* Excel FSP: multiple per program

* Program registration attribute portal (#5858)

* Frontend alligning to new registration attribute & fsp config change

Renamed portal models according to new data structure, registration attribtes & new fsp conig

Added missing import

Check voucher support with fspName instead of label

* Styling changes

---------

Co-authored-by: Ruben <vandervalk@geoit.nl>

* Fix.excel setup (#5970)

* fix: get match column correctly AB#30281

* fix: lingering case of StatusEnum AB#30281

* fix: do not duplicate response rows with multiple fspConfigs

* fix: api-test AB#30281

* fix: fix and unskip api-test on get fsp instructions AB#30281

* fix: api-test on snapshot AB#30281

* feat: return separate template file per fsp config

* fix: snapshot template api test

* chore: remove hasReconciliation

* chore: split off interface

* fix: resolve comments

---------

Co-authored-by: Ruben <vandervalk@geoit.nl>
Co-authored-by: jannisvisser <jannisvisser@redcross.nl>

Validate fsp config and required attributes for Registration data refactor (#5860)

* AB#30474 Validate fsp config and required attributes WIP

* AB#30474 & AB#30781 Validate registration with program registration attribute refactor

* Migrate refactored registration data and program attributes (#5977)

Migrations refactor registration data

Co-authored-by: Ruben <vandervalk@geoit.nl>

* Select the right kind of type while migrating program questions

* Changes based on comments on the new validation of registrations

* Expect required fsp attributes to be filled during payment

* chore: rm unused methods / unskip tests / typos (#6004)

---------

Co-authored-by: Ruben <vandervalk@geoit.nl>
Co-authored-by: jannisvisser <jannisvisser@redcross.nl>

fix: make seed mock script work again (#6003)

* fix: make seed mock script work again

* fix: revert to abbreviated sequence name

test: api-tests on update chosen fsp AB#31025 (#6006)

Fix.test data (#6015)

* fix: api-test excel

* fix: make test data work

* fix: calculate totalmultiplierSum in dryRun case

* fix: import of boolean attribute
RubenGeo pushed a commit that referenced this pull request Nov 5, 2024
@diderikvw
Refactor registration data and attributes
0393ff7 
Excel FSP: multiple per program (#5848)

* Excel FSP: multiple per program

* Program registration attribute portal (#5858)

* Frontend alligning to new registration attribute & fsp config change

Renamed portal models according to new data structure, registration attribtes & new fsp conig

Added missing import

Check voucher support with fspName instead of label

* Styling changes

---------

Co-authored-by: Ruben <vandervalk@geoit.nl>

* Fix.excel setup (#5970)

* fix: get match column correctly AB#30281

* fix: lingering case of StatusEnum AB#30281

* fix: do not duplicate response rows with multiple fspConfigs

* fix: api-test AB#30281

* fix: fix and unskip api-test on get fsp instructions AB#30281

* fix: api-test on snapshot AB#30281

* feat: return separate template file per fsp config

* fix: snapshot template api test

* chore: remove hasReconciliation

* chore: split off interface

* fix: resolve comments

---------

Co-authored-by: Ruben <vandervalk@geoit.nl>
Co-authored-by: jannisvisser <jannisvisser@redcross.nl>

Validate fsp config and required attributes for Registration data refactor (#5860)

* AB#30474 Validate fsp config and required attributes WIP

* AB#30474 & AB#30781 Validate registration with program registration attribute refactor

* Migrate refactored registration data and program attributes (#5977)

Migrations refactor registration data

Co-authored-by: Ruben <vandervalk@geoit.nl>

* Select the right kind of type while migrating program questions

* Changes based on comments on the new validation of registrations

* Expect required fsp attributes to be filled during payment

* chore: rm unused methods / unskip tests / typos (#6004)

---------

Co-authored-by: Ruben <vandervalk@geoit.nl>
Co-authored-by: jannisvisser <jannisvisser@redcross.nl>

fix: make seed mock script work again (#6003)

* fix: make seed mock script work again

* fix: revert to abbreviated sequence name

test: api-tests on update chosen fsp AB#31025 (#6006)

Fix.test data (#6015)

* fix: api-test excel

* fix: make test data work

* fix: calculate totalmultiplierSum in dryRun case

* fix: import of boolean attribute

Program fsp configs endpoints (#5989)

* Some initial refactor and draft code

Add code framework for endpoints

Get endpoint implementation done

WIP implement post endpoint

* Manage fsp config enpoints

* Comments jannis manage program fsp config

---------

Co-authored-by: Diderik van Wingerden <diderik@diderikvanwingerden.com>
Co-authored-by: Ruben <vandervalk@geoit.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@diderikvw diderikvw diderikvw requested changes

@jannisvisser jannisvisser jannisvisser approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request that affects our end users Refactor registration data PRs part of item AB#28961 to refactor registration data
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RubenGeo @diderikvw @jannisvisser