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

Settlement-v2 merge into master #615

Merged
merged 22 commits into from
Feb 27, 2020
Merged

Settlement-v2 merge into master #615

merged 22 commits into from
Feb 27, 2020

Conversation

ggrg
Copy link
Member

@ggrg ggrg commented Feb 26, 2020

Probably, it is good time to consider merging into master to avoid further maintenance

ggrg and others added 20 commits January 6, 2020 16:07
* Added migrations and seeds

* WIP

* Remove unused code (#504)

* Remove unused code

* Update dependencies

* Maintenance update (#505)

- Upgraded Event-SDK
- Version bump

* Upgraded central-services-stream for #1114KafkaErrorLocalQueuefull fix (#511)

* package.json and package-lock

* Changes following peer review

* Added settlementWindowContent.settlementId

Co-authored-by: Steven Oderayi <oderayi@gmail.com>
Co-authored-by: Miguel de Barros <miguel@debarros.me>
* Added additional window states

* Change to currentStateId. Dependencies update
* Seed settlementModel samples. Deps

* settlementModel.name unique index

* Re-run failed integration tests. Added hapi-swagger to ncu ignore list
Disabled settlementModel seeds (#564)
* Changes:

* 1179-Create SettlementModel API new code

* Address PR comments:
- Used central-services-shared for the enums
- handled duplicate insert to not return internal server error and sql statement
- Fixed validations on the routes.js
- Changed settlementCurrency to currency on the request
- Changed type to ledgerAccountType on the request

* 1179-Create SettlementModel API

Cleaned up the code

* Triggering build

* Applied standard.JS
* Added settlementModel.autoPositionReset. Dependencies update

* Fix /settlementModel to plural /settlementModels

* Fix npm vulnerabilities
#588)

*    Changes for story #1207:

			- Added PUT/GET routes with Joi validations
			- Included #1211 autoPositionReset property to GET requests
			- Created handler scripts
			- Implemented DAO scripts
			- Updated Unit tests

* Fixed npm audit errors

* 1207- Implement settlementModels management - GET and PUT operations

 * Moved enums to central-services-shared
 * Updated central-services-shared version
* Implemented settlement model definition validation. Node upgrade

* 9.1.2-snapshot

* Fix coverage

* Change as per PR request
settlement model unique constraint (#606)
@ggrg ggrg self-assigned this Feb 26, 2020
Copy link
Contributor

@rmothilal rmothilal left a comment

Choose a reason for hiding this comment

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

please see comments

migrations/910102_hotfix954.js Show resolved Hide resolved
@@ -0,0 +1,56 @@
/*****
Copy link
Contributor

Choose a reason for hiding this comment

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

why does the filename have a dash at the end of it?

Copy link
Member Author

Choose a reason for hiding this comment

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

It is currently not executed, but I just wanted to preserve it for a while until it's absolutely certain, there won't be any generic settlement models to be seeded. Please, let me know if it would be better to delete the script.

Copy link
Contributor

Choose a reason for hiding this comment

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

I would make a note in the file if you wish to keep it

Copy link
Contributor

Choose a reason for hiding this comment

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

I would suggest making a Note in the file stating why it is there and that it is not used. also consider appending or prepending the file name with ignore/deprecated or an appropriate term

Copy link
Contributor

@rmothilal rmothilal left a comment

Choose a reason for hiding this comment

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

PLease see comments

@ggrg ggrg requested a review from rmothilal February 27, 2020 15:48
Copy link
Contributor

@rmothilal rmothilal left a comment

Choose a reason for hiding this comment

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

Happy

@ggrg ggrg merged commit 267bab7 into master Feb 27, 2020
@ggrg ggrg deleted the settlement-v2 branch February 27, 2020 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants