iMerge branch 'develop' into feat/202-featured-items-use-cases

Author: g-saracca

src/collections/infra/repositories/CollectionsRepository.ts

@@ -37,9 +37,9 @@ export interface NewCollectionContactRequestPayload {
 }
 
 export interface NewCollectionMetadataBlocksRequestPayload {
-  metadataBlockNames: string[]
-  facetIds: string[]
-  inputLevels: NewCollectionInputLevelRequestPayload[]
+  metadataBlockNames?: string[]
+  facetIds?: string[]
+  inputLevels?: NewCollectionInputLevelRequestPayload[]
 }
 
 export interface NewCollectionInputLevelRequestPayload {
@@ -183,7 +183,7 @@ export class CollectionsRepository extends ApiRepository implements ICollections
       })
     )
 
-    const inputLevelsRequestBody: NewCollectionInputLevelRequestPayload[] =
+    const inputLevelsRequestBody: NewCollectionInputLevelRequestPayload[] | undefined =
       collectionDTO.inputLevels?.map((inputLevel) => ({
         datasetFieldTypeName: inputLevel.datasetFieldName,
         include: inputLevel.include,

src/core/infra/repositories/ApiRepository.ts

@@ -48,7 +48,7 @@ export abstract class ApiRepository {
   protected buildApiEndpoint(
     resourceName: string,
     operation: string,
-    resourceId: number | string = undefined
+    resourceId: number | string | undefined = undefined
   ) {
     return typeof resourceId === 'number'
       ? `/${resourceName}/${resourceId}/${operation}`

src/core/infra/repositories/apiConfigBuilders.ts

@@ -8,7 +8,7 @@ export const buildRequestConfig = (
   contentType: string = ApiConstants.CONTENT_TYPE_APPLICATION_JSON,
   abortSignal?: AbortSignal
 ): AxiosRequestConfig => {
-  const requestConfig: AxiosRequestConfig = {
+  const requestConfig: AxiosRequestConfig & { headers: Record<string, unknown> } = {
     params: queryParams,
     headers: {
       'Content-Type': contentType

src/datasets/domain/models/Dataset.ts

@@ -6,6 +6,7 @@ export interface Dataset {
   versionId: number
   versionInfo: DatasetVersionInfo
   license?: DatasetLicense
+  termsOfUse: TermsOfUse
   alternativePersistentId?: string
   publicationDate?: string
   citationDate?: string
@@ -35,6 +36,17 @@ export interface DatasetLicense {
   iconUri?: string
 }
 
+export interface TermsOfUse {
+  fileAccessRequest: boolean
+  termsOfAccess?: string
+  dataAccessPlace?: string
+  originalArchive?: string
+  availabilityStatus?: string
+  contactForAccess?: string
+  sizeOfCollection?: string
+  studyCompletion?: string
+}
+
 export type DatasetMetadataBlocks = [CitationMetadataBlock, ...DatasetMetadataBlock[]]
 
 export interface DatasetMetadataBlock {
@@ -53,7 +65,7 @@ export type DatasetMetadataFieldValue =
   | DatasetMetadataSubField[]
   | AnonymizedField
 
-export type DatasetMetadataSubField = Record<string, string>
+export type DatasetMetadataSubField = Record<string, string | undefined>
 
 export interface CitationMetadataBlock extends DatasetMetadataBlock {
   name: 'citation'

src/datasets/domain/useCases/validators/DatasetResourceValidator.ts

@@ -17,9 +17,10 @@ export class DatasetResourceValidator implements ResourceValidator {
     metadataBlocks: MetadataBlock[]
   ) {
     const metadataBlockName = metadataBlockValues.name
-    const metadataBlock: MetadataBlock = metadataBlocks.find(
+    const metadataBlock = metadataBlocks.find(
       (metadataBlock) => metadataBlock.name === metadataBlockName
-    )
+    ) as MetadataBlock
+
     for (const metadataFieldKey of Object.keys(metadataBlock.metadataFields)) {
       this.metadataFieldValidator.validate({
         metadataFieldInfo: metadataBlock.metadataFields[metadataFieldKey],

src/datasets/domain/useCases/validators/SingleMetadataFieldValidator.ts

@@ -8,6 +8,7 @@ import { MetadataFieldValidator } from './MetadataFieldValidator'
 import { DatasetMetadataChildFieldValueDTO } from '../../dtos/DatasetDTO'
 import { MultipleMetadataFieldValidator } from './MultipleMetadataFieldValidator'
 import {
+  MetadataFieldInfo,
   MetadataFieldType,
   MetadataFieldWatermark
 } from '../../../../metadataBlocks/domain/models/MetadataBlock'
@@ -62,7 +63,7 @@ export class SingleMetadataFieldValidator extends BaseMetadataFieldValidator {
     datasetMetadataFieldAndValueInfo: DatasetMetadataFieldAndValueInfo
   ) {
     if (
-      !datasetMetadataFieldAndValueInfo.metadataFieldInfo.controlledVocabularyValues.includes(
+      !datasetMetadataFieldAndValueInfo.metadataFieldInfo.controlledVocabularyValues?.includes(
         datasetMetadataFieldAndValueInfo.metadataFieldValue as string
       )
     ) {
@@ -120,13 +121,21 @@ export class SingleMetadataFieldValidator extends BaseMetadataFieldValidator {
     datasetMetadataFieldAndValueInfo: DatasetMetadataFieldAndValueInfo
   ) {
     const metadataFieldInfo = datasetMetadataFieldAndValueInfo.metadataFieldInfo
-    const childMetadataFieldKeys = Object.keys(metadataFieldInfo.childMetadataFields)
+
+    const childMetadataFieldKeys = Object.keys(
+      metadataFieldInfo.childMetadataFields as Record<string, MetadataFieldInfo>
+    )
+
     const metadataFieldValidator = new MetadataFieldValidator(
       this,
       new MultipleMetadataFieldValidator(this)
     )
+
     for (const childMetadataFieldKey of childMetadataFieldKeys) {
-      const childMetadataFieldInfo = metadataFieldInfo.childMetadataFields[childMetadataFieldKey]
+      const childMetadataFieldInfo = (
+        metadataFieldInfo.childMetadataFields as Record<string, MetadataFieldInfo>
+      )[childMetadataFieldKey]
+
       metadataFieldValidator.validate({
         metadataFieldInfo: childMetadataFieldInfo,
         metadataFieldKey: childMetadataFieldKey,

src/datasets/infra/repositories/transformers/DatasetPayload.ts

@@ -16,6 +16,14 @@ export interface DatasetPayload {
   alternativePersistentId?: string
   publicationDate?: string
   citationDate?: string
+  fileAccessRequest: boolean
+  termsOfAccess?: string
+  dataAccessPlace?: string
+  originalArchive?: string
+  availabilityStatus?: string
+  contactForAccess?: string
+  sizeOfCollection?: string
+  studyCompletion?: string
   files: FilePayload[]
   isPartOf: OwnerNodePayload
 }

src/datasets/infra/repositories/transformers/datasetTransformers.ts

@@ -68,9 +68,9 @@ export const transformDatasetModelToUpdateDatasetRequestPayload = (
   datasetMetadataBlocksValues.forEach(function (
     newDatasetMetadataBlockValues: DatasetMetadataBlockValuesDTO
   ) {
-    const metadataBlock: MetadataBlock = metadataBlocks.find(
+    const metadataBlock = metadataBlocks.find(
       (metadataBlock) => metadataBlock.name == newDatasetMetadataBlockValues.name
-    )
+    ) as MetadataBlock
     const metadataBlockFieldsPayload: MetadataFieldRequestPayload[] = []
     const metadataBlockFields = metadataBlock.metadataFields
     const datasetMetadataFields = newDatasetMetadataBlockValues.fields
@@ -119,7 +119,7 @@ export const transformMetadataBlockModelsToRequestPayload = (
   ) {
     const metadataBlock: MetadataBlock = metadataBlocks.find(
       (metadataBlock) => metadataBlock.name == newDatasetMetadataBlockValues.name
-    )
+    ) as MetadataBlock
     metadataBlocksRequestPayload[newDatasetMetadataBlockValues.name] = {
       fields: transformMetadataFieldModelsToRequestPayload(
         newDatasetMetadataBlockValues.fields,
@@ -195,8 +195,9 @@ export const transformMetadataChildFieldValueToRequestPayload = (
 ): Record<string, MetadataFieldRequestPayload> => {
   const metadataChildFieldRequestPayload: Record<string, MetadataFieldRequestPayload> = {}
   for (const metadataChildFieldKey of Object.keys(datasetMetadataChildFieldValue)) {
-    const childMetadataFieldInfo: MetadataFieldInfo =
-      metadataBlockFieldInfo.childMetadataFields[metadataChildFieldKey]
+    const childMetadataFieldInfo: MetadataFieldInfo = (
+      metadataBlockFieldInfo.childMetadataFields as Record<string, MetadataFieldInfo>
+    )[metadataChildFieldKey]
     const value: string = datasetMetadataChildFieldValue[metadataChildFieldKey] as unknown as string
     metadataChildFieldRequestPayload[metadataChildFieldKey] = {
       value: value,
@@ -233,6 +234,16 @@ export const transformVersionPayloadToDataset = (
       lastUpdateTime: new Date(versionPayload.lastUpdateTime),
       releaseTime: new Date(versionPayload.releaseTime)
     },
+    termsOfUse: {
+      fileAccessRequest: versionPayload.fileAccessRequest,
+      termsOfAccess: versionPayload.termsOfAccess,
+      dataAccessPlace: versionPayload.dataAccessPlace,
+      originalArchive: versionPayload.originalArchive,
+      availabilityStatus: versionPayload.availabilityStatus,
+      contactForAccess: versionPayload.contactForAccess,
+      sizeOfCollection: versionPayload.sizeOfCollection,
+      studyCompletion: versionPayload.studyCompletion
+    },
     metadataBlocks: transformPayloadToDatasetMetadataBlocks(
       versionPayload.metadataBlocks,
       keepRawFields
@@ -242,7 +253,9 @@ export const transformVersionPayloadToDataset = (
     })
   }
   if ('license' in versionPayload) {
-    datasetModel.license = transformPayloadToDatasetLicense(versionPayload.license)
+    datasetModel.license = transformPayloadToDatasetLicense(
+      versionPayload.license as LicensePayload
+    )
   }
   if ('alternativePersistentId' in versionPayload) {
     datasetModel.alternativePersistentId = versionPayload.alternativePersistentId

src/files/infra/clients/DirectUploadClient.ts

@@ -73,7 +73,8 @@ export class DirectUploadClient implements IDirectUploadClient {
       if (axios.isCancel(error)) {
         throw new FileUploadCancelError(file.name, datasetId)
       }
-      throw new FileUploadError(file.name, datasetId, error.message)
+      const errorMessage = error instanceof Error ? error.message : 'Upload singlepart file failed'
+      throw new FileUploadError(file.name, datasetId, errorMessage)
     }
   }
 
@@ -114,16 +115,20 @@ export class DirectUploadClient implements IDirectUploadClient {
         eTags[`${index + 1}`] = eTag
       } catch (error) {
         if (axios.isCancel(error)) {
-          await this.abortMultipartUpload(file.name, datasetId, destination.abortEndpoint)
+          await this.abortMultipartUpload(file.name, datasetId, destination.abortEndpoint as string)
           throw new FileUploadCancelError(file.name, datasetId)
         }
         if (retries < maxRetries) {
           const backoffDelay = Math.pow(2, retries) * 1000
           await new Promise((resolve) => setTimeout(resolve, backoffDelay))
           await uploadPart(destinationUrl, index, retries + 1)
         } else {
-          await this.abortMultipartUpload(file.name, datasetId, destination.abortEndpoint)
-          throw new FilePartUploadError(file.name, datasetId, error.message, index + 1)
+          await this.abortMultipartUpload(file.name, datasetId, destination.abortEndpoint as string)
+
+          const errorMessage =
+            error instanceof Error ? error.message : 'Upload part of multipart file failed'
+
+          throw new FilePartUploadError(file.name, datasetId, errorMessage, index + 1)
         }
       }
     }
@@ -165,7 +170,7 @@ export class DirectUploadClient implements IDirectUploadClient {
   ): Promise<void> {
     return await axios
       .put(
-        buildRequestUrl(destination.completeEndpoint),
+        buildRequestUrl(destination.completeEndpoint as string),
         eTags,
         buildRequestConfig(
           true,
@@ -177,7 +182,7 @@ export class DirectUploadClient implements IDirectUploadClient {
       .then(() => undefined)
       .catch(async (error) => {
         if (axios.isCancel(error)) {
-          await this.abortMultipartUpload(fileName, datasetId, destination.abortEndpoint)
+          await this.abortMultipartUpload(fileName, datasetId, destination.abortEndpoint as string)
           throw new FileUploadCancelError(fileName, datasetId)
         }
         throw new MultipartCompletionError(fileName, datasetId, error.message)

src/metadataBlocks/infra/repositories/transformers/metadataBlockTransformers.ts

@@ -64,15 +64,19 @@ const transformMetadataBlockPayloadToMetadataBlock = (
 
 const getChildFieldKeys = (metadataBlockFieldsPayload: Record<string, unknown>): Set<string> => {
   const childFieldKeys = new Set<string>()
-  Object.values(metadataBlockFieldsPayload).forEach(
-    (fieldInfo: { childFields?: Record<string, unknown> }) => {
-      if (fieldInfo.childFields) {
-        Object.keys(fieldInfo.childFields).forEach((childKey) => {
-          childFieldKeys.add(childKey)
-        })
-      }
+  Object.values(metadataBlockFieldsPayload).forEach((fieldInfo) => {
+    if (
+      fieldInfo &&
+      typeof fieldInfo === 'object' &&
+      'childFields' in fieldInfo &&
+      typeof fieldInfo.childFields === 'object' &&
+      (fieldInfo?.childFields as Record<string, unknown>)
+    ) {
+      Object.keys(fieldInfo.childFields as Record<string, unknown>).forEach((childKey) => {
+        childFieldKeys.add(childKey)
+      })
     }
-  )
+  })
   return childFieldKeys
 }