Merge pull request #248 from loneil/feature/deleteFile

couple model fixes for file storage db record
bcgov · Oct 28, 2021 · 635dbc8 · 635dbc8
2 parents 97001ee + 62a6a33
commit 635dbc8
Show file tree

Hide file tree

Showing 7 changed files with 19,979 additions and 19 deletions.
diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json
diff --git a/app/frontend/package.json b/app/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common-hosted-form-service-frontend",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "private": true,
   "license": "Apache-2.0",
   "scripts": {

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common-hosted-form-service-app",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "private": true,
   "license": "Apache-2.0",
   "scripts": {

diff --git a/app/src/forms/common/models/tables/fileStorage.js b/app/src/forms/common/models/tables/fileStorage.js
@@ -1,8 +1,9 @@
 const { Model } = require('objection');
+const { Timestamps } = require('../mixins');
 const { Regex } = require('../../constants');
 const stamps = require('../jsonSchema').stamps;
 
-class FileStorage extends Model {
+class FileStorage extends Timestamps(Model) {
   static get tableName() {
     return 'file_storage';
   }

diff --git a/app/src/forms/file/service.js b/app/src/forms/file/service.js
@@ -46,7 +46,7 @@ const service = {
   delete: async (id) => {
     let trx;
     try {
-      trx = FileStorage.startTransaction();
+      trx = await FileStorage.startTransaction();
       const obj = await service.read(id);
 
       await FileStorage.query(trx)

diff --git a/openshift/app.bc.yaml b/openshift/app.bc.yaml
@@ -60,7 +60,7 @@ objects:
               value: "${ROUTE_PATH}"
           from:
             kind: DockerImage
-            name: docker.io/node:lts-alpine
+            name: docker.io/node:14.18.1-alpine
         type: Docker
       successfulBuildsHistoryLimit: 3
 parameters: