24195 tweaks on filing queries #3166
Merged
Conversation
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
vysakh-menon-aot
commented
Jan 8, 2025
| @@ -511,7 +511,6 @@ def json(self, slim=False): | |||
| 'lastLedgerTimestamp': self.last_ledger_timestamp.isoformat(), | |||
| 'lastAddressChangeDate': '', | |||
| 'lastDirectorChangeDate': '', | |||
| 'lastModified': self.last_modified.isoformat(), | |||
There was a problem hiding this comment.
included in _slim_json
vysakh-menon-aot
commented
Jan 8, 2025
| @@ -896,7 +896,7 @@ def get_filings_by_types(business_id: int, filing_types): | |||
| filter(Filing.business_id == business_id). \ | |||
| filter(Filing._filing_type.in_(filing_types)). \ | |||
| filter(Filing._status == Filing.Status.COMPLETED.value). \ | |||
| order_by(desc(Filing.effective_date)). \ | |||
| order_by(desc(Filing.transaction_id)). \ | |||
There was a problem hiding this comment.
order with transaction_id for COMPLETED filing queries
vysakh-menon-aot
commented
Jan 8, 2025
| @@ -80,7 +80,6 @@ def get_businesses(identifier: str): | |||
| recent_filing_json = CoreFiling.get_most_recent_filing_json(business.id, None, jwt) | |||
| if recent_filing_json: | |||
| business_json['submitter'] = recent_filing_json['filing']['header']['submitter'] | |||
| business_json['lastModified'] = recent_filing_json['filing']['header']['date'] | |||
There was a problem hiding this comment.
Not required to override. lastModified will be updated in entity-filer while processing a filing
vysakh-menon-aot
commented
Jan 8, 2025
| if filing.transaction_id: # transaction_id will be None for the pending filings (intermediate state) | ||
| query = query.filter(Filing.transaction_id < filing.transaction_id) | ||
|
|
||
| return query.order_by(Filing.transaction_id.desc()).first() |
There was a problem hiding this comment.
order with transaction_id for COMPLETED filing queries
|
vysakh-menon-aot
commented
Jan 8, 2025
| max_filing = max_filing.filter(Filing._filing_sub_type == filing_sub_type) | ||
| max_filing = max_filing.subquery() | ||
| def get_most_recent_filing(business_id: str, filing_type: str = None, filing_sub_type: str = None): | ||
| """Return the most recent filing. |
There was a problem hiding this comment.
Simplified and generalize this function
argush3
approved these changes
Jan 8, 2025
chenhongjing
approved these changes
Jan 8, 2025
ketaki-deodhar
approved these changes
Jan 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #: /bcgov/entity#24195
Description of changes:
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).