fixed doc env vars + mongo v2 migration
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
package notifications
|
||||
|
||||
import (
|
||||
messaging "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
gmessaging "github.com/tech/sendico/pkg/generated/gmessaging"
|
||||
messaging "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
"github.com/tech/sendico/pkg/model"
|
||||
nm "github.com/tech/sendico/pkg/model/notification"
|
||||
"github.com/tech/sendico/pkg/mservice"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
type ObjectNotification struct {
|
||||
messaging.Envelope
|
||||
actorAccountRef primitive.ObjectID
|
||||
objectRef primitive.ObjectID
|
||||
actorAccountRef bson.ObjectID
|
||||
objectRef bson.ObjectID
|
||||
}
|
||||
|
||||
func (acn *ObjectNotification) Serialize() ([]byte, error) {
|
||||
@@ -33,9 +33,9 @@ func NewObjectNotification(t mservice.Type, action nm.NotificationAction) model.
|
||||
|
||||
func NewObjectImp(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectType mservice.Type,
|
||||
objectRef primitive.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
action nm.NotificationAction,
|
||||
) messaging.Envelope {
|
||||
return &ObjectNotification{
|
||||
|
||||
@@ -3,15 +3,15 @@ package notifications
|
||||
import (
|
||||
"context"
|
||||
|
||||
me "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
gmessaging "github.com/tech/sendico/pkg/generated/gmessaging"
|
||||
me "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
moh "github.com/tech/sendico/pkg/messaging/notifications/object/handler"
|
||||
np "github.com/tech/sendico/pkg/messaging/notifications/processor"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"github.com/tech/sendico/pkg/model"
|
||||
nm "github.com/tech/sendico/pkg/model/notification"
|
||||
"github.com/tech/sendico/pkg/mservice"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"go.uber.org/zap"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
@@ -28,12 +28,12 @@ func (ounp *ObjectNotificaionProcessor) Process(ctx context.Context, envelope me
|
||||
ounp.logger.Warn("Failed to unmarshall envelope", zap.Error(err), zap.String("topic", ounp.event.ToString()))
|
||||
return err
|
||||
}
|
||||
actorAccountRef, err := primitive.ObjectIDFromHex(msg.ActorAccountRef)
|
||||
actorAccountRef, err := bson.ObjectIDFromHex(msg.ActorAccountRef)
|
||||
if err != nil {
|
||||
ounp.logger.Warn("Failed to restore actor account reference", zap.Error(err), zap.String("topic", ounp.event.ToString()), zap.String("actor_account_ref", msg.ActorAccountRef))
|
||||
return err
|
||||
}
|
||||
objectRef, err := primitive.ObjectIDFromHex(msg.ObjectRef)
|
||||
objectRef, err := bson.ObjectIDFromHex(msg.ObjectRef)
|
||||
if err != nil {
|
||||
ounp.logger.Warn("Failed to restore object reference", zap.Error(err), zap.String("topic", ounp.event.ToString()), zap.String("object_ref", msg.ObjectRef))
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user