AppStd/DigitalData.UserManager
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Entfernen der right_group-Eigenschaft aus der Representation-Entität

Browse Source 
- Die Spalte `right_group` aus der `Representation`-Entität entfernt, um die Zuordnung von Benutzern oder Gruppen zu spezifischen Gruppen zu entfernen.
- Stattdessen wurde die `group`-Eigenschaft hinzugefügt, um flexible Zuordnungen zu ermöglichen.
- Ermöglicht nun `user-user`, `user-group`, `group-user` und `group-group` Repräsentationen.
This commit is contained in:
Developer 02 2024-09-09 17:25:12 +02:00
parent 75e708d02d
commit 25a4b0752b
15 changed files with 86 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts
View File

@ -22,13 +22,13 @@ export class UserRepTableComponent extends BaseTableComponent<UserRep, UserRepSe
this.loading = false
}
override fetchData(userId?: number): void {
this.service.getAll(false, true, true, true, userId).subscribe({
override fetchData(userId?: number, groupId?: number): void {
this.service.getAll({ withUser: false, withRepGroup: true, withGroup: false, withRepUser: true, userId: userId, groupId: groupId }).subscribe({
next: (response: UserRep[]) => {
this.source = response;
this.loading = false;
},
error: (error: any) => {}
error: (error: any) => { }
});
}
}

4
DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/models/user-management.api.models.ts
View File

@ -58,12 +58,12 @@ export interface UserRep {
id?: number,
userId: number,
repGroupId?: number,
rightGroupId: number,
groupId?: number,
addedWho: string,
repUserId?: number,
user?: User,
repGroup?: Group,
rightGroup?: Group,
group?: Group,
repUser?: User
}

13
DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.html
View File

@ -7,10 +7,13 @@
<mat-tab label="Benutzer">
<app-user-table #users [onSelectedRows]="userOnSelectedRows"></app-user-table>
</mat-tab>
<mat-tab label="Gruppe">
<app-group-table #rightGroups [columns]="groupColumns" [onSelectedRows]="groupOnSelectedRows"></app-group-table>
</mat-tab>
</mat-tab-group>
</div>
<!-- (1, 2): representations -->
<div class="col-2">
<div class="col-4">
<mat-tab-group>
<mat-tab label="Rep. Benutzer">
<app-user-table #repUsers [onSelectedRows]="repUserOnSelectedRows"></app-user-table>
@ -20,14 +23,6 @@
</mat-tab>
</mat-tab-group>
</div>
<!-- (1, 3): right groups -->
<div class="col-2">
<mat-tab-group>
<mat-tab label="Rechte Gruppe">
<app-group-table #rightGroups] [columns]="groupRightColumns" [onSelectedRows]="rightGroupOnSelectedRows"></app-group-table>
</mat-tab>
</mat-tab-group>
</div>
<!-- (1, 4): assigned users -->
<div class="col-3">
<mat-tab-group>

55
DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts
View File

@ -8,6 +8,7 @@ import Swal from 'sweetalert2';
import { MatTabsModule, MatTabGroup } from '@angular/material/tabs';
import { env } from '../../../environments/environment';
import { BasePageComponent } from '../base-page/base-page.component';
import { UserRep } from '../../models/user-management.api.models';
@Component({
standalone: true,
@ -19,8 +20,8 @@ import { BasePageComponent } from '../base-page/base-page.component';
export class UserRepresentationComponent extends BasePageComponent implements AfterViewInit {
useRepLabel: string = "";
groupColumns: Array<GuiColumn>;
groupRepCols: Array<GuiColumn>;
groupRightColumns: Array<GuiColumn>;
slUserId: null | number = null;
slRepUserId: null | number = null;
slRepGroupId: null | number = null;
@ -32,7 +33,7 @@ export class UserRepresentationComponent extends BasePageComponent implements Af
constructor(private userRepService: UserRepService) {
super()
this.groupRepCols = env.columnNames.group.representative;
this.groupRightColumns = env.columnNames.group.right;
this.groupColumns = env.columnNames.group.right;
this.userRepService = userRepService;
}
@ -43,7 +44,7 @@ export class UserRepresentationComponent extends BasePageComponent implements Af
this.users.fetchData();
this.repUsers.fetchData();
this.repGroups.fetchData();
this.rightGroups.fetchData();
this.groups.fetchData();
})
this.transferService.add(() => {
this.repUsers.safelyUnselectAll();
@ -53,26 +54,34 @@ export class UserRepresentationComponent extends BasePageComponent implements Af
}
@ViewChild("users") users!: UserTableComponent;
@ViewChild("groups") groups!: GroupTableComponent;
@ViewChild("repUsers") repUsers!: UserTableComponent;
@ViewChild("repGroups") repGroups!: GroupTableComponent;
@ViewChild("rightGroups") rightGroups!: GroupTableComponent;
@ViewChild("userReps") userReps!: UserRepTableComponent;
userOnSelectedRows = (rows: GuiSelectedRow[]) => {
userGroupOnSelectedRows = (rows: GuiSelectedRow[], isUser: boolean = true) => {
if (rows.length > 0) {
this.users.safelyUnselectAll();
this.useRepLabel = `Vertretungen von ${rows[0].source?.username}`
this.userReps.fetchData(rows[0].source?.id)
this.slUserId = rows[0].source?.id
if (isUser) {
this.useRepLabel = `Vertretungen von ${rows[0].source?.username}`
this.userReps.fetchData(rows[0].source?.id)
this.slUserId = rows[0].source?.id
}
else {
this.useRepLabel = `Vertretungen von ${rows[0].source?.name}`
this.userReps.fetchData(undefined, rows[0].source?.id)
this.slUserId = rows[0].source?.id
}
}
}
rightGroupOnSelectedRows = (rows: GuiSelectedRow[]) => {
if (rows.length > 0) {
this.slRightGroupId = rows[0].source?.id
} else {
this.slRightGroupId = null;
}
userOnSelectedRows = (rows: GuiSelectedRow[]) => {
this.userGroupOnSelectedRows(rows, true);
}
groupOnSelectedRows = (rows: GuiSelectedRow[]) => {
this.userGroupOnSelectedRows(rows, false);
}
repUserOnSelectedRows = (rows: GuiSelectedRow[]) => {
@ -91,17 +100,9 @@ export class UserRepresentationComponent extends BasePageComponent implements Af
text: "Bitte wählen Sie die Vertretungen Benutzer!",
});
}
else if (!this.slRightGroupId) {
Swal.fire({
icon: "error",
title: "Oops...",
text: "Bitte wählen Sie die Rechte Gruppe!",
});
}
else {
var newUserRep = {
var newUserRep: UserRep = {
userId: this.slUserId,
rightGroupId: this.slRightGroupId,
repUserId: this.slRepUserId,
addedWho: 'DEFAULT'
}
@ -145,17 +146,9 @@ export class UserRepresentationComponent extends BasePageComponent implements Af
text: "Bitte wählen Sie die Vertretungen Gruppe!",
});
}
else if (!this.slRightGroupId) {
Swal.fire({
icon: "error",
title: "Oops...",
text: "Bitte wählen Sie die rechte Gruppe!",
});
}
else {
var newUserRep = {
userId: this.slUserId,
rightGroupId: this.slRightGroupId,
repGroupId: this.slRepGroupId,
addedWho: 'DEFAULT'
}

46
DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts
View File

@ -9,28 +9,42 @@ import { UrlService } from "./url.service";
providedIn: "root"
})
export class UserRepService extends ApiService<UserRep> {
constructor(http: HttpClient, urlService : UrlService) {
constructor(http: HttpClient, urlService: UrlService) {
super(http, urlService.apiRoute.userRep)
}
override getAll(withUser: boolean = false, withRepGroup: boolean = false, withRightGroup: boolean = false, withRepUser: boolean = false, userId?: number): Observable<UserRep[]> {
override getAll(options?: Options): Observable<UserRep[]> {
let params = new HttpParams();
if (withUser) {
params = params.set('withUser', withUser);
}
if (withRepGroup) {
params = params.set('withRepGroup', withRepGroup);
}
if (withRightGroup) {
params = params.set('withRightGroup', withRightGroup);
}
if (withRepUser) {
params = params.set('withRepUser', withRepUser);
}
if (userId) {
params = params.set('userId', userId)
if (options) {
if (options.withUser) {
params = params.set('withUser', options.withUser);
}
if (options.withRepGroup) {
params = params.set('withRepGroup', options.withRepGroup);
}
if (options.withGroup) {
params = params.set('withRightGroup', options.withGroup);
}
if (options.withRepUser) {
params = params.set('withRepUser', options.withRepUser);
}
if (options.userId) {
params = params.set('userId', options.userId)
}
if (options.groupId) {
params = params.set('groupId', options.groupId)
}
}
return this.http.get<UserRep[]>(`${this.baseUrl}`, { params: params, withCredentials: true });
}
}
interface Options {
withUser: boolean;
withRepGroup: boolean;
withGroup: boolean;
withRepUser: boolean;
userId?: number;
groupId?: number;
}

4
DigitalData.UserManager.API/ClientApp/user_manager_ui/src/environments/environment.ts
View File

@ -189,10 +189,6 @@ export const env = {
header: "Repr. Gruppen",
field: (ur: any) => ur.repGroup?.name
},
{
header: "Rechte Gruppen",
field: (ur: any) => ur.rightGroup?.name
},
{
header: "Repr. Benutzer",
field: (ur: any) => ur.repUser?.username

4
DigitalData.UserManager.API/Controllers/UserRepController.cs
View File

@ -21,11 +21,11 @@ namespace DigitalData.UserManager.API.Controllers
}
[HttpGet]
public async Task<IActionResult> GetAll(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null)
public async Task<IActionResult> GetAll(bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false, int? userId = null, int? groupId = null)
{
try
{
return await _service.ReadAllAsync(withUser, withRepGroup, withRightGroup, withRepUser, userId).ThenAsync(Ok, IActionResult (m, n) =>
return await _service.ReadAllAsync(withUser, withRepGroup, withGroup, withRepUser, userId, groupId).ThenAsync(Ok, IActionResult (m, n) =>
{
_logger.LogNotice(n);
return NotFound();

2
DigitalData.UserManager.Application/Contracts/IUserRepService.cs
View File

@ -6,6 +6,6 @@ namespace DigitalData.UserManager.Application.Contracts
{
public interface IUserRepService : IBaseService<UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep>
{
Task<DataResult<IEnumerable<UserRepReadDto>>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null);
Task<DataResult<IEnumerable<UserRepReadDto>>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false, int? userId = null, int? groupId = null);
}
}

3
DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs
View File

@ -5,8 +5,7 @@ namespace DigitalData.UserManager.Application.DTOs.UserRep
public record UserRepCreateDto(
int UserId,
int? RepGroupId,
int RightGroupId,
string AddedWho,
int? GroupId,
int RepUserId
) : BaseCreateDto();
}

4
DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs
View File

@ -8,13 +8,13 @@ namespace DigitalData.UserManager.Application.DTOs.UserRep
int Id,
int UserId,
int? RepGroupId,
int RightGroupId,
int? GroupId,
string AddedWho,
string ChangedWho,
int? RepUserId,
UserReadDto? User,
GroupReadDto? RepGroup,
GroupReadDto? RightGroup,
GroupReadDto? Group,
UserReadDto? RepUser,
DateTime? AddedWhen,
DateTime? ChangedWhen

2
DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs
View File

@ -5,7 +5,7 @@ namespace DigitalData.UserManager.Application.DTOs.UserRep
public record UserRepUpdateDto(
int UserId,
int? RepGroupId,
int RightGroupId,
int? GroupId,
int RepUserId
) : BaseUpdateDto();
}

4
DigitalData.UserManager.Application/Services/UserRepService.cs
View File

@ -15,9 +15,9 @@ namespace DigitalData.UserManager.Application.Services
{
}
public async Task<DataResult<IEnumerable<UserRepReadDto>>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null)
public async Task<DataResult<IEnumerable<UserRepReadDto>>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false, int? userId = null, int? groupId = null)
{
var urs = await _repository.ReadAllAsync(withUser, withRepGroup, withRightGroup, withRepUser, userId);
var urs = await _repository.ReadAllAsync(withUser, withRepGroup, withGroup, withRepUser, userId, groupId);
var urReadDTOs = _mapper.MapOrThrow<IEnumerable<UserRepReadDto>>(urs);
return Result.Success(urReadDTOs);
}

9
DigitalData.UserManager.Domain/Entities/UserRep.cs
View File

@ -14,9 +14,8 @@ namespace DigitalData.UserManager.Domain.Entities
[Column("REPR_GROUP")]
public int? RepGroupId { get; set; }
[Required]
[Column("RIGHT_GROUP")]
public int RightGroupId { get; set; }
[Column("GROUP_ID")]
public int? GroupId { get; set; } = null;
[Column("REPR_USER")]
public int? RepUserId { get; set; }
@ -27,8 +26,8 @@ namespace DigitalData.UserManager.Domain.Entities
[ForeignKey("RepGroupId")]
public virtual Group? RepGroup { get; set; }
[ForeignKey("RightGroupId")]
public virtual Group? RightGroup { get; set; }
[ForeignKey("GroupId")]
public virtual Group? Group { get; set; }
[ForeignKey("RepUserId")]
public virtual User? RepUser { get; set; }

2
DigitalData.UserManager.Infrastructure/Contracts/IUserRepRepository.cs
View File

@ -5,6 +5,6 @@ namespace DigitalData.UserManager.Infrastructure.Contracts
{
public interface IUserRepRepository : ICRUDRepository<UserRep, int>
{
Task<IEnumerable<UserRep>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null);
Task<IEnumerable<UserRep>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false, int? userId = null, int? groupId = null);
}
}

13
DigitalData.UserManager.Infrastructure/Repositories/UserRepRepository.cs
View File

@ -12,9 +12,9 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
{
}
public async Task<IEnumerable<UserRep>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null)
public async Task<IEnumerable<UserRep>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false, int? userId = null, int? groupId = null)
{
var query = _dbSet.AsQueryable();
var query = _dbSet.AsNoTracking();
if (withUser)
query = query.Include(ur => ur.User);
@ -22,8 +22,8 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
if (withRepGroup)
query = query.Include(ur => ur.RepGroup);
if (withRightGroup)
query = query.Include(ur => ur.RightGroup);
if (withGroup)
query = query.Include(ur => ur.Group);
if (withRepUser)
query = query.Include(ur => ur.RepUser);
@ -33,6 +33,11 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
query = query.Where(ur => ur.UserId == userId);
}
if (groupId is not null)
{
query = query.Where(ur => ur.GroupId == groupId);
}
return await query.ToListAsync();
}
}