Tag Enhancement and Bug in the same pull request

Fixes #95.

Author: CyberShadow

data/payloads/bugzilla_jsonrpc.cgi_Bug.comments_8573,8574

@@ -0,0 +1,14 @@
+{
+    "error" : null,
+    "result" : {
+        "bugs" : {
+            "8573" : {
+                "comments" : []
+            },
+            "8574" : {
+                "comments" : []
+            }
+        },
+        "comments" : {}
+    }
+}

data/payloads/bugzilla_jsonrpc.cgi_Bug.update_8574

@@ -0,0 +1,4 @@
+{
+    "error" : null,
+    "result" : null
+}

data/payloads/trello_1_search?query=name:%22Issue%208574%22&key=01234&token=abcde

@@ -0,0 +1,28 @@
+{
+    "options": {
+        "terms": [
+            {
+                "fields": [
+                    "name"
+                ],
+                "text": "Issue 8574",
+                "phrase": true,
+                "partial": false
+            }
+        ],
+        "modifiers": [],
+        "modelTypes": [
+            "actions",
+            "cards",
+            "boards",
+            "organizations",
+            "members"
+        ],
+        "partial": false
+    },
+    "boards": [],
+    "cards": [],
+    "organizations": [],
+    "members": []
+}
+

source/dlangbot/app.d

@@ -255,18 +255,15 @@ void handlePR(string action, PullRequest* _pr)
         if (refs.any!(r => r.fixed))
         {
             import std.algorithm : canFind, filter, map, sort, uniq;
-            import std.array : array;
+            import std.array : assocArray;
+            import std.typecons : tuple;
             // references are already sorted by id
             auto bugzillaIds = refs.map!(r => r.id).uniq;
-            auto bugzillSeverities = descs
+            auto labels = descs
                 .filter!(d => bugzillaIds.canFind(d.id))
-                .map!(i => i.severity);
+                .map!(i => i.severity == "enhancement" ? "Enhancement" : "Bug Fix")
+                .map!(label => tuple(label, true)).assocArray.keys; // unique
             logDebug("[github/handlePR](%s): trying to add bug fix label", _pr.pid);
-            string[] labels;
-            if (bugzillSeverities.canFind("enhancement"))
-                labels ~= "Enhancement";
-            else
-                labels ~= "Bug Fix";
 
             pr.addLabels(labels);
         }

test/comments.d

@@ -153,6 +153,43 @@ unittest
     postGitHubHook("dlang_phobos_synchronize_4921.json");
 }
 
+@("multiple-severity-labels")
+unittest
+{
+    setAPIExpectations(
+        "/github/repos/dlang/phobos/pulls/4921/commits", (ref Json j) {
+            j[0]["commit"]["message"] = "Fix Issue 8573, 8574";
+        },
+         "/github/repos/dlang/phobos/issues/4921/comments",
+        "/bugzilla/buglist.cgi?bug_id=8573,8574&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
+        (scope HTTPServerRequest req, scope HTTPServerResponse res){
+            res.writeBody(
+`bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
+8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","enhancement","P2",
+8574,"Some Bug","NEW","---","normal","P2",`);
+        },
+        "/github/repos/dlang/phobos/issues/4921/labels",
+        "/github/repos/dlang/phobos/issues/4921/labels", (ref Json j) {
+            j = Json.emptyArray;
+        },
+        "/github/orgs/dlang/public_members?per_page=100",
+        "/github/repos/dlang/phobos/issues/comments/262784442",
+        (scope HTTPServerRequest req, scope HTTPServerResponse res){
+        },
+        "/github/repos/dlang/phobos/issues/4921/labels",
+        (scope HTTPServerRequest req, scope HTTPServerResponse res){
+            assert(req.json[].sort.equal(["Bug Fix", "Enhancement"]));
+        },
+        "/trello/1/search?query=name:%22Issue%208573%22&"~trelloAuth,
+        "/trello/1/search?query=name:%22Issue%208574%22&"~trelloAuth,
+        "/bugzilla/jsonrpc.cgi", // Bug.comments (#8573,#8574)
+        "/bugzilla/jsonrpc.cgi", // Bug.update   (#8573)
+        "/bugzilla/jsonrpc.cgi", // Bug.update   (#8574)
+    );
+
+    postGitHubHook("dlang_phobos_synchronize_4921.json");
+}
+
 @("do-not-readd-labels-1-#97")
 unittest
 {