Merge pull request #9647 from 2403905/issue-9642

Fixed the channel lock in a workers pool
owncloud · Jul 18, 2024 · ffe1542 · ffe1542
2 parents da2e202 + 7f9e018
commit ffe1542
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/changelog/unreleased/fix-workers-lock.md b/changelog/unreleased/fix-workers-lock.md
@@ -0,0 +1,6 @@
+Bugfix: Fixed the channel lock in a workers pool
+
+We fixed an error when the users can't see more than 10 shares
+
+https://github.com/owncloud/ocis/pull/9647
+https://github.com/owncloud/ocis/issues/9642
diff --git a/services/graph/pkg/service/v0/utils.go b/services/graph/pkg/service/v0/utils.go
@@ -145,7 +145,6 @@ func cs3ReceivedSharesToDriveItems(ctx context.Context,
 	identityCache identity.IdentityCache,
 	receivedShares []*collaboration.ReceivedShare) ([]libregraph.DriveItem, error) {
 
-	ch := make(chan libregraph.DriveItem)
 	group := new(errgroup.Group)
 	// Set max concurrency
 	group.SetLimit(10)
@@ -160,6 +159,7 @@ func cs3ReceivedSharesToDriveItems(ctx context.Context,
 		receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare)
 	}
 
+	ch := make(chan libregraph.DriveItem, len(receivedSharesByResourceID))
 	for _, receivedSharesForResource := range receivedSharesByResourceID {
 		receivedShares := receivedSharesForResource
 
@@ -477,7 +477,6 @@ func cs3ReceivedOCMSharesToDriveItems(ctx context.Context,
 	identityCache identity.IdentityCache,
 	receivedShares []*ocm.ReceivedShare) ([]libregraph.DriveItem, error) {
 
-	ch := make(chan libregraph.DriveItem)
 	group := new(errgroup.Group)
 	// Set max concurrency
 	group.SetLimit(10)
@@ -488,6 +487,7 @@ func cs3ReceivedOCMSharesToDriveItems(ctx context.Context,
 		receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare)
 	}
 
+	ch := make(chan libregraph.DriveItem, len(receivedSharesByResourceID))
 	for _, receivedSharesForResource := range receivedSharesByResourceID {
 		receivedShares := receivedSharesForResource