fix: add checks for discount value #5880

shreyanshdwivedi · 2019-05-13T22:11:44Z

Fixes #5874

Checklist

I have read the Contribution & Best practices Guide and my PR follows them.
My branch is up-to-date with the Upstream development branch.
The unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

All the functions created/modified in this PR contain relevant docstrings.

Short description of what this resolves:

Currently their is no server side validation of data sent on creating/editing a discount code.

Changes proposed in this pull request:

Adds check for discount amount and discount %

app/api/schema/discount_codes.py

codecov · 2019-05-13T22:32:16Z

Codecov Report

Merging #5880 into development will decrease coverage by <.01%.
The diff coverage is 73.33%.

@@               Coverage Diff               @@
##           development    #5880      +/-   ##
===============================================
- Coverage        66.17%   66.17%   -0.01%     
===============================================
  Files              285      285              
  Lines            14133    14118      -15     
===============================================
- Hits              9353     9343      -10     
+ Misses            4780     4775       -5

Impacted Files	Coverage Δ
.../integration/api/validation/test_discount_codes.py	`98.52% <100%> (+1.09%)`	⬆️
app/api/schema/discount_codes.py	`59.25% <44.82%> (-3.95%)`	⬇️
app/api/helpers/auth.py	`89.47% <0%> (-2.53%)`	⬇️
app/api/auth.py	`21.3% <0%> (-2.05%)`	⬇️
app/models/ticket.py	`71.73% <0%> (-1.18%)`	⬇️
tests/all/integration/api/helpers/test_auth.py	`97.22% <0%> (-0.7%)`	⬇️
config.py	`87.32% <0%> (-0.52%)`	⬇️
app/models/setting.py	`88.59% <0%> (-0.45%)`	⬇️
app/__init__.py	`86.78% <0%> (-0.16%)`	⬇️
app/api/schema/settings.py	`100% <0%> (ø)`	⬆️
... and 5 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 6d69104...e5b08ba. Read the comment docs.

app/api/schema/discount_codes.py

tests/all/integration/api/validation/test_discount_codes.py

tests/all/unit/api/validation/test_discount_codes.py

tests/all/integration/api/validation/test_discount_codes.py

tests/all/unit/api/validation/test_discount_codes.py

shreyanshdwivedi · 2019-05-14T19:35:06Z

@iamareebjamal I've added a new file to add new tests in unit test section. Please review
@mrsaicharan1 @uds5501 please review

tests/all/unit/api/validation/test_discount_codes.py

tests/all/integration/api/validation/test_discount_codes.py

app/api/schema/discount_codes.py

iamareebjamal · 2019-05-15T15:16:21Z

Please handle percent by marshmallow schema

app/api/schema/discount_codes.py

shreyanshdwivedi · 2019-06-05T01:10:34Z

@CosmicCoder96 @iamareebjamal I've finalized my PR and included checks and tests for free tickets.
Idk why travis is failing. Such errors are occuring in other PRs as well. Please review and let me know if the travis is failing due to my PR.

iamareebjamal · 2019-06-05T11:59:09Z

The error was straightforward and right there in the clear:

  File "/home/travis/build/fossasia/open-event-server/app/api/schema/discount_codes.py", line 172, in validate_value
    for ticket in data['tickets']:
KeyError: 'tickets'

let me know if the travis is failing due to my PR.

Yes

app/api/schema/discount_codes.py

added tests Updated tests adds check for negative discount amount and percent removes validation for event discount code adds check for free tickets

shreyanshdwivedi · 2019-06-06T05:25:24Z

@iamareebjamal @uds5501 @CosmicCoder96 I've finalized the PR and fix the build. Please review

shreyanshdwivedi · 2019-06-08T15:42:06Z

@iamareebjamal please review

shreyanshdwivedi · 2019-06-13T07:56:13Z

@iamareebjamal @niranjan94 please review

kushthedude

LGTM !!

abhinavk96 · 2019-06-22T11:30:24Z

app/api/schema/discount_codes.py

+            if 'tickets' in data:
+                for ticket in data['tickets']:
+                    ticket_object = Ticket.query.filter_by(id=ticket).one()
+                    if not ticket_object.price:


shouldn't it be compared to zero ? for clarity?

@CosmicCoder96 actually we are allowing none for price attribute of ticket. Though for front-end we send 0 in case ticket price is not set but server is also for android. Maybe there are tickets present with None as ticket price so it may cause discrepancies
price = fields.Float(validate=lambda n: n >= 0, allow_none=True)
I checked it just now. Should I compare explicitly?

@shreyanshdwivedi okay, cool then don't change it.

added tests Updated tests adds check for negative discount amount and percent removes validation for event discount code adds check for free tickets

houndci-bot reviewed May 13, 2019

View reviewed changes

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

auto-label bot added the fix label May 13, 2019

shreyanshdwivedi force-pushed the checkDiscount branch from 2bd4190 to 352539f Compare May 13, 2019 22:14

shreyanshdwivedi force-pushed the checkDiscount branch 3 times, most recently from 2b47e7f to a8ba942 Compare May 14, 2019 00:30

fossasia deleted a comment May 14, 2019

shreyanshdwivedi force-pushed the checkDiscount branch from a8ba942 to 57148a6 Compare May 14, 2019 00:36

fossasia deleted a comment May 14, 2019

iamareebjamal reviewed May 14, 2019

View reviewed changes

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

iamareebjamal reviewed May 14, 2019

View reviewed changes

tests/all/integration/api/validation/test_discount_codes.py Outdated Show resolved Hide resolved

houndci-bot reviewed May 14, 2019

View reviewed changes

tests/all/unit/api/validation/test_discount_codes.py Outdated Show resolved Hide resolved

tests/all/unit/api/validation/test_discount_codes.py Outdated Show resolved Hide resolved

tests/all/integration/api/validation/test_discount_codes.py Show resolved Hide resolved

shreyanshdwivedi force-pushed the checkDiscount branch from a6340b8 to 444ba63 Compare May 14, 2019 18:39

houndci-bot reviewed May 14, 2019

View reviewed changes

tests/all/unit/api/validation/test_discount_codes.py Outdated Show resolved Hide resolved

shreyanshdwivedi force-pushed the checkDiscount branch from 444ba63 to 1b298e3 Compare May 14, 2019 18:42

fossasia deleted a comment May 14, 2019

shreyanshdwivedi force-pushed the checkDiscount branch from 1b298e3 to e89e7be Compare May 14, 2019 19:09

iamareebjamal reviewed May 14, 2019

View reviewed changes

tests/all/unit/api/validation/test_discount_codes.py Outdated Show resolved Hide resolved

shreyanshdwivedi force-pushed the checkDiscount branch from e89e7be to 2d062c2 Compare May 14, 2019 21:20

houndci-bot reviewed May 14, 2019

View reviewed changes

tests/all/unit/api/validation/test_discount_codes.py Show resolved Hide resolved

tests/all/unit/api/validation/test_discount_codes.py Outdated Show resolved Hide resolved

shreyanshdwivedi force-pushed the checkDiscount branch from 2d062c2 to 9d204a2 Compare May 14, 2019 21:23

iamareebjamal reviewed May 14, 2019

View reviewed changes

tests/all/integration/api/validation/test_discount_codes.py Show resolved Hide resolved

iamareebjamal reviewed May 15, 2019

View reviewed changes

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

iamareebjamal reviewed May 15, 2019

View reviewed changes

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

shreyanshdwivedi force-pushed the checkDiscount branch from dd50f80 to d65c2e7 Compare May 15, 2019 18:59

shreyanshdwivedi force-pushed the checkDiscount branch from a2ef6a1 to e486741 Compare June 4, 2019 11:46

fossasia deleted a comment Jun 4, 2019

uds5501 reviewed Jun 5, 2019

View reviewed changes

app/api/schema/discount_codes.py Outdated Show resolved Hide resolved

shreyanshdwivedi force-pushed the checkDiscount branch 2 times, most recently from 2f7e1b6 to a989538 Compare June 5, 2019 12:28

fossasia deleted a comment Jun 5, 2019

fix: add checks for discount value

04a9b28

added tests Updated tests adds check for negative discount amount and percent removes validation for event discount code adds check for free tickets

shreyanshdwivedi force-pushed the checkDiscount branch from a989538 to 04a9b28 Compare June 6, 2019 04:29

uds5501 approved these changes Jun 8, 2019

View reviewed changes

Merge branch 'development' into checkDiscount

a595d4f

fossasia deleted a comment Jun 17, 2019

kushthedude approved these changes Jun 17, 2019

View reviewed changes

abhinavk96 requested a review from iamareebjamal June 18, 2019 17:11

Merge branch 'development' into checkDiscount

8f220c3

fossasia deleted a comment Jun 18, 2019

bhaveshAn approved these changes Jun 19, 2019

View reviewed changes

bhaveshAn requested a review from pradeepgangwar June 19, 2019 19:28

Merge branch 'development' into checkDiscount

e5b08ba

abhinavk96 reviewed Jun 22, 2019

View reviewed changes

abhinavk96 approved these changes Jun 22, 2019

View reviewed changes

abhinavk96 requested review from iamareebjamal and removed request for iamareebjamal June 22, 2019 12:25

mariobehling merged commit 6d0f957 into fossasia:development Jun 22, 2019

fix: add checks for discount value #5880

fix: add checks for discount value #5880

Uh oh!

Conversation

shreyanshdwivedi commented May 13, 2019

Checklist

Short description of what this resolves:

Changes proposed in this pull request:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented May 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shreyanshdwivedi commented May 14, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iamareebjamal commented May 15, 2019

Uh oh!

Uh oh!

shreyanshdwivedi commented Jun 5, 2019

Uh oh!

iamareebjamal commented Jun 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

shreyanshdwivedi commented Jun 6, 2019

Uh oh!

shreyanshdwivedi commented Jun 8, 2019

Uh oh!

shreyanshdwivedi commented Jun 13, 2019

Uh oh!

kushthedude left a comment

Choose a reason for hiding this comment

Uh oh!

abhinavk96 Jun 22, 2019

Choose a reason for hiding this comment

Uh oh!

shreyanshdwivedi Jun 22, 2019

Choose a reason for hiding this comment

Uh oh!

abhinavk96 Jun 22, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov bot commented May 13, 2019 •

edited

Loading

iamareebjamal commented Jun 5, 2019 •

edited

Loading