From 973474b8af108c71bb2b8e89180213c95133c057 Mon Sep 17 00:00:00 2001 From: Jaskaranbir Date: Wed, 7 Nov 2018 22:12:22 -0500 Subject: [PATCH] Bump ESModel to v4.0.0 --- .env | 3 ++ Gopkg.lock | 31 +++++++------- Gopkg.toml | 4 +- main/main.go | 2 +- test/.envp | 3 ++ test/.envq | 3 ++ test/docker-compose.yaml | 4 +- test/user_suite_test.go | 36 ++++++++-------- user/delete.go | 20 ++++++--- user/insert.go | 44 ++++++++++++++----- user/update.go | 32 ++++++++++---- user/user_validations_test.go | 80 +++++++++++++++++------------------ 12 files changed, 159 insertions(+), 103 deletions(-) diff --git a/.env b/.env index 7261f7e..77c0bab 100644 --- a/.env +++ b/.env @@ -1,3 +1,6 @@ +SERVICE_NAME=agg-userauth-cmd +KAFKA_LOG_PRODUCER_TOPIC=log.sink + # ===> Kafka KAFKA_BROKERS=kafka:9092 diff --git a/Gopkg.lock b/Gopkg.lock index ba7793f..b2643c3 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -18,23 +18,23 @@ version = "v3.1.0" [[projects]] - digest = "1:d546e8d64b0b7a3e4ef399b00cb37a839697adfb1392e21b7726cc9c5404e53f" + digest = "1:b374152c0b4b0dff7c0236ed48d0fdee003e009876dbd7cb642d9b4a7f884f2b" name = "github.com/TerrexTech/go-eventspoll" packages = [ "errors", "poll", ] pruneopts = "UT" - revision = "ba822cac45b6a3e425ffcd9d7a35c04abc440e8b" - version = "v3.0.1" + revision = "c2c40a442eab5325df33f65f6d7aacfee5bbf944" + version = "v4.0.0" [[projects]] - digest = "1:dee9ede39c2d6dd372cf8ac6df7e2051989c36a1d91565f7b40f4aef432979c5" + digest = "1:4d3876e2ce747cfeded59a1210056e894d2593b73e843454a19d7f845afad23e" name = "github.com/TerrexTech/go-eventstore-models" packages = ["model"] pruneopts = "UT" - revision = "309bc2e4adb405313be36883daf2b8a7ce09bba9" - version = "v3.0.0" + revision = "4d0913b6357bca72d45064058f63c02d20c9e2c0" + version = "v4.0.0" [[projects]] digest = "1:017b08c994a864ea4e94f1837037c14087f784a1e99d54173eba9050f7a81f74" @@ -110,7 +110,7 @@ [[projects]] branch = "master" - digest = "1:64609c53991a461bd1ebd4d398cc930be8ba5d441d2a02b73f94c40a66ef93db" + digest = "1:348bbd07b4a983b2f811f81948c78142de09bb9fcf25284bee5e2ab3bdd0f6f9" name = "github.com/gocql/gocql" packages = [ ".", @@ -119,7 +119,7 @@ "internal/streams", ] pruneopts = "UT" - revision = "a84ce58083d3d907fb0d94290d088a1fcd9cd858" + revision = "68ae1e384be4d7cd7df0f5b77f331759d806308e" [[projects]] digest = "1:c594a691090b434d55c67f6cc8e326ef5ba49452abc059821bd5d4fd4cdef08c" @@ -324,39 +324,38 @@ name = "golang.org/x/crypto" packages = ["pbkdf2"] pruneopts = "UT" - revision = "bc7917b19d8f099105de72dc62898400be07c984" + revision = "e4dc69e5b2fd71dcaf8bd5d054eb936deb78d1fa" [[projects]] branch = "master" - digest = "1:6d5ed712653ea5321fe3e3475ab2188cf362a4e0d31e9fd3acbd4dfbbca0d680" + digest = "1:5193d913046443e59093d66a97a40c51f4a5ea4ceba60f3b3ecf89694de5d16f" name = "golang.org/x/net" packages = [ - "context", "html", "html/atom", "html/charset", ] pruneopts = "UT" - revision = "c44066c5c816ec500d459a2a324a753f78531ae0" + revision = "1c5f79cfb1642860bbe00b6cfce66700c01e04f6" [[projects]] branch = "master" - digest = "1:c313aef534e493304f3666fbd24dca5932ebf776a82b7a40f961c9355794a1b1" + digest = "1:d6b0cfc5ae30841c4b116ac589629f56f8add0955a39f11d8c0d06ca67f5b3d5" name = "golang.org/x/sync" packages = [ "errgroup", "semaphore", ] pruneopts = "UT" - revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" + revision = "42b317875d0fa942474b76e1b46a6060d720ae6e" [[projects]] branch = "master" - digest = "1:fbacfb57e3d052810813bca2d48c22fbde916ecfc4a2bac08df30ed6e9e59759" + digest = "1:7ba061af4131fb44b30448572acd0d6fefbf63a61b97b7ef1dea0be5871c2742" name = "golang.org/x/sys" packages = ["unix"] pruneopts = "UT" - revision = "d69651ed3497faee15a5363a89578e9991f6d5e2" + revision = "66b7b1311ac80bbafcd2daeef9a5e6e2cd1e2399" [[projects]] digest = "1:4392fcf42d5cf0e3ff78c96b2acf8223d49e4fdc53eb77c99d2f8dfe4680e006" diff --git a/Gopkg.toml b/Gopkg.toml index 619180a..b961dde 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -38,11 +38,11 @@ [[constraint]] name = "github.com/TerrexTech/go-eventspoll" - version = "3.0.0" + version = "4.0.0" [[constraint]] name = "github.com/TerrexTech/go-eventstore-models" - version = "3.0.0" + version = "4.0.0" [[constraint]] name = "github.com/TerrexTech/go-kafkautils" diff --git a/main/main.go b/main/main.go index ea0981c..786d5a0 100644 --- a/main/main.go +++ b/main/main.go @@ -81,7 +81,7 @@ func main() { for { select { - case <-eventPoll.RoutinesCtx().Done(): + case err := <-eventPoll.Wait(): err = errors.New("service-context closed") log.Fatalln(err) diff --git a/test/.envp b/test/.envp index 951f634..838d9c1 100644 --- a/test/.envp +++ b/test/.envp @@ -1,3 +1,6 @@ +SERVICE_NAME=go-eventstore-query +KAFKA_LOG_PRODUCER_TOPIC=log.sink + CASSANDRA_HOSTS=cassandra:9042 CASSANDRA_DATA_CENTERS=datacenter1:1 CASSANDRA_USERNAME=cassandra diff --git a/test/.envq b/test/.envq index be6f240..0de7fd7 100644 --- a/test/.envq +++ b/test/.envq @@ -1,3 +1,6 @@ +SERVICE_NAME=go-eventpersistence +KAFKA_LOG_PRODUCER_TOPIC=log.sink + CASSANDRA_HOSTS=cassandra:9042 CASSANDRA_DATA_CENTERS=datacenter1:1 CASSANDRA_EVENT_META_TABLE=events_meta diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml index d050dcb..498bc83 100644 --- a/test/docker-compose.yaml +++ b/test/docker-compose.yaml @@ -34,12 +34,12 @@ services: - 2181:2181 go-eventpersistence: - image: terrextech/go-eventpersistence:v2.0.1 + image: terrextech/go-eventpersistence:v3.0.0 env_file: - ./.envp go-eventstore-query: - image: terrextech/go-eventstore-query:v2.1.0 + image: terrextech/go-eventstore-query:v3.0.0 env_file: - ./.envq diff --git a/test/user_suite_test.go b/test/user_suite_test.go index 4c36a12..4891518 100644 --- a/test/user_suite_test.go +++ b/test/user_suite_test.go @@ -100,16 +100,16 @@ var _ = Describe("UserAuthAggregate", func() { Expect(err).ToNot(HaveOccurred()) uid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) mockEvent = &model.Event{ - Action: "insert", + EventAction: "insert", CorrelationID: cid, AggregateID: user.AggregateID, Data: marshalUser, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 0, YearBucket: 2018, } @@ -139,11 +139,11 @@ var _ = Describe("UserAuthAggregate", func() { err := json.Unmarshal(msg.Value, kr) Expect(err).ToNot(HaveOccurred()) - if kr.UUID == mockEvent.TimeUUID { + if kr.UUID == mockEvent.UUID { Expect(kr.Error).To(BeEmpty()) Expect(kr.ErrorCode).To(BeZero()) Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) user := &user.User{} err = json.Unmarshal(kr.Result, user) @@ -193,12 +193,12 @@ var _ = Describe("UserAuthAggregate", func() { mockUser.ID = mockID Byf("Creating update MockEvent") - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) - mockEvent.Action = "update" + mockEvent.EventAction = "update" mockEvent.Data = marshalUpdate - mockEvent.Timestamp = time.Now() - mockEvent.TimeUUID = timeUUID + mockEvent.NanoTime = time.Now().UnixNano() + mockEvent.UUID = UUID Byf("Producing MockEvent") p, err := kafka.NewProducer(&kafka.ProducerConfig{ @@ -222,11 +222,11 @@ var _ = Describe("UserAuthAggregate", func() { err := json.Unmarshal(msg.Value, kr) Expect(err).ToNot(HaveOccurred()) - if kr.UUID == mockEvent.TimeUUID { + if kr.UUID == mockEvent.UUID { Expect(kr.Error).To(BeEmpty()) Expect(kr.ErrorCode).To(BeZero()) Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) result := map[string]int{} err = json.Unmarshal(kr.Result, &result) @@ -265,12 +265,12 @@ var _ = Describe("UserAuthAggregate", func() { Expect(err).ToNot(HaveOccurred()) Byf("Creating delete MockEvent") - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) - mockEvent.Action = "delete" + mockEvent.EventAction = "delete" mockEvent.Data = marshalDelete - mockEvent.Timestamp = time.Now() - mockEvent.TimeUUID = timeUUID + mockEvent.NanoTime = time.Now().UnixNano() + mockEvent.UUID = UUID Byf("Producing MockEvent") p, err := kafka.NewProducer(&kafka.ProducerConfig{ @@ -294,11 +294,11 @@ var _ = Describe("UserAuthAggregate", func() { err := json.Unmarshal(msg.Value, kr) Expect(err).ToNot(HaveOccurred()) - if kr.UUID == mockEvent.TimeUUID { + if kr.UUID == mockEvent.UUID { Expect(kr.Error).To(BeEmpty()) Expect(kr.ErrorCode).To(BeZero()) Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) result := map[string]int{} err = json.Unmarshal(kr.Result, &result) diff --git a/user/delete.go b/user/delete.go index 96e9cbb..839841a 100644 --- a/user/delete.go +++ b/user/delete.go @@ -26,7 +26,9 @@ func Delete(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -39,7 +41,9 @@ func Delete(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -52,7 +56,9 @@ func Delete(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: DatabaseError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -66,14 +72,18 @@ func Delete(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } return &model.KafkaResponse{ AggregateID: event.AggregateID, CorrelationID: event.CorrelationID, + EventAction: event.EventAction, Result: resultMarshal, - UUID: event.TimeUUID, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } diff --git a/user/insert.go b/user/insert.go index 7c3a603..d3c3cb0 100644 --- a/user/insert.go +++ b/user/insert.go @@ -23,7 +23,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -37,7 +39,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } user.UserID = userID @@ -51,7 +55,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } if user.Email == "" { @@ -63,7 +69,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } if user.UserName == "" { @@ -75,7 +83,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } if user.Password == "" { @@ -87,7 +97,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } if user.Role == "" { @@ -99,7 +111,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -112,7 +126,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: DatabaseError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } insertedID, assertOK := insertResult.InsertedID.(objectid.ObjectID) @@ -125,7 +141,9 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -139,14 +157,18 @@ func Insert(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } return &model.KafkaResponse{ AggregateID: event.AggregateID, CorrelationID: event.CorrelationID, + EventAction: event.EventAction, Result: result, - UUID: event.TimeUUID, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } diff --git a/user/update.go b/user/update.go index 0f1da68..6815a39 100644 --- a/user/update.go +++ b/user/update.go @@ -34,7 +34,9 @@ func Update(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -47,7 +49,9 @@ func Update(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -62,7 +66,9 @@ func Update(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -75,7 +81,9 @@ func Update(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } if update["password"] != nil && update["password"] == "" { @@ -87,7 +95,9 @@ func Update(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -100,7 +110,9 @@ func Update(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: DatabaseError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } @@ -117,14 +129,18 @@ func Update(collection *mongo.Collection, event *model.Event) *model.KafkaRespon CorrelationID: event.CorrelationID, Error: err.Error(), ErrorCode: InternalError, - UUID: event.TimeUUID, + EventAction: event.EventAction, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } return &model.KafkaResponse{ AggregateID: event.AggregateID, CorrelationID: event.CorrelationID, + EventAction: event.EventAction, Result: resultMarshal, - UUID: event.TimeUUID, + ServiceAction: event.ServiceAction, + UUID: event.UUID, } } diff --git a/user/user_validations_test.go b/user/user_validations_test.go index 5685f45..010c912 100644 --- a/user/user_validations_test.go +++ b/user/user_validations_test.go @@ -20,7 +20,7 @@ func TestUser(t *testing.T) { var _ = Describe("UserAggregate", func() { Describe("delete", func() { It("should return error if filter is empty", func() { - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -28,13 +28,13 @@ var _ = Describe("UserAggregate", func() { Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "delete", + EventAction: "delete", CorrelationID: cid, AggregateID: AggregateID, Data: []byte("{}"), - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -43,7 +43,7 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) }) @@ -70,7 +70,7 @@ var _ = Describe("UserAggregate", func() { marshalUser, err := json.Marshal(user) Expect(err).ToNot(HaveOccurred()) - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -78,13 +78,13 @@ var _ = Describe("UserAggregate", func() { Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "insert", + EventAction: "insert", CorrelationID: cid, AggregateID: 1, Data: marshalUser, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -93,7 +93,7 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) It("should return error if email is empty", func() { @@ -101,7 +101,7 @@ var _ = Describe("UserAggregate", func() { marshalUser, err := json.Marshal(user) Expect(err).ToNot(HaveOccurred()) - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -109,13 +109,13 @@ var _ = Describe("UserAggregate", func() { Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "insert", + EventAction: "insert", CorrelationID: cid, AggregateID: 1, Data: marshalUser, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -124,7 +124,7 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) It("should return error if username is empty", func() { @@ -132,7 +132,7 @@ var _ = Describe("UserAggregate", func() { marshalUser, err := json.Marshal(user) Expect(err).ToNot(HaveOccurred()) - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -140,13 +140,13 @@ var _ = Describe("UserAggregate", func() { Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "insert", + EventAction: "insert", CorrelationID: cid, AggregateID: 1, Data: marshalUser, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -155,7 +155,7 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) It("should return error if role is empty", func() { @@ -163,7 +163,7 @@ var _ = Describe("UserAggregate", func() { marshalUser, err := json.Marshal(user) Expect(err).ToNot(HaveOccurred()) - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -171,13 +171,13 @@ var _ = Describe("UserAggregate", func() { Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "insert", + EventAction: "insert", CorrelationID: cid, AggregateID: 1, Data: marshalUser, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -186,13 +186,13 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) }) Describe("update", func() { It("should return error if filter is empty", func() { - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -206,13 +206,13 @@ var _ = Describe("UserAggregate", func() { marshalArgs, err := json.Marshal(updateArgs) Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "delete", + EventAction: "delete", CorrelationID: cid, AggregateID: 1, Data: marshalArgs, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -221,11 +221,11 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) It("should return error if update is empty", func() { - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -241,13 +241,13 @@ var _ = Describe("UserAggregate", func() { marshalArgs, err := json.Marshal(updateArgs) Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "delete", + EventAction: "delete", CorrelationID: cid, AggregateID: 1, Data: marshalArgs, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -256,11 +256,11 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) It("should return error if userID in update is empty", func() { - timeUUID, err := uuuid.NewV1() + UUID, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) cid, err := uuuid.NewV4() Expect(err).ToNot(HaveOccurred()) @@ -278,13 +278,13 @@ var _ = Describe("UserAggregate", func() { marshalArgs, err := json.Marshal(updateArgs) Expect(err).ToNot(HaveOccurred()) mockEvent := &model.Event{ - Action: "delete", + EventAction: "delete", CorrelationID: cid, AggregateID: 1, Data: marshalArgs, - Timestamp: time.Now(), + NanoTime: time.Now().UnixNano(), UserUUID: uid, - TimeUUID: timeUUID, + UUID: UUID, Version: 3, YearBucket: 2018, } @@ -293,7 +293,7 @@ var _ = Describe("UserAggregate", func() { Expect(kr.CorrelationID).To(Equal(mockEvent.CorrelationID)) Expect(kr.Error).ToNot(BeEmpty()) Expect(kr.ErrorCode).To(Equal(int16(InternalError))) - Expect(kr.UUID).To(Equal(mockEvent.TimeUUID)) + Expect(kr.UUID).To(Equal(mockEvent.UUID)) }) }) })