Put back lock

Author: louis-z

NGitLab.Mock/Clients/ClientContext.cs

@@ -1,35 +1,40 @@
 using System;
+using System.Diagnostics;
+using System.Threading;
 
 namespace NGitLab.Mock.Clients;
 
-internal sealed class ClientContext
+internal sealed class ClientContext(GitLabServer server, User user)
 {
-    public ClientContext(GitLabServer server, User user)
-    {
-        Server = server;
-        User = user;
-    }
+    private readonly SemaphoreSlim _operationLock = new(1, 1);
 
-    public GitLabServer Server { get; }
+    public GitLabServer Server { get; } = server;
 
-    public User User { get; }
+    public User User { get; } = user;
 
     public bool IsAuthenticated => User != null;
 
     public IDisposable BeginOperationScope()
     {
         Server.RaiseOnClientOperation();
-        return new Releaser();
+        return new Releaser(_operationLock);
     }
 
     private sealed class Releaser : IDisposable
     {
-        public Releaser()
+        private readonly SemaphoreSlim _operationLock;
+
+        public Releaser(SemaphoreSlim operationLock)
         {
+            _operationLock = operationLock;
+            if (Debugger.IsAttached && _operationLock.CurrentCount == 0)
+                Debugger.Break();
+            _operationLock.Wait();
         }
 
         public void Dispose()
         {
+            _operationLock.Release();
         }
     }
 }

NGitLab.Mock/Clients/GroupClient.cs

@@ -156,13 +156,18 @@ public Models.Group GetGroup(GroupId id)
     {
         using (Context.BeginOperationScope())
         {
-            var group = Server.AllGroups.FirstOrDefault(g => id.Equals(g.PathWithNameSpace, g.Id));
+            return GetGroupLockless(id);
+        }
+    }
 
-            if (group == null || !group.CanUserViewGroup(Context.User))
-                throw GitLabException.NotFound();
+    private Models.Group GetGroupLockless(GroupId id)
+    {
+        var group = Server.AllGroups.FirstOrDefault(g => id.Equals(g.PathWithNameSpace, g.Id));
 
-            return group.ToClientGroup(Context.User);
-        }
+        if (group == null || !group.CanUserViewGroup(Context.User))
+            throw GitLabException.NotFound();
+
+        return group.ToClientGroup(Context.User);
     }
 
     public Task<Models.Group> GetByFullPathAsync(string fullPath, CancellationToken cancellationToken = default) => GetGroupAsync(fullPath, cancellationToken);
@@ -333,7 +338,7 @@ public Models.Group Update(long id, GroupUpdate groupUpdate)
     {
         using (Context.BeginOperationScope())
         {
-            var parentGroup = GetGroup(groupId);
+            var parentGroup = GetGroupLockless(groupId);
             var groups = Server.AllGroups.Where(group => group.CanUserViewGroup(Context.User));
 
             if (query is not null)

NGitLab.Mock/Clients/GroupHooksClient.cs

@@ -20,19 +20,24 @@ public IEnumerable<Models.GroupHook> All
         {
             using (Context.BeginOperationScope())
             {
-                var hooks = GetGroup(_groupId, GroupPermission.Edit).Hooks;
-                return ToClientGroupHooks(hooks).ToList();
+                return GetAllLockless();
             }
         }
     }
 
+    private List<Models.GroupHook> GetAllLockless()
+    {
+        var hooks = GetGroup(_groupId, GroupPermission.Edit).Hooks;
+        return ToClientGroupHooks(hooks).ToList();
+    }
+
     public Models.GroupHook this[long hookId]
     {
         get
         {
             using (Context.BeginOperationScope())
             {
-                var hook = All.FirstOrDefault(h => h.Id == hookId) ?? throw GitLabException.NotFound();
+                var hook = GetAllLockless().FirstOrDefault(h => h.Id == hookId) ?? throw GitLabException.NotFound();
                 return hook;
             }
         }