From 39cb2fa4341b94f8f7acb3bd856029b0c04061ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Jerman?= <tomaz.jerman@kendu.si>
Date: Wed, 18 Mar 2020 17:33:26 +0100
Subject: [PATCH] Cleanup field validation

---
 pkg/migrate/types/node.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkg/migrate/types/node.go b/pkg/migrate/types/node.go
index d8904fd5f..298e70a3a 100644
--- a/pkg/migrate/types/node.go
+++ b/pkg/migrate/types/node.go
@@ -314,9 +314,13 @@ func updateRefs(n *Node, repo repository.RecordRepository) error {
 				}
 			}
 
+			if f == nil {
+				continue
+			}
+
 			val := v.Value
 			// determine value based on the provided map
-			if f != nil && f.Options["moduleID"] != nil {
+			if f.Options["moduleID"] != nil {
 				ref, ok := f.Options["moduleID"].(string)
 				if !ok {
 					return errors.New("moduleField.record.invalidRefFormat")
@@ -409,6 +413,11 @@ func importNodeSource(n *Node, users map[string]uint64, repo repository.RecordRe
 					}
 				}
 
+				if f == nil {
+					continue
+				}
+
+				if f.Options["moduleID"] != nil {
 				// spliced nodes should NOT manage their references
 				if !n.spliced && f != nil && f.Options["moduleID"] != nil {
 					ref, ok := f.Options["moduleID"].(string)
@@ -421,7 +430,9 @@ func importNodeSource(n *Node, users map[string]uint64, repo repository.RecordRe
 							val = n.mapping[ref][val]
 						}
 					}
+				} else if f.Kind == "User" {
 				}
+				} else {
 
 				if f != nil && f.Kind == "User" {
 					val = fmt.Sprint(users[val])