making follow up request active

Author: martinheidegger

src/Permissions.ts

@@ -18,23 +18,6 @@ function pushToMapped <K, V> (map: Map<K, V[]>, key: K, value: V): number {
   return list.push(value)
 }
 
-function deleteFromMapped <K, V> (map: Map<K, V[]>, key: K, value: V): boolean {
-  const list = map.get(key)
-  if (list === undefined) {
-    return false
-  }
-  const index = list.indexOf(value)
-  if (index === -1) {
-    return false
-  }
-  if (list.length === 1) {
-    map.delete(key)
-    return true
-  }
-  list.splice(index, 1)
-  return true
-}
-
 export class Permissions {
   readonly members = new States<MemberState>()
   readonly requests = new States<RequestState>()
@@ -114,6 +97,15 @@ export class Permissions {
     const amountMembers = this.members.byState.added?.size ?? 0
     // The signature of the member that created the request is not necessary
     const neededSignatures = amountMembers - 1
+    if (
+      // Remove operations are okay with having one less
+      request.operation === 'remove' &&
+      // Two members can form a majority, to remove one of two members
+      // unilaterally is impossible
+      amountMembers > 2
+    ) {
+      return neededSignatures - 1
+    }
     return neededSignatures
   }
 
@@ -136,7 +128,19 @@ export class Permissions {
       this.requests.set(request.id, 'finished')
       this.openRequests.delete(request.id)
       this.signatures.delete(request.id)
-      deleteFromMapped(this.openRequestsByMember, request.from, request)
+      const list = this.openRequestsByMember.get(request.from)
+      if (list === undefined) {
+        throw new Error('This may never occur')
+      }
+      if (list.shift() !== request) {
+        throw new Error('This may also never occur')
+      }
+      const entry = list[0]
+      if (entry === undefined) {
+        this.openRequestsByMember.delete(request.from)
+      } else {
+        this.requests.set(entry.id, 'active')
+      }
       return
     }
     throw new Error('todo')

test/Permissions.ts

@@ -213,3 +213,16 @@ test('Two members need to confirm the add-request', t => {
   t.deepEquals(p.members.byState.added, new Set([memberA, memberB, memberC, memberD]))
   t.end()
 })
+
+test('Previously pending requests need to become active', t => {
+  const p = new Permissions()
+  p.add(request({ operation: 'add', who: memberA, id: '1', from: memberA }))
+  p.add(request({ operation: 'add', who: memberB, from: memberA }))
+  p.add(request({ operation: 'add', id: '1', who: memberC, from: memberA }))
+  p.add(request({ operation: 'add', id: '2', who: memberD, from: memberA }))
+  p.add(request({ operation: 'add', id: '3', who: memberB, from: memberA }))
+  p.add(response({ response: 'accept', id: '1', from: memberB }))
+  t.equals(p.requests.get('2'), 'active')
+  t.equals(p.requests.get('3'), 'pending')
+  t.end()
+})