diff --git a/app/api/schema/speakers_calls.py b/app/api/schema/speakers_calls.py index 9423b03650..6d7eb87a89 100644 --- a/app/api/schema/speakers_calls.py +++ b/app/api/schema/speakers_calls.py @@ -32,19 +32,19 @@ def validate_date(self, data, original_data): if 'ends_at' not in data: data['ends_at'] = speakers_calls.ends_at - if 'event_starts_at' not in data: - data['event_starts_at'] = speakers_calls.event.starts_at + # if 'event_starts_at' not in data: + # data['event_starts_at'] = speakers_calls.event.starts_at if data['starts_at'] >= data['ends_at']: raise UnprocessableEntity({'pointer': '/data/attributes/ends-at'}, "ends-at should be after starts-at") - if 'event_starts_at' in data and data['starts_at'] > data['event_starts_at']: - raise UnprocessableEntity({'pointer': '/data/attributes/starts-at'}, - "speakers-call starts-at should be before event starts-at") + # if 'event_starts_at' in data and data['starts_at'] > data['event_starts_at']: + # raise UnprocessableEntity({'pointer': '/data/attributes/starts-at'}, + # "speakers-call starts-at should be before event starts-at") - if 'event_starts_at' in data and data['ends_at'] > data['event_starts_at']: - raise UnprocessableEntity({'pointer': '/data/attributes/ends-at'}, - "speakers-call ends-at should be before event starts-at") + # if 'event_starts_at' in data and data['ends_at'] > data['event_starts_at']: + # raise UnprocessableEntity({'pointer': '/data/attributes/ends-at'}, + # "speakers-call ends-at should be before event starts-at") id = fields.Str(dump_only=True) announcement = fields.Str(required=True) diff --git a/app/api/schema/tickets.py b/app/api/schema/tickets.py index 00b1f76932..6cb4ab1b8d 100644 --- a/app/api/schema/tickets.py +++ b/app/api/schema/tickets.py @@ -30,20 +30,20 @@ def validate_date(self, data, original_data): if 'sales_ends_at' not in data: data['sales_ends_at'] = ticket.sales_ends_at - if 'event_ends_at' not in data: - data['event_ends_at'] = ticket.event.ends_at + # if 'event_ends_at' not in data: + # data['event_ends_at'] = ticket.event.ends_at if data['sales_starts_at'] >= data['sales_ends_at']: raise UnprocessableEntity({'pointer': '/data/attributes/sales-ends-at'}, "sales-ends-at should be after sales-starts-at") - if 'event_ends_at' in data and data['sales_starts_at'] > data['event_ends_at']: - raise UnprocessableEntity({'pointer': '/data/attributes/sales-starts-at'}, - "ticket sales-starts-at should be before event ends-at") + # if 'event_ends_at' in data and data['sales_starts_at'] > data['event_ends_at']: + # raise UnprocessableEntity({'pointer': '/data/attributes/sales-starts-at'}, + # "ticket sales-starts-at should be before event ends-at") - if 'event_ends_at' in data and data['sales_ends_at'] > data['event_ends_at']: - raise UnprocessableEntity({'pointer': '/data/attributes/sales-ends-at'}, - "ticket sales-ends-at should be before event ends-at") + # if 'event_ends_at' in data and data['sales_ends_at'] > data['event_ends_at']: + # raise UnprocessableEntity({'pointer': '/data/attributes/sales-ends-at'}, + # "ticket sales-ends-at should be before event ends-at") @validates_schema def validate_quantity(self, data): diff --git a/tests/all/integration/api/validation/test_speakers_call.py b/tests/all/integration/api/validation/test_speakers_call.py index ce5377b1ed..13dcec5e9d 100644 --- a/tests/all/integration/api/validation/test_speakers_call.py +++ b/tests/all/integration/api/validation/test_speakers_call.py @@ -49,39 +49,39 @@ def test_date_start_gt_end(self): with self.assertRaises(UnprocessableEntity): SpeakersCallSchema.validate_date(schema, data, original_data) - def test_date_start_gt_event_end(self): - """ - Speakers Call Validate Date - Tests if exception is raised when speakers_call starts_at is after event starts_at - :return: - """ - schema = SpeakersCallSchema() - original_data = { - 'data': {} - } - data = { - 'starts_at': datetime(2003, 9, 4, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'ends_at': datetime(2003, 9, 10, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'event_starts_at': datetime(2003, 9, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')) - } - with self.assertRaises(UnprocessableEntity): - SpeakersCallSchema.validate_date(schema, data, original_data) + # def test_date_start_gt_event_end(self): + # """ + # Speakers Call Validate Date-Tests if exception is raised when speakers_call starts_at is after event starts_at + # :return: + # """ + # schema = SpeakersCallSchema() + # original_data = { + # 'data': {} + # } + # data = { + # 'starts_at': datetime(2003, 9, 4, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'ends_at': datetime(2003, 9, 10, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'event_starts_at': datetime(2003, 9, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')) + # } + # with self.assertRaises(UnprocessableEntity): + # SpeakersCallSchema.validate_date(schema, data, original_data) - def test_date_end_gt_event_end(self): - """ - Speakers Call Validate Date - Tests if exception is raised when speakers_call ends_at is after event starts_at - :return: - """ - schema = SpeakersCallSchema() - original_data = { - 'data': {} - } - data = { - 'starts_at': datetime(2003, 9, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'ends_at': datetime(2003, 9, 10, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'event_starts_at': datetime(2003, 9, 5, 12, 30, 45).replace(tzinfo=timezone('UTC')) - } - with self.assertRaises(UnprocessableEntity): - SpeakersCallSchema.validate_date(schema, data, original_data) + # def test_date_end_gt_event_end(self): + # """ + # Speakers Call Validate Date-Tests if exception is raised when speakers_call ends_at is after event starts_at + # :return: + # """ + # schema = SpeakersCallSchema() + # original_data = { + # 'data': {} + # } + # data = { + # 'starts_at': datetime(2003, 9, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'ends_at': datetime(2003, 9, 10, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'event_starts_at': datetime(2003, 9, 5, 12, 30, 45).replace(tzinfo=timezone('UTC')) + # } + # with self.assertRaises(UnprocessableEntity): + # SpeakersCallSchema.validate_date(schema, data, original_data) def test_date_db_populate(self): """ diff --git a/tests/all/integration/api/validation/test_tickets.py b/tests/all/integration/api/validation/test_tickets.py index ff65f65c67..488eb9fe82 100644 --- a/tests/all/integration/api/validation/test_tickets.py +++ b/tests/all/integration/api/validation/test_tickets.py @@ -49,39 +49,39 @@ def test_date_start_gt_end(self): with self.assertRaises(UnprocessableEntity): TicketSchema.validate_date(schema, data, original_data) - def test_date_start_gt_event_end(self): - """ - Tickets Validate Date - Tests if exception is raised when sales_starts_at is after event ends_at - :return: - """ - schema = TicketSchema() - original_data = { - 'data': {} - } - data = { - 'sales_starts_at': datetime(2003, 8, 4, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'sales_ends_at': datetime(2003, 9, 4, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'event_ends_at': datetime(2003, 8, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')) - } - with self.assertRaises(UnprocessableEntity): - TicketSchema.validate_date(schema, data, original_data) + # def test_date_start_gt_event_end(self): + # """ + # Tickets Validate Date-Tests if exception is raised when sales_starts_at is after event ends_at + # :return: + # """ + # schema = TicketSchema() + # original_data = { + # 'data': {} + # } + # data = { + # 'sales_starts_at': datetime(2003, 8, 4, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'sales_ends_at': datetime(2003, 9, 4, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'event_ends_at': datetime(2003, 8, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')) + # } + # with self.assertRaises(UnprocessableEntity): + # TicketSchema.validate_date(schema, data, original_data) - def test_date_end_gt_event_end(self): - """ - Tickets Validate Date - Tests if exception is raised when sales_ends_at is after event ends_at - :return: - """ - schema = TicketSchema() - original_data = { - 'data': {} - } - data = { - 'sales_starts_at': datetime(2003, 8, 1, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'sales_ends_at': datetime(2003, 8, 10, 12, 30, 45).replace(tzinfo=timezone('UTC')), - 'event_ends_at': datetime(2003, 8, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')) - } - with self.assertRaises(UnprocessableEntity): - TicketSchema.validate_date(schema, data, original_data) + # def test_date_end_gt_event_end(self): + # """ + # Tickets Validate Date-Tests if exception is raised when sales_ends_at is after event ends_at + # :return: + # """ + # schema = TicketSchema() + # original_data = { + # 'data': {} + # } + # data = { + # 'sales_starts_at': datetime(2003, 8, 1, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'sales_ends_at': datetime(2003, 8, 10, 12, 30, 45).replace(tzinfo=timezone('UTC')), + # 'event_ends_at': datetime(2003, 8, 2, 12, 30, 45).replace(tzinfo=timezone('UTC')) + # } + # with self.assertRaises(UnprocessableEntity): + # TicketSchema.validate_date(schema, data, original_data) def test_date_db_populate(self): """