fix derived dataset datablock tests and add apitests into the actions

Author: martin-trajanovski

.github/workflows/test-build.yml

@@ -20,6 +20,22 @@ jobs:
           docker-compose up --build --exit-code-from scicat-backend
           docker-compose down
 
+
+  apitests:
+    name: API tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: API tests
+        run: |
+          cp CI/ESS/docker-compose.api.yaml docker-compose.yaml
+          docker-compose down --remove-orphans
+          docker-compose pull
+          docker-compose up --build --exit-code-from scicat-backend
+          docker-compose down
+
   e2etests:
     name: E2E Tests
     runs-on: ubuntu-latest

CI/ESS/Dockerfile.api.test

@@ -0,0 +1,25 @@
+FROM node:16-alpine
+
+RUN apk update && apk upgrade && \
+  apk add --no-cache git
+
+ENV PORT 3000
+EXPOSE 3000
+
+# Prepare app directory
+WORKDIR /home/node/app
+COPY package*.json /home/node/app/
+
+# set up local user to avoid running as root
+RUN chown -R node:node /home/node/app
+USER node
+
+# Install our packages
+RUN npm ci --omit=optional
+
+# Copy the rest of our application, node_modules is ignored via .dockerignore
+COPY --chown=node:node . /home/node/app
+COPY --chown=node:node CI/ESS/wait-api.sh /home/node/app/
+
+# Start the app
+CMD ["./wait-api.sh"]

CI/ESS/docker-compose.api.yaml

@@ -0,0 +1,10 @@
+version: "3"
+services:
+    mongodb:
+        image: "bitnami/mongodb:4.0"
+    scicat-backend:
+        build:
+            context: .
+            dockerfile: CI/ESS/Dockerfile.api.test
+        depends_on:
+            - mongodb

CI/ESS/wait-api.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+# wait for mongo container to come up
+sleep 15
+npm run test:api:mocha

package.json

@@ -21,8 +21,8 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
-    "test:e2e:mocha": "mocha --timeout=60000 --reporter spec --exit",
+    "test:api": "jest --config ./test/jest-e2e.json",
+    "test:api:mocha": "mocha --timeout=60000 --reporter spec --exit",
     "prepare:local": "docker-compose -f CI/E2E/docker-compose-local.yaml up -d && cp functionalAccounts.json.example functionalAccounts.json"
   },
   "dependencies": {

src/datasets/schemas/dataset.schema.ts

@@ -118,31 +118,31 @@ export class Dataset extends Ownable {
     description:
       "Total size of all source files contained in source folder on disk when unpacked",
   })
-  @Prop({ type: Number, index: true })
+  @Prop({ type: Number, index: true, default: 0 })
   size: number;
 
   @ApiProperty({
     type: Number,
     description:
       "Total size of all datablock package files created for this dataset",
   })
-  @Prop()
+  @Prop({ default: 0 })
   packedSize: number;
 
   @ApiProperty({
     type: Number,
     description:
       "Total number of lines in filelisting of all OrigDatablocks for this dataset",
   })
-  @Prop()
+  @Prop({ default: 0 })
   numberOfFiles: number;
 
   @ApiProperty({
     type: Number,
     description:
       "Total number of lines in filelisting of all Datablocks for this dataset",
   })
-  @Prop()
+  @Prop({ default: 0 })
   numberOfFilesArchived: number;
 
   @ApiProperty({

status-tests/README.md

@@ -20,7 +20,7 @@
 
 - in a second terminal run the tests and save results in temporary file
   ```bash
-  > npm run test:e2e:mocha >>~/scicat-backend-nestjs-tests.txt 2>&1
+  > npm run test:api:mocha >>~/scicat-backend-nestjs-tests.txt 2>&1
   ```
 
 - run awk script on results file