From 815b8a37dd731d0c66734539771745a82e6dc6e7 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Mon, 28 Nov 2016 20:33:39 -0800 Subject: [PATCH] start use of constants for audit entries --- core/api/request/document.go | 14 +++++++++----- core/api/request/init.go | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/core/api/request/document.go b/core/api/request/document.go index b0a50356..925bd38a 100644 --- a/core/api/request/document.go +++ b/core/api/request/document.go @@ -71,7 +71,7 @@ func (p *Persister) GetDocument(id string) (document entity.Document, err error) return } - p.Base.Audit(p.Context, "get-document", id, "") + p.Base.Audit(p.Context, AuditGetDocument, id, "") return } @@ -80,8 +80,10 @@ func (p *Persister) GetDocument(id string) (document entity.Document, err error) func (p *Persister) GetDocumentMeta(id string) (meta entity.DocumentMeta, err error) { err = nil - sqlViewers := `SELECT CONVERT_TZ(MAX(a.created), @@session.time_zone, '+00:00') as created, - IFNULL(a.userid, '') AS userid, IFNULL(u.firstname, '') AS firstname, IFNULL(u.lastname, '') AS lastname + // sqlViewers := `SELECT CONVERT_TZ(MAX(a.created), @@session.time_zone, '+00:00') as created, + + sqlViewers := `SELECT MAX(a.created) as created, + IFNULL(a.userid, '') AS userid, IFNULL(u.firstname, 'Anonymous') AS firstname, IFNULL(u.lastname, 'Viewer') AS lastname FROM audit a LEFT JOIN user u ON a.userid=u.refid WHERE a.orgid=? AND a.documentid=? AND a.userid != '0' AND a.userid != '' @@ -96,8 +98,10 @@ func (p *Persister) GetDocumentMeta(id string) (meta entity.DocumentMeta, err er } //SELECT CONVERT_TZ(a.created, @@session.time_zone, '+00:00') as - sqlEdits := `SELECT CONVERT_TZ(a.created, @@session.time_zone, '+00:00') as created, - IFNULL(a.action, '') AS action, IFNULL(a.userid, '') AS userid, IFNULL(u.firstname, '') AS firstname, IFNULL(u.lastname, '') AS lastname, IFNULL(a.pageid, '') AS pageid + // sqlEdits := `SELECT CONVERT_TZ(a.created, @@session.time_zone, '+00:00') as created, + + sqlEdits := `SELECT a.created, + IFNULL(a.action, '') AS action, IFNULL(a.userid, '') AS userid, IFNULL(u.firstname, 'Anonymous') AS firstname, IFNULL(u.lastname, 'Viewer') AS lastname, IFNULL(a.pageid, '') AS pageid FROM audit a LEFT JOIN user u ON a.userid=u.refid WHERE a.orgid=? AND a.documentid=? AND a.userid != '0' AND a.userid != '' AND (a.action='update-page' OR a.action='add-page' OR a.action='remove-page') diff --git a/core/api/request/init.go b/core/api/request/init.go index efef2786..d644ff00 100644 --- a/core/api/request/init.go +++ b/core/api/request/init.go @@ -222,3 +222,8 @@ func (m *baseManager) SQLPrepareError(method string, id string) string { func (m *baseManager) SQLSelectError(method string, id string) string { return fmt.Sprintf("Unable to execute SQL for %s, ID %s", method, id) } + +const ( + // AuditGetDocument means someone viewed a document + AuditGetDocument string = "get-document" +)