fixed doc env vars + mongo v2 migration
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
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 AccountNotification struct {
|
||||
messaging.Envelope
|
||||
accountRef primitive.ObjectID
|
||||
accountRef bson.ObjectID
|
||||
}
|
||||
|
||||
func (acn *AccountNotification) Serialize() ([]byte, error) {
|
||||
@@ -29,7 +29,7 @@ func NewAccountNotification(action nm.NotificationAction) model.NotificationEven
|
||||
return model.NewNotification(mservice.Accounts, action)
|
||||
}
|
||||
|
||||
func NewAccountImp(sender string, accountRef primitive.ObjectID, action nm.NotificationAction) messaging.Envelope {
|
||||
func NewAccountImp(sender string, accountRef bson.ObjectID, action nm.NotificationAction) messaging.Envelope {
|
||||
return &AccountNotification{
|
||||
Envelope: messaging.CreateEnvelope(sender, NewAccountNotification(action)),
|
||||
accountRef: accountRef,
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
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 PasswordResetNotification struct {
|
||||
messaging.Envelope
|
||||
accountRef primitive.ObjectID
|
||||
accountRef bson.ObjectID
|
||||
resetToken string
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ func NewPasswordResetNotification(action nm.NotificationAction) model.Notificati
|
||||
return model.NewNotification(mservice.Accounts, action)
|
||||
}
|
||||
|
||||
func NewPasswordResetImp(sender string, accountRef primitive.ObjectID, resetToken string, action nm.NotificationAction) messaging.Envelope {
|
||||
func NewPasswordResetImp(sender string, accountRef bson.ObjectID, resetToken string, action nm.NotificationAction) messaging.Envelope {
|
||||
return &PasswordResetNotification{
|
||||
Envelope: messaging.CreateEnvelope(sender, NewPasswordResetNotification(action)),
|
||||
accountRef: accountRef,
|
||||
|
||||
@@ -4,14 +4,14 @@ import (
|
||||
"context"
|
||||
|
||||
"github.com/tech/sendico/pkg/db/account"
|
||||
me "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
gmessaging "github.com/tech/sendico/pkg/generated/gmessaging"
|
||||
me "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
mah "github.com/tech/sendico/pkg/messaging/notifications/account/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"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"go.uber.org/zap"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
@@ -29,7 +29,7 @@ func (prnp *PasswordResetNotificationProcessor) Process(ctx context.Context, env
|
||||
prnp.logger.Warn("Failed to unmarshall envelope", zap.Error(err), zap.String("topic", prnp.event.ToString()))
|
||||
return err
|
||||
}
|
||||
accountRef, err := primitive.ObjectIDFromHex(msg.AccountRef)
|
||||
accountRef, err := bson.ObjectIDFromHex(msg.AccountRef)
|
||||
if err != nil {
|
||||
prnp.logger.Warn("Failed to restore object ID", zap.Error(err), zap.String("topic", prnp.event.ToString()), zap.String("account_ref", msg.AccountRef))
|
||||
return err
|
||||
|
||||
@@ -4,14 +4,14 @@ import (
|
||||
"context"
|
||||
|
||||
"github.com/tech/sendico/pkg/db/account"
|
||||
me "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
gmessaging "github.com/tech/sendico/pkg/generated/gmessaging"
|
||||
me "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
mah "github.com/tech/sendico/pkg/messaging/notifications/account/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"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"go.uber.org/zap"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
@@ -29,7 +29,7 @@ func (acnp *AccoountNotificaionProcessor) Process(ctx context.Context, envelope
|
||||
acnp.logger.Warn("Failed to unmarshall envelope", zap.Error(err), zap.String("topic", acnp.event.ToString()))
|
||||
return err
|
||||
}
|
||||
accountRef, err := primitive.ObjectIDFromHex(msg.AccountRef)
|
||||
accountRef, err := bson.ObjectIDFromHex(msg.AccountRef)
|
||||
if err != nil {
|
||||
acnp.logger.Warn("Failed to restore object ID", zap.Error(err), zap.String("topic", acnp.event.ToString()), zap.String("account_ref", msg.AccountRef))
|
||||
return err
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"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"
|
||||
)
|
||||
|
||||
type confirmationCodePayload struct {
|
||||
@@ -34,7 +34,7 @@ func newConfirmationEvent(action nm.NotificationAction) model.NotificationEvent
|
||||
return model.NewNotification(mservice.Confirmations, action)
|
||||
}
|
||||
|
||||
func NewConfirmationCodeEnvelope(sender string, accountRef primitive.ObjectID, destination string, target model.ConfirmationTarget, code string) messaging.Envelope {
|
||||
func NewConfirmationCodeEnvelope(sender string, accountRef bson.ObjectID, destination string, target model.ConfirmationTarget, code string) messaging.Envelope {
|
||||
return &ConfirmationCodeNotification{
|
||||
Envelope: messaging.CreateEnvelope(sender, newConfirmationEvent(nm.NAPending)),
|
||||
payload: confirmationCodePayload{
|
||||
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"github.com/tech/sendico/pkg/model"
|
||||
nm "github.com/tech/sendico/pkg/model/notification"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
@@ -30,7 +30,7 @@ func (ccp *ConfirmationCodeProcessor) Process(ctx context.Context, envelope me.E
|
||||
return err
|
||||
}
|
||||
|
||||
accountRef, err := primitive.ObjectIDFromHex(msg.AccountRef)
|
||||
accountRef, err := bson.ObjectIDFromHex(msg.AccountRef)
|
||||
if err != nil {
|
||||
ccp.logger.Warn("Failed to restore account id from envelope", zap.Error(err), zap.String("topic", ccp.event.ToString()), zap.String("account_ref", msg.AccountRef))
|
||||
return err
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
nm "github.com/tech/sendico/pkg/model/notification"
|
||||
"github.com/tech/sendico/pkg/mservice"
|
||||
"github.com/tech/sendico/pkg/mutil/mzap"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
@@ -28,7 +28,7 @@ type InvitationNotificaionProcessor struct {
|
||||
func (ianp *InvitationNotificaionProcessor) onInvitation(
|
||||
ctx context.Context,
|
||||
objectType mservice.Type,
|
||||
objectRef, actorAccountRef primitive.ObjectID,
|
||||
objectRef, actorAccountRef bson.ObjectID,
|
||||
action nm.NotificationAction,
|
||||
) error {
|
||||
var invitation model.Invitation
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package notifications
|
||||
|
||||
import (
|
||||
an "github.com/tech/sendico/pkg/messaging/internal/notifications/account"
|
||||
messaging "github.com/tech/sendico/pkg/messaging/envelope"
|
||||
an "github.com/tech/sendico/pkg/messaging/internal/notifications/account"
|
||||
nm "github.com/tech/sendico/pkg/model/notification"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
)
|
||||
|
||||
func Account(sender string, accountRef primitive.ObjectID, action nm.NotificationAction) messaging.Envelope {
|
||||
func Account(sender string, accountRef bson.ObjectID, action nm.NotificationAction) messaging.Envelope {
|
||||
return an.NewAccountImp(sender, accountRef, action)
|
||||
}
|
||||
|
||||
func AccountCreated(sender string, accountRef primitive.ObjectID) messaging.Envelope {
|
||||
func AccountCreated(sender string, accountRef bson.ObjectID) messaging.Envelope {
|
||||
return Account(sender, accountRef, nm.NACreated)
|
||||
}
|
||||
|
||||
@@ -8,14 +8,14 @@ import (
|
||||
np "github.com/tech/sendico/pkg/messaging/notifications/processor"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
nm "github.com/tech/sendico/pkg/model/notification"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
)
|
||||
|
||||
func PasswordReset(sender string, accountRef primitive.ObjectID, resetToken string, action nm.NotificationAction) messaging.Envelope {
|
||||
func PasswordReset(sender string, accountRef bson.ObjectID, resetToken string, action nm.NotificationAction) messaging.Envelope {
|
||||
return an.NewPasswordResetImp(sender, accountRef, resetToken, action)
|
||||
}
|
||||
|
||||
func PasswordResetRequested(sender string, accountRef primitive.ObjectID, resetToken string) messaging.Envelope {
|
||||
func PasswordResetRequested(sender string, accountRef bson.ObjectID, resetToken string) messaging.Envelope {
|
||||
return PasswordReset(sender, accountRef, resetToken, nm.NAPasswordReset)
|
||||
}
|
||||
|
||||
|
||||
@@ -8,10 +8,10 @@ import (
|
||||
np "github.com/tech/sendico/pkg/messaging/notifications/processor"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"github.com/tech/sendico/pkg/model"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/v2/bson"
|
||||
)
|
||||
|
||||
func Code(sender string, accountRef primitive.ObjectID, destination string, target model.ConfirmationTarget, code string) messaging.Envelope {
|
||||
func Code(sender string, accountRef bson.ObjectID, destination string, target model.ConfirmationTarget, code string) messaging.Envelope {
|
||||
return cinternal.NewConfirmationCodeEnvelope(sender, accountRef, destination, target, code)
|
||||
}
|
||||
|
||||
|
||||
@@ -5,38 +5,38 @@ import (
|
||||
on "github.com/tech/sendico/pkg/messaging/notifications/object"
|
||||
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"
|
||||
)
|
||||
|
||||
func InvitationCreated(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectType mservice.Type,
|
||||
objectRef primitive.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
) messaging.Envelope {
|
||||
return on.ObjectCreated(sender, actorAccountRef, mservice.Invitations, objectRef)
|
||||
}
|
||||
|
||||
func InvitationUpdated(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
objectRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
) messaging.Envelope {
|
||||
return on.ObjectUpdated(sender, actorAccountRef, mservice.Invitations, objectRef)
|
||||
}
|
||||
|
||||
func InvitationDeleted(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
objectRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
) messaging.Envelope {
|
||||
return on.ObjectDeleted(sender, actorAccountRef, mservice.Invitations, objectRef)
|
||||
}
|
||||
|
||||
func Invitation(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
objectRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
action nm.NotificationAction,
|
||||
) messaging.Envelope {
|
||||
return on.Object(sender, actorAccountRef, mservice.Invitations, objectRef, action)
|
||||
|
||||
@@ -5,12 +5,12 @@ import (
|
||||
|
||||
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"
|
||||
)
|
||||
|
||||
type ObjectUpdateHandler = func(
|
||||
ctx context.Context,
|
||||
objectType mservice.Type,
|
||||
objectRef, actorAccountRef primitive.ObjectID,
|
||||
objectRef, actorAccountRef bson.ObjectID,
|
||||
action nm.NotificationAction,
|
||||
) error
|
||||
|
||||
@@ -5,14 +5,14 @@ import (
|
||||
on "github.com/tech/sendico/pkg/messaging/internal/notifications/object"
|
||||
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"
|
||||
)
|
||||
|
||||
func Object(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectType mservice.Type,
|
||||
objectRef primitive.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
action nm.NotificationAction,
|
||||
) messaging.Envelope {
|
||||
return on.NewObjectImp(sender, actorAccountRef, objectType, objectRef, action)
|
||||
@@ -20,27 +20,27 @@ func Object(
|
||||
|
||||
func ObjectCreated(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectType mservice.Type,
|
||||
objectRef primitive.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
) messaging.Envelope {
|
||||
return Object(sender, actorAccountRef, objectType, objectRef, nm.NACreated)
|
||||
}
|
||||
|
||||
func ObjectUpdated(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectType mservice.Type,
|
||||
objectRef primitive.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
) messaging.Envelope {
|
||||
return Object(sender, actorAccountRef, objectType, objectRef, nm.NAUpdated)
|
||||
}
|
||||
|
||||
func ObjectDeleted(
|
||||
sender string,
|
||||
actorAccountRef primitive.ObjectID,
|
||||
actorAccountRef bson.ObjectID,
|
||||
objectType mservice.Type,
|
||||
objectRef primitive.ObjectID,
|
||||
objectRef bson.ObjectID,
|
||||
) messaging.Envelope {
|
||||
return Object(sender, actorAccountRef, objectType, objectRef, nm.NADeleted)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user