From dbe69aba04526d77cdca2597c2ebf8f36d53a104 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Fri, 1 Jun 2018 16:57:05 +0200 Subject: [PATCH] Adaptation aux changements --- .../Controllers/ValuesController.cs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/AideDeJeu/AideDeJeuWeb/Controllers/ValuesController.cs b/AideDeJeu/AideDeJeuWeb/Controllers/ValuesController.cs index b9567f65..6bb8935a 100644 --- a/AideDeJeu/AideDeJeuWeb/Controllers/ValuesController.cs +++ b/AideDeJeu/AideDeJeuWeb/Controllers/ValuesController.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using AideDeJeu.ViewModels; using AideDeJeuLib.Cards; using AideDeJeuLib.Spells; using Microsoft.AspNetCore.Mvc; @@ -13,23 +14,16 @@ namespace AideDeJeuWeb.Controllers [HttpGet("{classe}")] public async Task> Get(string classe) { - var scrapper = new SpellsScrappers(); - var spellIds = await scrapper.GetSpellIds(classe); - var spells = await scrapper.GetSpells(spellIds); - + var items = AideDeJeu.Tools.Helpers.GetResourceObject>("AideDeJeu.Data.spells_vf.json"); + var filter = new VFSpellFilterViewModel(); + var fitems = await filter.FilterItems(items); var cardDatas = new List(); - foreach (var spell in spells) + foreach (var spell in fitems) { - cardDatas.AddRange(Converters.ToCardDatas(spell)); + cardDatas.AddRange(Converters.ToCardDatas(spell as Spell)); } return cardDatas; - //var spellIds = spells.Select(spell => spell.Id); - //var fullspells = await scrapper.GetSpells(spellIds); - //return spells; - //return await scrapper.GetSpellIds(""); - //return await new SpellsScrappers().GetSpells(); - //return new string[] { "value1", "value2" }; } // GET api/values/5