Skip to content

Commit f5ee94a

Browse files
Merge pull request #855 from internxt/remove_encname_createDeviceAsFolder
[PB-5673] Remove encryptedName from createDeviceAsFolder
2 parents 322315f + 7d8dc89 commit f5ee94a

3 files changed

Lines changed: 46 additions & 9 deletions

File tree

src/modules/backups/backup.usecase.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ export class BackupUseCase {
9797
bucket = backupsBucket;
9898
}
9999

100-
const encryptedName = this.cryptoService.encryptName(deviceName, bucket);
101100
const folders = await this.folderUsecases.getFolders(user.id, {
102101
bucket,
103102
plainName: deviceName,
@@ -110,7 +109,6 @@ export class BackupUseCase {
110109
}
111110

112111
const createdFolder = await this.folderUsecases.createFolderDevice(user, {
113-
name: encryptedName,
114112
plainName: deviceName,
115113
bucket,
116114
});

src/modules/folder/folder.usecase.spec.ts

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { Test, TestingModule } from '@nestjs/testing';
22
import { createMock } from '@golevelup/ts-jest';
33
import { FolderUseCases, SortParamsFolder } from './folder.usecase';
4-
import {
5-
SequelizeFolderRepository,
6-
FolderRepository,
7-
} from './folder.repository';
4+
import { SequelizeFolderRepository } from './folder.repository';
85
import {
96
BadRequestException,
107
ConflictException,
@@ -40,7 +37,7 @@ const user = newUser();
4037

4138
describe('FolderUseCases', () => {
4239
let service: FolderUseCases;
43-
let folderRepository: FolderRepository;
40+
let folderRepository: SequelizeFolderRepository;
4441
let cryptoService: CryptoService;
4542
let sharingService: SharingService;
4643
let fileUsecases: FileUseCases;
@@ -86,7 +83,9 @@ describe('FolderUseCases', () => {
8683
.compile();
8784

8885
service = module.get<FolderUseCases>(FolderUseCases);
89-
folderRepository = module.get<FolderRepository>(SequelizeFolderRepository);
86+
folderRepository = module.get<SequelizeFolderRepository>(
87+
SequelizeFolderRepository,
88+
);
9089
cryptoService = module.get<CryptoService>(CryptoService);
9190
sharingService = module.get<SharingService>(SharingService);
9291
fileUsecases = module.get<FileUseCases>(FileUseCases);
@@ -2066,4 +2065,44 @@ describe('FolderUseCases', () => {
20662065
expect(result).toEqual(folders);
20672066
});
20682067
});
2068+
describe('createFolderDevice', () => {
2069+
it('When plain name is not given, then it should throw an error', async () => {
2070+
const mockFolderData: Partial<FolderAttributes> = {
2071+
bucket: 'mock bucket',
2072+
};
2073+
await expect(
2074+
service.createFolderDevice(userMocked, mockFolderData),
2075+
).rejects.toThrow(BadRequestException);
2076+
expect(folderRepository.createFolder).not.toHaveBeenCalled();
2077+
});
2078+
2079+
it('When bucket is not given, then it should throw an error', async () => {
2080+
const mockFolderData: Partial<FolderAttributes> = {
2081+
plainName: 'mock plain name',
2082+
};
2083+
2084+
await expect(
2085+
service.createFolderDevice(userMocked, mockFolderData),
2086+
).rejects.toThrow(BadRequestException);
2087+
expect(folderRepository.createFolder).not.toHaveBeenCalled();
2088+
});
2089+
2090+
it('When both plain name and bucket are given, then it should create a folder', async () => {
2091+
const mockFolder = newFolder();
2092+
const mockFolderData: Partial<FolderAttributes> = {
2093+
plainName: 'mock plain name',
2094+
bucket: 'mock bucket',
2095+
};
2096+
jest
2097+
.spyOn(folderRepository, 'createFolder')
2098+
.mockResolvedValue(mockFolder);
2099+
const result = await service.createFolderDevice(
2100+
userMocked,
2101+
mockFolderData,
2102+
);
2103+
2104+
expect(result).toBe(mockFolder);
2105+
expect(folderRepository.createFolder).toHaveBeenCalledTimes(1);
2106+
});
2107+
});
20692108
});

src/modules/folder/folder.usecase.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ export class FolderUseCases {
334334
}
335335

336336
async createFolderDevice(user: User, folderData: Partial<FolderAttributes>) {
337-
if (!folderData.name || !folderData.bucket) {
337+
if (!folderData.plainName || !folderData.bucket) {
338338
throw new BadRequestException('Folder name and bucket are required');
339339
}
340340
return this.folderRepository.createFolder(user.id, folderData);

0 commit comments

Comments
 (0)