fix: black formatting

fix: fixed factory
fossasia · Feb 2, 2020 · d539a83 · d539a83
1 parent 94453b7
commit d539a83
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 65 deletions.
diff --git a/app/api/helpers/scheduled_jobs.py b/app/api/helpers/scheduled_jobs.py
@@ -255,45 +255,47 @@ def send_monthly_event_invoice():
                 ticket_fee_object = (
                     db.session.query(TicketFees).filter_by(currency=currency).one()
                 )
-                ticket_fee_percentage = ticket_fee_object.service_fee
-                ticket_fee_maximum = ticket_fee_object.maximum_fee
-                orders = Order.query.filter_by(event=event).all()
-                gross_revenue = event.calc_monthly_revenue()
-                ticket_fees = event.tickets_sold * (ticket_fee_percentage / 100)
-                if ticket_fees > ticket_fee_maximum:
-                    ticket_fees = ticket_fee_maximum
-                net_revenue = gross_revenue - ticket_fees
-                payment_details = {
-                    'tickets_sold': event.tickets_sold,
-                    'gross_revenue': gross_revenue,
-                    'net_revenue': net_revenue,
-                    'amount_payable': ticket_fees,
-                }
-                # save invoice as pdf
-                pdf = create_save_pdf(
-                    render_template(
-                        'pdf/event_invoice.html',
-                        orders=orders,
-                        user=user,
-                        admin_info=admin_info,
-                        currency=currency,
-                        event=event,
-                        ticket_fee_object=ticket_fee_object,
-                        payment_details=payment_details,
-                        net_revenue=net_revenue,
-                    ),
-                    UPLOAD_PATHS['pdf']['event_invoice'],
-                    dir_path='/static/uploads/pdf/event_invoices/',
-                    identifier=event.identifier,
-                )
-                # save event_invoice info to DB
-
-                event_invoice = EventInvoice(
-                    amount=net_revenue, invoice_pdf_url=pdf, event_id=event.id
-                )
-                save_to_db(event_invoice)
             except NoResultFound:
-                return NotFoundError({'source': ''}, 'Ticket Fee not set for {}'.format(currency)).respond()
+                raise NotFoundError(
+                    {'source': ''}, 'Ticket Fee not set for {}'.format(currency)
+                ).respond()
+            ticket_fee_percentage = ticket_fee_object.service_fee
+            ticket_fee_maximum = ticket_fee_object.maximum_fee
+            orders = Order.query.filter_by(event=event).all()
+            gross_revenue = event.calc_monthly_revenue()
+            ticket_fees = event.tickets_sold * (ticket_fee_percentage / 100)
+            if ticket_fees > ticket_fee_maximum:
+                ticket_fees = ticket_fee_maximum
+            net_revenue = gross_revenue - ticket_fees
+            payment_details = {
+                'tickets_sold': event.tickets_sold,
+                'gross_revenue': gross_revenue,
+                'net_revenue': net_revenue,
+                'amount_payable': ticket_fees,
+            }
+            # save invoice as pdf
+            pdf = create_save_pdf(
+                render_template(
+                    'pdf/event_invoice.html',
+                    orders=orders,
+                    user=user,
+                    admin_info=admin_info,
+                    currency=currency,
+                    event=event,
+                    ticket_fee_object=ticket_fee_object,
+                    payment_details=payment_details,
+                    net_revenue=net_revenue,
+                ),
+                UPLOAD_PATHS['pdf']['event_invoice'],
+                dir_path='/static/uploads/pdf/event_invoices/',
+                identifier=event.identifier,
+            )
+            # save event_invoice info to DB
+
+            event_invoice = EventInvoice(
+                amount=net_revenue, invoice_pdf_url=pdf, event_id=event.id
+            )
+            save_to_db(event_invoice)
 
 
 @celery.on_after_configure.connect

diff --git a/app/factories/ticket_holder.py b/app/factories/ticket_holder.py
diff --git a/celerybeat-schedule b/celerybeat-schedule
diff --git a/tests/all/integration/api/helpers/test_scheduled_jobs.py b/tests/all/integration/api/helpers/test_scheduled_jobs.py
@@ -3,15 +3,14 @@
 from app.api.helpers.scheduled_jobs import (
     delete_ticket_holders_no_order_id,
     event_invoices_mark_due,
-    send_monthly_event_invoice
+    send_monthly_event_invoice,
 )
 from app.factories.attendee import AttendeeFactory
 from app.factories.ticket_fee import TicketFeesFactory
 from app.factories.event_invoice import EventInvoiceFactory
 from app.factories.user import UserFactory
 from app.factories.event import EventFactoryBasic
 from app.factories.order import OrderFactory
-from app.factories.ticket_holder import TicketHolderFactory
 from app.models import db
 from app.models.event_invoice import EventInvoice
 from app.models.ticket_holder import TicketHolder
@@ -85,27 +84,24 @@ def test_delete_ticket_holder_with_valid_order_id(self):
             self.assertIsNot(ticket_holder, None)
 
     def test_send_monthly_invoice(self):
-        """Method to test marking of event invoices as due"""
+        """Method to test monthly invoices"""
 
         with self.app.test_request_context():
             # ticket fee factory
             ticket_fee_test = TicketFeesFactory()
             # event factory
-            test_event = EventFactoryBasic(
-                state='published'
-            )
-            test_event.tickets_sold = 1
+            test_event = EventFactoryBasic(state='published')
             # user factory
             test_user = UserFactory()
             # order factory
-            test_order = OrderFactory(
-                status='completed'
+            test_order = OrderFactory(status='completed')
+            test_order.completed_at = datetime.datetime.now() - datetime.timedelta(
+                days=30
             )
-            test_order.completed_at = datetime.datetime.now() - datetime.timedelta(days=30)
             test_order.amount = 100
             test_order.event = test_event
             # ticket holder factory
-            test_ticket_holder = TicketHolderFactory()
+            test_ticket_holder = AttendeeFactory()
             test_event.owner = test_user
             db.session.commit()