test: Fix and test calculate_order_amount #6997

iamareebjamal · 2020-05-13T04:27:08Z

houndci-bot · 2020-05-13T04:27:17Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+
+
+def _create_ticket_dict(tickets, quantities):
+    return [dict(id=ticket.id, quantity=quantity) for ticket, quantity in zip(tickets, quantities)]


line too long (99 > 90 characters)

houndci-bot · 2020-05-13T04:27:17Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+def test_no_amount():
+    amount_data = calculate_order_amount([])
+
+    assert amount_data['total_amount'] == 0.0


Black would make changes.

houndci-bot · 2020-05-13T04:27:17Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

@@ -0,0 +1,82 @@
+from app.api.helpers.order import calculate_order_amount
+from tests.factories.tax import TaxSubFactory
+from tests.factories.ticket import TicketFactory, TicketSubFactory, TicketFactoryBase


'tests.factories.ticket.TicketFactory' imported but unused
'tests.factories.ticket.TicketFactoryBase' imported but unused

houndci-bot · 2020-05-13T04:27:17Z

app/api/custom/orders.py

@@ -99,8 +101,9 @@ def resend_emails():
            )
            return jsonify(
                status=True,
-                message="Verification emails for order : {} has been sent successfully"
-                .format(order_identifier),
+                message="Verification emails for order : {} has been sent successfully".format(


line too long (95 > 90 characters)

houndci-bot · 2020-05-13T04:27:18Z

app/api/custom/orders.py

@@ -8,17 +8,19 @@
 from app.api.auth import return_file
 from app.api.helpers.db import get_count, safe_query
 from app.api.helpers.files import make_frontend_url
-from app.api.helpers.errors import ForbiddenError, NotFoundError, \
-    UnprocessableEntityError
+from app.api.helpers.errors import ForbiddenError, NotFoundError, UnprocessableEntityError


Black would make changes.

codecov · 2020-05-13T04:33:38Z

Codecov Report

Merging #6997 into development will increase coverage by 0.48%.
The diff coverage is 22.81%.

@@               Coverage Diff               @@
##           development    #6997      +/-   ##
===============================================
+ Coverage        59.82%   60.30%   +0.48%     
===============================================
  Files              259      259              
  Lines            12875    12853      -22     
===============================================
+ Hits              7702     7751      +49     
+ Misses            5173     5102      -71

Impacted Files	Coverage Δ
app/api/access_codes.py	`51.21% <0.00%> (ø)`
app/api/attendees.py	`41.17% <0.00%> (ø)`
app/api/custom_forms.py	`70.83% <0.00%> (ø)`
app/api/custom_placeholders.py	`53.06% <ø> (ø)`
app/api/custom_system_roles.py	`67.74% <0.00%> (ø)`
app/api/data_layers/EventCopyLayer.py	`20.22% <ø> (ø)`
app/api/discount_codes.py	`22.27% <0.00%> (ø)`
app/api/email_notifications.py	`86.84% <0.00%> (ø)`
app/api/event_copy.py	`28.57% <0.00%> (ø)`
app/api/event_copyright.py	`63.63% <0.00%> (ø)`
... and 37 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 09049eb...fad1de4. Read the comment docs.

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+def _create_taxed_tickets(db, tax_included=True):
+    tax = TaxSubFactory(rate=18.0, is_tax_included_in_price=tax_included)
+    tickets = _create_tickets([123.5, 456.3], event=tax.event)
+    tickets.append(TicketSubFactory(type='donation', event=tax.event, min_price=500.0, max_price=1000.0))


houndci-bot · 2020-05-13T05:57:27Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+
+
+def _expect_donation_error(ticket_dict):
+    with pytest.raises(UnprocessableEntity, match='Price for donation ticket should be present and within range '


line too long (113 > 90 characters)

houndci-bot · 2020-05-13T05:57:28Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+def _create_donation_tickets(db):
+    event = EventFactoryBasic()
+    tickets = _create_tickets([10, 20], event=event)
+    tickets.append(TicketSubFactory(type='donation', max_price=20, min_price=10, event=event))


line too long (94 > 90 characters)

houndci-bot · 2020-05-13T05:57:28Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+
+    ticket_dict = _create_ticket_dict([ticket1, ticket2], [1, 2])
+
+    with pytest.raises(UnprocessableEntity, match='All tickets must belong to same event'):


line too long (91 > 90 characters)

houndci-bot · 2020-05-13T05:57:28Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+def test_no_amount():
+    amount_data = calculate_order_amount([])
+
+    assert amount_data['total'] == 0.0


Black would make changes.

houndci-bot · 2020-05-13T05:57:28Z

app/api/helpers/order.py

@@ -220,7 +218,8 @@ def calculate_order_amount(tickets, discount_code):
            price = ticket_info.get('price')
            if not price or price > ticket.max_price or price < ticket.min_price:
                raise UnprocessableEntity(
-                    {'source': 'data/tickets'}, "Price for donation ticket invalid"
+                    {'pointer': 'tickets/price'}, f"Price for donation ticket should be present and within range "
+                                                  f"{ticket.min_price} to {ticket.max_price}"


line too long (93 > 90 characters)

houndci-bot · 2020-05-13T05:57:29Z

app/api/helpers/order.py

@@ -220,7 +218,8 @@ def calculate_order_amount(tickets, discount_code):
            price = ticket_info.get('price')
            if not price or price > ticket.max_price or price < ticket.min_price:
                raise UnprocessableEntity(
-                    {'source': 'data/tickets'}, "Price for donation ticket invalid"
+                    {'pointer': 'tickets/price'}, f"Price for donation ticket should be present and within range "


line too long (114 > 90 characters)

houndci-bot · 2020-05-13T05:57:29Z

app/api/helpers/order.py

        ticket = safe_query_without_soft_deleted_entries(
            db, Ticket, 'id', ticket_identifier, 'id'
        )
        if not event:
            event = ticket.event
            fees = TicketFees.query.filter_by(currency=event.payment_currency).first()
        elif ticket.event.id != event.id:
-            raise UnprocessableEntity({'source': 'data/tickets'}, "Invalid Ticket")
+            raise UnprocessableEntity({'pointer': 'tickets'}, "All tickets must belong to same event")


line too long (102 > 90 characters)

houndci-bot · 2020-05-13T11:47:23Z

app/api/helpers/order.py

        ticket = safe_query_without_soft_deleted_entries(
            db, Ticket, 'id', ticket_identifier, 'id'
        )
        if not event:
            event = ticket.event
+
+            if event.deleted_at:
+                raise ObjectNotFound({'pointer': 'tickets/event'}, f'Event: {event.id} not found')


line too long (98 > 90 characters)

houndci-bot · 2020-05-13T17:09:49Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+    ticket_b = TicketSubFactory(price=495.8, event=ticket_a.event)
+    ticket_c = TicketSubFactory(price=321.3, event=ticket_a.event)
+
+    discount = DiscountCodeTicketSubFactory(type='percent', value=50.0, tickets=[ticket_a, ticket_b])


line too long (101 > 90 characters)

houndci-bot · 2020-05-13T17:09:49Z

tests/all/integration/api/helpers/order/test_calculate_order_amount.py

+
+def test_discount_code(db):
+    ticket = TicketSubFactory(price=100.0)
+    discount_code = DiscountCodeTicketSubFactory(type='percent', value=10.0, tickets=[ticket])


line too long (94 > 90 characters)

houndci-bot · 2020-05-13T17:56:18Z

tests/all/integration/api/helpers/test_db.py

@@ -27,15 +27,15 @@ def test_safe_query(self):
        with self.app.test_request_context():
            event = EventFactoryBasic()
            save_to_db(event)
-            obj = safe_query(db, Event, 'id', event.id, 'event_id')
+            obj = safe_query(Event, 'id', event.id, 'event_id')


Black would make changes.

lgtm-com · 2020-05-13T18:45:23Z

This pull request introduces 2 alerts and fixes 1 when merging ff3df8b into 09049eb - view on LGTM.com

new alerts:

2 for Unused import

fixed alerts:

1 for Testing equality to None

houndci-bot · 2020-05-14T06:41:02Z

tests/all/integration/api/helpers/test_db.py

+
+    event = EventFactoryBasic()
+    save_to_db(event)
+    obj = safe_query(Event, 'id', event.id, 'event_id')


Black would make changes.

niranjan94 · 2020-05-14T06:44:13Z

Here is an overview of what got changed by this pull request:

Complexity increasing per file
==============================
- tests/all/integration/api/helpers/order/test_calculate_order_amount.py  19
- app/api/helpers/order.py  1
- tests/all/integration/api/helpers/test_db.py  3
         

Clones added
============
- tests/all/integration/api/helpers/order/test_calculate_order_amount.py  4
         

Clones removed
==============
+ app/api/user_emails.py  -1
+ app/api/email_notifications.py  -1

See the complete overview on Codacy

lgtm-com · 2020-05-14T07:08:49Z

This pull request introduces 1 alert and fixes 1 when merging fad1de4 into 9e8c40a - view on LGTM.com

new alerts:

1 for Unused import

fixed alerts:

1 for Testing equality to None

auto-label bot added the testing label May 13, 2020

houndci-bot reviewed May 13, 2020

View reviewed changes

iamareebjamal added the Work in Progress label May 13, 2020

houndci-bot reviewed May 13, 2020

View reviewed changes

iamareebjamal force-pushed the test/order-amount branch from 6fd3df9 to 85c5e57 Compare May 13, 2020 17:10

houndci-bot reviewed May 13, 2020

View reviewed changes

iamareebjamal force-pushed the test/order-amount branch from a09e6de to 419cd21 Compare May 13, 2020 17:59

iamareebjamal added refactor and removed Work in Progress labels May 13, 2020

iamareebjamal added 4 commits May 13, 2020 23:48

test: Fix and test calculate_order_amount

48e7dc4

test: Add tests for donation tickets and change interface

f035c74

test: Add tests for deleted ticket and event

ebd39dc

test: Add basic discount codes test

60cafde

iamareebjamal force-pushed the test/order-amount branch from 419cd21 to ff3df8b Compare May 13, 2020 18:18

chore(refactor): Simplify query and test deleted discount

fad1de4

iamareebjamal force-pushed the test/order-amount branch from ff3df8b to fad1de4 Compare May 14, 2020 06:40

houndci-bot reviewed May 14, 2020

View reviewed changes

iamareebjamal mentioned this pull request May 14, 2020

Remove repetitive safe_query #7001

Closed

iamareebjamal merged commit eeaa8b9 into fossasia:development May 14, 2020

iamareebjamal deleted the test/order-amount branch May 14, 2020 06:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: Fix and test calculate_order_amount #6997

test: Fix and test calculate_order_amount #6997

iamareebjamal commented May 13, 2020 •

edited

Loading

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

codecov bot commented May 13, 2020 •

edited

Loading

This comment was marked as outdated.

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

houndci-bot May 13, 2020

lgtm-com bot commented May 13, 2020

houndci-bot May 14, 2020

niranjan94 commented May 14, 2020

lgtm-com bot commented May 14, 2020



		def _create_ticket_dict(tickets, quantities):
		return [dict(id=ticket.id, quantity=quantity) for ticket, quantity in zip(tickets, quantities)]



		def _expect_donation_error(ticket_dict):
		with pytest.raises(UnprocessableEntity, match='Price for donation ticket should be present and within range '


		ticket_dict = _create_ticket_dict([ticket1, ticket2], [1, 2])

		with pytest.raises(UnprocessableEntity, match='All tickets must belong to same event'):

test: Fix and test calculate_order_amount #6997

test: Fix and test calculate_order_amount #6997

Conversation

iamareebjamal commented May 13, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented May 13, 2020 • edited Loading

Codecov Report

This comment was marked as outdated.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lgtm-com bot commented May 13, 2020

Choose a reason for hiding this comment

niranjan94 commented May 14, 2020

lgtm-com bot commented May 14, 2020

iamareebjamal commented May 13, 2020 •

edited

Loading

codecov bot commented May 13, 2020 •

edited

Loading