Merge pull request #2383 from fqutishat/update

fix: batch write

Author: Firas Qutishat

pkg/storage/formattedstore/batchwrite.go

@@ -164,6 +164,9 @@ func newPendingBatch(provider batchProvider, formatter Formatter) *pendingBatch
 }
 
 func (p *pendingBatch) put(addBatch *batch) error {
+	p.mutex.Lock()
+	defer p.mutex.Unlock()
+
 	p.size++
 
 	formattedValue, err := p.formatter.FormatPair(addBatch.keyID, addBatch.value)
@@ -176,35 +179,30 @@ func (p *pendingBatch) put(addBatch *batch) error {
 		return err
 	}
 
-	p.mutex.Lock()
-
 	p.values = append(p.values, models.VaultOperation{
 		Operation:         models.UpsertDocumentVaultOperation,
 		EncryptedDocument: *encryptedDocument,
 	})
 
-	p.mutex.Unlock()
-
 	return nil
 }
 
 func (p *pendingBatch) delete(addBatch *batch) error {
+	p.mutex.Lock()
+	defer p.mutex.Unlock()
+
 	p.size++
 
 	id, err := p.formatter.GenerateEDVDocumentID(addBatch.keyID)
 	if err != nil {
 		return err
 	}
 
-	p.mutex.Lock()
-
 	p.values = append(p.values, models.VaultOperation{
 		Operation:  models.DeleteDocumentVaultOperation,
 		DocumentID: id,
 	})
 
-	p.mutex.Unlock()
-
 	return nil
 }