marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User permissions for all tabs

Browse Source
This commit is contained in:
Stoyan Zlatev
2023-04-17 12:43:13 +02:00
parent 1858c5883d
commit 6e7a655e6e
32 changed files with 181 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LaaProductionWeb/LaaProductionWeb.Services/AccountService.cs
+16 -174
View File
@@ -4,187 +4,29 @@
using LaaProductionWeb.Services.Interfaces;
using LaaProductionWeb.Services.Models;
using System.Collections.Generic;
using System.Linq;
public class AccountService : IAccountService
{
private readonly ISqlClient dbContext;
private readonly ISqlClient sqlClient;
public AccountService(ISqlClient dbContext)
=> this.dbContext = dbContext;
public AccountService(ISqlClient sqlClient)
=> this.sqlClient = sqlClient;
public WindowsUser GetOrCreateWindowsUser(string primarySID, string domainName, string userName)
public Employee FindEmployee(string firstName, string lastName)
{
var user = this.dbContext.FirstOrDefault($@"
DECLARE @userId INT;
SELECT @userId = [Account].[WindowsUsers].[UserId]
FROM [Account].[WindowsUsers]
WHERE [Account].[WindowsUsers].[PrimarySID] = @{nameof(primarySID)}
IF @userId IS NULL
INSERT INTO [Account].[WindowsUsers] (
[PrimarySID]
, [DomainName]
, [UserName])
OUTPUT [Inserted].[UserId]
VALUES (@{nameof(primarySID)}
, @{nameof(domainName)}
, @{nameof(userName)})
ELSE SELECT @userId",
var permissions = this.sqlClient.ExecuteReader($@"
SELECT [MitarbeiterRechte].[Recht]
FROM [Mitarbeiter]
JOIN [MitarbeiterRechte]
ON [MitarbeiterRechte].[MitarbeiterNr] = [Mitarbeiter].[MitarbeiterNr]
WHERE [Vorname] LIKE @{nameof(firstName)}
AND [Name] LIKE @{nameof(lastName)}
AND [MitarbeiterRechte].[Recht] LIKE 'WEB_%'",
parameters => parameters
.Add(nameof(primarySID), primarySID)
.Add(nameof(domainName), domainName)
.Add(nameof(userName), userName),
reader => new WindowsUser
{
UserId = reader.GetValue<int>(0)
})
?? new WindowsUser();
user.Roles = this
.GetUserRoles(user.UserId)
.Select(x => x.RoleName);
.Add(nameof(firstName), firstName)
.Add(nameof(lastName), lastName),
reader => reader.GetString());
return user;
}
public PermissionsModel GetPermissionModelForUser(int userId, string role)
{
var roleModel = this.GetRoleForUser(role);
return new PermissionsModel
{
UserId = userId,
Role = roleModel
};
}
public UserRole GetRoleForUser(string role)
=> this.dbContext.FirstOrDefault($@"
SELECT [Account].[Roles].[RoleId]
, [Account].[Roles].[RoleName]
, [Account].[Roles].[DisplayName]
, [Account].[UsersRoles].[Approved]
FROM [Account].[Roles]
LEFT JOIN [Account].[UsersRoles]
ON [Account].[UsersRoles].[RoleId] = [Account].[Roles].[RoleId]
WHERE [Account].[Roles].[RoleName] = @{nameof(role)}",
parameters => parameters.Add(nameof(role), role),
reader => new UserRole
{
RoleId = reader.GetValue<int>(0),
RoleName = reader.GetString(1),
DisplayName = reader.GetString(2),
Pending = reader.GetValue<bool?>(3),
}) ?? new UserRole();
public IEnumerable<UserRole> GetUserRoles(int userId)
=> this.dbContext.ExecuteReader($@"
SELECT [Account].[Roles].[RoleId]
, [Account].[Roles].[RoleName]
, [Account].[Roles].[DisplayName]
FROM [Account].[Roles]
JOIN [Account].[UsersRoles]
ON [Account].[UsersRoles].[RoleId] = [Account].[Roles].[RoleId]
AND [Account].[UsersRoles].[UserId] = @{nameof(userId)}
AND [Account].[UsersRoles].[Approved] = 1",
parameters => parameters.Add(nameof(userId), userId),
reader => new UserRole
{
RoleId = reader.GetValue<int>(0),
RoleName = reader.GetString(1),
DisplayName = reader.GetString(2),
});
public List<UserPermissions> GetUsersWithPendingRoles()
=> this.dbContext.ExecuteReader($@"
SELECT [Account].[Users].[UserId]
, [Account].[Users].[FirstName] + ' ' + [Account].[Users].[LastName]
, [Account].[Roles].[RoleId]
, [Account].[Roles].[RoleName]
, [Account].[UsersRoles].[Approved]
FROM [Account].[UsersRoles]
JOIN [Account].[Roles] ON [Account].[Roles].[RoleId] = [Account].[UsersRoles].[RoleId]
JOIN [Account].[Users] ON [Account].[Users].[UserId] = [Account].[UsersRoles].[UserId]
WHERE [Account].[UsersRoles].[Approved] = 0",
reader => new
{
UserId = reader.GetValue<int>(0),
DisplayName = reader.GetString(1),
RoleId = reader.GetValue<int>(2),
RoleName = reader.GetString(3),
Approved = reader.GetValue<bool>(4)
})
.GroupBy(x => new UserPermissions
{
UserId = x.UserId,
DisplayName = x.DisplayName
}, UserPermissionsComparer.Current)
.Select(x => new UserPermissions
{
UserId = x.Key.UserId,
DisplayName = x.Key.DisplayName,
Roles = x
.AsEnumerable()
.Select(r => new RoleModel
{
RoleId = r.RoleId,
RoleName = r.RoleName,
Approved = r.Approved
})
.ToList()
})
.ToList();
public void RequestPermissions(PermissionsModel model)
{
this.dbContext.ExecuteNonQuery($@"
INSERT INTO [Auftrag].[Account].[Users] (
[UserId]
, [FirstName]
, [LastName])
VALUES (@{nameof(model.UserId)}
, @{nameof(model.FirstName)}
, @{nameof(model.LastName)})",
parameters => parameters
.Add(nameof(model.UserId), model.UserId)
.Add(nameof(model.FirstName), model.FirstName)
.Add(nameof(model.LastName), model.LastName));
model.Role.Pending = this.dbContext.ExecuteNonQuery($@"
INSERT INTO [Auftrag].[Account].[UsersRoles] (
[UserId]
, [RoleId])
VALUES (@{nameof(model.UserId)}
, @{nameof(model.Role.RoleId)})",
parameters => parameters
.Add(nameof(model.UserId), model.UserId)
.Add(nameof(model.Role.RoleId), model.Role.RoleId)) == 1;
}
public void SaveUserPermissions(IEnumerable<UserPermissions> usersPermissions)
{
foreach (var user in usersPermissions)
{
foreach (var role in user.Roles)
{
this.dbContext.ExecuteNonQuery(
role.Deleted
? $@"DELETE FROM [Account].[UsersRoles]
WHERE [Account].[UsersRoles].[UserId] = @{nameof(user.UserId)}
AND [Account].[UsersRoles].[RoleId] = @{nameof(role.RoleId)}"
: $@"UPDATE [Account].[UsersRoles]
SET [Approved] = @{nameof(role.Approved)}
WHERE [Account].[UsersRoles].[UserId] = @{nameof(user.UserId)}
AND [Account].[UsersRoles].[RoleId] = @{nameof(role.RoleId)}",
parameters => parameters
.Add(nameof(user.UserId), user.UserId)
.Add(nameof(role.RoleId), role.RoleId)
.Add(nameof(role.Approved), role.Approved));
}
}
return new Employee(permissions);
}
}
}
LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IAccountService.cs
+1 -15
View File
@@ -2,22 +2,8 @@
{
using LaaProductionWeb.Services.Models;
using System.Collections.Generic;
public interface IAccountService : ITransient
{
WindowsUser GetOrCreateWindowsUser(string primarySID, string domainName, string userName);
PermissionsModel GetPermissionModelForUser(int userId, string role);
IEnumerable<UserRole> GetUserRoles(int userId);
List<UserPermissions> GetUsersWithPendingRoles();
UserRole GetRoleForUser(string role);
void RequestPermissions(PermissionsModel model);
void SaveUserPermissions(IEnumerable<UserPermissions> usersPermissions);
Employee FindEmployee(string firstName, string lastName);
}
}
LaaProductionWeb/LaaProductionWeb.Services/LaaProductionWeb.Services.csproj
+1 -5
View File
@@ -66,6 +66,7 @@
<Compile Include="Interfaces\IReportService.cs" />
<Compile Include="Interfaces\IShipmentsService.cs" />
<Compile Include="Interfaces\ITransient.cs" />
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\HeliumPressurePoint.cs" />
<Compile Include="Models\HeliumReportFilter.cs" />
<Compile Include="Models\HeliumReportFilterProperty.cs" />
@@ -76,10 +77,6 @@
<Compile Include="Models\PalletPosition.cs" />
<Compile Include="Models\ProductionApproval.cs" />
<Compile Include="Models\ProductionOrders.cs" />
<Compile Include="Models\RoleModel.cs" />
<Compile Include="Models\UserRole.cs" />
<Compile Include="Models\UserPermissions.cs" />
<Compile Include="Models\WindowsUser.cs" />
<Compile Include="Models\BatchPrintModel.cs" />
<Compile Include="Models\OrderClientModel.cs" />
<Compile Include="Models\OrderInfoModel.cs" />
@@ -88,7 +85,6 @@
<Compile Include="Models\OrderScanModel.cs" />
<Compile Include="Models\OrdersFoundModel.cs" />
<Compile Include="Models\PalletsBatchModel.cs" />
<Compile Include="Models\PermissionsModel.cs" />
<Compile Include="Models\Result.cs" />
<Compile Include="Models\SerialNr.cs" />
<Compile Include="Models\ShipmentModel.cs" />
LaaProductionWeb/LaaProductionWeb.Services/Models/Employee.cs
+14
View File
@@ -0,0 +1,14 @@
namespace LaaProductionWeb.Services.Models
{
using System;
using System.Collections.Generic;
public class Employee
{
public Employee(IEnumerable<string> permissions)
=> this.Permissions = permissions;
public IEnumerable<string> Permissions { get; }
= Array.Empty<string>();
}
}
LaaProductionWeb/LaaProductionWeb.Services/Models/PermissionsModel.cs
-19
View File
@@ -1,19 +0,0 @@
namespace LaaProductionWeb.Services.Models
{
using System.ComponentModel.DataAnnotations;
public class PermissionsModel
{
public int UserId { get; set; }
[Display(Name = "Vorname")]
[Required(ErrorMessage = "Die Vorname ist erforderlich.")]
public string FirstName { get; set; }
[Display(Name = "Name")]
[Required(ErrorMessage = "Die Name ist erforderlich.")]
public string LastName { get; set; }
public UserRole Role { get; set; }
}
}
LaaProductionWeb/LaaProductionWeb.Services/Models/RoleModel.cs
-13
View File
@@ -1,13 +0,0 @@
namespace LaaProductionWeb.Services.Models
{
public class RoleModel
{
public int RoleId { get; set; }
public string RoleName { get; set; }
public bool Approved { get; set; }
public bool Deleted { get; set; }
}
}
LaaProductionWeb/LaaProductionWeb.Services/Models/UserPermissions.cs
-25
View File
@@ -1,25 +0,0 @@
namespace LaaProductionWeb.Services.Models
{
using System.Collections.Generic;
public class UserPermissions
{
public int UserId { get; set; }
public string DisplayName { get; set; }
public List<RoleModel> Roles { get; set; }
}
public class UserPermissionsComparer : IEqualityComparer<UserPermissions>
{
public bool Equals(UserPermissions x, UserPermissions y)
=> x?.UserId == y?.UserId;
public int GetHashCode(UserPermissions obj)
=> obj?.UserId ?? default(int);
public static UserPermissionsComparer Current
= new UserPermissionsComparer();
}
}
LaaProductionWeb/LaaProductionWeb.Services/Models/UserRole.cs
-13
View File
@@ -1,13 +0,0 @@
namespace LaaProductionWeb.Services.Models
{
public class UserRole
{
public int RoleId { get; set; }
public string RoleName { get; set; }
public string DisplayName { get; set; }
public bool? Pending { get; set; }
}
}
LaaProductionWeb/LaaProductionWeb.Services/Models/WindowsUser.cs
-12
View File
@@ -1,12 +0,0 @@
namespace LaaProductionWeb.Services.Models
{
using System;
using System.Collections.Generic;
public class WindowsUser
{
public int UserId { get; set; } = -1;
public IEnumerable<string> Roles { get; set; } = Array.Empty<string>();
}
}
LaaProductionWeb/LaaProductionWeb.Services/OrdersService.cs
+6 -6
View File
@@ -6,14 +6,14 @@
public class OrdersService : IOrdersService
{
private readonly ISqlClient dbContext;
private readonly ISqlClient sqlClient;
public OrdersService(ISqlClient dbContext)
=> this.dbContext = dbContext;
public OrdersService(ISqlClient sqlClient)
=> this.sqlClient = sqlClient;
public OrdersFoundModel FindOrders(string search)
{
var ordersFound = this.dbContext.ExecuteReader(
var ordersFound = this.sqlClient.ExecuteReader(
query: $@"
SELECT DISTINCT
[AlleAuftragPositionen].[AuftragNr] -- 0
@@ -39,7 +39,7 @@
public OrderPositions FindPositions(string orderNr)
{
var positionsFound = this.dbContext.ExecuteReader(
var positionsFound = this.sqlClient.ExecuteReader(
query: $@"
SELECT DISTINCT
[AlleAuftragPositionen].[PositionNr] -- 0
@@ -55,7 +55,7 @@
public ProductionOrders FindProductionOrders(string productionNr)
{
var ordersFound = this.dbContext.ExecuteReader($@"
var ordersFound = this.sqlClient.ExecuteReader($@"
SELECT DISTINCT
[AlleAuftragPositionen].[FertigungsauftragNr] -- 1
FROM [AlleAuftragPositionen]
LaaProductionWeb/LaaProductionWeb.Services/ProtocolService.cs
+12 -12
View File
@@ -11,13 +11,13 @@
public class ProtocolService : IProtocolService
{
private readonly ISqlClient dbContext;
private readonly ISqlClient sqlClient;
public ProtocolService(ISqlClient dbContext)
=> this.dbContext = dbContext;
public ProtocolService(ISqlClient sqlClient)
=> this.sqlClient = sqlClient;
public bool DeleteFile(int fileId)
=> this.dbContext.ExecuteScalar<int>($@"
=> this.sqlClient.ExecuteScalar<int>($@"
DELETE FROM [File]
WHERE [FileId] = @{nameof(fileId)};
DELETE FROM [FilesOrders]
@@ -27,7 +27,7 @@
public string FileContent(int? fileId)
{
var fileContent = this.dbContext.FirstOrDefault(
var fileContent = this.sqlClient.FirstOrDefault(
query: $@"
SELECT [dbo].[File].[FileContent]
FROM [dbo].[File]
@@ -40,7 +40,7 @@
public OrderClientModel FindOrder(int orderId)
{
var orderClientModel = this.dbContext.FirstOrDefault(
var orderClientModel = this.sqlClient.FirstOrDefault(
query: $@"
SELECT DISTINCT
[APG].[AuftragNr]
@@ -72,7 +72,7 @@
if (orderClientModel != null && orderId > 0)
{
orderClientModel.FileId = this.dbContext.FirstOrDefault($@"
orderClientModel.FileId = this.sqlClient.FirstOrDefault($@"
SELECT [FileId]
FROM [FilesOrders]
WHERE [OrderId] = @{nameof(orderId)}
@@ -85,7 +85,7 @@
}
public IEnumerable<KeyValuePair<int, string>> FindOrdersById(int orderno)
=> this.dbContext.ExecuteReader($@"
=> this.sqlClient.ExecuteReader($@"
SELECT DISTINCT
[APG].[AuftragNr]
, [K].[Name]
@@ -104,7 +104,7 @@
value: reader.GetString(1)));
public IEnumerable<KeyValuePair<int, string>> FindOrdersByClient(string clientName)
=> this.dbContext.ExecuteReader(
=> this.sqlClient.ExecuteReader(
query: $@"
SELECT DISTINCT
[APG].[AuftragNr]
@@ -124,7 +124,7 @@
value: reader.GetString(1)));
public IEnumerable<TestStatus> LoadTestStatus(int orderId)
=> this.dbContext.ExecuteReader(
=> this.sqlClient.ExecuteReader(
query: $@"
SELECT DISTINCT
[APS].[PositionNr] AS [PosNr] -- 0
@@ -165,7 +165,7 @@
public bool OrderCompleted(int orderId)
{
var sumResults = this.dbContext.ExecuteReader($@"
var sumResults = this.sqlClient.ExecuteReader($@"
SELECT CAST(CASE WHEN ISNULL([CPT].[CordonelPressureTest_Valid], 1) = 1 THEN 0 ELSE 1 END AS INT)
+ CAST(CASE WHEN ISNULL([DP].[Dicht], 1) = 1 THEN 0 ELSE 1 END AS INT)
+ ISNULL(MAX([APS].[StatusFertigung]) - 30, 0)
@@ -199,7 +199,7 @@
var fileName = $"{clientId}_{orderId}.pdf";
var fileContent = this.GetBuffer(fileStream);
return this.dbContext.ExecuteScalar<int>(
return this.sqlClient.ExecuteScalar<int>(
query: $@"
INSERT INTO [dbo].[File] (
[FileName]
LaaProductionWeb/LaaProductionWeb.Services/ReportService.cs
+5 -5
View File
@@ -10,10 +10,10 @@
public class ReportService : IReportService
{
private readonly ISqlClient dbContext;
private readonly ISqlClient sqlClient;
public ReportService(ISqlClient dbContext)
=> this.dbContext = dbContext;
public ReportService(ISqlClient sqlClient)
=> this.sqlClient = sqlClient;
public HeliumReportModel LoadHeliumPressureReport(HeliumReportModel model = null)
{
@@ -25,7 +25,7 @@
var where = model.Filter.Where();
var orderBy = model.Filter.OrderBy();
model.Items = this.dbContext.ExecuteReader($@"
model.Items = this.sqlClient.ExecuteReader($@"
SELECT [PT].[CordonelPressureTest_FertigungsAuftragsNr] AS [FertigungNr] -- 0 Filter
, [POS].[AuftragNr] AS [AuftragNr] -- 1 Filter
, [POS].[PositionNr] AS [PositionNr] -- 2 Filter
@@ -94,7 +94,7 @@
}
public IEnumerable<HeliumPressurePoint> LoadHeliumPressureResults(int testId)
=> this.dbContext.ExecuteReader($@"
=> this.sqlClient.ExecuteReader($@"
SELECT [CordonelPressureTestTestPoints_Id]
, [CordonelPressureTest_TestPointNr]
, CAST([CordonelPressureTest_TestPointResult] AS NUMERIC(9, 8))
LaaProductionWeb/LaaProductionWeb.Services/ShipmentsService.cs
+13 -13
View File
@@ -11,10 +11,10 @@
public class ShipmentsService : IShipmentsService
{
private readonly ISqlClient dbContext;
private readonly ISqlClient sqlClient;
public ShipmentsService(ISqlClient dbContext)
=> this.dbContext = dbContext;
public ShipmentsService(ISqlClient sqlClient)
=> this.sqlClient = sqlClient;
public OrderScanModel DeletePalletEntry(int id)
{
@@ -30,7 +30,7 @@
public int GetPalletsCount(OrderScanModel model)
{
var palletsCount = this.dbContext.FirstOrDefault(
var palletsCount = this.sqlClient.FirstOrDefault(
query: $@"
SELECT COUNT(1)
FROM (SELECT [PalettenNr] AS [PalletNr]
@@ -52,7 +52,7 @@
public byte[] LoadBatchBuffer(OrderScanModel model)
{
var palletLoad = this.dbContext.ExecuteReader(
var palletLoad = this.sqlClient.ExecuteReader(
query: $@"
SELECT [PalettenNr]
, [SerienNr]
@@ -76,7 +76,7 @@
}
public IEnumerable<SerialNr> LoadBatchItems(OrderScanModel model)
=> this.dbContext.ExecuteReader(
=> this.sqlClient.ExecuteReader(
query: $@"
SELECT DISTINCT
[PalettenScan].[ID] -- 0
@@ -117,7 +117,7 @@
const string orderNr = nameof(model.OrderNr);
const string palNr = nameof(model.PalletNr);
var batchModel = this.dbContext.FirstOrDefault(
var batchModel = this.sqlClient.FirstOrDefault(
query: $@"
SELECT TOP 1
[Auftrag].[AuftragNr] -- 0
@@ -156,7 +156,7 @@
}
private IEnumerable<PalletPosition> LoadBatchPositions(OrderScanModel model, string orderNr, string palNr)
=> this.dbContext.ExecuteReader($@"
=> this.sqlClient.ExecuteReader($@"
SELECT DISTINCT
[Auftrag].[PositionNr]
, COUNT(1)
@@ -223,7 +223,7 @@
}
private OrderScanModel DeletePalletEntryById(int id)
=> this.dbContext.FirstOrDefault(
=> this.sqlClient.FirstOrDefault(
query: $@"
DELETE
FROM [PalettenScan]
@@ -240,7 +240,7 @@
});
private OrderIdentity UpdateOrderIdentifiers(int? orderNr, int? positionNr, string serialNr)
=> this.dbContext.FirstOrDefault(
=> this.sqlClient.FirstOrDefault(
query: $@"
SELECT DISTINCT TOP 1
[AuftragPositionSerienNr].[PositionNr] -- 0
@@ -263,7 +263,7 @@
});
private int InsertPalletEntry(OrderScanModel model)
=> this.dbContext.ExecuteNonQuery($@"
=> this.sqlClient.ExecuteNonQuery($@"
INSERT
INTO [PalettenScan] (
[PalettenNr]
@@ -289,7 +289,7 @@
.Add(nameof(model.Place), model.Place));
private bool PalletsEntryExists(int? orderNr, int? positionNr, string serialNr)
=> this.dbContext.FirstOrDefault($@"
=> this.sqlClient.FirstOrDefault($@"
SELECT CAST(CASE WHEN [PalettenScan].[ID] IS NULL THEN 0 ELSE 1 END AS BIT)
FROM [PalettenScan]
WHERE [PalettenScan].[AuftragNr] = @{nameof(orderNr)}
@@ -300,7 +300,7 @@
reader => reader.GetValue<bool>(0));
private bool UpdatePalletsNr(OrderScanModel model)
=> this.dbContext.FirstOrDefault($@"
=> this.sqlClient.FirstOrDefault($@"
BEGIN TRANSACTION
------------------------------------------------------------------------
DECLARE @rowsByAuftragPosition INT = (