Config reorganization

General refactor
This commit is contained in:
Lucio Maranta
2018-02-09 14:59:24 +01:00
parent 6c9bdbaede
commit 99c2e8dc01
17 changed files with 183 additions and 130 deletions
@@ -1,10 +1,7 @@
using Step.Model.DatabaseModels;
using Step.Model.DTOModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Step.Database.Controllers
{
@@ -37,20 +34,26 @@ namespace Step.Database.Controllers
{
return dbCtx
.MachinesUsers
.Include("Role")
.Include("Role") // Join with Role, Machine, User
.Include("Machine")
.Include("User")
.Where(x => x.MachineUserId == id)
.FirstOrDefault();
}
public MachineUserModel Create(int machineId, int userId, int roleId)
{
MachineUserModel machine = new MachineUserModel() { MachineId = machineId, UserId = userId, RoleId = roleId };
// Create database model
MachineUserModel machine = new MachineUserModel() {
MachineId = machineId,
UserId = userId,
RoleId = roleId
};
// Add into database
dbCtx.MachinesUsers.Add(
machine
);
// Commit changes
dbCtx.SaveChanges();
return machine;
@@ -61,7 +64,7 @@ namespace Step.Database.Controllers
RoleModel role = dbCtx
.MachinesUsers
.Include("Role")
.Where(x => x.MachineId == machineId && x.UserId == userId)
.Where(x => x.MachineId == machineId && x.UserId == userId) // Find by machine id and user id, joining with role
.FirstOrDefault().Role;
return new DTORoleModel()
@@ -71,4 +74,4 @@ namespace Step.Database.Controllers
};
}
}
}
}