Skip to content

Commit 0a47abc

Browse files
committed
feat: return the parent uuid
1 parent c943a0b commit 0a47abc

6 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/modules/file/file.repository.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ describe('FileRepository', () => {
578578
include: expect.arrayContaining([
579579
expect.objectContaining({
580580
as: 'folder',
581-
attributes: ['plainName', 'removed', 'deleted'],
581+
attributes: ['plainName', 'removed', 'deleted', 'uuid'],
582582
required: false,
583583
}),
584584
]),
@@ -649,7 +649,7 @@ describe('FileRepository', () => {
649649
include: expect.arrayContaining([
650650
expect.objectContaining({
651651
as: 'folder',
652-
attributes: ['plainName', 'removed', 'deleted'],
652+
attributes: ['plainName', 'removed', 'deleted', 'uuid'],
653653
required: false,
654654
}),
655655
]),

src/modules/file/file.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ export class SequelizeFileRepository implements FileRepository {
532532
{
533533
model: FolderModel,
534534
as: 'folder',
535-
attributes: ['plainName', 'removed', 'deleted'],
535+
attributes: ['plainName', 'removed', 'deleted', 'uuid'],
536536
required: false,
537537
},
538538
{

src/modules/folder/folder.repository.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ describe('SequelizeFolderRepository', () => {
397397
include: expect.arrayContaining([
398398
expect.objectContaining({
399399
as: 'parent',
400-
attributes: ['plainName', 'removed', 'deleted'],
400+
attributes: ['plainName', 'removed', 'deleted', 'uuid'],
401401
required: false,
402402
}),
403403
]),
@@ -469,7 +469,7 @@ describe('SequelizeFolderRepository', () => {
469469
include: expect.arrayContaining([
470470
expect.objectContaining({
471471
as: 'parent',
472-
attributes: ['plainName', 'removed', 'deleted'],
472+
attributes: ['plainName', 'removed', 'deleted', 'uuid'],
473473
required: false,
474474
}),
475475
]),

src/modules/folder/folder.repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export class SequelizeFolderRepository implements FolderRepository {
331331
{
332332
model: FolderModel,
333333
as: 'parent',
334-
attributes: ['plainName', 'removed', 'deleted'],
334+
attributes: ['plainName', 'removed', 'deleted', 'uuid'],
335335
required: false,
336336
},
337337
...include,

src/modules/trash/trash.controller.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ describe('TrashController', () => {
458458
parent: {
459459
plainName: parentFolder.plainName,
460460
status: parentFolder.status,
461+
uuid: parentFolder.uuid,
461462
},
462463
expiresAt: expectedExpiresAt,
463464
};
@@ -532,6 +533,7 @@ describe('TrashController', () => {
532533
parent: {
533534
plainName: parentFolder.plainName,
534535
status: parentFolder.status,
536+
uuid: parentFolder.uuid,
535537
},
536538
expiresAt: expectedExpiresAt,
537539
};
@@ -590,6 +592,7 @@ describe('TrashController', () => {
590592
parent: {
591593
plainName: mockFile.folder?.plainName ?? null,
592594
status: mockFile.folder?.status ?? null,
595+
uuid: mockFile.folder?.uuid ?? null,
593596
},
594597
expiresAt: null,
595598
},
@@ -626,6 +629,7 @@ describe('TrashController', () => {
626629
parent: {
627630
plainName: mockFolder.parent?.plainName ?? null,
628631
status: mockFolder.parent?.status ?? null,
632+
uuid: mockFolder.parent?.uuid ?? null,
629633
},
630634
expiresAt: null,
631635
},

src/modules/trash/trash.controller.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ export class TrashController {
122122
parent: {
123123
plainName: file.folder?.plainName,
124124
status: file.folder?.status,
125+
uuid: file.folder?.uuid,
125126
},
126127
expiresAt:
127128
retentionDays && file.updatedAt
@@ -150,6 +151,7 @@ export class TrashController {
150151
parent: {
151152
plainName: folder.parent?.plainName ?? null,
152153
status: folder.parent?.status ?? null,
154+
uuid: folder.parent?.uuid ?? null,
153155
},
154156
}),
155157
expiresAt:

0 commit comments

Comments
 (0)