Improve bus (#3)

* Improve bus
* Add ticket log

database/busdb/busdb.go

@@ -33,22 +33,13 @@ func NewDatabase(ctx context.Context, internal driver.Database, b *bus.Bus) (*Bu
 	}, nil
 }
 
-type OperationType int
-
-const (
-	Create OperationType = iota
-	Read                 = iota
-	Update               = iota
-)
-
 type Operation struct {
-	OperationType OperationType
-	Ids           []driver.DocumentID
-	Msg           string
+	Type bus.DatabaseUpdateType
+	Ids  []driver.DocumentID
 }
 
-var CreateOperation = &Operation{OperationType: Create}
-var ReadOperation = &Operation{OperationType: Read}
+var CreateOperation = &Operation{Type: bus.DatabaseEntryCreated}
+var ReadOperation = &Operation{Type: bus.DatabaseEntryRead}
 
 func (db BusDatabase) Query(ctx context.Context, query string, vars map[string]interface{}, operation *Operation) (driver.Cursor, *models.LogEntry, error) {
 	cur, err := db.internal.Query(ctx, query, vars)
@@ -59,8 +50,8 @@ func (db BusDatabase) Query(ctx context.Context, query string, vars map[string]i
 	var logs *models.LogEntry
 
 	switch {
-	case operation.OperationType == Update:
-		if err := db.LogAndNotify(ctx, operation.Ids, operation.Msg); err != nil {
+	case operation.Type == bus.DatabaseEntryCreated, operation.Type == bus.DatabaseEntryUpdated:
+		if err := db.bus.PublishDatabaseUpdate(operation.Ids, operation.Type); err != nil {
 			return nil, nil, err
 		}
 	}
@@ -68,19 +59,6 @@ func (db BusDatabase) Query(ctx context.Context, query string, vars map[string]i
 	return cur, logs, err
 }
 
-func (db BusDatabase) LogAndNotify(ctx context.Context, ids []driver.DocumentID, msg string) error {
-	var logEntries []*models.LogEntry
-	for _, i := range ids {
-		logEntries = append(logEntries, &models.LogEntry{Reference: i.String(), Message: msg})
-	}
-
-	if err := db.LogBatchCreate(ctx, logEntries); err != nil {
-		return err
-	}
-
-	return db.bus.PublishUpdate(ids)
-}
-
 func (db BusDatabase) Remove(ctx context.Context) error {
 	return db.internal.Remove(ctx)
 }
@@ -104,7 +82,7 @@ func (c Collection) CreateDocument(ctx, newctx context.Context, key string, docu
 		return meta, err
 	}
 
-	err = c.db.LogAndNotify(ctx, []driver.DocumentID{meta.ID}, "Document created")
+	err = c.db.bus.PublishDatabaseUpdate([]driver.DocumentID{meta.ID}, bus.DatabaseEntryCreated)
 	if err != nil {
 		return meta, err
 	}
@@ -117,7 +95,7 @@ func (c Collection) CreateEdge(ctx, newctx context.Context, edge *driver.EdgeDoc
 		return meta, err
 	}
 
-	err = c.db.LogAndNotify(ctx, []driver.DocumentID{meta.ID}, "Document created")
+	err = c.db.bus.PublishDatabaseUpdate([]driver.DocumentID{meta.ID}, bus.DatabaseEntryCreated)
 	if err != nil {
 		return meta, err
 	}
@@ -138,7 +116,7 @@ func (c Collection) CreateEdges(ctx context.Context, edges []*driver.EdgeDocumen
 		ids = append(ids, meta.ID)
 	}
 
-	err = c.db.LogAndNotify(ctx, ids, "Document created")
+	err = c.db.bus.PublishDatabaseUpdate(ids, bus.DatabaseEntryCreated)
 	if err != nil {
 		return metas, err
 	}
@@ -160,7 +138,7 @@ func (c Collection) UpdateDocument(ctx context.Context, key string, update inter
 		return meta, err
 	}
 
-	return meta, c.db.bus.PublishUpdate([]driver.DocumentID{meta.ID})
+	return meta, c.db.bus.PublishDatabaseUpdate([]driver.DocumentID{meta.ID}, bus.DatabaseEntryUpdated)
 }
 
 func (c Collection) ReplaceDocument(ctx context.Context, key string, document interface{}) (driver.DocumentMeta, error) {
@@ -169,7 +147,7 @@ func (c Collection) ReplaceDocument(ctx context.Context, key string, document in
 		return meta, err
 	}
 
-	return meta, c.db.bus.PublishUpdate([]driver.DocumentID{meta.ID})
+	return meta, c.db.bus.PublishDatabaseUpdate([]driver.DocumentID{meta.ID}, bus.DatabaseEntryUpdated)
 }
 
 func (c Collection) RemoveDocument(ctx context.Context, formatInt string) (driver.DocumentMeta, error) {

database/busdb/log.go

@@ -3,6 +3,8 @@ package busdb
 import (
 	"context"
 	"errors"
+	"github.com/SecurityBrewery/catalyst/bus"
+	"strings"
 
 	"github.com/arangodb/go-driver"
 
@@ -12,15 +14,16 @@ import (
 
 const LogCollectionName = "logs"
 
-func (db *BusDatabase) LogCreate(ctx context.Context, reference, message string) (*models.LogEntry, error) {
+func (db *BusDatabase) LogCreate(ctx context.Context, logType, reference, message string) (*models.LogEntry, error) {
 	user, ok := UserFromContext(ctx)
 	if !ok {
 		return nil, errors.New("no user in context")
 	}
 
 	logentry := &models.LogEntry{
+		Type:      logType,
 		Reference: reference,
-		Created:   time.Now(),
+		Created:   time.Now().UTC(),
 		Creator:   user.ID,
 		Message:   message,
 	}
@@ -31,27 +34,18 @@ func (db *BusDatabase) LogCreate(ctx context.Context, reference, message string)
 		return nil, err
 	}
 
-	return &doc, db.bus.PublishUpdate([]driver.DocumentID{driver.DocumentID(logentry.Reference)})
+	return &doc, nil
 }
 
-func (db *BusDatabase) LogBatchCreate(ctx context.Context, logEntryForms []*models.LogEntry) error {
-	user, ok := UserFromContext(ctx)
-	if !ok {
-		return errors.New("no user in context")
-	}
-
+func (db *BusDatabase) LogBatchCreate(ctx context.Context, logentries []*models.LogEntry) error {
 	var ids []driver.DocumentID
-	var logentries []*models.LogEntry
-	for _, logEntryForm := range logEntryForms {
-		logentry := &models.LogEntry{
-			Reference: logEntryForm.Reference,
-			Created:   time.Now(),
-			Creator:   user.ID,
-			Message:   logEntryForm.Message,
+	for _, entry := range logentries {
+		if strings.HasPrefix(entry.Reference, "tickets/") {
+			ids = append(ids, driver.DocumentID(entry.Reference))
 		}
-
-		logentries = append(logentries, logentry)
-		ids = append(ids, driver.DocumentID(logentry.Reference))
+	}
+	if ids != nil {
+		go db.bus.PublishDatabaseUpdate(ids, bus.DatabaseEntryCreated)
 	}
 
 	_, errs, err := db.logCollection.CreateDocuments(ctx, logentries)
@@ -63,7 +57,7 @@ func (db *BusDatabase) LogBatchCreate(ctx context.Context, logEntryForms []*mode
 		return err
 	}
 
-	return db.bus.PublishUpdate(ids)
+	return nil
 }
 
 func (db *BusDatabase) LogList(ctx context.Context, reference string) ([]*models.LogEntry, error) {