From cd48a4b22a5324bc734a4b4d4fe559f350ed089c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Jerman?= <tomaz.jerman@kendu.si>
Date: Thu, 28 May 2020 10:00:31 +0200
Subject: [PATCH] Add sys user export to tructured export

---
 compose/encoder/record.go | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/compose/encoder/record.go b/compose/encoder/record.go
index f91951017..0344955ee 100644
--- a/compose/encoder/record.go
+++ b/compose/encoder/record.go
@@ -84,7 +84,7 @@ func (enc flatWriter) Record(r *types.Record) (err error) {
 	return enc.w.Write(out)
 }
 
-func (enc structuredEncoder) Record(r *types.Record) error {
+func (enc structuredEncoder) Record(r *types.Record) (err error) {
 	var (
 		// Exporter can choose fields so we need this buffer
 		// to hold just what we need
@@ -102,13 +102,22 @@ func (enc structuredEncoder) Record(r *types.Record) error {
 		case "namespaceID":
 			out[f.name] = r.NamespaceID
 		case "ownedBy":
-			out[f.name] = r.OwnedBy
+			out[f.name], err = fmtSysUser(r.OwnedBy, enc.u)
+			if err != nil {
+				return err
+			}
 		case "createdBy":
-			out[f.name] = r.CreatedBy
+			out[f.name], err = fmtSysUser(r.CreatedBy, enc.u)
+			if err != nil {
+				return err
+			}
 		case "createdAt":
 			out[f.name] = fmtTime(&r.CreatedAt)
 		case "updatedBy":
-			out[f.name] = r.UpdatedBy
+			out[f.name], err = fmtSysUser(r.UpdatedBy, enc.u)
+			if err != nil {
+				return err
+			}
 		case "updatedAt":
 			if r.UpdatedAt == nil {
 				out[f.name] = nil
@@ -117,7 +126,10 @@ func (enc structuredEncoder) Record(r *types.Record) error {
 			}
 
 		case "deletedBy":
-			out[f.name] = r.DeletedBy
+			out[f.name], err = fmtSysUser(r.DeletedBy, enc.u)
+			if err != nil {
+				return err
+			}
 		case "deletedAt":
 			if r.DeletedAt == nil {
 				out[f.name] = nil