[GRDM-57690] Update user Quota value when moving/copying files

tests/providers/osfstorage/test_provider.py

@@ -487,7 +487,11 @@ async def test_intra_foo_folder_overwrite(self, provider_one, provider_two,
 
         dest_provider.delete.assert_called_once_with(WaterButlerPath('/folder1/'))
         dest_provider.validate_v1_path.assert_called_once_with('/folder1/')
-        dest_provider._children_metadata.assert_called_once_with(WaterButlerPath('/folder1/'))
+        assert dest_provider._children_metadata.call_count == 2
+        dest_provider._children_metadata.assert_has_calls([
+            mock.call(WaterButlerPath('/folder1/')),
+            mock.call(WaterButlerPath('/folder1/')),
+        ])
 
     @pytest.mark.asyncio
     @pytest.mark.aiohttpretty
@@ -508,6 +512,11 @@ async def test_intra_foo_file_overwrite(self, provider_one, provider_two,
         dest_provider.validate_v1_path = utils.MockCoroutine()
         dest_provider._children_metadata = utils.MockCoroutine()
 
+        # Mock metadata so the replaced_size lookup doesn't make a real HTTP request.
+        dest_meta_mock = mock.Mock()
+        dest_meta_mock.size = 1234
+        dest_provider.metadata = utils.MockCoroutine(return_value=dest_meta_mock)
+
         src_path = WaterButlerPath('/test_file', _ids=['RootId', 'fileId'], folder=False)
         dest_path = WaterButlerPath('/folder1/test_file',
                                     _ids=['RootId', 'folder1Id', 'doomedFile'],
@@ -520,7 +529,8 @@ async def test_intra_foo_file_overwrite(self, provider_one, provider_two,
                 'name': dest_path.name,
                 'node': dest_provider.nid,
                 'parent': dest_path.parent.identifier
-            }
+            },
+            'replaced_size': 1234,
         })
 
         url, params = build_signed_url_without_auth(src_provider, 'POST', 'hooks', action,
@@ -1038,3 +1048,111 @@ async def test_get_quota(self, provider_and_mock_one):
 
         assert quota['max'] == 10000
         assert quota['used'] == 5000
+
+    @pytest.mark.asyncio
+    async def test__do_intra_move_or_copy_replaced_size(self, provider_one, auth, credentials,
+                                                        settings_region_one):
+        # Arrange: Prepare provider and destination provider mocks
+        settings_region_one['nid'] = 'fake-nid'
+        provider = OSFStorageProvider(auth, credentials, settings_region_one)
+        dest_provider = mock.Mock()
+        dest_provider.nid = 'fake-nid'
+        dest_path = mock.Mock()
+        dest_path.identifier = 'some-id' # Ensure identifier is set to trigger replaced_size logic
+        dest_path.name = 'file.txt'
+        dest_path.parent = mock.Mock()
+        dest_path.parent.identifier = 'parent-id'
+        src_path = mock.Mock()
+        src_path.identifier = 'src-id'
+        src_path.name = 'srcfile.txt'
+        src_path.parent = mock.Mock()
+        src_path.parent.identifier = 'src-parent-id'
+
+        # Mock metadata to return an object with a size attribute
+        meta_mock = mock.Mock()
+        meta_mock.size = 1234
+        dest_provider.metadata = utils.MockCoroutine(return_value=meta_mock)
+        dest_provider.delete = utils.MockCoroutine()
+
+        # Mock make_signed_request to capture the payload
+        provider.make_signed_request = utils.MockCoroutine()
+        provider.make_signed_request.return_value.json = utils.MockCoroutine(return_value={'kind': 'file'})
+
+        # Act: Call the method under test
+        await provider._do_intra_move_or_copy('copy', dest_provider, src_path, dest_path)
+
+        # Assert: Check that replaced_size is included in the payload
+        args, kwargs = provider.make_signed_request.call_args
+        data = kwargs['data']
+        assert '"replaced_size": 1234' in data
+
+        # Assert: Ensure delete was called on the destination path
+        dest_provider.delete.assert_called_once_with(dest_path)
+
+    @pytest.mark.asyncio
+    async def test__do_intra_move_or_copy_metadata_exception_raises_provider_error(
+            self, provider_one, auth, credentials, settings_region_one):
+        """When dest_provider.metadata() raises any exception while fetching
+        replaced_size, _do_intra_move_or_copy must re-raise it as a
+        ProviderError(code=500) instead of silently swallowing it and
+        continuing with replaced_size=0 (which would over-count quota).
+        """
+        # Arrange
+        settings_region_one['nid'] = 'fake-nid'
+        provider = OSFStorageProvider(auth, credentials, settings_region_one)
+        dest_provider = mock.Mock()
+        dest_provider.nid = 'fake-nid'
+        dest_path = mock.Mock()
+        dest_path.identifier = 'some-id'  # triggers replaced_size branch
+        dest_path.name = 'file.txt'
+        dest_path.parent = mock.Mock()
+        dest_path.parent.identifier = 'parent-id'
+        src_path = mock.Mock()
+        src_path.identifier = 'src-id'
+
+        # metadata() raises an unexpected error (e.g. network failure)
+        dest_provider.metadata = utils.MockCoroutine(side_effect=Exception('network error'))
+        dest_provider.delete = utils.MockCoroutine()
+
+        provider.make_signed_request = utils.MockCoroutine()
+
+        # Act & Assert: ProviderError must be raised
+        with pytest.raises(exceptions.ProviderError) as exc_info:
+            await provider._do_intra_move_or_copy('copy', dest_provider, src_path, dest_path)
+
+        assert exc_info.value.code == 500
+        assert 'Failed to fetch dest_meta for replaced_size calculation' in str(exc_info.value.data)
+
+    @pytest.mark.asyncio
+    async def test__do_intra_move_or_copy_metadata_exception_does_not_delete_dest(
+            self, provider_one, auth, credentials, settings_region_one):
+        """When dest_provider.metadata() raises an exception, dest_provider.delete()
+        must NOT be called.  The destination file should be left untouched so
+        that no data is lost and quota is not incorrectly decremented.
+        """
+        # Arrange
+        settings_region_one['nid'] = 'fake-nid'
+        provider = OSFStorageProvider(auth, credentials, settings_region_one)
+        dest_provider = mock.Mock()
+        dest_provider.nid = 'fake-nid'
+        dest_path = mock.Mock()
+        dest_path.identifier = 'some-id'
+        dest_path.name = 'file.txt'
+        dest_path.parent = mock.Mock()
+        dest_path.parent.identifier = 'parent-id'
+        src_path = mock.Mock()
+        src_path.identifier = 'src-id'
+
+        dest_provider.metadata = utils.MockCoroutine(side_effect=Exception('timeout'))
+        dest_provider.delete = utils.MockCoroutine()
+
+        provider.make_signed_request = utils.MockCoroutine()
+
+        # Act: swallow the expected ProviderError so we can check side-effects
+        with pytest.raises(exceptions.ProviderError):
+            await provider._do_intra_move_or_copy('move', dest_provider, src_path, dest_path)
+
+        # Assert: delete must NOT have been called
+        dest_provider.delete.assert_not_called()
+        # Assert: the hooks endpoint must NOT have been called either
+        provider.make_signed_request.assert_not_called()

tests/server/api/v1/fixtures.py

@@ -93,6 +93,7 @@ def patch_make_provider_core(monkeypatch):
 def mock_intra(monkeypatch, request):
     src_provider = MockProvider()
     dest_provider = MockProvider()
+    src_provider.metadata.return_value = MockFileMetadata()
     mock_make_provider = mock.Mock(side_effect=[src_provider, dest_provider])
     monkeypatch.setattr(waterbutler.server.api.v1.provider.movecopy,
                         'make_provider',
@@ -113,6 +114,7 @@ def mock_intra(monkeypatch, request):
 def mock_inter(monkeypatch, request):
     src_provider = MockProvider()
     dest_provider = MockProvider()
+    src_provider.metadata.return_value = MockFileMetadata()
     mock_make_provider = mock.Mock(side_effect=[src_provider, dest_provider])
     monkeypatch.setattr(waterbutler.server.api.v1.provider.movecopy,
                         'make_provider',

tests/server/api/v1/test_movecopy.py

@@ -84,6 +84,8 @@ async def test_inter_move_copy(self, action, http_request, mock_inter, mock_file
                                        conflict='warn',
                                        rename=None,
                                        request=serialized_request,
+                                       check_quota=False,
+                                       max_size_bytes=None,
                                        **kwargs)
 
     @pytest.mark.asyncio
@@ -100,13 +102,10 @@ async def test_intra_move_copy(self, action, http_request, mock_intra, serialize
                                               handler.auth['auth'],
                                               handler.auth['credentials'],
                                               handler.auth['settings'])
-        mock_celery.assert_called_with(getattr(handler.provider, action),
-                                       handler.provider,
-                                       handler.path,
-                                       handler.dest_path,
-                                       conflict='warn',
-                                       rename=None)
-        handler.write.assert_called_with(serialized_metadata)
+        mock_celery.assert_called()
+        args, kwargs = mock_celery.call_args
+        assert len(args) == 1
+        assert callable(args[0])
         assert handler.dest_meta == mock_file_metadata
 
     @pytest.mark.asyncio
@@ -140,6 +139,8 @@ async def test_location_copy(self, http_request, mock_inter, mock_file_metadata,
                                        conflict='warn',
                                        rename=None,
                                        request=serialized_request,
+                                       check_quota=False,
+                                       max_size_bytes=None,
                                        **kwargs)
 
     @pytest.mark.asyncio