transaction calculations: fixes #9 #20
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
markbrough
requested changes
Nov 10, 2023
| # the `value_local` dict has the total value of the transaction listed in each country's local currency; this | ||
| # adjusts it according to proportion of total allocated to sector/country | ||
| self.flat_transaction['value_local'] = dict([(country, (value_local * sector_pct_adjustment)) for | ||
| country, value_local in self.transaction.value_local.value.items()]) |
There was a problem hiding this comment.
I see! Previously, the value_local was being set and multiplied by a fraction (for the sector and country) each time so it became very small.
Comment on lines
+135
to
+144
| expected_data = {'fcdo': {'LR': {'15110': 1232 / 0.726269155}}, | ||
| "finddiagnostics": {'AO': {'32182': (71189586 / 100) * 0.18 * 0.72, | ||
| '12210': (71189586 / 100) * 0.18 * 0.28}, | ||
| 'AE': {'32182': (71189586 / 100) * 0.01 * 0.72, | ||
| '12210': (71189586 / 100) * 0.01 * 0.28}, | ||
| 'AR': {'32182': (71189586 / 100) * 0.01 * 0.72, | ||
| '12210': (71189586 / 100) * 0.01 * 0.28}, | ||
| 'AT': {'32182': (71189586 / 100) * 0.0001 * 0.72, | ||
| '12210': (71189586 / 100) * 0.0001 * 0.28}, | ||
| }} |
There was a problem hiding this comment.
Although this works, I think this is slightly confusing because you divide only the non-USD values by 100. Then in the finddiagnostics file, country AO is 0.18% (So 0.0018) and sector 32182 is 72% (so 0.72). I think it would be good to just divide by 1 (the USD:USD conversion rate) and then multiply by the fraction each time.
So perhaps this could instead be written as:
{ 'AO': {'32182': (71189586 / 1) * 0.0018 * 0.72 }}
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.
No description provided.