Merge pull request #501 from FelixTing/issue-500

fix(v2): Refine the ReplaceSubscriptionModelFieldsWithDTO func
edgexfoundry · Feb 9, 2021 · 69eff89 · 69eff89
2 parents 32bd43a + 5f87525
commit 69eff89
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/v2/dtos/requests/subscription.go b/v2/dtos/requests/subscription.go
@@ -107,6 +107,12 @@ func ReplaceSubscriptionModelFieldsWithDTO(s *models.Subscription, patch dtos.Up
 	if patch.Receiver != nil {
 		s.Receiver = *patch.Receiver
 	}
+	if patch.ResendLimit != nil {
+		s.ResendLimit = *patch.ResendLimit
+	}
+	if patch.ResendInterval != nil {
+		s.ResendInterval = *patch.ResendInterval
+	}
 }
 
 func NewAddSubscriptionRequest(dto dtos.Subscription) AddSubscriptionRequest {

diff --git a/v2/dtos/requests/subscription_test.go b/v2/dtos/requests/subscription_test.go
@@ -300,3 +300,21 @@ func TestUpdateSubscriptionRequest_UnmarshalJSON(t *testing.T) {
 		})
 	}
 }
+
+func TestReplaceSubscriptionModelFieldsWithDTO(t *testing.T) {
+	subscription := models.Subscription{
+		Id:   "7a1707f0-166f-4c4b-bc9d-1d54c74e0137",
+		Name: "name",
+	}
+	patch := updateSubscriptionData()
+
+	ReplaceSubscriptionModelFieldsWithDTO(&subscription, patch)
+
+	assert.Equal(t, dtos.ToCategoryModels(testSubscriptionCategories), subscription.Categories)
+	assert.Equal(t, testSubscriptionLabels, subscription.Labels)
+	assert.Equal(t, dtos.ToChannelModels(testSubscriptionChannels), subscription.Channels)
+	assert.Equal(t, testSubscriptionDescription, subscription.Description)
+	assert.Equal(t, testSubscriptionReceiver, subscription.Receiver)
+	assert.Equal(t, testSubscriptionResendLimit, subscription.ResendLimit)
+	assert.Equal(t, testSubscriptionResendInterval, subscription.ResendInterval)
+}