* Refactor and fix machine self-registration into db

+ Added change language API
+ Added Role to user info
This commit is contained in:
Lucio Maranta
2018-01-17 12:35:34 +01:00
parent fa485d902b
commit 53223b0bef
8 changed files with 123 additions and 19 deletions
@@ -1,4 +1,5 @@
using Step.Model.DatabaseModels;
using Step.Model.DTOModels;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -22,15 +23,41 @@ namespace Step.Database.Controllers
// Clear database context
dbCtx.Dispose();
}
public MachinesUsersModel FindByUserId(int machineId, int userId)
{
return dbCtx
.MachinesUsers
.Include("Role")
.Include("Role") // TODO Add machine and user info?
.Where(x => x.MachineId == machineId && x.UserId == userId)
.FirstOrDefault();
}
public MachinesUsersModel Create(int machineId, int userId, int roleId)
{
MachinesUsersModel machine = new MachinesUsersModel() { MachineId = machineId, UserId = userId, RoleId = roleId };
dbCtx.MachinesUsers.Add(
machine
);
dbCtx.SaveChanges();
return machine;
}
public DTORoleModel GetUserRole(int machineId, int userId)
{
RoleModel role = dbCtx
.MachinesUsers
.Include("Role")
.Where(x => x.MachineId == machineId && x.UserId == userId)
.FirstOrDefault().Role;
return new DTORoleModel()
{
Id = role.RoleId,
Name = role.Name
};
}
}
}