Merge #4

4: Bump ESModels to 4.0.0 r=Jaskaranbir a=Jaskaranbir



Co-authored-by: Jaskaranbir <jaskaranbir.dhillon@gmail.com>

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"

inventory/inventory_validations_test.go

@@ -19,21 +19,21 @@ func TestInventory(t *testing.T) {
 var _ = Describe("InventoryAggregate", func() {
 	Describe("query", 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())
 			uid, err := uuuid.NewV4()
 			Expect(err).ToNot(HaveOccurred())
 
 			mockEvent := &model.Event{
-				Action:        "delete",
+				EventAction:   "delete",
 				CorrelationID: cid,
 				AggregateID:   2,
 				Data:          []byte("{}"),
-				Timestamp:     time.Now(),
+				NanoTime:      time.Now().UnixNano(),
 				UserUUID:      uid,
-				TimeUUID:      timeUUID,
+				UUID:          uuid,
 				Version:       3,
 				YearBucket:    2018,
 			}
@@ -42,7 +42,7 @@ var _ = Describe("InventoryAggregate", 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))
 		})
 	})
 })

inventory/query.go

@@ -22,7 +22,9 @@ func Query(collection *mongo.Collection, event *model.Event) *model.KafkaRespons
 			CorrelationID: event.CorrelationID,
 			Error:         err.Error(),
 			ErrorCode:     InternalError,
-			UUID:          event.TimeUUID,
+			EventAction:   event.EventAction,
+			ServiceAction: event.ServiceAction,
+			UUID:          event.UUID,
 		}
 	}
 
@@ -35,7 +37,9 @@ func Query(collection *mongo.Collection, event *model.Event) *model.KafkaRespons
 			CorrelationID: event.CorrelationID,
 			Error:         err.Error(),
 			ErrorCode:     InternalError,
-			UUID:          event.TimeUUID,
+			EventAction:   event.EventAction,
+			ServiceAction: event.ServiceAction,
+			UUID:          event.UUID,
 		}
 	}
 
@@ -48,7 +52,9 @@ func Query(collection *mongo.Collection, event *model.Event) *model.KafkaRespons
 			CorrelationID: event.CorrelationID,
 			Error:         err.Error(),
 			ErrorCode:     DatabaseError,
-			UUID:          event.TimeUUID,
+			EventAction:   event.EventAction,
+			ServiceAction: event.ServiceAction,
+			UUID:          event.UUID,
 		}
 	}
 
@@ -61,14 +67,18 @@ func Query(collection *mongo.Collection, event *model.Event) *model.KafkaRespons
 			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,
 	}
 }

main/main.go

@@ -82,7 +82,7 @@ func main() {
 
 	for {
 		select {
-		case <-eventPoll.RoutinesCtx().Done():
+		case <-eventPoll.Wait():
 			err = errors.New("service-context closed")
 			log.Fatalln(err)
 

test/inventory_suite_test.go

@@ -107,16 +107,16 @@ var _ = Describe("InventoryAggregate", 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:   inventory.AggregateID,
 			Data:          marshalInv,
-			Timestamp:     time.Now(),
+			NanoTime:      time.Now().UnixNano(),
 			UserUUID:      uid,
-			TimeUUID:      timeUUID,
+			UUID:          uuid,
 			Version:       0,
 			YearBucket:    2018,
 		}
@@ -141,12 +141,12 @@ var _ = Describe("InventoryAggregate", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			Byf("Creating query MockEvent")
-			timeUUID, err := uuuid.NewV1()
+			uuid, err := uuuid.NewV4()
 			Expect(err).ToNot(HaveOccurred())
-			mockEvent.Action = "query"
+			mockEvent.EventAction = "query"
 			mockEvent.Data = marshalQuery
-			mockEvent.Timestamp = time.Now()
-			mockEvent.TimeUUID = timeUUID
+			mockEvent.NanoTime = time.Now().UnixNano()
+			mockEvent.UUID = uuid
 
 			Byf("Producing MockEvent")
 			p, err = kafka.NewProducer(&kafka.ProducerConfig{
@@ -170,11 +170,11 @@ var _ = Describe("InventoryAggregate", 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 := []inventory.Inventory{}
 					err = json.Unmarshal(kr.Result, &result)