import { snakeCase } from 'lodash';
import { CollectionResource, defaultCollectionSelectedFields } from 'models/collection';
import { AuthService } from '../auth-service/auth-service';
-import { CollectionService } from './collection-service';
+import { CollectionService, emptyCollectionUuid } from './collection-service';
describe('collection-service', () => {
let collectionService: CollectionService;
describe('deleteFiles', () => {
it('should remove no files', async () => {
// given
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
const filePaths: string[] = [];
- const collectionUUID = '';
+ const collectionUUID = 'zzzzz-tpzed-5o5tg0l9a57gxxx';
// when
await collectionService.deleteFiles(collectionUUID, filePaths);
// then
- expect(webdavClient.delete).not.toHaveBeenCalled();
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${collectionUUID}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {},
+ }
+ );
});
it('should remove only root files', async () => {
// given
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
const filePaths: string[] = ['/root/1', '/root/1/100', '/root/1/100/test.txt', '/root/2', '/root/2/200', '/root/3/300/test.txt'];
- const collectionUUID = '';
+ const collectionUUID = 'zzzzz-tpzed-5o5tg0l9a57gxxx';
// when
await collectionService.deleteFiles(collectionUUID, filePaths);
// then
- expect(webdavClient.delete).toHaveBeenCalledTimes(3);
- expect(webdavClient.delete).toHaveBeenCalledWith("c=/root/3/300/test.txt");
- expect(webdavClient.delete).toHaveBeenCalledWith("c=/root/2");
- expect(webdavClient.delete).toHaveBeenCalledWith("c=/root/1");
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${collectionUUID}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {
+ '/root/3/300/test.txt': '',
+ '/root/2': '',
+ '/root/1': '',
+ },
+ }
+ );
});
it('should remove files with uuid prefix', async () => {
// given
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
const filePaths: string[] = ['/root/1'];
const collectionUUID = 'zzzzz-tpzed-5o5tg0l9a57gxxx';
await collectionService.deleteFiles(collectionUUID, filePaths);
// then
- expect(webdavClient.delete).toHaveBeenCalledTimes(1);
- expect(webdavClient.delete).toHaveBeenCalledWith("c=zzzzz-tpzed-5o5tg0l9a57gxxx/root/1");
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${collectionUUID}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {
+ '/root/1': '',
+ },
+ }
+ );
});
- });
- describe('batch file operations', () => {
it('should batch remove files', async () => {
serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
// given
const collectionUUID = 'zzzzz-4zz18-5o5tg0l9a57gxxx';
// when
- await collectionService.batchFileDelete(collectionUUID, filePaths);
+ await collectionService.deleteFiles(collectionUUID, filePaths);
// then
expect(serverApi.put).toHaveBeenCalledTimes(1);
}
);
});
+ });
+
+ describe('renameFile', () => {
+ it('should rename file', async () => {
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
+ const collectionUuid = 'zzzzz-4zz18-ywq0rvhwwhkjnfq';
+ const collectionPdh = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
+ const oldPath = '/old/path';
+ const newPath = '/new/filename';
+ await collectionService.renameFile(collectionUuid, collectionPdh, oldPath, newPath);
+
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${collectionUuid}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {
+ [newPath]: `${collectionPdh}${oldPath}`,
+ },
+ }
+ );
+ });
+ });
+
+ describe('copyFiles', () => {
it('should batch copy files', async () => {
serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
- // given
const filePaths: string[] = ['/root/1', '/secondFile', 'barefile.txt'];
- // const collectionUUID = 'zzzzz-4zz18-5o5tg0l9a57gxxx';
- const collectionPDH = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
+ const sourcePdh = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
const destinationUuid = 'zzzzz-4zz18-ywq0rvhwwhkjnfq';
const destinationPath = '/destinationPath';
// when
- await collectionService.batchFileCopy(collectionPDH, filePaths, destinationUuid, destinationPath);
+ await collectionService.copyFiles(sourcePdh, filePaths, destinationUuid, destinationPath);
// then
expect(serverApi.put).toHaveBeenCalledTimes(1);
preserve_version: true
},
replace_files: {
- [`${destinationPath}/1`]: `${collectionPDH}/root/1`,
- [`${destinationPath}/secondFile`]: `${collectionPDH}/secondFile`,
- [`${destinationPath}/barefile.txt`]: `${collectionPDH}/barefile.txt`,
+ [`${destinationPath}/1`]: `${sourcePdh}/root/1`,
+ [`${destinationPath}/secondFile`]: `${sourcePdh}/secondFile`,
+ [`${destinationPath}/barefile.txt`]: `${sourcePdh}/barefile.txt`,
+ },
+ }
+ );
+ });
+
+ it('should copy files from rooth', async () => {
+ // Test copying from root paths
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
+ const filePaths: string[] = ['/'];
+ const sourcePdh = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
+
+ const destinationUuid = 'zzzzz-4zz18-ywq0rvhwwhkjnfq';
+ const destinationPath = '/destinationPath';
+
+ await collectionService.copyFiles(sourcePdh, filePaths, destinationUuid, destinationPath);
+
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${destinationUuid}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {
+ [`${destinationPath}`]: `${sourcePdh}/`,
},
}
);
});
+ it('should copy files to root path', async () => {
+ // Test copying to root paths
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
+ const filePaths: string[] = ['/'];
+ const sourcePdh = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
+
+ const destinationUuid = 'zzzzz-4zz18-ywq0rvhwwhkjnfq';
+ const destinationPath = '/';
+
+ await collectionService.copyFiles(sourcePdh, filePaths, destinationUuid, destinationPath);
+
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${destinationUuid}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {
+ "/": `${sourcePdh}/`,
+ },
+ }
+ );
+ });
+ });
+
+ describe('moveFiles', () => {
it('should batch move files', async () => {
serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
// given
const filePaths: string[] = ['/rootFile', '/secondFile', '/subpath/subfile', 'barefile.txt'];
const srcCollectionUUID = 'zzzzz-4zz18-5o5tg0l9a57gxxx';
- const srcCollectionPDH = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
+ const srcCollectionPdh = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
const destinationUuid = 'zzzzz-4zz18-ywq0rvhwwhkjnfq';
const destinationPath = '/destinationPath';
// when
- await collectionService.batchFileMove(srcCollectionUUID, srcCollectionPDH, filePaths, destinationUuid, destinationPath);
+ await collectionService.moveFiles(srcCollectionUUID, srcCollectionPdh, filePaths, destinationUuid, destinationPath);
// then
expect(serverApi.put).toHaveBeenCalledTimes(2);
preserve_version: true
},
replace_files: {
- [`${destinationPath}/rootFile`]: `${srcCollectionPDH}/rootFile`,
- [`${destinationPath}/secondFile`]: `${srcCollectionPDH}/secondFile`,
- [`${destinationPath}/subfile`]: `${srcCollectionPDH}/subpath/subfile`,
- [`${destinationPath}/barefile.txt`]: `${srcCollectionPDH}/barefile.txt`,
+ [`${destinationPath}/rootFile`]: `${srcCollectionPdh}/rootFile`,
+ [`${destinationPath}/secondFile`]: `${srcCollectionPdh}/secondFile`,
+ [`${destinationPath}/subfile`]: `${srcCollectionPdh}/subpath/subfile`,
+ [`${destinationPath}/barefile.txt`]: `${srcCollectionPdh}/barefile.txt`,
},
}
);
);
});
+ it('should batch move files within collection', async () => {
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
+ // given
+ const filePaths: string[] = ['/one', '/two', '/subpath/subfile', 'barefile.txt'];
+ const srcCollectionUUID = 'zzzzz-4zz18-5o5tg0l9a57gxxx';
+ const srcCollectionPdh = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
+
+ const destinationPath = '/destinationPath';
+
+ // when
+ await collectionService.moveFiles(srcCollectionUUID, srcCollectionPdh, filePaths, srcCollectionUUID, destinationPath);
+
+ // then
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ // Verify copy
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${srcCollectionUUID}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {
+ [`${destinationPath}/one`]: `${srcCollectionPdh}/one`,
+ ['/one']: '',
+ [`${destinationPath}/two`]: `${srcCollectionPdh}/two`,
+ ['/two']: '',
+ [`${destinationPath}/subfile`]: `${srcCollectionPdh}/subpath/subfile`,
+ ['/subpath/subfile']: '',
+ [`${destinationPath}/barefile.txt`]: `${srcCollectionPdh}/barefile.txt`,
+ ['/barefile.txt']: '',
+ },
+ }
+ );
+ });
+
it('should abort batch move when copy fails', async () => {
// Simulate failure to copy
serverApi.put = jest.fn(() => Promise.reject({
// given
const filePaths: string[] = ['/rootFile', '/secondFile', '/subpath/subfile', 'barefile.txt'];
const srcCollectionUUID = 'zzzzz-4zz18-5o5tg0l9a57gxxx';
- const srcCollectionPDH = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
+ const srcCollectionPdh = '8cd9ce1dfa21c635b620b1bfee7aaa08+180';
const destinationUuid = 'zzzzz-4zz18-ywq0rvhwwhkjnfq';
const destinationPath = '/destinationPath';
// when
try {
- await collectionService.batchFileMove(srcCollectionUUID, srcCollectionPDH, filePaths, destinationUuid, destinationPath);
+ await collectionService.moveFiles(srcCollectionUUID, srcCollectionPdh, filePaths, destinationUuid, destinationPath);
} catch {}
// then
preserve_version: true
},
replace_files: {
- [`${destinationPath}/rootFile`]: `${srcCollectionPDH}/rootFile`,
- [`${destinationPath}/secondFile`]: `${srcCollectionPDH}/secondFile`,
- [`${destinationPath}/subfile`]: `${srcCollectionPDH}/subpath/subfile`,
- [`${destinationPath}/barefile.txt`]: `${srcCollectionPDH}/barefile.txt`,
+ [`${destinationPath}/rootFile`]: `${srcCollectionPdh}/rootFile`,
+ [`${destinationPath}/secondFile`]: `${srcCollectionPdh}/secondFile`,
+ [`${destinationPath}/subfile`]: `${srcCollectionPdh}/subpath/subfile`,
+ [`${destinationPath}/barefile.txt`]: `${srcCollectionPdh}/barefile.txt`,
},
}
);
describe('createDirectory', () => {
it('creates empty directory', async () => {
// given
- const directoryNames = {
- 'newDir': 'newDir',
- '/fooDir': 'fooDir',
- '/anotherPath/': 'anotherPath',
- 'trailingSlash/': 'trailingSlash',
- };
- const collectionUUID = 'zzzzz-tpzed-5o5tg0l9a57gxxx';
-
- Object.keys(directoryNames).map(async (path) => {
+ const directoryNames = [
+ {in: 'newDir', out: 'newDir'},
+ {in: '/fooDir', out: 'fooDir'},
+ {in: '/anotherPath/', out: 'anotherPath'},
+ {in: 'trailingSlash/', out: 'trailingSlash'},
+ ];
+ const collectionUuid = 'zzzzz-tpzed-5o5tg0l9a57gxxx';
+
+ for (var i = 0; i < directoryNames.length; i++) {
+ serverApi.put = jest.fn(() => Promise.resolve({ data: {} }));
// when
- await collectionService.createDirectory(collectionUUID, path);
+ await collectionService.createDirectory(collectionUuid, directoryNames[i].in);
// then
- expect(webdavClient.mkdir).toHaveBeenCalledWith(`c=${collectionUUID}/${directoryNames[path]}`);
- });
+ expect(serverApi.put).toHaveBeenCalledTimes(1);
+ expect(serverApi.put).toHaveBeenCalledWith(
+ `/collections/${collectionUuid}`, {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: {
+ ["/" + directoryNames[i].out]: emptyCollectionUuid,
+ },
+ }
+ );
+ }
});
});
projects / arvados-workbench2.git / blobdiff