fixed data import with multiple attribute marked as unique (#3027)

* fixed data import with multiple attribute marked as unique * fixing tests * cleanup yarn.lock * restored yarn.lock * fixing tests --------- Co-authored-by: Stefano Ricci <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Sep 21, 2023 · bf1652a · bf1652a
1 parent f5b4cd9
commit bf1652a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/server/modules/dataImport/service/DataImportJob/DataImportJob.js b/server/modules/dataImport/service/DataImportJob/DataImportJob.js
@@ -151,7 +151,7 @@ export default class DataImportJob extends DataImportBaseJob {
       }
     } catch (e) {
       const { key, params } = e
-      const errorKey = key || Validation.messageKeys.dataImport.errorUpdatingValues
+      const errorKey = key ?? Validation.messageKeys.dataImport.errorUpdatingValues
       this._addError(errorKey, params)
     }
   }

diff --git a/server/modules/record/manager/_recordManager/recordUpdateManager.js b/server/modules/record/manager/_recordManager/recordUpdateManager.js
@@ -349,7 +349,11 @@ const _afterNodesUpdate = async ({ survey, record, nodes }, t) => {
 
   const rootUniqueNodeDefsModified = nodeDefsModified.filter((nodeDef) => {
     const nodeDefParent = Survey.getNodeDefParent(nodeDef)(survey)
-    return NodeDef.isRoot(nodeDefParent) && NodeDefValidations.isUnique(NodeDef.getValidations(nodeDef))
+    return (
+      NodeDef.isRoot(nodeDefParent) &&
+      NodeDef.isSingle(nodeDef) &&
+      NodeDefValidations.isUnique(NodeDef.getValidations(nodeDef))
+    )
   })
   if (rootUniqueNodeDefsModified.length > 0) {
     // for each modified node def, validate record uniqueness of records with same record unique nodes