From 7e80cac4e907cb0e198e4d6eb84e4f83bd7873d0 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:30:41 +0100
Subject: [PATCH] Improve sys fields; fix deleted record detection

---
 pkg/migrate/types/node.go | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkg/migrate/types/node.go b/pkg/migrate/types/node.go
index 3eaefd508..dad185312 100644
--- a/pkg/migrate/types/node.go
+++ b/pkg/migrate/types/node.go
@@ -282,11 +282,12 @@ func (n *Node) Splice(from *Node) *Node {
 
 func sysField(f string) bool {
 	switch f {
-	case "CreatedDate",
+	case "OwnerId",
+		"IsDeleted",
+		"CreatedDate",
 		"CreatedById",
-		"LastModifiedById",
 		"LastModifiedDate",
-		"IsDeleted":
+		"LastModifiedById":
 		return true
 	}
 	return false
@@ -353,6 +354,17 @@ func importNodeSource(n *Node, users map[string]uint64, repo repository.RecordRe
 
 			if sysField(h) {
 				switch h {
+				case "OwnerId":
+					rr.OwnedBy = users[val]
+					break
+
+					// ignore deleted values, as SF provides minimal info about those
+				case "IsDeleted":
+					if val == "1" {
+						goto looper
+					}
+					break
+
 				case "CreatedDate":
 					if val != "" {
 						rr.CreatedAt, err = time.Parse(SfDateTime, val)
@@ -379,12 +391,6 @@ func importNodeSource(n *Node, users map[string]uint64, repo repository.RecordRe
 						}
 					}
 					break
-
-					// ignore deleted values, as SF provides minimal info about those
-				case "IsDeleted":
-					if val != "" {
-						goto looper
-					}
 				}
 			} else {
 				var f *types.ModuleField