Merge pull request #132 from IQSS/fix/create_dataset_use_case

Fix CreateDataset use case

Author: GPortas

.eslintrc

@@ -25,7 +25,8 @@
         "ecmaVersion": 2021,
         "sourceType": "module",
         "project": [
-            "./tsconfig.json"
+            "./tsconfig.json",
+            "./tsconfig.tests.json"
         ]
     },
     "rules": {

.github/workflows/deploy_pr.yml

@@ -3,7 +3,7 @@ name: deploy_pr
 on: pull_request
 
 jobs:
-  test:
+  test-unit:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -17,11 +17,36 @@ jobs:
       - name: Run unit tests
         run: npm run test:unit
 
+  test-integration:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 19
+
+      - name: Install npm dependencies
+        run: npm ci
+
       - name: Run integration tests
         run: npm run test:integration
 
+  test-functional:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 19
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run functional tests
+        run: npm run test:functional
+
   publish-gpr:
-    needs: test
+    needs: [test-unit, test-integration, test-functional]
     runs-on: ubuntu-latest
     permissions:
       packages: write

jest.config.functional.ts

@@ -0,0 +1,6 @@
+import config from './jest.config'
+
+config.modulePathIgnorePatterns = ['<rootDir>/test/unit', '<rootDir>/test/integration']
+console.log('RUNNING FUNCTIONAL TESTS')
+
+export default config

jest.config.integration.ts

@@ -1,6 +1,6 @@
 import config from './jest.config'
 
-config.modulePathIgnorePatterns = ['<rootDir>/test/unit']
+config.modulePathIgnorePatterns = ['<rootDir>/test/unit', '<rootDir>/test/functional']
 console.log('RUNNING INTEGRATION TESTS')
 
 export default config

jest.config.ts

@@ -8,7 +8,7 @@ const config: Config = {
   testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.ts$',
   moduleFileExtensions: ['ts', 'js', 'json', 'node'],
   coveragePathIgnorePatterns: ['node_modules', 'testHelpers'],
-  globalSetup: '<rootDir>/test/integration/environment/setup.ts',
+  globalSetup: '<rootDir>/test/environment/setup.ts',
   testTimeout: 25000,
   coverageThreshold: {
     global: {

jest.config.unit.ts

@@ -1,6 +1,6 @@
 import config from './jest.config'
 
-config.modulePathIgnorePatterns = ['<rootDir>/test/integration']
+config.modulePathIgnorePatterns = ['<rootDir>/test/integration', '<rootDir>/test/functional']
 delete config.globalSetup
 delete config.testTimeout
 console.log('RUNNING UNIT TESTS')

package.json

@@ -12,6 +12,7 @@
     "test": "jest -c jest.config.ts",
     "test:unit": "jest -c jest.config.unit.ts",
     "test:integration": "jest -c jest.config.integration.ts",
+    "test:functional": "jest -c jest.config.functional.ts",
     "test:coverage": "jest --coverage -c jest.config.ts",
     "test:coverage:check": "jest --coverage --ci --config jest.config.ts",
     "lint": "npm run lint:eslint && npm run lint:prettier",

src/core/infra/repositories/ApiRepository.ts

@@ -13,11 +13,7 @@ export abstract class ApiRepository {
       .get(this.buildRequestUrl(apiEndpoint), this.buildRequestConfig(authRequired, queryParams))
       .then((response) => response)
       .catch((error) => {
-        throw new ReadError(
-          `[${error.response.status}]${
-            error.response.data ? ` ${error.response.data.message}` : ''
-          }`
-        )
+        throw new ReadError(this.buildErrorMessage(error))
       })
   }
 
@@ -34,11 +30,7 @@ export abstract class ApiRepository {
       )
       .then((response) => response)
       .catch((error) => {
-        throw new WriteError(
-          `[${error.response.status}]${
-            error.response.data ? ` ${error.response.data.message}` : ''
-          }`
-        )
+        throw new WriteError(this.buildErrorMessage(error))
       })
   }
 
@@ -87,4 +79,12 @@ export abstract class ApiRepository {
   private buildRequestUrl(apiEndpoint: string): string {
     return `${ApiConfig.dataverseApiUrl}${apiEndpoint}`
   }
+
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  private buildErrorMessage(error: any): string {
+    const status =
+      error.response && error.response.status ? error.response.status : 'unknown error status'
+    const message = error.response && error.response.data ? ` ${error.response.data.message}` : ''
+    return `[${status}]${message}`
+  }
 }

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

@@ -49,7 +49,6 @@ export class MultipleMetadataFieldValidator extends BaseMetadataFieldValidator {
         metadataFieldKey: newDatasetMetadataFieldAndValueInfo.metadataFieldKey,
         metadataFieldValue: value,
         metadataBlockName: newDatasetMetadataFieldAndValueInfo.metadataBlockName,
-        metadataParentFieldKey: newDatasetMetadataFieldAndValueInfo.metadataFieldKey,
         metadataFieldPosition: metadataFieldPosition
       })
     })

src/datasets/domain/useCases/validators/errors/FieldValidationError.ts

@@ -17,7 +17,7 @@ export class FieldValidationError extends ResourceValidationError {
     if (parentMetadataFieldName) {
       message += ` with parent field ${parentMetadataFieldName}`
     }
-    if (fieldPosition) {
+    if (fieldPosition != undefined) {
       message += ` in position ${fieldPosition}`
     }
     if (reason) {