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

Create kudos in feed #2576

Merged
merged 7 commits into from
Nov 5, 2018
Merged

Create kudos in feed #2576

merged 7 commits into from
Nov 5, 2018

Conversation

octavioamu
Copy link
Contributor

@octavioamu octavioamu commented Oct 30, 2018

Description
Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Affected core subsystem(s)
Testing
Refers/Fixes

app/dashboard/models.py Outdated Show resolved Hide resolved
app/kudos/views.py Outdated Show resolved Hide resolved
app/kudos/views.py Outdated Show resolved Hide resolved
@jasonrhaas jasonrhaas mentioned this pull request Oct 30, 2018
3 tasks
@owocki
Copy link
Contributor

owocki commented Nov 1, 2018

@octavioamu the code LGTM -- did you test!? the linter/build is failing

@octavioamu
Copy link
Contributor Author

@owocki is not finished I will come back to this one today

@codecov
Copy link

codecov bot commented Nov 2, 2018

Codecov Report

Merging #2576 into master will increase coverage by 0.76%.
The diff coverage is 18.42%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2576      +/-   ##
==========================================
+ Coverage   29.96%   30.73%   +0.76%     
==========================================
  Files         162      162              
  Lines       13027    13507     +480     
  Branches     1741     1927     +186     
==========================================
+ Hits         3904     4151     +247     
- Misses       8999     9243     +244     
+ Partials      124      113      -11
Impacted Files Coverage Δ
...eting/management/commands/assemble_leaderboards.py 93.68% <0%> (+11.5%) ⬆️
app/app/settings.py 82.85% <100%> (+2.69%) ⬆️
app/dashboard/models.py 52.21% <28.57%> (+0.06%) ⬆️
app/kudos/views.py 26.97% <9.09%> (-1.67%) ⬇️
app/dashboard/views.py 13.44% <0%> (+0.51%) ⬆️
app/avatar/utils.py 19.4% <0%> (+0.97%) ⬆️
app/dashboard/utils.py 38.77% <0%> (+3.21%) ⬆️
app/retail/views.py 35.15% <0%> (+5.52%) ⬆️
... and 1 more

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 1608344...4a7bb9a. Read the comment docs.

app/app/settings.py Outdated Show resolved Hide resolved
app/dashboard/models.py Outdated Show resolved Hide resolved
app/dashboard/models.py Outdated Show resolved Hide resolved
app/dashboard/models.py Show resolved Hide resolved
app/dashboard/models.py Outdated Show resolved Hide resolved
app/kudos/models.py Outdated Show resolved Hide resolved
@@ -283,7 +262,13 @@ def send_2(request):
This form is filled out before the 'send' button is clicked.

"""
if not request.user.is_authenticated or request.user.is_authenticated and not getattr(request.user, 'profile', None):

Choose a reason for hiding this comment

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

E501 line too long (121 > 120 characters)

app/kudos/views.py Outdated Show resolved Hide resolved
app/kudos/views.py Outdated Show resolved Hide resolved
app/marketing/management/commands/assemble_leaderboards.py Outdated Show resolved Hide resolved
@octavioamu octavioamu changed the title [WIP] Create kudos in feed Create kudos in feed Nov 2, 2018
@octavioamu octavioamu requested a review from owocki November 2, 2018 04:22
@@ -450,8 +487,8 @@ def receive(request, key, txid, network):

"""
these_kudos_transfers = KudosTransfer.objects.filter(web3_type='v3', txid=txid, network=network)
kudos_transfers = these_kudos_transfers.filter(metadata__reference_hash_for_receipient=key) | these_kudos_transfers.filter(
metadata__reference_hash_for_funder=key)
kudos_transfers = these_kudos_transfers.filter(metadata__reference_hash_for_receipient=key) |

Choose a reason for hiding this comment

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

E999 SyntaxError: invalid syntax

Copy link
Contributor

Choose a reason for hiding this comment

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

Need to fix the syntax error here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

tried to fix the E501 line too long

kudos_transfers = these_kudos_transfers.filter(metadata__reference_hash_for_receipient=key) | these_kudos_transfers.filter(
metadata__reference_hash_for_funder=key)
kudos_transfers = these_kudos_transfers.filter(metadata__reference_hash_for_receipient=key) |
these_kudos_transfers.filter(metadata__reference_hash_for_funder=key)

Choose a reason for hiding this comment

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

E113 unexpected indentation

owocki
owocki previously approved these changes Nov 2, 2018
@owocki
Copy link
Contributor

owocki commented Nov 2, 2018

LGTM; @mbeacom ?

@mbeacom

This comment has been minimized.

Copy link
Contributor

@mbeacom mbeacom left a comment

Choose a reason for hiding this comment

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

Should be good to go once the syntax error is fixed

Thanks @octavioamu

@@ -450,8 +487,8 @@ def receive(request, key, txid, network):

"""
these_kudos_transfers = KudosTransfer.objects.filter(web3_type='v3', txid=txid, network=network)
kudos_transfers = these_kudos_transfers.filter(metadata__reference_hash_for_receipient=key) | these_kudos_transfers.filter(
metadata__reference_hash_for_funder=key)
kudos_transfers = these_kudos_transfers.filter(metadata__reference_hash_for_receipient=key) |
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to fix the syntax error here

app/retail/templates/shared/activity.html Show resolved Hide resolved
app/kudos/views.py Outdated Show resolved Hide resolved
@owocki
Copy link
Contributor

owocki commented Nov 5, 2018

ok let me know when its finished

@octavioamu
Copy link
Contributor Author

YES! figured out how to do it, lol. Ready to merge @owocki

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