signalR fix for .net8

.github/workflows/client.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Setup Package Name
         id: package_name

Cite.Api.Data/CiteContext.cs

@@ -1,21 +1,19 @@
 // Copyright 2022 Carnegie Mellon University. All Rights Reserved.
 // Released under a MIT (SEI)-style license, please see LICENSE.md in the project root for license information or contact [email protected] for full terms.
 
+using System;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure.Internal;
 using Cite.Api.Data.Models;
 using Cite.Api.Data.Extensions;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;
 
 namespace Cite.Api.Data
 {
     public class CiteContext : DbContext
     {
-        private DbContextOptions<CiteContext> _options;
+        // Needed for EventInterceptor
+        public IServiceProvider ServiceProvider;
 
-        public CiteContext(DbContextOptions<CiteContext> options) : base(options) {
-            _options = options;
-        }
+        public CiteContext(DbContextOptions<CiteContext> options) : base(options) { }
 
         public DbSet<ScoringModelEntity> ScoringModels { get; set; }
         public DbSet<ScoringCategoryEntity> ScoringCategories { get; set; }
@@ -50,4 +48,3 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
     }
 }
-

Cite.Api.Data/CiteDbContextFactory.cs

@@ -0,0 +1,24 @@
+// Copyright 2024 Carnegie Mellon University. All Rights Reserved.
+// Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information.
+using System;
+using Microsoft.EntityFrameworkCore;
+namespace Cite.Api.Data;
+public class CiteContextFactory : IDbContextFactory<CiteContext>
+{
+    private readonly IDbContextFactory<CiteContext> _pooledFactory;
+    private readonly IServiceProvider _serviceProvider;
+    public CiteContextFactory(
+        IDbContextFactory<CiteContext> pooledFactory,
+        IServiceProvider serviceProvider)
+    {
+        _pooledFactory = pooledFactory;
+        _serviceProvider = serviceProvider;
+    }
+    public CiteContext CreateDbContext()
+    {
+        var context = _pooledFactory.CreateDbContext();
+        // Inject the current scope's ServiceProvider
+        context.ServiceProvider = _serviceProvider;
+        return context;
+    }
+}

Cite.Api.Data/Entry.cs

@@ -0,0 +1,49 @@
+// Copyright 2024 Carnegie Mellon University. All Rights Reserved.
+// Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+namespace Cite.Api.Data;
+public class Entry
+{
+    public object Entity { get; set; }
+    public EntityState State { get; set; }
+    public IEnumerable<PropertyEntry> Properties { get; set; }
+    private Dictionary<string, bool> IsPropertyModified { get; set; } = new();
+    public Entry(EntityEntry entry, Entry oldEntry = null)
+    {
+        Entity = entry.Entity;
+        State = entry.State;
+        Properties = entry.Properties;
+        ProcessOldEntry(oldEntry);
+        foreach (var prop in Properties)
+        {
+            IsPropertyModified[prop.Metadata.Name] = prop.IsModified;
+        }
+    }
+    private void ProcessOldEntry(Entry oldEntry)
+    {
+        if (oldEntry == null) return;
+        if (oldEntry.State != EntityState.Unchanged && oldEntry.State != EntityState.Detached)
+        {
+            State = oldEntry.State;
+        }
+        var modifiedProperties = oldEntry.GetModifiedProperties();
+        foreach (var property in Properties)
+        {
+            if (modifiedProperties.Contains(property.Metadata.Name))
+            {
+                property.IsModified = true;
+            }
+        }
+    }
+    public string[] GetModifiedProperties()
+    {
+        return IsPropertyModified
+            .Where(x => x.Value)
+            .Select(x => x.Key)
+            .ToArray();
+    }
+}