update test for issue-ocis-reva-260

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

changelog/unreleased/ocs-filter-path-and-status.md

@@ -2,4 +2,6 @@ Bugfix: filter share with me requests
 
 The OCS API now properly filters share with me requests by path and by share status (pending, accepted, rejected, all)
 
+https://github.com/owncloud/ocis-reva/issues/260
+https://github.com/owncloud/ocis-reva/issues/311
 https://github.com/cs3org/reva/pull/1301

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go

@@ -692,7 +692,7 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 
 	ctx := r.Context()
 
-	var info *provider.ResourceInfo
+	var pinfo *provider.ResourceInfo
 	p := r.URL.Query().Get("path")
 	// we need to lookup the resource id so we can filter the list of shares later
 	if p != "" {
@@ -732,7 +732,7 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		info = statRes.GetInfo()
+		pinfo = statRes.GetInfo()
 	}
 
 	lrsReq := collaboration.ListReceivedSharesRequest{}
@@ -754,14 +754,25 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 	lrsRes.GetShares()
 
 	shares := make([]*conversions.ShareData, 0)
+
+	var info *provider.ResourceInfo
 	// TODO(refs) filter out "invalid" shares
 	for _, rs := range lrsRes.GetShares() {
 
 		if stateFilter != ocsStateUnknown && rs.GetState() != stateFilter {
 			continue
 		}
-
-		if info == nil {
+		if pinfo != nil {
+			// check if the shared resource matches the path resource
+			if rs.Share.ResourceId.StorageId != pinfo.GetId().StorageId ||
+				rs.Share.ResourceId.OpaqueId != pinfo.GetId().OpaqueId {
+				// try next share
+				continue
+			}
+			// we can reuse the stat info
+			info = pinfo
+		} else {
+			// we need to do a stat call
 			statRequest := provider.StatRequest{
 				Ref: &provider.Reference{
 					Spec: &provider.Reference_Id{
@@ -777,9 +788,6 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 			}
 
 			info = statRes.GetInfo()
-		} else if rs.Share.ResourceId.StorageId != info.GetId().StorageId ||
-			rs.Share.ResourceId.OpaqueId != info.GetId().OpaqueId {
-			continue
 		}
 
 		data, err := conversions.UserShare2ShareData(r.Context(), rs.Share)

tests/acceptance/expected-failures-on-EOS-storage.txt

@@ -346,10 +346,6 @@ apiSharePublicLink1/createPublicLinkShare.feature:779
 # https://github.com/owncloud/core/issues/37605 Public cannot upload file with mtime set on a public link share with new version of WebDAV API
 apiSharePublicLink1/createPublicLinkShare.feature:793
 #
-# https://github.com/owncloud/ocis-reva/issues/311 Deleting a public link after renaming a file
-apiSharePublicLink1/deletePublicLinkShare.feature:37
-apiSharePublicLink1/deletePublicLinkShare.feature:38
-#
 # https://github.com/owncloud/ocis-reva/issues/373 copying a folder within a public link folder to folder with same name as an already existing file overwrites the parent file
 apiSharePublicLink2/copyFromPublicLink.feature:60
 #

tests/acceptance/expected-failures-on-OCIS-storage.txt

@@ -206,7 +206,6 @@ apiShareManagementToShares/acceptShares.feature:160
 apiShareManagementToShares/acceptShares.feature:162
 apiShareManagementToShares/acceptShares.feature:175
 apiShareManagementToShares/acceptShares.feature:196
-apiShareManagementToShares/acceptShares.feature:216
 apiShareManagementToShares/acceptShares.feature:223
 apiShareManagementToShares/acceptShares.feature:249
 apiShareManagementToShares/acceptShares.feature:270
@@ -315,11 +314,6 @@ apiShareManagementBasicToShares/deleteShareFromShares.feature:182
 apiShareManagementBasicToShares/deleteShareFromShares.feature:183
 apiShareManagementBasicToShares/deleteShareFromShares.feature:184
 #
-# https://github.com/owncloud/ocis-reva/issues/260 Sharee retrieves the information about a share -but gets response containing all the shares
-#
-apiShareOperationsToShares/accessToShare.feature:55
-apiShareOperationsToShares/accessToShare.feature:56
-#
 # https://github.com/owncloud/ocis-reva/issues/262 Shares are not deleted when user is deleted
 #
 apiShareOperationsToShares/gettingShares.feature:24

tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt

@@ -207,7 +207,6 @@ apiShareManagementToShares/acceptShares.feature:160
 apiShareManagementToShares/acceptShares.feature:162
 apiShareManagementToShares/acceptShares.feature:175
 apiShareManagementToShares/acceptShares.feature:196
-apiShareManagementToShares/acceptShares.feature:216
 apiShareManagementToShares/acceptShares.feature:223
 apiShareManagementToShares/acceptShares.feature:249
 apiShareManagementToShares/acceptShares.feature:270
@@ -305,11 +304,6 @@ apiShareManagementBasicToShares/deleteShareFromShares.feature:182
 apiShareManagementBasicToShares/deleteShareFromShares.feature:183
 apiShareManagementBasicToShares/deleteShareFromShares.feature:184
 #
-# https://github.com/owncloud/ocis-reva/issues/260 Sharee retrieves the information about a share -but gets response containing all the shares
-#
-apiShareOperationsToShares/accessToShare.feature:55
-apiShareOperationsToShares/accessToShare.feature:56
-#
 # https://github.com/owncloud/ocis-reva/issues/262 Shares are not deleted when user is deleted
 #
 apiShareOperationsToShares/gettingShares.feature:24
@@ -475,11 +469,6 @@ apiSharePublicLink1/createPublicLinkShare.feature:730
 apiSharePublicLink1/createPublicLinkShare.feature:733
 apiSharePublicLink1/createPublicLinkShare.feature:742
 #
-# https://github.com/owncloud/ocis-reva/issues/311 Deleting a public link after renaming a file
-#
-apiSharePublicLink1/deletePublicLinkShare.feature:37
-apiSharePublicLink1/deletePublicLinkShare.feature:38
-#
 # https://github.com/owncloud/ocis-reva/issues/373 copying a folder within a public link folder to folder with same name as an already existing file overwrites the parent file
 #
 apiSharePublicLink2/copyFromPublicLink.feature:60