From e6775aaa09005594cb9240ed7dc81c24d7a213d0 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Fri, 29 May 2020 18:10:06 +0200
Subject: [PATCH] Add more robust user val expanding

---
 compose/encoder/record.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/compose/encoder/record.go b/compose/encoder/record.go
index f0f5a86d2..23330cf86 100644
--- a/compose/encoder/record.go
+++ b/compose/encoder/record.go
@@ -1,6 +1,7 @@
 package encoder
 
 import (
+	"fmt"
 	"strconv"
 	"time"
 
@@ -30,7 +31,19 @@ func fmtSysUser(u uint64, finder userFinder) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return su.Name, nil
+
+	switch true {
+	case su.Name != "":
+		return su.Name, nil
+	case su.Handle != "":
+		return su.Handle, nil
+	case su.Email != "":
+		return su.Email, nil
+	case su.Username != "":
+		return su.Username, nil
+	}
+
+	return fmt.Sprintf("%d", su.ID), nil
 }
 
 func (enc flatWriter) Record(r *types.Record) (err error) {