Cherry Picked all new commits from main to the feature branch #2499
Conversation
JazzarKarim
force-pushed
the
19451-sync-with-main
branch
from
5c6542b
to
b2d4cab
Compare
|
JazzarKarim
requested review from
argush3,
chenhongjing,
leodube-aot,
tshyun24 and
kzdev420
* AmalTED pdf * Amalgamating pdf * remove Dissolution/Restoration Information section * fix lint error * lint with flake8 * lint
* 19154 Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca> * fix linting Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca> * update error messages Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca> --------- Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>
* fix spacing and TING * retrive to the previous output
* added first draft of outputs * testing adding folder * added draft amalgamation outputs * cleaned up application syntax * fixed typo * added data formatting and noa * added dates for certificate of amalgamation * repeated effective_date_time in business details for amalgamation application * fixed lint issue * fixed typo * fixed notice of articles and removed amalgamation/nameRequest * removed amalgamations.html from business-summary.html * reestablished amalgamations.html * removed completingParty from amalgamations and added from incorp * removed incorp/bencompany from noa in amalgamationApp
* 18803 add amalgamation email * fix small * fix lint issue * fix small * fix the get_filing parts * fix small * fix the test * fix lint issue * fix lint issue * update version
…) to business(es) (bcgov#2414)
…ran black formatter
…esses data (bcgov#2515) cherry pick fixes
JazzarKarim
force-pushed
the
19451-sync-with-main
branch
from
03fd424
to
cfed4e8
Compare
| from business_model import AmalgamatingBusiness, Amalgamation, Document, Filing, LegalEntity, RegistrationBootstrap, db | ||
| from entity_queue_common.service_utils import QueueException | ||
| from legal_api import db | ||
| from legal_api.models import ( |
There was a problem hiding this comment.
The filer imports it's models from the business_model library, not from legal_api. This can also be updated for the filer in tests/unit/__init__.py and test_amalgamation_application.py.
Also, you can probably remove the AccountService import from line 32 in this file since it isn't used.
| from flask_babel import _ as babel # noqa: N813, I004, I001; importing camelcase '_' as a name | ||
|
|
||
| # noqa: I003 | ||
| from legal_api.errors import Error | ||
| from legal_api.models import ConsentContinuationOut | ||
| from legal_api.services.filings.validations.common_validations import validate_court_order | ||
| from legal_api.services.filings.validations.continuation_out import validate_foreign_jurisdiction |
There was a problem hiding this comment.
I think this should be imported from common_validations in the line above since at the moment this is a circular import.
|
|
||
| # revision identifiers, used by Alembic. | ||
| revision = 'ba862cfda9e5' | ||
| down_revision = 'f978e34aa8bb' |
There was a problem hiding this comment.
This down_revision doesn't exist, throwing a KeyError when trying to run the unit tests. I haven't worked much in the migration scripts but this seems to indicate we are missing one of the migrations?
There was a problem hiding this comment.
We don't need to bring over any of the new migration scripts directly most of the time. We typically cut new tickets to incorporate the new db updates coming in from main.
In the legal name branch, we have mostly collapsed all the alembic script updates into a few scripts.
@JazzarKarim you can just leave these out as I believe we have already ported over these changes. Can you double check that https://github.com/bcgov/lear/blob/feature-legal-name/legal-api/migrations/versions/004f7558063f_second.py in legal name branch have the changes in both of the scripts you cherry picked over for this PR? If things check out, we can remove these two scripts from the PR.
And thanks for flagging this @leodube-aot !
There was a problem hiding this comment.
Removed both scripts.
I confirmed that these changes were already in the legal name branch but in this file: https://github.com/bcgov/lear/blob/feature-legal-name/legal-api/migrations/versions/5238dd8fb805_.py
So, I believe it should be OK to remove them. Thanks for catching that Leo and Argus!
|
Issue #: /bcgov/entity#19451
Description of changes:
Cherry Picked all new commits from main to the feature branch
No changes?? (remove amalgamating information section for TING (#2407))
Left this out for now: 18803 Add amalgamation tracker (#2426) (deals with messages in queue)
Not sure if i need to change something here #2444
Not sure what to do in business filings as the file has changed https://github.com/bcgov/lear/pull/2478/files#diff-3726ee4258cac46a611a4f1aee86c82be813913b2f6dcff918ac71b33aac8db5
After this PR, the feature branch should be up-to-date with all the latest changes of main.
I tried as much as possible to find/fix everything. It's impossible for me to find everything though so some stuff might be broken in case I wrongly fixed a conflict. Should be small stuff though I hope.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the lear license (Apache 2.0).