Skip to content

Commit

Permalink
indicate if there are insufficient data for the number of champions r…
Browse files Browse the repository at this point in the history 
…equested
  • Loading branch information
@danReynolds
danReynolds committed Feb 8, 2017
1 parent 632a08c commit bff9320
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 22 deletions.
35 changes: 29 additions & 6 deletions api.json
View file
@@ -1,7 +1,7 @@
{
"_type": "export",
"__export_format": 3,
"__export_date": "2017-01-18T21:34:27.318Z",
"__export_date": "2017-02-08T16:10:34.242Z",
"__export_source": "insomnia.desktop.app:v4.0.9",
"resources": [
{
Expand All @@ -26,23 +26,46 @@
{
"_id": "jar_30a5e3c7960c4635a8f667027e901e22",
"parentId": "wrk_6d555102de1a469aa75025d23e488d2b",
"modified": 1484775237533,
"modified": 1486568006016,
"created": 1481786758558,
"name": "Default Jar",
"cookies": [],
"_type": "cookie_jar"
},
{
"_id": "req_2e0b78dced0245b597503925353df8db",
"parentId": "wrk_6d555102de1a469aa75025d23e488d2b",
"modified": 1486404348206,
"created": 1486404289271,
"url": "{{ url }}",
"name": "lcs/standings",
"method": "POST",
"body": {
"mimeType": "application/json",
"text": "{\n \"id\": \"a66c4148-69c9-435a-8371-2ca182ef67b4\",\n \"timestamp\": \"2017-02-06T18:05:43.598Z\",\n \"result\": {\n \"source\": \"agent\",\n \"resolvedQuery\": \"Who is winning the LCS in NA?\",\n \"action\": \"competitions/standings\",\n \"actionIncomplete\": false,\n \"parameters\": {\n \"competition\": \"LCS\",\n \"region\": \"na\"\n },\n \"contexts\": [\n {\n \"name\": \"lcs\",\n \"parameters\": {\n \"competition.original\": \"LCS\",\n \"competition\": \"LCS\",\n \"region.original\": \"NA\",\n \"region\": \"na\"\n },\n \"lifespan\": 5\n }\n ],\n \"metadata\": {\n \"intentId\": \"2b515a9a-eaf0-4123-9cdf-8921c4278c50\",\n \"webhookUsed\": \"true\",\n \"webhookForSlotFillingUsed\": \"true\",\n \"intentName\": \"lcs/standings\"\n },\n \"fulfillment\": {\n \"speech\": \"\",\n \"messages\": [\n {\n \"type\": 0,\n \"speech\": \"\"\n }\n ]\n },\n \"score\": 1\n },\n \"status\": {\n \"code\": 206,\n \"errorType\": \"partial_content\",\n \"errorDetails\": \"Webhook call failed. Error message: org.springframework.web.client.HttpClientErrorException: 404 Not Found ErrorId: a6fdcb3e-dcbe-4fd0-b3d4-4373a844c8c2\"\n },\n \"sessionId\": \"95bcfd3e-53e7-4fbc-9ca8-6454421879bd\"\n}"
},
"parameters": [],
"headers": [
{
"name": "Content-Type",
"value": "application/json"
}
],
"authentication": {},
"metaSortKey": -1486404289271,
"_type": "request"
},
{
"_id": "req_30337ed27c9444deb392be7f6b1ff2be",
"parentId": "wrk_6d555102de1a469aa75025d23e488d2b",
"modified": 1484532963135,
"modified": 1486570164131,
"created": 1482600505061,
"url": "{{ url }}",
"name": "champions/counters",
"method": "POST",
"body": {
"mimeType": "application/json",
"text": "{\n\t\"id\": \"a8daca3a-01de-4395-b4a0-428aefe42f2e\",\n\t\"timestamp\": \"2016-12-20T00:07:16.229Z\",\n\t\"result\": {\n\t\t\"source\": \"agent\",\n\t\t\"resolvedQuery\": \"Who counters Jayce top?\",\n\t\t\"action\": \"champions/counters\",\n\t\t\"actionIncomplete\": false,\n\t\t\"parameters\": {\n\t\t\t\"champion\": \"Jayce\",\n\t\t\t\"lane\": \"Top\"\n\t\t},\n\t\t\"contexts\": [],\n\t\t\"metadata\": {\n\t\t\t\"intentId\": \"7fbc7812-0bda-452f-8a7d-1bf8bb134a4b\",\n\t\t\t\"webhookUsed\": \"true\",\n\t\t\t\"webhookForSlotFillingUsed\": \"false\",\n\t\t\t\"intentName\": \"champions/counters\"\n\t\t},\n\t\t\"fulfillment\": {\n\t\t\t\"speech\": \"The best counters for Jayce Top are Talon at 70.38% win rate, Rammus at 68.0% win rate, Warwick at 62.5% win rate\",\n\t\t\t\"messages\": [\n\t\t\t\t{\n\t\t\t\t\t\"type\": 0,\n\t\t\t\t\t\"speech\": \"The best counters for Jayce Top are Talon at 70.38% win rate, Rammus at 68.0% win rate, Warwick at 62.5% win rate\"\n\t\t\t\t}\n\t\t\t]\n\t\t},\n\t\t\"score\": 0.96\n\t},\n\t\"status\": {\n\t\t\"code\": 200,\n\t\t\"errorType\": \"success\"\n\t},\n\t\"sessionId\": \"e73bf291-8c55-4a67-9941-837aced9bf16\"\n}"
"text": "{\n \"id\": \"07f9a83a-69e1-4812-a15f-77222d39b083\",\n \"timestamp\": \"2017-01-25T06:45:31.508Z\",\n \"result\": {\n \"source\": \"agent\",\n \"resolvedQuery\": \"Second best counter Jayce Top\",\n \"action\": \"champions/counters\",\n \"actionIncomplete\": false,\n \"parameters\": {\n \"champion\": \"Jayce\",\n \"lane\": \"Top\",\n \"list_order\": \"best\",\n \"list_position\": \"1\",\n \"list_size\": \"1\"\n },\n \"contexts\": [\n {\n \"name\": \"counters\",\n \"parameters\": {\n \"lane.original\": \"Top\",\n \"order.original\": \"worst\",\n \"list_position.original\": \"Second\",\n \"list_size\": \"\",\n \"list_order.original\": \"best\",\n \"rank.original\": \"\",\n \"list_position\": \"2\",\n \"list_order\": \"best\",\n \"rank\": \"\",\n \"list_size.original\": \"\",\n \"champion.original\": \"Jayce\",\n \"lane\": \"Top\",\n \"champion\": \"Jayce\",\n \"order\": \"worst\"\n },\n \"lifespan\": 5\n }\n ],\n \"metadata\": {\n \"intentId\": \"7fbc7812-0bda-452f-8a7d-1bf8bb134a4b\",\n \"webhookUsed\": \"true\",\n \"webhookForSlotFillingUsed\": \"true\",\n \"intentName\": \"champions/counters\"\n },\n \"fulfillment\": {\n \"speech\": \"\",\n \"messages\": [\n {\n \"type\": 0,\n \"speech\": \"\"\n }\n ]\n },\n \"score\": 1\n },\n \"status\": {\n \"code\": 206,\n \"errorType\": \"partial_content\",\n \"errorDetails\": \"Webhook call failed. Error message: org.springframework.web.client.HttpServerErrorException: 500 Internal Server Error ErrorId: 5e65555c-7410-4683-be86-89041884be31\"\n },\n \"sessionId\": \"20de7667-e229-43c4-80d9-a3e538b96781\"\n}"
},
"parameters": [],
"headers": [
Expand Down Expand Up @@ -242,7 +265,7 @@
{
"_id": "req_8a9b75d53d5e479e96ace9d7ef3845db",
"parentId": "wrk_6d555102de1a469aa75025d23e488d2b",
"modified": 1484775257449,
"modified": 1486570228905,
"created": 1484257755665,
"url": "{{ url }}",
"name": "summoners/show",
Expand All @@ -265,7 +288,7 @@
{
"_id": "req_9f008ddeeac445098da6d6e8da34269e",
"parentId": "wrk_6d555102de1a469aa75025d23e488d2b",
"modified": 1484774571801,
"modified": 1486570222207,
"created": 1484769646719,
"url": "{{ url }}",
"name": "summoners/champion",
Expand Down
34 changes: 21 additions & 13 deletions app/controllers/champions_controller.rb
View file
Expand Up @@ -13,24 +13,26 @@ def ranking
tag = champion_params[:tag]

champions = Rails.cache.read(:champions)
rankings = Rails.cache.read({ rankings: role })
rankings = Rails.cache.read(rankings: role)
rankings = rankings.select { |ranking| ranking[:tags].include?(tag) } unless tag.blank?
sortable_rankings = Sortable.new({
collection: rankings
}.merge(champion_params.slice(:list_position, :list_size, :list_order)))

ranking_message = sortable_rankings.sort.map do |role_data|
rankings = sortable_rankings.sort.map do |role_data|
champions[role_data[:key]][:name]
end.en.conjunction(article: false)
end
list_size_message = sortable_rankings.list_size_message
list_position_message = sortable_rankings.list_position_message
topic_message = tag_message(tag, sortable_rankings.list_size.to_i)
topic_message = tag_message(tag, rankings.size)

render json: {
speech: (
"The #{list_position_message}#{sortable_rankings.list_order} " \
"#{insufficient_champions_message(rankings.size, 'ranking')}The " \
"#{list_position_message}#{sortable_rankings.list_order} " \
"#{list_size_message}#{topic_message} in #{role} " \
"#{"is".en.plural_verb(sortable_rankings.list_size)} #{ranking_message}."
"#{"is".en.plural_verb(sortable_rankings.list_size)} " \
"#{rankings.en.conjunction(article: false)}."
)
}
end
Expand Down Expand Up @@ -146,7 +148,7 @@ def matchup

def counters
matchups = @role_data[:matchups].select do |matchup|
matchup[:games] > MIN_MATCHUPS
matchup[:games] >= MIN_MATCHUPS
end

if matchups.blank?
Expand All @@ -166,18 +168,18 @@ def counters
counters = sortable_counters.sort.map do |counter|
"#{champions[counter[:key]][:name]} at a " \
"#{(100 - counter[:winRate]).round(2)}% win rate"
end.en.conjunction(article: false)

end
list_size_message = sortable_counters.list_size_message
list_position_message = sortable_counters.list_position_message
list_size = sortable_counters.list_size.to_i

render json: {
speech: (
"The #{list_position_message}#{sortable_counters.list_order} " \
"#{list_size_message}#{'counter'.en.pluralize(list_size)} for " \
"#{@champion.name} #{@role} #{'is'.en.plural_verb(list_size)} " \
"#{counters}."
"#{insufficient_champions_message(counters.size, 'counter')}The " \
"#{list_position_message}#{sortable_counters.list_order} " \
"#{list_size_message}#{'counter'.en.pluralize(counters.size)} " \
"for #{@champion.name} #{@role} #{'is'.en.plural_verb(counters.size)} " \
"#{counters.en.conjunction(article: false)}."
)
}
end
Expand Down Expand Up @@ -248,6 +250,12 @@ def enemy_tips

private

def insufficient_champions_message(size, type)
return '' if champion_params[:list_size].to_i == size
"The current patch only has enough data for #{size.en.numwords} " \
"#{type.en.pluralize(size)}. "
end

def parse_ability_order(abilities)
first_abilities = abilities.first(3)

Expand Down
2 changes: 1 addition & 1 deletion lib/sortable.rb
View file
Expand Up @@ -35,7 +35,7 @@ def sort
end

def list_size_message
@list_size.to_i == 1 ? '' : "#{@list_size.en.numwords} "
@list_size.to_i == 1 || @collection.size == 1 ? '' : "#{@list_size.en.numwords} "
end

def list_position_message
Expand Down
52 changes: 50 additions & 2 deletions spec/controllers/champions_controller_spec.rb
View file
Expand Up @@ -167,6 +167,29 @@ def speech
)
end

context 'without enough champions' do
let(:champion) { Champion.new(name: 'Bard') }
let(:role_data) do
champion.roles.first.tap do |role|
role[:matchups] = role[:matchups].select do |matchup|
matchup[:games] >= 100
end.first(1)
end
end

before :each do
allow(Rails.cache).to receive(:read).with(rankings: 'Top').and_return(
Rails.cache.read(rankings: 'Top').first(1)
)
allow(Rails.cache).to receive(:read).with(:champions).and_call_original
end

it 'should indicate that there were not enough champions' do
post action, params
expect(speech).to eq 'The current patch only has enough data for one ranking. The best champion in Top are Darius.'
end
end

context 'with list position' do
before :each do
allow(controller).to receive(:champion_params).and_return(
Expand Down Expand Up @@ -509,11 +532,36 @@ def speech
it_should_behave_like 'verify role'
it_should_behave_like 'load champion'

context 'without sufficient matchups' do
context 'without enough matchups' do
let(:champion) { Champion.new(name: 'Bard') }
let(:role_data) do
champion.roles.first.tap do |role|
role[:matchups] = role[:matchups].select do |matchup|
matchup[:games] >= 100
end.first(1)
end
end

before :each do
allow(controller).to receive(:champion_params).and_return(
champion: champion.name,
list_size: 2
)
allow(Champion).to receive(:new).and_return(champion)
allow(champion).to receive(:find_by_role).and_return(role_data)
end

it 'should indicate that there was not the correct number of results' do
post action, params
expect(speech).to eq 'The current patch only has enough data for one counter. The best counter for Bard Support is Taric at a 57.9% win rate.'
end
end

context 'without any matchups' do
let(:champion) { Champion.new(name: 'Bard') }
let(:role_data) do
champion.roles.first.tap do |role|
role[:matchups].map! { |matchup| { games: 10 } }
role[:matchups].map! { |_| { games: 10 } }
end
end

Expand Down

0 comments on commit bff9320

Please sign in to comment.