chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2026-08-21 11:27:04 +02:00
Code Activity
6,749 Commits 3 Branches 0 Tags
master
Commit Graph
6749 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco NassabainandSean Molenaar 1a5ca74172 ✨ Add sharer display name into shared items 
- Add mapSharedByDisplayNames in ShareService
- Update ItemController to call function on items

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar bbdd95c30d 🔥 Remove UserManager code from ItemMapper & tests 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
mnassabainandSean Molenaar 7f21574615 🎨 Type hint ItemController share function 
Co-authored-by: Sean Molenaar <SMillerDev@users.noreply.github.com>
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 4d0a82d429 ✏️ Fix phpcs indentation error 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar c2c92a3f5a 🩹 Fix issues after rebase 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 276460a240 🩹 Item: mark categoriesJson as updated in clone 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 35dc4cf033 🗃 Update share migration version 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar af84bbf204 ✅ Item: update tests - include sharer display name 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 7306370ece ✨ Item: add sharer display name in findEntities 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 8674d558fc ✨ Update Item model: add sharedByDisplayName 
- added field + setters + getters
- include field in serialized Item

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 0fdd88df55 🧹 ShareService: rename $url to $urlGenerator 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar a754b437e0 ✅ Update test to include localization 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 7f3c63a2a4 🎨 ShareService: update dummy feed URL 
- add IURLGenerator DI
- update url to "http://serverurl/news/sharedwithme"
- updated tests: added DI + adapted expected url

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 920ae54a2c 🌐 ShareService: Localize dummy feed title 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar b0c42e4cd7 ♻️ Item: Remove isShared 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 2cba1e4146 🧹 Cleanup code, remove spaces, rename variables 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 4612ed9bf0 🎨 Share migration: remove shared_by default value 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar e5d439ee7e 🚑 Fix newsItem insert error 
- add Item::__clone method resetting updated fields
- set item id to null in ShareService

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 5c5578b16e ✅ Update ItemServiceTest: remove share tests 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar e6eb878c4f ✅ WIP add ShareServiceTest 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 25e2efd54a ✅ Update ItemTest - remove sharedWith field 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 293300166d 🚑 Fix exception handling in ShareService 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 88fa9886ae ✅ Update ItemController share tests 
- use ShareService and shareItemWithUser function

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 1a582f2a7a 🚑 Fix ItemController::share 
- call correct ShareService function
- correct ShareService className annotation

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar d92d77c066 🚑 Fix errors in ShareService 
- change argument $id to $itemId
- import Exceptions

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar d275a5b9e7 🩹 Patch ItemControllerTest to mock shareService 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 409c835433 🩹 Patch ItemController + test to use ShareService 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar dd818c6203 🚑 Fix circular inclusion: create ShareService 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 8fd3975907 🎨 Update share migration 
- remove shared_with column
- make shared_by nullable

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar e96d7c9b1e 🎨 Item.php: make shared_by nullable 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 6a6f89ff94 🎨 Item.php: Remove shared_with 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 54a228eca5 ✨ Add FeedService DI into ItemService in tests 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 26569fd4a2 ✨ Add FeedServiceV2 DI into ItemServiceV2 
- used for finding dummy share feed

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 2ee5112760 🔥 Remove old share logic from tests & old tests 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 9bd27da9ba 🔥 Remove old share item logic & functions 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar d2e831fbaa 🎨 Update item share: add items to dummy feed 
- create/find a 'shared with me' dummy feed
- clone item, initialize fields, add to dummy feed

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 525c47bd01 📝 Update CHANGELOG and AUTHORS 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 4a7e092b98 🔥 Remove front-end edit from back-end pr 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar a1edb03e19 🔥 Remove changes from front-end for back-end pr 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar f708e40b75 ✏️ Fix share test name typo 
- testFindAllShared => testFindAllSharedWithUser

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
WENDLING NICOLASandSean Molenaar f6014567f3 🗑 '!=' is discouraged, replaced by '!==' 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
WENDLING NICOLASandSean Molenaar a9863ec5f7 🗑 '!=' is discouraged, replaced by '!==' 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 80dec257c2 ✅ Update find shared items tests 
- testFindAllSharedWithUser
- testFindAllSharedWithUserHideRead
- testFindAllSharedWithUserSearch

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar af02560363 🎨 ItemMapperV2: add new offset code (findShared) 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 8de50d44b6 ✅ ItemMapperPaginatedTest: update tests 
Adapted folder/feed/item tests to take account for shared data
- testFindAllItemsStarredSearch
- testFindAllFeed
- testFindAllFeedInverted
- testFindAllFeedHideRead
- testFindAllFeedSearch
- testFindAllFolderIdNull
- testFindAllFolderHideRead
- testFindAllFolderHideReadInvertOrder
- testFindAllFolderSearchId

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
WENDLING NICOLASandSean Molenaar ee49a1d1cc ✅ Fix tests in ItemMapperPaginatedTest: 
- testFindAllItemsInvalid
- testFindAllItemsFullInverted
- testFindAllItemsUnread
- testFindAllItemsStarred

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
WENDLING NICOLASandSean Molenaar abba7386ee ✅ Fix tests in ItemMapperAfterTest: 
- testFindAllAfterStarred
- testFindAllAfterAll
- testFindAllAfterInvalid

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
WENDLING NICOLASandSean Molenaar 6dbf64fa9d ✅ Fix tests in ItemMapperAfterTest: 
- testFindAllInFeedAfter
- testFindAllInFeedAfterHideRead
- testFindAllInFolderAfter
- testFindAllInFolderAfterHideRead
- testFindAllAfterUnread

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 702d611f35 🔀 Resolving merge: moving shared tests 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00
Marco NassabainandSean Molenaar 85dbed9ffa 🧹 Cleanup test files: added new lines 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
 2021-04-08 22:31:21 +02:00