refactor(msg): simplify publishers
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
parent
17d5068238
commit
8b01b42949
|
@ -21,15 +21,13 @@ func NewEnnoblementPublisher(publisher message.Publisher, marshaler CommandEvent
|
||||||
func (e *EnnoblementPublisher) CmdRefresh(ctx context.Context, payloads ...domain.RefreshEnnoblementsCmdPayload) error {
|
func (e *EnnoblementPublisher) CmdRefresh(ctx context.Context, payloads ...domain.RefreshEnnoblementsCmdPayload) error {
|
||||||
msgs := make([]*message.Message, 0, len(payloads))
|
msgs := make([]*message.Message, 0, len(payloads))
|
||||||
for _, p := range payloads {
|
for _, p := range payloads {
|
||||||
msg, err := e.marshaler.Marshal(model.RefreshEnnoblementsCmdPayload{
|
msg, err := e.marshaler.Marshal(model.RefreshEnnoblementsCmdPayload(p))
|
||||||
Key: p.Key,
|
|
||||||
URL: p.URL,
|
|
||||||
VersionCode: p.VersionCode,
|
|
||||||
})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("marshaler.Marshal: %w", err)
|
return fmt.Errorf("marshaler.Marshal: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
msg.SetContext(ctx)
|
msg.SetContext(ctx)
|
||||||
|
|
||||||
msgs = append(msgs, msg)
|
msgs = append(msgs, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,14 +22,13 @@ func NewServerPublisher(publisher message.Publisher, marshaler CommandEventMarsh
|
||||||
func (s *ServerPublisher) CmdRefresh(ctx context.Context, payloads ...domain.RefreshServersCmdPayload) error {
|
func (s *ServerPublisher) CmdRefresh(ctx context.Context, payloads ...domain.RefreshServersCmdPayload) error {
|
||||||
msgs := make([]*message.Message, 0, len(payloads))
|
msgs := make([]*message.Message, 0, len(payloads))
|
||||||
for _, p := range payloads {
|
for _, p := range payloads {
|
||||||
msg, err := s.marshaler.Marshal(model.RefreshServersCmdPayload{
|
msg, err := s.marshaler.Marshal(model.RefreshServersCmdPayload(p))
|
||||||
Host: p.Host,
|
|
||||||
VersionCode: p.VersionCode,
|
|
||||||
})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("marshaler.Marshal: %w", err)
|
return fmt.Errorf("marshaler.Marshal: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
msg.SetContext(ctx)
|
msg.SetContext(ctx)
|
||||||
|
|
||||||
msgs = append(msgs, msg)
|
msgs = append(msgs, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,50 +19,40 @@ func NewSnapshotPublisher(publisher message.Publisher, marshaler CommandEventMar
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SnapshotPublisher) CmdCreatePlayers(ctx context.Context, payloads ...domain.CreateSnapshotsCmdPayload) error {
|
func (s *SnapshotPublisher) CmdCreatePlayers(ctx context.Context, payloads ...domain.CreateSnapshotsCmdPayload) error {
|
||||||
msgs, err := s.marshalCreateSnapshotsCmdPayloads(ctx, payloads...)
|
if err := s.publishCmdCreate(ctx, playersCmdCreateSnapshots, payloads...); err != nil {
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = s.publisher.Publish(playersCmdCreateSnapshots, msgs...); err != nil {
|
|
||||||
return fmt.Errorf("publisher.Publish: %w", err)
|
return fmt.Errorf("publisher.Publish: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SnapshotPublisher) CmdCreateTribes(ctx context.Context, payloads ...domain.CreateSnapshotsCmdPayload) error {
|
func (s *SnapshotPublisher) CmdCreateTribes(ctx context.Context, payloads ...domain.CreateSnapshotsCmdPayload) error {
|
||||||
msgs, err := s.marshalCreateSnapshotsCmdPayloads(ctx, payloads...)
|
if err := s.publishCmdCreate(ctx, tribesCmdCreateSnapshots, payloads...); err != nil {
|
||||||
|
return fmt.Errorf("publisher.Publish: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *SnapshotPublisher) publishCmdCreate(
|
||||||
|
ctx context.Context,
|
||||||
|
topic string,
|
||||||
|
payloads ...domain.CreateSnapshotsCmdPayload,
|
||||||
|
) error {
|
||||||
|
msgs := make([]*message.Message, 0, len(payloads))
|
||||||
|
|
||||||
|
for _, p := range payloads {
|
||||||
|
msg, err := s.marshaler.Marshal(model.CreateSnapshotsCmdPayload(p))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return fmt.Errorf("%s: marshaler.Marshal: %w", p.Key, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = s.publisher.Publish(tribesCmdCreateSnapshots, msgs...); err != nil {
|
msg.SetContext(ctx)
|
||||||
return fmt.Errorf("publisher.Publish: %w", err)
|
|
||||||
|
msgs = append(msgs, msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := s.publisher.Publish(tribesCmdCreateSnapshots, msgs...); err != nil {
|
||||||
|
return fmt.Errorf("%s: publisher.Publish: %w", topic, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SnapshotPublisher) marshalCreateSnapshotsCmdPayloads(
|
|
||||||
ctx context.Context,
|
|
||||||
payloads ...domain.CreateSnapshotsCmdPayload,
|
|
||||||
) ([]*message.Message, error) {
|
|
||||||
msgs := make([]*message.Message, 0, len(payloads))
|
|
||||||
|
|
||||||
for _, p := range payloads {
|
|
||||||
msg, err := s.marshaler.Marshal(model.CreateSnapshotsCmdPayload{
|
|
||||||
Key: p.Key,
|
|
||||||
VersionCode: p.VersionCode,
|
|
||||||
Date: p.Date,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("marshaler.Marshal: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
msg.SetContext(ctx)
|
|
||||||
msgs = append(msgs, msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
return msgs, nil
|
|
||||||
}
|
|
||||||
|
|
Reference in New Issue
Block a user