Skip to content

[PB-5673] set name = plainName #898

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.

Sign up for GitHub

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

Open
TamaraFinogina wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[PB-5673] set name = plainName #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6235939
set name = plainName
TamaraFinogina Jan 22, 2026
894c2a0
Merge remote-tracking branch 'origin/master' into remove_enc_name
TamaraFinogina Jan 23, 2026
431008e
only attempt folder decryption if no plainName
TamaraFinogina Jan 23, 2026
7f724ca
always create folder with plainName attribute
TamaraFinogina Jan 23, 2026
ccdbc4b
fix sonar issue
TamaraFinogina Jan 23, 2026
a224df4
Merge remote-tracking branch 'origin/master' into remove_enc_name
TamaraFinogina Jan 26, 2026
f713435
switch findOne to plainName
TamaraFinogina Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 9 additions & 28 deletions src/modules/file/file.usecase.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ describe('FileUseCases', () => {
const expectedFile = newFile({
attributes: {
...file,
name: 'newencrypted-' + file.name,
name: file.plainName,
folderId: destinationFolder.id,
folderUuid: destinationFolder.uuid,
status: FileStatus.EXISTS,
Expand All @@ -458,10 +458,6 @@ describe('FileUseCases', () => {
.spyOn(folderUseCases, 'getFolderByUuid')
.mockResolvedValueOnce(destinationFolder);

jest
.spyOn(cryptoService, 'encryptName')
.mockReturnValueOnce(expectedFile.name);

jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(null);
Expand All @@ -482,7 +478,7 @@ describe('FileUseCases', () => {
{
folderId: destinationFolder.id,
folderUuid: destinationFolder.uuid,
name: expectedFile.name,
name: expectedFile.plainName,
status: FileStatus.EXISTS,
plainName: expectedFile.plainName,
type: expectedFile.type,
Expand Down Expand Up @@ -545,7 +541,6 @@ describe('FileUseCases', () => {
jest
.spyOn(folderUseCases, 'getFolderByUuid')
.mockResolvedValueOnce(destinationFolder);
jest.spyOn(cryptoService, 'encryptName').mockReturnValueOnce(file.name);
jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(file);
Expand All @@ -568,7 +563,6 @@ describe('FileUseCases', () => {
jest
.spyOn(folderUseCases, 'getFolderByUuid')
.mockResolvedValueOnce(destinationFolder);
jest.spyOn(cryptoService, 'encryptName').mockReturnValueOnce(file.name);
jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(conflictFile);
Expand Down Expand Up @@ -606,6 +600,7 @@ describe('FileUseCases', () => {
folderUuid: destinationFolder.uuid,
status: FileStatus.EXISTS,
plainName: newAttributes.name,
name: newAttributes.name,
type: newAttributes.type,
},
});
Expand All @@ -617,10 +612,6 @@ describe('FileUseCases', () => {
.spyOn(folderUseCases, 'getFolderByUuid')
.mockResolvedValueOnce(destinationFolder);

jest
.spyOn(cryptoService, 'encryptName')
.mockReturnValueOnce(fileToBeMovedAndRenamed.name);

jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(null);
Expand All @@ -646,7 +637,7 @@ describe('FileUseCases', () => {
{
folderId: destinationFolder.id,
folderUuid: destinationFolder.uuid,
name: expectedFile.name,
name: expectedFile.plainName,
status: FileStatus.EXISTS,
plainName: expectedFile.plainName,
type: expectedFile.type,
Expand Down Expand Up @@ -678,6 +669,7 @@ describe('FileUseCases', () => {
folderUuid: destinationFolder.uuid,
status: FileStatus.EXISTS,
plainName: newAttributes.name,
name: newAttributes.name,
type: newAttributes.type,
},
});
Expand All @@ -689,10 +681,6 @@ describe('FileUseCases', () => {
.spyOn(folderUseCases, 'getFolderByUuid')
.mockResolvedValueOnce(destinationFolder);

jest
.spyOn(cryptoService, 'encryptName')
.mockReturnValueOnce(fileToBeRenamed.name);

jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(null);
Expand All @@ -714,7 +702,7 @@ describe('FileUseCases', () => {
{
folderId: expectedFile.folderId,
folderUuid: expectedFile.folderUuid,
name: expectedFile.name,
name: expectedFile.plainName,
status: FileStatus.EXISTS,
plainName: expectedFile.plainName,
type: expectedFile.type,
Expand Down Expand Up @@ -746,10 +734,6 @@ describe('FileUseCases', () => {
.spyOn(folderUseCases, 'getFolderByUuid')
.mockResolvedValueOnce(destinationFolder);

jest
.spyOn(cryptoService, 'encryptName')
.mockReturnValueOnce(fileToBeRenamed.name);

jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(null);
Expand Down Expand Up @@ -1347,20 +1331,18 @@ describe('FileUseCases', () => {
const newFileMeta: UpdateFileMetaDto = { plainName: 'new-name' };
const mockFile = newFile({ owner: userMocked });

const encryptedName = 'encrypted-name';
const updatedFile = newFile({
attributes: {
...mockFile,
plainName: newFileMeta.plainName,
name: encryptedName,
name: newFileMeta.plainName,
},
});

jest.spyOn(fileRepository, 'findOneBy').mockResolvedValueOnce(mockFile);
jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(null);
jest.spyOn(cryptoService, 'encryptName').mockReturnValue(encryptedName);

const result = await service.updateFileMetaData(
userMocked,
Expand All @@ -1385,7 +1367,7 @@ describe('FileUseCases', () => {
userMocked.id,
expect.objectContaining({
plainName: newFileMeta.plainName,
name: encryptedName,
name: newFileMeta.plainName,
}),
);
const {
Expand Down Expand Up @@ -1421,7 +1403,6 @@ describe('FileUseCases', () => {
jest
.spyOn(fileRepository, 'findByPlainNameAndFolderId')
.mockResolvedValueOnce(null);
jest.spyOn(cryptoService, 'encryptName').mockReturnValue(mockFile.name);

const result = await service.updateFileMetaData(
userMocked,
Expand Down Expand Up @@ -1844,7 +1825,7 @@ describe('FileUseCases', () => {
const mockFile = newFile({
attributes: {
fileId: testFileId,
name: 'encrypted-name',
name: 'name',
type: 'jpg',
size: BigInt(1000),
bucket: testBucketId,
Expand Down
20 changes: 5 additions & 15 deletions src/modules/file/file.usecase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import {
} from '../feature-limit/limits.enum';
import { FeatureLimitUsecases } from '../feature-limit/feature-limit.usecase';
import { SequelizeFileVersionRepository } from './file-version.repository';
import { FileVersion, FileVersionStatus } from './file-version.domain';
import { FileVersionStatus } from './file-version.domain';
import { FileVersionDto } from './dto/responses/file-version.dto';
import { UserUseCases } from '../user/user.usecase';
import { RedisService } from '../../externals/redis/redis.service';
Expand Down Expand Up @@ -346,10 +346,7 @@ export class FileUseCases {
throw new ForbiddenException('Folder is not yours');
}

const cryptoFileName = this.cryptoService.encryptName(
newFileDto.plainName,
folder.id,
);
const cryptoFileName = newFileDto.plainName;

const exists = await this.fileRepository.findByPlainNameAndFolderId(
user.id,
Expand Down Expand Up @@ -474,9 +471,7 @@ export class FileUseCases {
newFileMetadata.plainName ??
file.plainName ??
this.cryptoService.decryptName(file.name, file.folderId);
const cryptoFileName = newFileMetadata.plainName
? this.cryptoService.encryptName(newFileMetadata.plainName, file.folderId)
: file.name;
const cryptoFileName = newFileMetadata.plainName || file.name;
const type = newFileMetadata.type ?? file.type;

const updatedFile = File.build({
Expand Down Expand Up @@ -863,7 +858,7 @@ export class FileUseCases {
if (shouldVersion) {
await this.applyRetentionPolicy(fileUuid, user.uuid);

const { fileId, size, modificationTime } = newFileData;
const { size, modificationTime } = newFileData;

await Promise.all([
this.fileVersionRepository.upsert({
Expand Down Expand Up @@ -996,15 +991,10 @@ export class FileUseCases {
);
}

const destinationEncryptedName = this.cryptoService.encryptName(
file.plainName,
destinationFolder.id,
);

const updateData: Partial<File> = {
folderId: destinationFolder.id,
folderUuid: destinationFolder.uuid,
name: destinationEncryptedName,
name: file.plainName,
status: FileStatus.EXISTS,
plainName: file.plainName,
type: file.type,
Expand Down
6 changes: 5 additions & 1 deletion src/modules/folder/folder.repository.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ describe('SequelizeFolderRepository', () => {
describe('create', () => {
it('When creating a folder with basic parameters, then it should return the created folder', async () => {
const userId = 1;
const name = 'encrypted-name';
const name = 'folder-name';
const bucket = 'bucket-id';
const parentId = 2;
const encryptVersion = '03-aes' as const;
Expand All @@ -788,6 +788,7 @@ describe('SequelizeFolderRepository', () => {
const result = await repository.create(
userId,
name,
name,
bucket,
parentId,
encryptVersion,
Expand All @@ -797,6 +798,7 @@ describe('SequelizeFolderRepository', () => {
expect(folderModel.create).toHaveBeenCalledWith({
userId,
name,
plainName: name,
bucket,
parentId,
encryptVersion,
Expand Down Expand Up @@ -834,6 +836,7 @@ describe('SequelizeFolderRepository', () => {
{
userId: 1,
name: 'folder1',
plainName: 'folderPlainName1',
bucket: 'bucket1',
parentId: 1,
encryptVersion: '03-aes' as const,
Expand All @@ -842,6 +845,7 @@ describe('SequelizeFolderRepository', () => {
{
userId: 1,
name: 'folder2',
plainName: 'folderPlainName2',
bucket: 'bucket2',
parentId: 1,
encryptVersion: '03-aes' as const,
Expand Down
3 changes: 3 additions & 0 deletions src/modules/folder/folder.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ export class SequelizeFolderRepository implements FolderRepository {
async create(
userId: UserAttributes['id'],
name: FolderAttributes['name'],
plainName: FolderAttributes['plainName'],
bucket: FolderAttributes['bucket'],
parentId: FolderAttributes['parentId'],
encryptVersion: FolderAttributes['encryptVersion'],
Expand All @@ -567,6 +568,7 @@ export class SequelizeFolderRepository implements FolderRepository {
const folder = await this.folderModel.create({
userId,
name,
plainName,
bucket,
parentId,
encryptVersion,
Expand All @@ -592,6 +594,7 @@ export class SequelizeFolderRepository implements FolderRepository {
folders: {
userId: UserAttributes['id'];
name: FolderAttributes['name'];
plainName: FolderAttributes['plainName'];
bucket: FolderAttributes['bucket'];
parentId: FolderAttributes['parentId'];
encryptVersion: FolderAttributes['encryptVersion'];
Expand Down
Loading
Loading