Skip to content

fix: remove recent ticket and speaker_call schema checks #5941

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.

Sign up for GitHub

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

Merged
2 commits merged into from
May 22, 2019
Merged

fix: remove recent ticket and speaker_call schema checks #5941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2409ea1
remove recent schema checks and their corresponding tests
uds5501 May 21, 2019
904ab04
fix hound issues
uds5501 May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/api/schema/speakers_calls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions app/api/schema/tickets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
64 changes: 32 additions & 32 deletions tests/all/integration/api/validation/test_speakers_call.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
64 changes: 32 additions & 32 deletions tests/all/integration/api/validation/test_tickets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down