3 files changed, 9 insertions, 8 deletions
diff --git a/store/sql_audit_store.go b/store/sql_audit_store.go
index 7e8fa74e4..693b46bb9 100644
--- a/store/sql_audit_store.go
+++ b/store/sql_audit_store.go
@@ -54,7 +54,7 @@ func (s SqlAuditStore) Save(audit *model.Audit) StoreChannel {
 	return storeChannel
 }
 
-func (s SqlAuditStore) Get(user_id string, limit int) StoreChannel {
+func (s SqlAuditStore) Get(user_id string, offset int, limit int) StoreChannel {
 
 	storeChannel := make(StoreChannel, 1)
 
@@ -75,10 +75,10 @@ func (s SqlAuditStore) Get(user_id string, limit int) StoreChannel {
 			query += " WHERE UserId = :user_id"
 		}
 
-		query += " ORDER BY CreateAt DESC LIMIT :limit"
+		query += " ORDER BY CreateAt DESC LIMIT :limit OFFSET :offset"
 
 		var audits model.Audits
-		if _, err := s.GetReplica().Select(&audits, query, map[string]interface{}{"user_id": user_id, "limit": limit}); err != nil {
+		if _, err := s.GetReplica().Select(&audits, query, map[string]interface{}{"user_id": user_id, "limit": limit, "offset": offset}); err != nil {
 			result.Err = model.NewLocAppError("SqlAuditStore.Get", "store.sql_audit.get.finding.app_error", nil, "user_id="+user_id)
 		} else {
 			result.Data = audits
diff --git a/store/sql_audit_store_test.go b/store/sql_audit_store_test.go
index 841b79627..fcdada4e5 100644
--- a/store/sql_audit_store_test.go
+++ b/store/sql_audit_store_test.go
@@ -4,9 +4,10 @@
 package store
 
 import (
-	"github.com/mattermost/platform/model"
 	"testing"
 	"time"
+
+	"github.com/mattermost/platform/model"
 )
 
 func TestSqlAuditStore(t *testing.T) {
@@ -25,7 +26,7 @@ func TestSqlAuditStore(t *testing.T) {
 
 	time.Sleep(100 * time.Millisecond)
 
-	c := store.Audit().Get(audit.UserId, 100)
+	c := store.Audit().Get(audit.UserId, 0, 100)
 	result := <-c
 	audits := result.Data.(model.Audits)
 
@@ -37,7 +38,7 @@ func TestSqlAuditStore(t *testing.T) {
 		t.Fatal("Failed to save property for extra info")
 	}
 
-	c = store.Audit().Get("missing", 100)
+	c = store.Audit().Get("missing", 0, 100)
 	result = <-c
 	audits = result.Data.(model.Audits)
 
@@ -45,7 +46,7 @@ func TestSqlAuditStore(t *testing.T) {
 		t.Fatal("Should have returned empty because user_id is missing")
 	}
 
-	c = store.Audit().Get("", 100)
+	c = store.Audit().Get("", 0, 100)
 	result = <-c
 	audits = result.Data.(model.Audits)
 
diff --git a/store/store.go b/store/store.go
index 1a43767dd..6c78a235d 100644
--- a/store/store.go
+++ b/store/store.go
@@ -208,7 +208,7 @@ type SessionStore interface {
 
 type AuditStore interface {
 	Save(audit *model.Audit) StoreChannel
-	Get(user_id string, limit int) StoreChannel
+	Get(user_id string, offset int, limit int) StoreChannel
 	PermanentDeleteByUser(userId string) StoreChannel
 }