generated from mwc/lab_server
Updated the routes and finished the ones
specified in the requirements.
This commit is contained in:
parent
22780b46a8
commit
afcd25178e
|
@ -16,7 +16,7 @@ def get_line_about_topic(params):
|
|||
raise NotFound("No lines with that topic")
|
||||
|
||||
@route_get('lines/rhyme', args={'rhyme': str})
|
||||
def get_line_about_topic(params):
|
||||
def get_line_with_rhyme(params):
|
||||
try:
|
||||
line = Rhyme.get_rhyme_for_word(params['rhyme']).lines.exclude(clean_text__endswith=params['rhyme']).random()
|
||||
return {'lines' : line, 'rhyme': params['rhyme']}
|
||||
|
@ -31,14 +31,30 @@ def get_random_couplet(params):
|
|||
if line.rhyming_lines().count() > 0:
|
||||
flag = False
|
||||
rhyming_line = line.rhyming_lines().random()
|
||||
return {'couple' : line + '\n' + rhyming_line}
|
||||
return {'couplet' : [line, rhyming_line]}
|
||||
|
||||
@route_get('/couplets/about', args={'topic' : str})
|
||||
def get_couplet_about_topic(params):
|
||||
flag = True
|
||||
while flag:
|
||||
line = Line.objects.random()
|
||||
try:
|
||||
line = Line.objects.filter(clean_text__contains=params['topic']).random()
|
||||
except Line.DoesNotExist:
|
||||
raise NotFound("No lines with that topic")
|
||||
if line.rhyming_lines().count() > 0:
|
||||
flag = False
|
||||
rhyming_line = line.rhyming_lines().random()
|
||||
return {'couplet' : [line, rhyming_line]}
|
||||
return {'couplet' : [line, rhyming_line], 'topic': params['topic']}
|
||||
|
||||
@route_get('/couplets/rhyme', args={'rhyme' : str})
|
||||
def get_couplet_with_rhyme(params):
|
||||
flag = True
|
||||
while flag:
|
||||
try:
|
||||
line = Rhyme.get_rhyme_for_word(params['rhyme']).lines.exclude(clean_text__endswith=params['rhyme']).random()
|
||||
except Line.DoesNotExist:
|
||||
raise NotFound("No lines with that rhyme")
|
||||
if line.rhyming_lines().count() > 0:
|
||||
flag = False
|
||||
rhyming_line = line.rhyming_lines().random()
|
||||
return {'couplet' : [line, rhyming_line], 'rhyme' : params['rhyme']}
|
Loading…
Reference in New Issue