refactor: Update code for Created & Modified removed from Event DTO (#…

…771)

closes #770

Signed-off-by: lenny <leonard.goodell@intel.com>

app-service-template/go.mod

@@ -6,7 +6,7 @@ go 1.15
 
 require (
 	github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.14
-	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.54
+	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.62
 	github.com/google/uuid v1.2.0
 	github.com/stretchr/testify v1.7.0
 )

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9
 	github.com/eclipse/paho.mqtt.golang v1.3.2
 	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.0.0-dev.22
-	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.56
+	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.62
 	github.com/edgexfoundry/go-mod-messaging/v2 v2.0.0-dev.6
 	github.com/edgexfoundry/go-mod-registry/v2 v2.0.0-dev.3
 	github.com/fxamacker/cbor/v2 v2.2.0

internal/appfunction/context.go

@@ -163,7 +163,6 @@ func (appContext *Context) PushToCoreData(deviceName string, readingName string,
 	// TODO: Remove once V2 EventClient is available
 	v2Reading := dtos.BaseReading{
 		Id:            v1Reading.Id,
-		Created:       v1Reading.Created,
 		Origin:        v1Reading.Origin,
 		DeviceName:    v1Reading.Device,
 		ResourceName:  v1Reading.Name,

internal/runtime/runtime.go

@@ -285,7 +285,6 @@ func (gr *GolangRuntime) unmarshalV1EventToV2Event(envelope types.MessageEnvelop
 		ProfileName: "Unknown",
 		DeviceName:  v1Event.Device,
 		SourceName:  "Unknown",
-		Created:     v1Event.Created,
 		Origin:      v1Event.Origin,
 		Tags:        v1Event.Tags,
 	}
@@ -298,7 +297,6 @@ func (gr *GolangRuntime) unmarshalV1EventToV2Event(envelope types.MessageEnvelop
 	for _, v1Reading := range v1Event.Readings {
 		v2Reading := dtos.BaseReading{
 			Id:           v1Reading.Id,
-			Created:      v1Reading.Created,
 			Origin:       v1Reading.Origin,
 			DeviceName:   v1Reading.Device,
 			ResourceName: v1Reading.Name,

internal/runtime/runtime_test.go

@@ -56,14 +56,12 @@ func createAddEventRequest() requests.AddEventRequest {
 }
 
 var testV1Event = models.Event{
-	ID:      testV2Event.Id,
-	Device:  "FamilyRoomThermostat",
-	Created: testV2Event.Created,
-	Origin:  testV2Event.Origin,
+	ID:     testV2Event.Id,
+	Device: "FamilyRoomThermostat",
+	Origin: testV2Event.Origin,
 	Readings: []models.Reading{
 		{
 			Id:        testV2Event.Readings[0].Id,
-			Created:   testV2Event.Readings[0].Created,
 			Origin:    testV2Event.Readings[0].Origin,
 			Device:    "FamilyRoomThermostat",
 			Name:      "Temperature",

internal/trigger/messagebus/messaging_test.go

@@ -567,7 +567,7 @@ func TestInitializeAndProcessBackgroundMessage(t *testing.T) {
 
 	expectedCorrelationID := "123"
 
-	expectedPayload := []byte(`{"id":"5888dea1bd36573f4681d6f9","created":1485364897029,"modified":1485364897029,"origin":1471806386919,"pushed":0,"device":"livingroomthermostat","readings":[{"id":"5888dea0bd36573f4681d6f8","created":1485364896983,"modified":1485364896983,"origin":1471806386919,"pushed":0,"name":"temperature","value":"38","device":"livingroomthermostat"}]}`)
+	expectedPayload := []byte(`{"id":"5888dea1bd36573f4681d6f9","origin":1471806386919,"pushed":0,"device":"livingroomthermostat","readings":[{"id":"5888dea0bd36573f4681d6f8","created":1485364896983,"modified":1485364896983,"origin":1471806386919,"pushed":0,"name":"temperature","value":"38","device":"livingroomthermostat"}]}`)
 
 	goRuntime := &runtime.GolangRuntime{}
 	goRuntime.Initialize(dic)

pkg/transforms/conversion_test.go

@@ -30,7 +30,7 @@ func TestTransformToXML(t *testing.T) {
 	eventIn := dtos.Event{
 		DeviceName: deviceName1,
 	}
-	expectedResult := `<Event><ApiVersion></ApiVersion><Id></Id><DeviceName>device1</DeviceName><ProfileName></ProfileName><SourceName></SourceName><Created>0</Created><Origin>0</Origin></Event>`
+	expectedResult := `<Event><ApiVersion></ApiVersion><Id></Id><DeviceName>device1</DeviceName><ProfileName></ProfileName><SourceName></SourceName><Origin>0</Origin></Event>`
 	conv := NewConversion()
 
 	continuePipeline, result := conv.TransformToXML(context, eventIn)

pkg/transforms/filter.go

@@ -113,7 +113,6 @@ func (f Filter) FilterByResourceName(ctx interfaces.AppFunctionContext, data int
 
 	auxEvent := dtos.Event{
 		DeviceName: existingEvent.DeviceName,
-		Created:    existingEvent.Created,
 		Origin:     existingEvent.Origin,
 		Readings:   []dtos.BaseReading{},
 	}

pkg/transforms/responsedata_test.go

@@ -20,14 +20,15 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/dtos"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestSetResponseDataString(t *testing.T) {
-	expected := `<Event><ID></ID><Pushed>0</Pushed><Device>id1</Device><Created>0</Created><Modified>0</Modified><Origin>0</Origin></Event>`
+	expected := getExpectedEventXml(t)
 	target := NewResponseData()
 
 	continuePipeline, result := target.SetResponseData(context, expected)
@@ -40,8 +41,7 @@ func TestSetResponseDataString(t *testing.T) {
 }
 
 func TestSetResponseDataBytes(t *testing.T) {
-	var expected []byte
-	expected = []byte(`<Event><ID></ID><Pushed>0</Pushed><Device>id1</Device><Created>0</Created><Modified>0</Modified><Origin>0</Origin></Event>`)
+	expected := []byte(getExpectedEventXml(t))
 	target := NewResponseData()
 
 	continuePipeline, result := target.SetResponseData(context, expected)
@@ -85,3 +85,12 @@ func TestSetResponseDataBadType(t *testing.T) {
 	require.NotNil(t, result)
 	assert.Contains(t, result.(error).Error(), "passed in data must be of type")
 }
+
+func getExpectedEventXml(t *testing.T) string {
+	event := dtos.NewEvent("profile1", "dev1", "source1")
+	event.AddSimpleReading("resource1", v2.ValueTypeInt32, int32(32))
+
+	xml, err := event.ToXML()
+	require.NoError(t, err)
+	return xml
+}