From 36b40d9f3b2f7796048f3a8f31d3b3c678ff2117 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:01:22 +0200
Subject: [PATCH] Add sys user export to xlsx export

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

diff --git a/compose/encoder/record.go b/compose/encoder/record.go
index 0344955ee..f0f5a86d2 100644
--- a/compose/encoder/record.go
+++ b/compose/encoder/record.go
@@ -162,8 +162,9 @@ func (enc structuredEncoder) Record(r *types.Record) (err error) {
 	return enc.w.Encode(out)
 }
 
-func (enc *excelizeEncoder) Record(r *types.Record) error {
+func (enc *excelizeEncoder) Record(r *types.Record) (err error) {
 	enc.row++
+	var u string
 
 	for p, f := range enc.ff {
 		p++
@@ -175,17 +176,33 @@ func (enc *excelizeEncoder) Record(r *types.Record) error {
 		case "namespaceID":
 			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtUint64(r.NamespaceID))
 		case "ownedBy":
-			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtUint64(r.OwnedBy))
+			u, err = fmtSysUser(r.OwnedBy, enc.u)
+			if err != nil {
+				return err
+			}
+			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), u)
 		case "createdBy":
-			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtUint64(r.CreatedBy))
+			u, err = fmtSysUser(r.CreatedBy, enc.u)
+			if err != nil {
+				return err
+			}
+			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), u)
 		case "createdAt":
 			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtTime(&r.CreatedAt))
 		case "updatedBy":
-			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtUint64(r.UpdatedBy))
+			u, err = fmtSysUser(r.UpdatedBy, enc.u)
+			if err != nil {
+				return err
+			}
+			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), u)
 		case "updatedAt":
 			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtTime(r.UpdatedAt))
 		case "deletedBy":
-			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtUint64(r.DeletedBy))
+			u, err = fmtSysUser(r.DeletedBy, enc.u)
+			if err != nil {
+				return err
+			}
+			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), u)
 		case "deletedAt":
 			_ = enc.f.SetCellStr(enc.sheet(), enc.pos(p), fmtTime(r.DeletedAt))
 		default: