Merge pull request #181 from nyaruka/add_urn_tweak

Don't add duplicate URNs to contacts

flows/actions/add_contact_urn.go

@@ -63,8 +63,10 @@ func (a *AddContactURNAction) Execute(run flows.FlowRun, step flows.Step, log fl
 		log.Add(events.NewErrorEvent(fmt.Errorf("unable to add URN '%s:%s': %s", a.Scheme, evaluatedPath, err.Error())))
 		return nil
 	}
-	urn = urn.Normalize("")
 
-	log.Add(events.NewURNAddedEvent(urn))
+	if !run.Contact().HasURN(urn) {
+		log.Add(events.NewURNAddedEvent(urn))
+	}
+
 	return nil
 }

flows/contact.go

@@ -76,10 +76,24 @@ func (c *Contact) Name() string { return c.name }
 func (c *Contact) URNs() URNList { return c.urns }
 
 // AddURN adds a new URN to this contact
-func (c *Contact) AddURN(urn urns.URN) {
-	// TODO normalize and check we're not adding duplicates
+func (c *Contact) AddURN(urn urns.URN) bool {
+	if c.HasURN(urn) {
+		return false
+	}
+	c.urns = append(c.urns, &ContactURN{URN: urn.Normalize("")})
+	return true
+}
+
+// HasURN checks whether the contact has the given URN
+func (c *Contact) HasURN(urn urns.URN) bool {
+	urn = urn.Normalize("")
 
-	c.urns = append(c.urns, &ContactURN{URN: urn})
+	for _, u := range c.urns {
+		if u.URN == urn {
+			return true
+		}
+	}
+	return false
 }
 
 // Groups returns the groups that this contact belongs to