Skip to content

Handle exception properly when deleting trash items #35879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Jul 18, 2019

Description

Any exception during deletion of an item from trashbin resulted in a 500 response.

Related Issue

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@DeepDiver1975 DeepDiver1975 force-pushed the bugfix/trashbin-api-handle-locked-exception-properly branch from 14b0509 to 77a862f Compare July 19, 2019 06:23
@codecov
Copy link

codecov bot commented Jul 19, 2019

Codecov Report

Merging #35879 into stable10 will decrease coverage by 19.45%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##             stable10   #35879       +/-   ##
===============================================
- Coverage       65.09%   45.63%   -19.46%     
===============================================
  Files            1302      116     -1186     
  Lines           77142    11519    -65623     
  Branches         1301     1301               
===============================================
- Hits            50216     5257    -44959     
+ Misses          26541     5877    -20664     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 30.99% <ø> (-35.29%) 0 <ø> (-20189)
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Storage/DAV.php 58.71% <0%> (-21.37%) 0% <0%> (ø)
apps/updatenotification/templates/admin.php
lib/private/Encryption/Keys/Storage.php
lib/private/App/CodeChecker/NodeVisitor.php
lib/private/RedisFactory.php
apps/dav/lib/Avatars/AvatarNode.php
...s/dav/appinfo/Migrations/Version20170202213905.php
apps/dav/lib/Upload/ChunkLocationProvider.php
apps/files/lib/AppInfo/Application.php
apps/systemtags/list.php
... and 1175 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46414e9...77a862f. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 19, 2019

Codecov Report

Merging #35879 into stable10 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35879      +/-   ##
==============================================
+ Coverage       65.09%    65.1%   +<.01%     
- Complexity      20189    20197       +8     
==============================================
  Files            1302     1302              
  Lines           77142    77158      +16     
  Branches         1301     1301              
==============================================
+ Hits            50216    50232      +16     
  Misses          26541    26541              
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.29% <100%> (ø) 20197 <3> (+8) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/files_trashbin/lib/Trashbin.php 77.8% <ø> (ø) 147 <0> (ø) ⬇️
...s/dav/lib/Connector/Sabre/Exception/FileLocked.php 100% <100%> (ø) 3 <2> (ø) ⬇️
apps/dav/lib/TrashBin/AbstractTrashBinNode.php 93.22% <100%> (+2.52%) 21 <1> (+8) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a1d7687...54bd6dc. Read the comment docs.

@DeepDiver1975 DeepDiver1975 force-pushed the bugfix/trashbin-api-handle-locked-exception-properly branch from 77a862f to c1ee30c Compare July 19, 2019 07:57
@DeepDiver1975 DeepDiver1975 force-pushed the bugfix/trashbin-api-handle-locked-exception-properly branch from c1ee30c to 54bd6dc Compare July 19, 2019 12:34
@DeepDiver1975 DeepDiver1975 merged commit 353b86c into stable10 Jul 23, 2019
@delete-merged-branch delete-merged-branch bot deleted the bugfix/trashbin-api-handle-locked-exception-properly branch July 23, 2019 07:21
@DeepDiver1975
Copy link
Member Author

THX @jvillafanez

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants