From 488fda65d074cb116307c3779761ed5752bbc090 Mon Sep 17 00:00:00 2001 From: Vzart Date: Sun, 4 Jun 2023 12:07:52 +0700 Subject: [PATCH 1/5] refactor: room --- src/Application/Rooms/Commands/DisableRoom.cs | 2 ++ src/Application/Rooms/Commands/EnableRoom.cs | 2 ++ src/Application/Rooms/Commands/RemoveRoom.cs | 1 + src/Application/Rooms/Commands/UpdateRoom.cs | 2 ++ src/Application/Rooms/Queries/GetAllRoomsPaginated.cs | 1 + src/Application/Rooms/Queries/GetRoomById.cs | 2 ++ 6 files changed, 10 insertions(+) diff --git a/src/Application/Rooms/Commands/DisableRoom.cs b/src/Application/Rooms/Commands/DisableRoom.cs index dd9c7afe..c70fe9a5 100644 --- a/src/Application/Rooms/Commands/DisableRoom.cs +++ b/src/Application/Rooms/Commands/DisableRoom.cs @@ -40,6 +40,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var room = await _context.Rooms + .Include(x => x.Department) + .Include(x => x.Staff) .Include(x => x.Lockers) .ThenInclude(y => y.Folders) .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken); diff --git a/src/Application/Rooms/Commands/EnableRoom.cs b/src/Application/Rooms/Commands/EnableRoom.cs index af5d710b..d27e9faf 100644 --- a/src/Application/Rooms/Commands/EnableRoom.cs +++ b/src/Application/Rooms/Commands/EnableRoom.cs @@ -38,6 +38,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var room = await _context.Rooms + .Include(x => x.Department) + .Include(x => x.Staff) .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken); if (room is null) diff --git a/src/Application/Rooms/Commands/RemoveRoom.cs b/src/Application/Rooms/Commands/RemoveRoom.cs index 9e35ddc1..b389e8d6 100644 --- a/src/Application/Rooms/Commands/RemoveRoom.cs +++ b/src/Application/Rooms/Commands/RemoveRoom.cs @@ -39,6 +39,7 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var room = await _context.Rooms + .Include(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken); if (room is null) diff --git a/src/Application/Rooms/Commands/UpdateRoom.cs b/src/Application/Rooms/Commands/UpdateRoom.cs index ade660fe..a4fbe702 100644 --- a/src/Application/Rooms/Commands/UpdateRoom.cs +++ b/src/Application/Rooms/Commands/UpdateRoom.cs @@ -50,6 +50,8 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var room = await _context.Rooms + .Include(x => x.Department) + .Include(x => x.Staff) .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken); if (room is null) diff --git a/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs b/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs index 31fddbb8..174b8dc9 100644 --- a/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs +++ b/src/Application/Rooms/Queries/GetAllRoomsPaginated.cs @@ -36,6 +36,7 @@ public async Task> Handle(Query request, CancellationToke { var rooms = _context.Rooms .Include(x => x.Department) + .Include(x => x.Staff) .AsQueryable(); if (!(request.SearchTerm is null || request.SearchTerm.Trim().Equals(string.Empty))) diff --git a/src/Application/Rooms/Queries/GetRoomById.cs b/src/Application/Rooms/Queries/GetRoomById.cs index 6e834b68..2d420d10 100644 --- a/src/Application/Rooms/Queries/GetRoomById.cs +++ b/src/Application/Rooms/Queries/GetRoomById.cs @@ -28,6 +28,8 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Query request, CancellationToken cancellationToken) { var room = await _context.Rooms + .Include(x => x.Department) + .Include(x => x.Staff) .FirstOrDefaultAsync(x => x.Id.Equals(request.RoomId), cancellationToken: cancellationToken); if (room is null) From 1cfb4581323eef07ff067a56b0a7ec6925eb86ec Mon Sep 17 00:00:00 2001 From: Vzart Date: Sun, 4 Jun 2023 12:11:36 +0700 Subject: [PATCH 2/5] refactor: locker --- src/Application/Lockers/Commands/DisableLocker.cs | 1 + src/Application/Lockers/Commands/EnableLocker.cs | 1 + src/Application/Lockers/Commands/UpdateLocker.cs | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Application/Lockers/Commands/DisableLocker.cs b/src/Application/Lockers/Commands/DisableLocker.cs index cbde208a..f033f0cb 100644 --- a/src/Application/Lockers/Commands/DisableLocker.cs +++ b/src/Application/Lockers/Commands/DisableLocker.cs @@ -40,6 +40,7 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var locker = await _context.Lockers + .Include(x => x.Room) .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) diff --git a/src/Application/Lockers/Commands/EnableLocker.cs b/src/Application/Lockers/Commands/EnableLocker.cs index 32dee1aa..e808c98a 100644 --- a/src/Application/Lockers/Commands/EnableLocker.cs +++ b/src/Application/Lockers/Commands/EnableLocker.cs @@ -40,6 +40,7 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var locker = await _context.Lockers + .Include(x => x.Room) .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) { diff --git a/src/Application/Lockers/Commands/UpdateLocker.cs b/src/Application/Lockers/Commands/UpdateLocker.cs index c55e2fea..6dcd2920 100644 --- a/src/Application/Lockers/Commands/UpdateLocker.cs +++ b/src/Application/Lockers/Commands/UpdateLocker.cs @@ -50,8 +50,9 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { - var locker = await _context.Lockers.Include(x => x.Room).FirstOrDefaultAsync( - x => x.Id.Equals(request.LockerId), cancellationToken); + var locker = await _context.Lockers + .Include(x => x.Room) + .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) { From d057a6a958a51ca16cf248e77663109506473207 Mon Sep 17 00:00:00 2001 From: Vzart Date: Sun, 4 Jun 2023 12:13:13 +0700 Subject: [PATCH 3/5] refactor: folder --- src/Application/Folders/Commands/DisableFolder.cs | 1 + src/Application/Folders/Commands/EnableFolder.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Application/Folders/Commands/DisableFolder.cs b/src/Application/Folders/Commands/DisableFolder.cs index 020bc1fe..fb7682cc 100644 --- a/src/Application/Folders/Commands/DisableFolder.cs +++ b/src/Application/Folders/Commands/DisableFolder.cs @@ -40,6 +40,7 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var folder = await _context.Folders + .Include(x => x.Locker) .FirstOrDefaultAsync(f => f.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Commands/EnableFolder.cs b/src/Application/Folders/Commands/EnableFolder.cs index 2cd66702..b09251e8 100644 --- a/src/Application/Folders/Commands/EnableFolder.cs +++ b/src/Application/Folders/Commands/EnableFolder.cs @@ -28,6 +28,7 @@ public CommandHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Command request, CancellationToken cancellationToken) { var folder = await _context.Folders + .Include(x => x.Locker) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) From a79713a39b047bd63d10a8b5786f87229995c2a7 Mon Sep 17 00:00:00 2001 From: Vzart Date: Sun, 4 Jun 2023 13:26:24 +0700 Subject: [PATCH 4/5] refactor: resolve requested changes --- src/Application/Folders/Commands/DisableFolder.cs | 1 + src/Application/Folders/Commands/EnableFolder.cs | 1 + src/Application/Folders/Commands/RemoveFolder.cs | 1 + src/Application/Folders/Commands/UpdateFolder.cs | 1 + src/Application/Folders/Queries/GetFolderById.cs | 5 ++++- src/Application/Users/Queries/GetUserById.cs | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Application/Folders/Commands/DisableFolder.cs b/src/Application/Folders/Commands/DisableFolder.cs index fb7682cc..dff30daa 100644 --- a/src/Application/Folders/Commands/DisableFolder.cs +++ b/src/Application/Folders/Commands/DisableFolder.cs @@ -41,6 +41,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var folder = await _context.Folders .Include(x => x.Locker) + .ThenInclude(x => x.Room) .FirstOrDefaultAsync(f => f.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Commands/EnableFolder.cs b/src/Application/Folders/Commands/EnableFolder.cs index b09251e8..e21db1c5 100644 --- a/src/Application/Folders/Commands/EnableFolder.cs +++ b/src/Application/Folders/Commands/EnableFolder.cs @@ -29,6 +29,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var folder = await _context.Folders .Include(x => x.Locker) + .ThenInclude(x => x.Room) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Commands/RemoveFolder.cs b/src/Application/Folders/Commands/RemoveFolder.cs index 30fb5776..8990f362 100644 --- a/src/Application/Folders/Commands/RemoveFolder.cs +++ b/src/Application/Folders/Commands/RemoveFolder.cs @@ -31,6 +31,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var folder = await _context.Folders .Include(x => x.Locker) + .ThenInclude(x => x.Room) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Commands/UpdateFolder.cs b/src/Application/Folders/Commands/UpdateFolder.cs index 47b6cc32..f068593a 100644 --- a/src/Application/Folders/Commands/UpdateFolder.cs +++ b/src/Application/Folders/Commands/UpdateFolder.cs @@ -52,6 +52,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var folder = await _context.Folders .Include(x => x.Locker) + .ThenInclude(x => x.Room) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Queries/GetFolderById.cs b/src/Application/Folders/Queries/GetFolderById.cs index 9b1d07df..cd641552 100644 --- a/src/Application/Folders/Queries/GetFolderById.cs +++ b/src/Application/Folders/Queries/GetFolderById.cs @@ -26,7 +26,10 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Query request, CancellationToken cancellationToken) { - var folder = await _context.Folders.FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); + var folder = await _context.Folders + .Include(x =>x .Locker) + .ThenInclude(x => x.Room) + .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) { diff --git a/src/Application/Users/Queries/GetUserById.cs b/src/Application/Users/Queries/GetUserById.cs index c4cd1278..7b22fe51 100644 --- a/src/Application/Users/Queries/GetUserById.cs +++ b/src/Application/Users/Queries/GetUserById.cs @@ -26,6 +26,7 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Query request, CancellationToken cancellationToken) { var user = await _context.Users + .Include(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.UserId), cancellationToken: cancellationToken); if (user is null) From 67d67bc08ab697e68e8314837b9e4d7b03a27146 Mon Sep 17 00:00:00 2001 From: Vzart Date: Sun, 4 Jun 2023 13:31:43 +0700 Subject: [PATCH 5/5] fix: im a stoopid people person thing --- src/Application/Folders/Commands/DisableFolder.cs | 1 + src/Application/Folders/Commands/EnableFolder.cs | 1 + src/Application/Folders/Commands/RemoveFolder.cs | 1 + src/Application/Folders/Commands/UpdateFolder.cs | 1 + src/Application/Folders/Queries/GetFolderById.cs | 1 + src/Application/Lockers/Commands/DisableLocker.cs | 1 + src/Application/Lockers/Commands/EnableLocker.cs | 1 + src/Application/Lockers/Commands/RemoveLocker.cs | 1 + src/Application/Lockers/Commands/UpdateLocker.cs | 1 + src/Application/Lockers/Queries/GetLockerById.cs | 5 ++++- 10 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Application/Folders/Commands/DisableFolder.cs b/src/Application/Folders/Commands/DisableFolder.cs index dff30daa..f57ab34b 100644 --- a/src/Application/Folders/Commands/DisableFolder.cs +++ b/src/Application/Folders/Commands/DisableFolder.cs @@ -42,6 +42,7 @@ public async Task Handle(Command request, CancellationToken cancellat var folder = await _context.Folders .Include(x => x.Locker) .ThenInclude(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(f => f.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Commands/EnableFolder.cs b/src/Application/Folders/Commands/EnableFolder.cs index e21db1c5..e7acf703 100644 --- a/src/Application/Folders/Commands/EnableFolder.cs +++ b/src/Application/Folders/Commands/EnableFolder.cs @@ -30,6 +30,7 @@ public async Task Handle(Command request, CancellationToken cancellat var folder = await _context.Folders .Include(x => x.Locker) .ThenInclude(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Commands/RemoveFolder.cs b/src/Application/Folders/Commands/RemoveFolder.cs index 8990f362..e8bc05f2 100644 --- a/src/Application/Folders/Commands/RemoveFolder.cs +++ b/src/Application/Folders/Commands/RemoveFolder.cs @@ -32,6 +32,7 @@ public async Task Handle(Command request, CancellationToken cancellat var folder = await _context.Folders .Include(x => x.Locker) .ThenInclude(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Commands/UpdateFolder.cs b/src/Application/Folders/Commands/UpdateFolder.cs index f068593a..edfcfe76 100644 --- a/src/Application/Folders/Commands/UpdateFolder.cs +++ b/src/Application/Folders/Commands/UpdateFolder.cs @@ -53,6 +53,7 @@ public async Task Handle(Command request, CancellationToken cancellat var folder = await _context.Folders .Include(x => x.Locker) .ThenInclude(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Folders/Queries/GetFolderById.cs b/src/Application/Folders/Queries/GetFolderById.cs index cd641552..c74c30c8 100644 --- a/src/Application/Folders/Queries/GetFolderById.cs +++ b/src/Application/Folders/Queries/GetFolderById.cs @@ -29,6 +29,7 @@ public async Task Handle(Query request, CancellationToken cancellatio var folder = await _context.Folders .Include(x =>x .Locker) .ThenInclude(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.FolderId), cancellationToken); if (folder is null) diff --git a/src/Application/Lockers/Commands/DisableLocker.cs b/src/Application/Lockers/Commands/DisableLocker.cs index f033f0cb..10a78f79 100644 --- a/src/Application/Lockers/Commands/DisableLocker.cs +++ b/src/Application/Lockers/Commands/DisableLocker.cs @@ -41,6 +41,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var locker = await _context.Lockers .Include(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) diff --git a/src/Application/Lockers/Commands/EnableLocker.cs b/src/Application/Lockers/Commands/EnableLocker.cs index e808c98a..49722a1a 100644 --- a/src/Application/Lockers/Commands/EnableLocker.cs +++ b/src/Application/Lockers/Commands/EnableLocker.cs @@ -41,6 +41,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var locker = await _context.Lockers .Include(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) { diff --git a/src/Application/Lockers/Commands/RemoveLocker.cs b/src/Application/Lockers/Commands/RemoveLocker.cs index 4a0ce1fc..a6ab6ad9 100644 --- a/src/Application/Lockers/Commands/RemoveLocker.cs +++ b/src/Application/Lockers/Commands/RemoveLocker.cs @@ -41,6 +41,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var locker = await _context.Lockers .Include(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) diff --git a/src/Application/Lockers/Commands/UpdateLocker.cs b/src/Application/Lockers/Commands/UpdateLocker.cs index 6dcd2920..20383ef9 100644 --- a/src/Application/Lockers/Commands/UpdateLocker.cs +++ b/src/Application/Lockers/Commands/UpdateLocker.cs @@ -52,6 +52,7 @@ public async Task Handle(Command request, CancellationToken cancellat { var locker = await _context.Lockers .Include(x => x.Room) + .ThenInclude(x => x.Department) .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) diff --git a/src/Application/Lockers/Queries/GetLockerById.cs b/src/Application/Lockers/Queries/GetLockerById.cs index 8077335f..64a1bf5a 100644 --- a/src/Application/Lockers/Queries/GetLockerById.cs +++ b/src/Application/Lockers/Queries/GetLockerById.cs @@ -26,7 +26,10 @@ public QueryHandler(IApplicationDbContext context, IMapper mapper) public async Task Handle(Query request, CancellationToken cancellationToken) { - var locker = await _context.Lockers.FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); + var locker = await _context.Lockers + .Include(x => x.Room) + .ThenInclude(x => x.Department) + .FirstOrDefaultAsync(x => x.Id.Equals(request.LockerId), cancellationToken); if (locker is null) {