Migrate User API (#1427)

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Upgraded to PostgreSQL 15 and PostGIS 3.4.
 - Removed unused `IsViewer` flag from user.
 - Removed unused `UserEvent` from user.
+- Migrated `User` API endpoints to .NET API.
 
 ### Fixed
 

src/api-legacy/__init__.py

@@ -62,7 +62,6 @@
 
 # User actions
 from bms.v1.user.handler import UserHandler
-from bms.v1.user.admin import AdminHandler
 
 # Workgroup actions
 from bms.v1.user.workgrpup.admin import WorkgroupAdminHandler

src/api-legacy/main.py

@@ -88,7 +88,6 @@ async def close(application):
         # user handlers
         SettingHandler,
         UserHandler,
-        AdminHandler,
         WorkgroupAdminHandler,
 
         # Borehole handlers
@@ -132,7 +131,6 @@ async def close(application):
 
         # User handlers
         (r'/api/v1/user', UserHandler),
-        (r'/api/v1/user/edit', AdminHandler),
 
         (r'/api/v1/user/workgroup/edit', WorkgroupAdminHandler),
 

src/api-legacy/v1/user/handler.py

@@ -11,7 +11,7 @@ async def execute(self, request):
         action = request.pop('action', None)
 
         if action in [
-            'GET', 'RELOAD'
+            'GET'
         ]:
 
             workgroups = []

src/api/BdmsContext.cs

@@ -18,6 +18,11 @@ public class BdmsContext : DbContext
     public DbSet<Stratigraphy> Stratigraphies { get; set; }
     public DbSet<Term> Terms { get; set; }
     public DbSet<User> Users { get; set; }
+    public IQueryable<User> UsersWithIncludes => Users
+        .Include(u => u.WorkgroupRoles)
+        .ThenInclude(wr => wr.Workgroup)
+        .Include(u => u.TermsAccepted)
+        .ThenInclude(ta => ta.Term);
     public DbSet<UserWorkgroupRole> UserWorkgroupRoles { get; set; }
     public DbSet<Workflow> Workflows { get; set; }
     public DbSet<Workgroup> Workgroups { get; set; }
@@ -88,6 +93,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.HasDefaultSchema("bdms");
         modelBuilder.Entity<UserWorkgroupRole>().HasKey(k => new { k.UserId, k.WorkgroupId, k.Role });
+        modelBuilder.Entity<TermsAccepted>().HasKey(k => new { k.UserId, k.TermId });
 
         modelBuilder.Entity<Borehole>()
             .HasMany(b => b.Files)

src/api/BoreholeLockService.cs

@@ -33,7 +33,7 @@ public async Task<bool> IsBoreholeLockedAsync(int? boreholeId, string? subjectId
             .Select(w => w.Role)
             .ToHashSet();
 
-        if (!user.WorkgroupRoles.Any(x => x.WorkgroupId == borehole.WorkgroupId && boreholeWorkflowRoles.Contains(x.Role)))
+        if (user.WorkgroupRoles == null || !user.WorkgroupRoles.Any(x => x.WorkgroupId == borehole.WorkgroupId && boreholeWorkflowRoles.Contains(x.Role)))
         {
             logger.LogWarning("Current user with subject_id <{SubjectId}> does not have the required role to edit the borehole with id <{BoreholeId}>.", subjectId, boreholeId);
             return true;

src/api/Controllers/BoreholeController.cs

@@ -38,7 +38,7 @@ public async Task<ActionResult<int>> CopyAsync([Required] int id, [Required] int
             .SingleOrDefaultAsync(u => u.SubjectId == HttpContext.GetUserSubjectId())
             .ConfigureAwait(false);
 
-        if (user == null || !user.WorkgroupRoles.Any(w => w.WorkgroupId == workgroupId && w.Role == Role.Editor))
+        if (user == null || user.WorkgroupRoles == null || !user.WorkgroupRoles.Any(w => w.WorkgroupId == workgroupId && w.Role == Role.Editor))
         {
             return Unauthorized();
         }