fix: directoryLabel not read from correct place

Author: g-saracca

src/files/infra/repositories/transformers/FilePayload.ts

@@ -10,7 +10,6 @@ export interface FilePayload {
     version: number
     description?: string
     restricted: boolean
-    directoryLabel?: string
     datasetVersionId?: number
     categories?: string[]
     contentType: string
@@ -37,6 +36,7 @@ export interface FilePayload {
   }
   version: number
   restricted: boolean
+  directoryLabel?: string
   label: string
   datasetVersionId: number
 }

src/files/infra/repositories/transformers/fileTransformers.ts

@@ -44,8 +44,8 @@ const transformFilePayloadToFile = (filePayload: FilePayload): FileModel => {
     ...(filePayload.dataFile.description && { description: filePayload.dataFile.description }),
     restricted: filePayload.restricted,
     latestRestricted: filePayload.dataFile.restricted,
-    ...(filePayload.dataFile.directoryLabel && {
-      directoryLabel: filePayload.dataFile.directoryLabel
+    ...(filePayload.directoryLabel && {
+      directoryLabel: filePayload.directoryLabel
     }),
     ...(filePayload.dataFile.datasetVersionId && {
       datasetVersionId: filePayload.dataFile.datasetVersionId

test/testHelpers/files/filesHelper.ts

@@ -81,6 +81,7 @@ export const createFilePayload = (): FilePayload => {
     restricted: false,
     version: 1,
     datasetVersionId: 2,
+    directoryLabel: 'directoryLabel',
     dataFile: {
       id: 1,
       version: 1,
@@ -116,7 +117,6 @@ export const createFilePayload = (): FilePayload => {
         isPartOf: { type: DvObjectType.DATAVERSE, identifier: 'root', displayName: 'Root' }
       },
       description: 'description',
-      directoryLabel: 'directoryLabel',
       datasetVersionId: 1,
       originalFormat: 'originalFormat',
       originalSize: 127426,