From ca766ba69ba86d6c33d8cab553f2875c0acfc85d Mon Sep 17 00:00:00 2001 From: Chris Camel Date: Sat, 18 Apr 2020 16:40:55 +0200 Subject: [PATCH] fix: fix spelling and grammar --- aggregate.go | 12 ++++++------ aggregate_test.go | 10 +++++----- command.go | 2 +- commandhandler/basic/basic.go | 4 ++-- event.go | 4 ++-- eventbus/eventbus.go | 2 +- eventbus/eventbus_test.go | 2 +- eventstore/mongo/mongo.go | 2 +- examples/bank/cmd/main/main.go | 12 ++++++------ examples/bank/events.go | 2 +- repository.go | 6 +++--- utils/uuid.go | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/aggregate.go b/aggregate.go index 2869948..1c791de 100644 --- a/aggregate.go +++ b/aggregate.go @@ -15,19 +15,19 @@ type AggregateHandler interface { ApplyChange(event Event) ApplyChangeHelper(aggregate AggregateHandler, event Event, commit bool) HandleCommand(Command) error - Uncommited() []Event - ClearUncommited() + Uncommitted() []Event + ClearUncommitted() IncrementVersion() GetID() string } -// Uncommited return the events to be saved -func (b *BaseAggregate) Uncommited() []Event { +// Uncommitted return the events to be saved +func (b *BaseAggregate) Uncommitted() []Event { return b.Changes } -// ClearUncommited the events -func (b *BaseAggregate) ClearUncommited() { +// ClearUncommitted the events +func (b *BaseAggregate) ClearUncommitted() { b.Changes = []Event{} } diff --git a/aggregate_test.go b/aggregate_test.go index 017478e..4968eea 100644 --- a/aggregate_test.go +++ b/aggregate_test.go @@ -6,24 +6,24 @@ type MockAggregate struct { BaseAggregate } -func TestBaseAggregateUncommited(t *testing.T) { +func TestBaseAggregateUncommitted(t *testing.T) { var mock MockAggregate var event Event - length := len(mock.Uncommited()) + length := len(mock.Uncommitted()) if length != 0 { t.Error("expected 0, got", length) } mock.Changes = append(mock.Changes, event) - length = len(mock.Uncommited()) + length = len(mock.Uncommitted()) if length == 0 { t.Error("expected 0, got", length) } - mock.ClearUncommited() - length = len(mock.Uncommited()) + mock.ClearUncommitted() + length = len(mock.Uncommitted()) if length != 0 { t.Error("expected 0, got", length) } diff --git a/command.go b/command.go index d7f3837..9b76311 100644 --- a/command.go +++ b/command.go @@ -1,6 +1,6 @@ package eventhus -// Command contains the methods to retreive basic info about it +// Command contains the methods to retrieve basic info about it type Command interface { GetType() string GetAggregateID() string diff --git a/commandhandler/basic/basic.go b/commandhandler/basic/basic.go index ad393c7..d753ec6 100644 --- a/commandhandler/basic/basic.go +++ b/commandhandler/basic/basic.go @@ -8,7 +8,7 @@ import ( ) // ErrInvalidID missing initial event -var ErrInvalidID = errors.New("Invalid ID, initial event missign") +var ErrInvalidID = errors.New("Invalid ID, initial event missing") // Handler contains the info to manage commands type Handler struct { @@ -44,7 +44,7 @@ func (h *Handler) Handle(command eventhus.Command) error { return err } - // if not contain a valid ID, the initial event (some like createAggreagate event) is missing + // if not contain a valid ID, the initial event (some like createAggregate event) is missing if aggregate.GetID() == "" { return ErrInvalidID } diff --git a/event.go b/event.go index b5cbb6a..860e3c8 100644 --- a/event.go +++ b/event.go @@ -35,12 +35,12 @@ type EventTypeRegister interface { Events() []string } -// EventType implements the EventyTypeRegister interface +// EventType implements the EventTypeRegister interface type EventType struct { sync.RWMutex } -// NewEventRegister gets a EventyTypeRegister interface +// NewEventRegister gets a EventTypeRegister interface func NewEventRegister() EventTypeRegister { return &EventType{} } diff --git a/eventbus/eventbus.go b/eventbus/eventbus.go index a3f83eb..4aff1e7 100644 --- a/eventbus/eventbus.go +++ b/eventbus/eventbus.go @@ -14,7 +14,7 @@ type MultiPublisherError struct { // Error will produce an error message out of all errors. func (e MultiPublisherError) Error() string { - o := "A few errors occured:" + o := "A few errors occurred:" for i, err := range e.Errors { o = fmt.Sprintf("%s\n\t%d) %s", o, i+1, err) diff --git a/eventbus/eventbus_test.go b/eventbus/eventbus_test.go index 96374b3..6e8d1a6 100644 --- a/eventbus/eventbus_test.go +++ b/eventbus/eventbus_test.go @@ -34,7 +34,7 @@ func Test_MultiPublisherError_String(t *testing.T) { sut.Add(errors.New("testing")) sut.Add(errors.New("testing")) - e := `A few errors occured: + e := `A few errors occurred: 1) testing 2) testing 3) testing` diff --git a/eventstore/mongo/mongo.go b/eventstore/mongo/mongo.go index 9f49c1e..e27a789 100644 --- a/eventstore/mongo/mongo.go +++ b/eventstore/mongo/mongo.go @@ -158,7 +158,7 @@ func (c *Client) Load(aggregateID string) ([]eventhus.Event, error) { return events, err } - // Set conrcete event and zero out the decoded event. + // Set concrete event and zero out the decoded event. dbEvent.data = dataType dbEvent.RawData = bson.Raw{} diff --git a/examples/bank/cmd/main/main.go b/examples/bank/cmd/main/main.go index de6ccae..84e3ea4 100644 --- a/examples/bank/cmd/main/main.go +++ b/examples/bank/cmd/main/main.go @@ -49,17 +49,17 @@ func main() { commandBus.HandleCommand(deposit) glog.Infof("account %s - deposit performed", uuid) - //3) Perform a withdrawl + //3) Perform a withdrawal time.Sleep(time.Millisecond * 100) - withdrawl := bank.PerformWithdrawal{ + withdrawal := bank.PerformWithdrawal{ Amount: 249, } - withdrawl.AggregateID = uuid - withdrawl.Version = 2 + withdrawal.AggregateID = uuid + withdrawal.Version = 2 - commandBus.HandleCommand(withdrawl) - glog.Infof("account %s - withdrawl performed", uuid) + commandBus.HandleCommand(withdrawal) + glog.Infof("account %s - withdrawal performed", uuid) }() } <-end diff --git a/examples/bank/events.go b/examples/bank/events.go index d4258ee..294d4d7 100644 --- a/examples/bank/events.go +++ b/examples/bank/events.go @@ -17,5 +17,5 @@ type OwnerChanged struct { //WithdrawalPerformed event type WithdrawalPerformed struct { - Amount int `json:"ammount"` + Amount int `json:"amount"` } diff --git a/repository.go b/repository.go index 4a778d9..30183aa 100644 --- a/repository.go +++ b/repository.go @@ -31,14 +31,14 @@ func (r *Repository) Load(aggregate AggregateHandler, ID string) error { // Save the events and publish it to eventbus func (r *Repository) Save(aggregate AggregateHandler, version int) error { - return r.eventStore.Save(aggregate.Uncommited(), version) + return r.eventStore.Save(aggregate.Uncommitted(), version) } // PublishEvents to an eventBus func (r *Repository) PublishEvents(aggregate AggregateHandler, bucket, subset string) error { var err error - for _, event := range aggregate.Uncommited() { + for _, event := range aggregate.Uncommitted() { if err = r.eventBus.Publish(event, bucket, subset); err != nil { return err } @@ -49,5 +49,5 @@ func (r *Repository) PublishEvents(aggregate AggregateHandler, bucket, subset st // SafeSave the events without check the version func (r *Repository) SafeSave(aggregate AggregateHandler, version int) error { - return r.eventStore.SafeSave(aggregate.Uncommited(), version) + return r.eventStore.SafeSave(aggregate.Uncommitted(), version) } diff --git a/utils/uuid.go b/utils/uuid.go index 8f6c8e1..943b44f 100644 --- a/utils/uuid.go +++ b/utils/uuid.go @@ -9,7 +9,7 @@ import ( "github.com/oklog/ulid" ) -// UUID retunrs an unique id basend on ulid algorithm +// UUID returns an unique id based on ULID algorithm func UUID() (string, error) { t := time.Unix(1000000, 0) entropy := make([]byte, 48)