Arena mobile files import: check file uuid is in record attribute val…

…ues (#3130) Co-authored-by: Stefano Ricci <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Nov 6, 2023 · db01e00 · db01e00
1 parent c76aa4c
commit db01e00
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/server/modules/arenaImport/service/arenaImport/jobs/filesImportJob.js b/server/modules/arenaImport/service/arenaImport/jobs/filesImportJob.js
@@ -30,6 +30,9 @@ export default class FilesImportJob extends Job {
           const fileName = RecordFile.getName(fileSummary)
           throw new Error(`Missing content for file ${fileUuid} (${fileName})`)
         }
+
+        this.checkFileUuidIsInRecords(fileUuid)
+
         file = RecordFile.assocContent(fileContent)(file)
 
         await this.persistFile(file)
@@ -39,6 +42,13 @@ export default class FilesImportJob extends Job {
     }
   }
 
+  checkFileUuidIsInRecords(fileUuid) {
+    const { recordsFileUuids } = this.context
+    if (recordsFileUuids && !recordsFileUuids.includes(fileUuid)) {
+      throw new Error(`File UUID ${fileUuid} not found in records`)
+    }
+  }
+
   async persistFile(file) {
     const { surveyId } = this.context
     const fileUuid = RecordFile.getUuid(file)

diff --git a/server/modules/mobile/service/arenaMobileDataImport/jobs/recordsImportJob.js b/server/modules/mobile/service/arenaMobileDataImport/jobs/recordsImportJob.js
@@ -19,6 +19,8 @@ import * as UserService from '@server/modules/user/service/userService'
 export default class RecordsImportJob extends DataImportBaseJob {
   constructor(params) {
     super(RecordsImportJob.type, params)
+
+    this.recordsFileUuids = new Set() // used to check validity of file UUIDs in FilesImportJob
   }
 
   async execute() {
@@ -77,6 +79,14 @@ export default class RecordsImportJob extends DataImportBaseJob {
         this.logWarn(`${messagePrefix} ${messageContent} ${messageSuffix}`)
         delete nodes[nodeUuid]
       }
+
+      // keep track of file uuids found in record attribute values
+      if (NodeDef.isFile(nodeDef)) {
+        const fileUuid = Node.getFileUuid(node)
+        if (fileUuid) {
+          this.recordsFileUuids.add(fileUuid)
+        }
+      }
     })
     // assoc nodes and build index from scratch
     this.currentRecord = Record.assocNodes({ nodes, sideEffect: true })(record)
@@ -163,6 +173,11 @@ export default class RecordsImportJob extends DataImportBaseJob {
     this.logDebug(`record insert complete (${nodesArray.length} nodes inserted)`)
   }
 
+  async beforeSuccess() {
+    await super.beforeSuccess()
+    this.setContext({ recordsFileUuids: Array.from(this.recordsFileUuids) })
+  }
+
   generateResult() {
     const result = super.generateResult()
     result['updatedRecordsUuids'] = Array.from(this.updatedRecordsUuids) // it will be used to refresh records in update threads