From 5a72a239e410d305f5a6f8ef58cc4674797fb829 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 31 Oct 2019 22:38:18 +0100
Subject: [PATCH] Normalize sort columns in user rest controller

Client's get User props that are named a bit differently than
internal props & db columns (createdAt vs created_at)
---
 system/rest/user.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/system/rest/user.go b/system/rest/user.go
index bc8a79bc6..bc94250fe 100644
--- a/system/rest/user.go
+++ b/system/rest/user.go
@@ -2,6 +2,7 @@ package rest
 
 import (
 	"context"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/titpetric/factory/resputil"
@@ -35,6 +36,12 @@ func (User) New() *User {
 }
 
 func (ctrl User) List(ctx context.Context, r *request.UserList) (interface{}, error) {
+	// Change all
+	normalizeSortColumns := strings.NewReplacer(
+		"createdAt",
+		"created_at",
+	)
+
 	f := types.UserFilter{
 		UserID:       payload.ParseUInt64s(r.UserID),
 		RoleID:       payload.ParseUInt64s(r.RoleID),
@@ -46,7 +53,7 @@ func (ctrl User) List(ctx context.Context, r *request.UserList) (interface{}, er
 		IncSuspended: r.IncSuspended,
 		IncDeleted:   r.IncDeleted,
 
-		Sort: r.Sort,
+		Sort: normalizeSortColumns.Replace(r.Sort),
 
 		PageFilter: rh.Paging(r.Page, r.PerPage),
 	}