-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add filter-files to the dav REPORT API
I added filter-files to the dav REPORT API. This enables the listing of favorites.
- Loading branch information
David Christofas
committed
Sep 27, 2021
1 parent
969ac3c
commit 6eee683
Showing
12 changed files
with
401 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Enhancement: Implement listing favorites via the dav report API | ||
|
|
||
| Added filter-files to the dav REPORT API. This enables the listing of | ||
| favorites. | ||
|
|
||
| https://github.com/cs3org/reva/pull/2071 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| // Copyright 2018-2021 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| package ocdav | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestUnmarshallReportFilterFiles(t *testing.T) { | ||
| ffXML := `<oc:filter-files xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns"> | ||
| <d:prop> | ||
| <d:getlastmodified /> | ||
| <d:getetag /> | ||
| <d:getcontenttype /> | ||
| <d:resourcetype /> | ||
| <oc:fileid /> | ||
| <oc:permissions /> | ||
| <oc:size /> | ||
| <d:getcontentlength /> | ||
| <oc:tags /> | ||
| <oc:favorite /> | ||
| <d:lockdiscovery /> | ||
| <oc:comments-unread /> | ||
| <oc:owner-display-name /> | ||
| <oc:share-types /> | ||
| </d:prop> | ||
| <oc:filter-rules> | ||
| <oc:favorite>1</oc:favorite> | ||
| </oc:filter-rules> | ||
| </oc:filter-files>` | ||
|
|
||
| reader := strings.NewReader(ffXML) | ||
|
|
||
| report, status, err := readReport(reader) | ||
| if status != 0 || err != nil { | ||
| t.Error("Failed to unmarshal filter-files xml") | ||
| } | ||
|
|
||
| if report.FilterFiles == nil { | ||
| t.Error("Failed to unmarshal filter-files xml. FilterFiles is nil") | ||
| } | ||
|
|
||
| if report.FilterFiles.Rules.Favorite == false { | ||
| t.Error("Failed to correctly unmarshal filter-rules. Favorite is expected to be true.") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // Copyright 2018-2021 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| package favorite | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" | ||
| provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" | ||
| ) | ||
|
|
||
| // Manager defines an interface for a favorites manager. | ||
| type Manager interface { | ||
| // ListFavorites returns all resources that were favorited by a user. | ||
| ListFavorites(ctx context.Context, userID *user.UserId) ([]*provider.ResourceId, error) | ||
| // SetFavorite marks a resource as favorited by a user. | ||
| SetFavorite(ctx context.Context, userID *user.UserId, resourceID *provider.ResourceId) error | ||
| // UnsetFavorite unmarks a resource as favorited by a user. | ||
| UnsetFavorite(ctx context.Context, userID *user.UserId, resourceID *provider.ResourceId) error | ||
| } | ||
|
|
||
| // NewInMemoryManager returns an instance of a favorites manager using an in-memory storage. | ||
| func NewInMemoryManager() Manager { | ||
| return InMemoryManager{favorites: make(map[string]map[string]*provider.ResourceId)} | ||
| } | ||
|
|
||
| // InMemoryManager implements the Manager interface to manage favorites using an in-memory storage. | ||
| type InMemoryManager struct { | ||
| favorites map[string]map[string]*provider.ResourceId | ||
| } | ||
|
|
||
| // ListFavorites returns all resources that were favorited by a user. | ||
| func (m InMemoryManager) ListFavorites(ctx context.Context, userID *user.UserId) ([]*provider.ResourceId, error) { | ||
| favorites := make([]*provider.ResourceId, 0, len(m.favorites[userID.OpaqueId])) | ||
| for _, id := range m.favorites[userID.OpaqueId] { | ||
| favorites = append(favorites, id) | ||
| } | ||
| return favorites, nil | ||
| } | ||
|
|
||
| // SetFavorite marks a resource as favorited by a user. | ||
| func (m InMemoryManager) SetFavorite(_ context.Context, userID *user.UserId, resourceID *provider.ResourceId) error { | ||
| if m.favorites[userID.OpaqueId] == nil { | ||
| m.favorites[userID.OpaqueId] = make(map[string]*provider.ResourceId) | ||
| } | ||
| m.favorites[userID.OpaqueId][resourceID.OpaqueId] = resourceID | ||
| return nil | ||
| } | ||
|
|
||
| // UnsetFavorite unmarks a resource as favorited by a user. | ||
| func (m InMemoryManager) UnsetFavorite(_ context.Context, userID *user.UserId, resourceID *provider.ResourceId) error { | ||
| delete(m.favorites[userID.OpaqueId], resourceID.OpaqueId) | ||
| return nil | ||
| } |
Oops, something went wrong.