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

export earnings, txid, token name/value, payee location #5957

Merged
merged 11 commits into from
Apr 25, 2020

Conversation

owocki
Copy link
Contributor

@owocki owocki commented Feb 6, 2020

Description

export earnings, txid, token name/value, payee location in earnings export

Refers/Fixes

customer request

Testing

tested locally

@thelostone-mc thelostone-mc changed the base branch from stable to master April 21, 2020 00:24
Copy link
Member

@thelostone-mc thelostone-mc left a comment

Choose a reason for hiding this comment

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

  • changed PR to master
  • resolved conflicts
  • recreated migration

profile = request.user.profile
earnings = profile.earnings if export_type == 'earnings' else profile.sent_earnings
earnings = earnings.all().order_by('-created_on')
earnings = earnings.filter(network='mainnet').order_by('-created_on')
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't this be dynamic to work on local also ?

Copy link
Member

Choose a reason for hiding this comment

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

nah it's just for export -> should be fine

@thelostone-mc
Copy link
Member

@owocki CI fail :|

@owocki
Copy link
Contributor Author

owocki commented Apr 22, 2020

@thelostone-mc just deployed a fix for tests

@@ -1759,10 +1759,13 @@ def psave_tip(sender, instance, **kwargs):
def postsave_tip(sender, instance, created, **kwargs):
is_valid = instance.sender_profile != instance.recipient_profile and instance.txid
if instance.pk and is_valid:
value_true = 0
value_true = 0
Copy link
Member

Choose a reason for hiding this comment

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

^ @owocki value_usd :P
I'll fix it up and see

@codecov
Copy link

codecov bot commented Apr 25, 2020

Codecov Report

Merging #5957 into master will increase coverage by 0.02%.
The diff coverage is 80.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5957      +/-   ##
==========================================
+ Coverage   27.08%   27.11%   +0.02%     
==========================================
  Files         290      290              
  Lines       26635    26642       +7     
  Branches     3943     3943              
==========================================
+ Hits         7214     7223       +9     
+ Misses      19154    19148       -6     
- Partials      267      271       +4     
Impacted Files Coverage Δ
app/grants/models.py 49.26% <ø> (ø)
app/kudos/models.py 50.32% <ø> (ø)
app/marketing/views.py 12.01% <0.00%> (ø)
app/dashboard/models.py 49.78% <100.00%> (+0.21%) ⬆️
app/dashboard/views.py 11.24% <0.00%> (ø)
...rketing/management/commands/no_applicants_email.py 0.00% <0.00%> (ø)
...eting/management/commands/assemble_leaderboards.py 40.48% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 84ce3c4...a6adb64. Read the comment docs.

@thelostone-mc thelostone-mc merged commit c6dbbaa into master Apr 25, 2020
@thelostone-mc thelostone-mc deleted the kevin/earnings_info branch April 25, 2020 03: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.

4 participants