From f2ba735e160b655ab4681ddb42e42060e6b0b3b4 Mon Sep 17 00:00:00 2001 From: henrydays Date: Thu, 4 Apr 2019 01:38:44 +0100 Subject: [PATCH] cromos --- api/Controllers/CromosController.cs | 8 +++++++- api/Controllers/TeamsController.cs | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/api/Controllers/CromosController.cs b/api/Controllers/CromosController.cs index ca733259..8b5c26b9 100755 --- a/api/Controllers/CromosController.cs +++ b/api/Controllers/CromosController.cs @@ -47,10 +47,16 @@ namespace api.Controllers { - if (Int32.Parse(usrCromos[i]) == c.Id) + if (Int32.Parse(usrCromos[i]) == c.Id ) { soma += c.pontos; Cromos toAdd = new Cromos { Id = c.Id, Nome = c.Nome, DescMostrar = c.DescUnlocked, QRCode = c.QRCode, img = c.img, unlocked = true, websiteCromo = c.websiteCromo, pontos = c.pontos, logo = c.logo }; + + var d = rList.Find(x=>x.Id== c.Id); + + if(d!=null) + continue; + rList.Add(toAdd); found = true; diff --git a/api/Controllers/TeamsController.cs b/api/Controllers/TeamsController.cs index d93b375e..b11d809e 100755 --- a/api/Controllers/TeamsController.cs +++ b/api/Controllers/TeamsController.cs @@ -189,7 +189,7 @@ namespace api.Controllers Team tEdit = await context.Teams.FirstOrDefaultAsync(t => t.Id == MemberToAdd.id); - if (newMember.team == null) + if (newMember.team == null && tEdit.NMembros<6) { tEdit.NMembros++; @@ -220,6 +220,11 @@ namespace api.Controllers User cap = await context.Users.FirstOrDefaultAsync(u => u.QRcode == NameChange.UserQR); + Team findTeam = await context.Teams.FirstOrDefaultAsync(n=>n.Nome == NameChange.nome); + + if(findTeam!= null){ + return Unauthorized(); + } if (cap.QRcode == tEdit.CapQR) { tEdit.Nome = NameChange.nome;