Extract db.MessagesStore.MarkAsResolved(repo.OrderMessage)

Author: placer14

core/inbound_message_scanner.go

@@ -120,13 +120,12 @@ func (scanner *inboundMessageScanner) PerformTask() {
 			// Dispatch handler
 			_, err = handler(*i, &msg.Msg, nil)
 			if err != nil {
-				log.Debugf("%d handle message error from %s: %s", m.MessageType, m.PeerID, err)
+				log.Errorf("%d handle message error from %s: %s", m.MessageType, m.PeerID, err)
 				continue
 			}
-			err = scanner.datastore.Messages().Put(m.MessageID, m.OrderID, pb.Message_MessageType(m.MessageType),
-				m.PeerID, *msg, "", 0, m.PeerPubkey)
+			err = scanner.datastore.Messages().MarkAsResolved(m)
 			if err != nil {
-				log.Errorf("err putting message : %v", err)
+				log.Errorf("marking message resolved: %s", err)
 			}
 		}
 	}

repo/datastore.go

@@ -446,4 +446,8 @@ type MessageStore interface {
 
 	// GetAllErrored returns the all messages with error
 	GetAllErrored() ([]OrderMessage, error)
+
+	// MarkAsResolved sets the message as resolved and will no longer return
+	// with GetAllErrored
+	MarkAsResolved(OrderMessage) error
 }

repo/db/messages.go

@@ -89,9 +89,9 @@ func (o *MessagesDB) GetAllErrored() ([]repo.OrderMessage, error) {
 	o.lock.Lock()
 	defer o.lock.Unlock()
 
-	stmt := "select messageID, orderID, message_type, message, peerID, err, pubkey from messages where err!=? "
+	stmt := `select messageID, orderID, message_type, message, peerID, err, pubkey from messages where err != ""`
 	var ret []repo.OrderMessage
-	rows, err := o.db.Query(stmt, "")
+	rows, err := o.db.Query(stmt)
 	if err != nil {
 		return ret, err
 	}
@@ -117,3 +117,24 @@ func (o *MessagesDB) GetAllErrored() ([]repo.OrderMessage, error) {
 	}
 	return ret, nil
 }
+
+// MarkAsResolved sets a provided message as resolved
+func (o *MessagesDB) MarkAsResolved(m repo.OrderMessage) error {
+	var (
+		stmt = `update messages set err = "" where messageID == ?`
+		msg  = new(repo.Message)
+	)
+
+	if len(m.Message) > 0 {
+		err := msg.UnmarshalJSON(m.Message)
+		if err != nil {
+			log.Errorf("failed extracting message (%+v): %s", m, err.Error())
+			return err
+		}
+	}
+	_, err := o.db.Exec(stmt, m.MessageID)
+	if err != nil {
+		return fmt.Errorf("marking msg (%s) as resolved: %s", m.MessageID, err.Error())
+	}
+	return nil
+}

repo/db/messages_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/OpenBazaar/openbazaar-go/repo"
 	"github.com/OpenBazaar/openbazaar-go/repo/db"
 	"github.com/OpenBazaar/openbazaar-go/schema"
+	"github.com/OpenBazaar/openbazaar-go/test/factory"
 )
 
 func buildNewMessageStore() (repo.MessageStore, func(), error) {
@@ -72,3 +73,58 @@ func TestMessageDB_Put(t *testing.T) {
 		t.Error("incorrect peerID")
 	}
 }
+
+func TestMessageDB_MarkAsResolved(t *testing.T) {
+	var (
+		messagesdb, teardown, err = buildNewMessageStore()
+		orderID                   = "orderID1"
+		unexpectedOrderID         = "unexpectedOrderID2"
+		msg                       = factory.NewMessageWithOrderPayload()
+		peerID                    = "QmSomepeerid"
+		recErr                    = "error message"
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer teardown()
+
+	err = messagesdb.Put(fmt.Sprintf("%s-%d", orderID, msg.Msg.MessageType), orderID, msg.Msg.MessageType, peerID, msg, recErr, 0, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = messagesdb.Put(fmt.Sprintf("%s-%d", unexpectedOrderID, msg.Msg.MessageType), unexpectedOrderID, msg.Msg.MessageType, peerID, msg, "", 0, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	erroredMsgs, err := messagesdb.GetAllErrored()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(erroredMsgs) != 1 {
+		t.Errorf("expected one error message, but found (%d)", len(erroredMsgs))
+	}
+
+	actual := erroredMsgs[0]
+	if actual.PeerID != peerID {
+		t.Errorf("expected peerID (%s), but found (%s)", peerID, actual.PeerID)
+	}
+	if actual.OrderID != orderID {
+		t.Errorf("expected orderID (%s), but found (%s)", orderID, actual.OrderID)
+	}
+
+	if err := messagesdb.MarkAsResolved(actual); err != nil {
+		t.Fatal(err)
+	}
+
+	erroredMsgs, err = messagesdb.GetAllErrored()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(erroredMsgs) != 0 {
+		t.Errorf("expected no error messages, but found (%d)", len(erroredMsgs))
+	}
+}

test/factory/message.go

@@ -0,0 +1,17 @@
+package factory
+
+import (
+	"github.com/OpenBazaar/openbazaar-go/pb"
+	"github.com/OpenBazaar/openbazaar-go/repo"
+	"github.com/golang/protobuf/ptypes/any"
+)
+
+func NewMessageWithOrderPayload() repo.Message {
+	payload := []byte("test payload")
+	return repo.Message{
+		Msg: pb.Message{
+			MessageType: pb.Message_ORDER,
+			Payload:     &any.Any{Value: payload},
+		},
+	}
+}