From 4397766800fd02517501a969b8212708badd3312 Mon Sep 17 00:00:00 2001
From: Michael Muré <batolettre@gmail.com>
Date: Sat, 28 Mar 2020 17:07:57 +0100
Subject: jira: tag bugs with the base URL, tighten the matching

---
 bridge/jira/import.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'bridge/jira/import.go')

diff --git a/bridge/jira/import.go b/bridge/jira/import.go
index 3d6d5414..b66b0fa3 100644
--- a/bridge/jira/import.go
+++ b/bridge/jira/import.go
@@ -216,7 +216,16 @@ func (ji *jiraImporter) ensureIssue(repo *cache.RepoCache, issue Issue) (*cache.
 		return nil, err
 	}
 
-	b, err := repo.ResolveBugCreateMetadata(metaKeyJiraId, issue.ID)
+	b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool {
+		if _, ok := excerpt.CreateMetadata[metaKeyJiraBaseUrl]; ok &&
+			excerpt.CreateMetadata[metaKeyJiraBaseUrl] != ji.conf[confKeyBaseUrl] {
+			return false
+		}
+
+		return excerpt.CreateMetadata[core.MetaKeyOrigin] == target &&
+			excerpt.CreateMetadata[metaKeyJiraId] == issue.ID &&
+			excerpt.CreateMetadata[metaKeyJiraProject] == ji.conf[confKeyProject]
+	})
 	if err != nil && err != bug.ErrBugNotExist {
 		return nil, err
 	}
@@ -241,6 +250,7 @@ func (ji *jiraImporter) ensureIssue(repo *cache.RepoCache, issue Issue) (*cache.
 				metaKeyJiraId:      issue.ID,
 				metaKeyJiraKey:     issue.Key,
 				metaKeyJiraProject: ji.conf[confKeyProject],
+				metaKeyJiraBaseUrl: ji.conf[confKeyBaseUrl],
 			})
 		if err != nil {
 			return nil, err
-- 
cgit