Fixed Crash Report screen

BUTR · Jul 1, 2024 · 1ff015b · 1ff015b
1 parent 20ff11e
commit 1ff015b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs
@@ -90,7 +90,7 @@ private async Task<Paging<UserCrashReportModel>> GetPaginatedBaseAsync(NexusMods
         await using var unitOfRead = _unitOfWorkFactory.CreateUnitOfRead();
 
         var user = await unitOfRead.NexusModsUsers.GetUserAsync(userId, ct);
-        return await unitOfRead.CrashReports.GetCrashReportsPaginatedAsync(user!, new PaginatedQuery(page, pageSize, filters, sortings), HttpContext.GetRole(), ct);
+        return await unitOfRead.CrashReports.GetCrashReportsPaginatedAsync(user, new PaginatedQuery(page, pageSize, filters, sortings), HttpContext.GetRole(), ct);
     }
 
     [HttpPost("Paginated")]

diff --git a/src/BUTR.Site.NexusMods.Server/Repositories/CrashReportEntityRepository.cs b/src/BUTR.Site.NexusMods.Server/Repositories/CrashReportEntityRepository.cs
@@ -125,8 +125,8 @@ IQueryable<UserCrashReportModel> DbQueryBase(Expression<Func<CrashReportEntity,
         var dbQuery = applicationRole == ApplicationRoles.Administrator || applicationRole == ApplicationRoles.Moderator
             ? DbQueryBase(x => true)
             : DbQueryBase(x => x.ToUsers.Any(y => y.NexusModsUser.NexusModsUserId == user.NexusModsUserId) ||
-                                                                      x.ModuleInfos.Any(y => moduleIds.Contains(y.Module.ModuleId)) ||
-                                                                      x.ModuleInfos.Where(y => y.NexusModsMod != null).Any(y => nexusModsModIds.Contains(y.NexusModsMod!.NexusModsModId)));
+                               x.ModuleInfos.Any(y => moduleIds.Contains(y.Module.ModuleId)) ||
+                               x.ModuleInfos.Any(y => nexusModsModIds.Contains(y.NexusModsMod!.NexusModsModId)));
 
         //return await dbQuery.PaginatedGroupedAsync(query.Page, query.PageSize, ct);
         return await dbQuery.PaginatedAsync(query.Page, query.PageSize, ct);

diff --git a/src/BUTR.Site.NexusMods.Server/Repositories/NexusModsUserRepository.cs b/src/BUTR.Site.NexusMods.Server/Repositories/NexusModsUserRepository.cs
@@ -33,7 +33,7 @@ public sealed record UserLinkedModModel
 public interface INexusModsUserRepositoryRead : IRepositoryRead<NexusModsUserEntity>
 {
     Task<NexusModsUserEntity?> GetUserWithIntegrationsAsync(NexusModsUserId userId, CancellationToken ct);
-    Task<NexusModsUserEntity?> GetUserAsync(NexusModsUserId userId, CancellationToken ct);
+    Task<NexusModsUserEntity> GetUserAsync(NexusModsUserId userId, CancellationToken ct);
 
     Task<Paging<UserLinkedModModel>> GetNexusModsModsPaginatedAsync(NexusModsUserId userId, PaginatedQuery query, CancellationToken ct);
 
@@ -60,11 +60,11 @@ internal class NexusModsUserRepository : Repository<NexusModsUserEntity>, INexus
 
     public NexusModsUserRepository(IAppDbContextProvider appDbContextProvider) : base(appDbContextProvider.Get()) { }
 
-    public async Task<NexusModsUserEntity?> GetUserAsync(NexusModsUserId userId, CancellationToken ct) => await _dbContext.NexusModsUsers
+    public async Task<NexusModsUserEntity> GetUserAsync(NexusModsUserId userId, CancellationToken ct) => await _dbContext.NexusModsUsers
         .Include(x => x.ToModules).ThenInclude(x => x.Module)
         .Include(x => x.ToNexusModsMods).ThenInclude(x => x.NexusModsMod)
         .AsSplitQuery()
-        .FirstAsync(x => x.NexusModsUserId == userId, ct);
+        .FirstOrDefaultAsync(x => x.NexusModsUserId == userId, ct) ?? NexusModsUserEntity.Create(userId);
 
     public async Task<NexusModsUserEntity?> GetUserWithIntegrationsAsync(NexusModsUserId userId, CancellationToken ct) => await _dbContext.NexusModsUsers
         .Include(x => x.ToRoles)