From 7be554265aee6c0c9fe7ecd75fac344b2cccdb21 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 19 2020 10:17:41 +0000
Subject: [PATCH 1/2] Make the full_url information required in the message schemas


This field stores the full_url to the object (project, issue, PR,
board...) about which a notification is sent.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure_messages/base.py b/pagure_messages/base.py
index 7c3212c..4acb9d7 100644
--- a/pagure_messages/base.py
+++ b/pagure_messages/base.py
@@ -39,8 +39,9 @@ BOARD = {
         "active": {"type": "boolean"},
         "status": {"type": ["array", "null"], "items": {"type": "string"}},
         "tag": {"type": TagColored},
+        "full_url": {"type": "string"},
     },
-    "required": ["name", "active", "status", "tag"],
+    "required": ["name", "active", "status", "tag", "full_url"],
 }
 
 
@@ -74,6 +75,7 @@ USER = {
         "name": {"type": "string"},
         "fullname": {"type": "string"},
         "url_path": {"type": "string"},
+        "full_path": {"type": "string"},
     },
     "required": ["name", "fullname", "url_path"],
 }
@@ -176,6 +178,7 @@ PROJECT = {
         "name": {"type": "string"},
         "fullname": {"type": "string"},
         "url_path": {"type": "string"},
+        "full_url": {"type": "string"},
         "description": {"type": "string"},
         "namespace": {"type": ["string", "null"]},
         # "parent": {"type": ["null", BASE_PROJECT]},
@@ -201,6 +204,7 @@ PROJECT = {
     "required": [
         "id",
         "name",
+        "full_url",
         "fullname",
         "url_path",
         "description",
@@ -234,6 +238,7 @@ ISSUE = {
     "type": "object",
     "properties": {
         "id": {"type": "number"},
+        "full_url": {"type": "string"},
         "title": {"type": "string"},
         "content": {"type": "string"},
         "status": {"type": "string"},
@@ -265,6 +270,7 @@ ISSUE = {
     },
     "required": [
         "id",
+        "full_url",
         "title",
         "content",
         "status",
@@ -293,6 +299,7 @@ PULL_REQUEST = {
         "id": {"type": "number"},
         "uid": {"type": "string"},
         "title": {"type": "string"},
+        "full_url": {"type": "string"},
         "branch": {"type": "string"},
         "project": PROJECT,
         "branch_from": {"type": "string"},
@@ -317,6 +324,7 @@ PULL_REQUEST = {
         "id",
         "uid",
         "title",
+        "full_url",
         "branch",
         "project",
         "branch_from",
diff --git a/pagure_messages/tests/utils.py b/pagure_messages/tests/utils.py
index 0a951a6..83f7182 100644
--- a/pagure_messages/tests/utils.py
+++ b/pagure_messages/tests/utils.py
@@ -19,6 +19,7 @@
 PROJECT = {
     "custom_keys": [],
     "description": "Fedora-messaging schemas for fedocal",
+    "full_url": "http://localhost.localdomain/fedora-infra/fedocal-messages",
     "parent": None,
     "date_modified": "1602658714",
     "access_users": {
@@ -36,6 +37,7 @@ PROJECT = {
     "user": {
         "fullname": "Pierre-YvesChibon",
         "url_path": "user/pingou",
+        "full_url": "http://localhost.localdomain/user/pingou",
         "name": "pingou",
     },
     "date_created": "1602658714",
@@ -49,9 +51,11 @@ PROJECT = {
 FORK = {
     "custom_keys": [],
     "description": "A git centered forge",
+    "full_url": "http://localhost.localdomain/fork/jjames/pagure",
     "parent": {
         "custom_keys": [],
         "description": "A git centered forge",
+        "full_url": "http://localhost.localdomain/pagure",
         "parent": None,
         "date_modified": "1590422384",
         "access_users": {
@@ -102,6 +106,7 @@ FORK = {
         "user": {
             "fullname": "Pierre-YvesChibon",
             "url_path": "user/pingou",
+            "full_url": "http://localhost.localdomain/user/pingou",
             "name": "pingou",
         },
         "date_created": "1431549490",
@@ -138,6 +143,7 @@ FORK = {
     "user": {
         "fullname": "Jerry James",
         "url_path": "user/jjames",
+        "full_url": "http://localhost.localdomain/user/jjames",
         "name": "jjames",
     },
     "date_created": "1602543006",
@@ -215,6 +221,7 @@ ISSUE = {
                     "tag_description": "ops problem now...",
                 },
                 "name": "ops",
+                "full_url": "http://localhost.localdomain/test/boards/ops",
             },
             "rank": 8,
         }
@@ -237,6 +244,7 @@ ISSUE = {
             "user": {
                 "fullname": "Andrei Stepanov",
                 "url_path": "user/astepano",
+                "full_url": "http://localhost.localdomain/user/astepano",
                 "name": "astepano",
             },
         },
@@ -254,6 +262,7 @@ ISSUE = {
             "user": {
                 "fullname": "Kevin Fenzi",
                 "url_path": "user/kevin",
+                "full_url": "http://localhost.localdomain/user/kevin",
                 "name": "kevin",
             },
         },
@@ -270,16 +279,19 @@ ISSUE = {
     "depends": [],
     "private": False,
     "date_created": "1599751343",
+    "full_url": "http://localhost.localdomain/test/issue/9311",
     "id": 9311,
     "closed_at": "1602535496",
     "closed_by": {
         "fullname": "Kevin Fenzi",
         "url_path": "user/kevin",
+        "full_url": "http://localhost.localdomain/user/kevin",
         "name": "kevin",
     },
     "custom_fields": [],
     "user": {
         "fullname": "Andrei Stepanov",
+        "full_url": "http://localhost.localdomain/user/astepano",
         "url_path": "user/astepano",
         "name": "astepano",
     },
@@ -294,6 +306,7 @@ PULL_REQUEST = {
     "commit_stop": "2e8db9ce332cae0747f6b38e414bb99634f9b662",
     "remote_git": None,
     "closed_at": "1602575128",
+    "full_url": "http://localhost.localdomain/pagure/pull-request/5014",
     "id": 5014,
     "title": "Reverse out of order instructions for new repos",
     "comments": [
@@ -313,6 +326,7 @@ PULL_REQUEST = {
             "user": {
                 "fullname": "Pierre-YvesChibon",
                 "url_path": "user/pingou",
+                "full_url": "http://localhost.localdomain/user/pingou",
                 "name": "pingou",
             },
         },
@@ -332,6 +346,7 @@ PULL_REQUEST = {
             "user": {
                 "fullname": "Pierre-YvesChibon",
                 "url_path": "user/pingou",
+                "full_url": "http://localhost.localdomain/user/pingou",
                 "name": "pingou",
             },
         },
@@ -342,12 +357,14 @@ PULL_REQUEST = {
     "user": {
         "fullname": "Jerry James",
         "url_path": "user/jjames",
+        "full_url": "http://localhost.localdomain/user/jjames",
         "name": "jjames",
     },
     "date_created": "1602543367",
     "closed_by": {
         "fullname": "Pierre-YvesChibon",
         "url_path": "user/pingou",
+        "full_url": "http://localhost.localdomain/user/pingou",
         "name": "pingou",
     },
     "branch_from": "master",
@@ -356,6 +373,7 @@ PULL_REQUEST = {
     "project": {
         "custom_keys": [],
         "description": "A git centered forge",
+        "full_url": "http://localhost.localdomain/pagure",
         "parent": None,
         "date_modified": "1590422384",
         "access_users": {
@@ -406,6 +424,7 @@ PULL_REQUEST = {
         "user": {
             "fullname": "Pierre-YvesChibon",
             "url_path": "user/pingou",
+            "full_url": "http://localhost.localdomain/user/pingou",
             "name": "pingou",
         },
         "date_created": "1431549490",
@@ -427,6 +446,7 @@ PULL_REQUEST = {
         "parent": {
             "custom_keys": [],
             "description": "A git centered forge",
+            "full_url": "http://localhost.localdomain/pagure",
             "parent": None,
             "date_modified": "1590422384",
             "access_users": {
@@ -477,6 +497,7 @@ PULL_REQUEST = {
             "user": {
                 "fullname": "Pierre-YvesChibon",
                 "url_path": "user/pingou",
+                "full_url": "http://localhost.localdomain/user/pingou",
                 "name": "pingou",
             },
             "date_created": "1431549490",
@@ -537,14 +558,24 @@ COMMIT_FLAG = {
     "url": "https://jenkins.example.org/job/project/job/project-postmerge/264/",
     "commit_hash": "36ca6c643221858eda70e2b52a6aee666dc6e576",
     "date_created": "1602687207",
-    "user": {"fullname": "foobar", "url_path": "user/foobar", "name": "foobar"},
+    "user": {
+        "fullname": "foobar",
+        "url_path": "user/foobar",
+        "name": "foobar",
+        "full_url": "http://localhost.localdomain/user/foobar",
+    },
 }
 
 
 GROUP = {
     "display_name": "fedora infra folks",
     "description": "Fedora infrastructure team",
-    "creator": {"fullname": "pingou", "url_path": "user/pingou", "name": "pingou"},
+    "creator": {
+        "fullname": "pingou",
+        "url_path": "user/pingou",
+        "name": "pingou",
+        "full_url": "http://localhost.localdomain/user/pingou",
+    },
     "members": [
         "pingou",
         "kevin",

From 457716a717f5f17bacd377302eb1a962c23d1a0c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 19 2020 10:17:42 +0000
Subject: [PATCH 2/2] Make use of the full_url field in the message to return the url property


And adjust the tests accordingly.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure_messages/base.py b/pagure_messages/base.py
index 4acb9d7..d4bbd83 100644
--- a/pagure_messages/base.py
+++ b/pagure_messages/base.py
@@ -383,6 +383,7 @@ GROUP = {
         "date_created": {"type": "string"},
         "group_type": {"type": "string"},
         "name": {"type": "string"},
+        "full_url": {"type": "string"},
     },
     "required": [
         "display_name",
@@ -392,6 +393,7 @@ GROUP = {
         "date_created",
         "group_type",
         "name",
+        "full_url",
     ],
 }
 
diff --git a/pagure_messages/issue_schema.py b/pagure_messages/issue_schema.py
index 8849bc3..088532d 100644
--- a/pagure_messages/issue_schema.py
+++ b/pagure_messages/issue_schema.py
@@ -59,12 +59,7 @@ class IssueAssignedAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
 
 
 class IssueAssignedResetV1(PagureMessage):
@@ -107,12 +102,7 @@ class IssueAssignedResetV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
 
 
 class IssueCommentAddedV1(PagureMessage):
@@ -155,14 +145,11 @@ class IssueCommentAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
+        issue_url = self.body["issue"]["full_url"]
         commentid = self.body["issue"]["comments"][-1]["id"]
 
-        tmpl = "{base_url}/{fullname}/issue/{issueid}#comment-{commentid}"
-        return tmpl.format(
-            base_url=base_url, fullname=fullname, issueid=issueid, commentid=commentid
+        return "{issue_url}#comment-{commentid}".format(
+            issue_url=issue_url, commentid=commentid
         )
 
 
@@ -209,12 +196,7 @@ class IssueDependencyAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
 
 
 class IssueDependencyRemovedV1(PagureMessage):
@@ -260,12 +242,7 @@ class IssueDependencyRemovedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
 
 
 class IssueDropV1(PagureMessage):
@@ -309,11 +286,9 @@ class IssueDropV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
+        full_url = self.body["project"]["full_url"]
 
-        tmpl = "{base_url}/{fullname}/issues"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return "{full_url}/issues".format(full_url=full_url)
 
 
 class IssueEditV1(PagureMessage):
@@ -359,12 +334,7 @@ class IssueEditV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
 
 
 class IssueNewV1(PagureMessage):
@@ -408,12 +378,7 @@ class IssueNewV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
 
 
 class IssueTagAddedV1(PagureMessage):
@@ -459,12 +424,7 @@ class IssueTagAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["issue"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
 
 
 class IssueTagRemovedV1(PagureMessage):
@@ -510,9 +470,4 @@ class IssueTagRemovedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        issueid = self.body["project"]["id"]
-
-        tmpl = "{base_url}/{fullname}/issue/{issueid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, issueid=issueid)
+        return self.body["issue"]["full_url"]
diff --git a/pagure_messages/misc_schema.py b/pagure_messages/misc_schema.py
index befcd0c..ec01186 100644
--- a/pagure_messages/misc_schema.py
+++ b/pagure_messages/misc_schema.py
@@ -61,12 +61,12 @@ class CommitFlagAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["repo"]["url_path"]
+        full_url = self.body["repo"]["full_url"]
         commithash = self.body["flag"]["commit_hash"]
 
-        tmpl = "{base_url}/{fullname}/c/{commithash}"
-        return tmpl.format(base_url=base_url, fullname=fullname, commithash=commithash)
+        return "{full_url}/c/{commithash}".format(
+            full_url=full_url, commithash=commithash
+        )
 
 
 class CommitFlagUpdatedV1(PagureMessage):
@@ -113,12 +113,12 @@ class CommitFlagUpdatedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["repo"]["url_path"]
+        full_url = self.body["repo"]["full_url"]
         commithash = self.body["flag"]["commit_hash"]
 
-        tmpl = "{base_url}/{fullname}/c/{commithash}"
-        return tmpl.format(base_url=base_url, fullname=fullname, commithash=commithash)
+        return "{full_url}/c/{commithash}".format(
+            full_url=full_url, commithash=commithash
+        )
 
 
 class GroupEditV1(PagureMessage):
@@ -160,11 +160,7 @@ class GroupEditV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        group_name = self.body["group"]["name"]
-
-        tmpl = "{base_url}/group/{group_name}"
-        return tmpl.format(base_url=base_url, group_name=group_name)
+        return self.body["group"]["full_url"]
 
 
 class TestNotificationV1(PagureMessage):
diff --git a/pagure_messages/project_schema.py b/pagure_messages/project_schema.py
index fbf40e7..4e22275 100644
--- a/pagure_messages/project_schema.py
+++ b/pagure_messages/project_schema.py
@@ -51,11 +51,7 @@ class ProjectNewV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectEditV1(PagureMessage):
@@ -97,11 +93,7 @@ class ProjectEditV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectForkedV1(PagureMessage):
@@ -139,11 +131,7 @@ class ProjectForkedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectDeletedV1(PagureMessage):
@@ -224,11 +212,7 @@ class ProjectGroupAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectGroupRemovedV1(PagureMessage):
@@ -276,11 +260,7 @@ class ProjectGroupRemovedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectGroupAccessUpdatedV1(PagureMessage):
@@ -324,11 +304,7 @@ class ProjectGroupAccessUpdatedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectTagEditedV1(PagureMessage):
@@ -367,11 +343,7 @@ class ProjectTagEditedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectTagRemovedV1(PagureMessage):
@@ -410,11 +382,7 @@ class ProjectTagRemovedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectUserAccessUpdatedV1(PagureMessage):
@@ -458,11 +426,7 @@ class ProjectUserAccessUpdatedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectUserAddedV1(PagureMessage):
@@ -501,11 +465,7 @@ class ProjectUserAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
 
 
 class ProjectUserRemovedV1(PagureMessage):
@@ -544,8 +504,4 @@ class ProjectUserRemovedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-
-        tmpl = "{base_url}/{fullname}"
-        return tmpl.format(base_url=base_url, fullname=fullname)
+        return self.body["project"]["full_url"]
diff --git a/pagure_messages/pull_requests_schema.py b/pagure_messages/pull_requests_schema.py
index 77c6096..4c8b4c2 100644
--- a/pagure_messages/pull_requests_schema.py
+++ b/pagure_messages/pull_requests_schema.py
@@ -58,12 +58,7 @@ class PullRequestAssignedAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestAssignedResetV1(PagureMessage):
@@ -106,12 +101,7 @@ class PullRequestAssignedResetV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestClosedV1(PagureMessage):
@@ -156,12 +146,7 @@ class PullRequestClosedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestCommentAddedV1(PagureMessage):
@@ -203,14 +188,11 @@ class PullRequestCommentAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
+        full_url = self.body["pullrequest"]["full_url"]
         commentid = self.body["pullrequest"]["comments"][-1]["id"]
 
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}#comment-{commentid}"
-        return tmpl.format(
-            base_url=base_url, fullname=fullname, prid=prid, commentid=commentid
+        return "{full_url}#comment-{commentid}".format(
+            full_url=full_url, commentid=commentid
         )
 
 
@@ -253,14 +235,11 @@ class PullRequestCommentEditedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
+        full_url = self.body["pullrequest"]["full_url"]
         commentid = self.body["pullrequest"]["comments"][-1]["id"]
 
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}#comment-{commentid}"
-        return tmpl.format(
-            base_url=base_url, fullname=fullname, prid=prid, commentid=commentid
+        return "{full_url}#comment-{commentid}".format(
+            full_url=full_url, commentid=commentid
         )
 
 
@@ -305,12 +284,7 @@ class PullRequestFlagAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestFlagUpdatedV1(PagureMessage):
@@ -354,12 +328,7 @@ class PullRequestFlagUpdatedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestInitialCommentEditedV1(PagureMessage):
@@ -402,12 +371,7 @@ class PullRequestInitialCommentEditedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestNewV1(PagureMessage):
@@ -450,12 +414,7 @@ class PullRequestNewV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestRebasedV1(PagureMessage):
@@ -497,12 +456,7 @@ class PullRequestRebasedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestReopenedV1(PagureMessage):
@@ -544,12 +498,7 @@ class PullRequestReopenedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestTagAddedV1(PagureMessage):
@@ -594,12 +543,7 @@ class PullRequestTagAddedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestTagRemovedV1(PagureMessage):
@@ -644,12 +588,7 @@ class PullRequestTagRemovedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
 
 
 class PullRequestUpdatedV1(PagureMessage):
@@ -691,9 +630,4 @@ class PullRequestUpdatedV1(PagureMessage):
 
     @property
     def url(self):
-        base_url = self.get_base_url()
-        fullname = self.body["pullrequest"]["project"]["url_path"]
-        prid = self.body["pullrequest"]["id"]
-
-        tmpl = "{base_url}/{fullname}/pull-request/{prid}"
-        return tmpl.format(base_url=base_url, fullname=fullname, prid=prid)
+        return self.body["pullrequest"]["full_url"]
diff --git a/pagure_messages/tests/test_commit_flag_added.py b/pagure_messages/tests/test_commit_flag_added.py
index 132ccfa..8173611 100644
--- a/pagure_messages/tests/test_commit_flag_added.py
+++ b/pagure_messages/tests/test_commit_flag_added.py
@@ -36,7 +36,7 @@ def test_minimal():
     message = CommitFlagAddedV1(body=body)
     message.validate()
     assert (
-        message.url == "https://pagure.io/fedora-infra/fedocal-messages/c/"
+        message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages/c/"
         "36ca6c643221858eda70e2b52a6aee666dc6e576"
     )
 
diff --git a/pagure_messages/tests/test_commit_flag_updated.py b/pagure_messages/tests/test_commit_flag_updated.py
index 25c4711..37c7887 100644
--- a/pagure_messages/tests/test_commit_flag_updated.py
+++ b/pagure_messages/tests/test_commit_flag_updated.py
@@ -36,7 +36,7 @@ def test_minimal():
     message = CommitFlagUpdatedV1(body=body)
     message.validate()
     assert (
-        message.url == "https://pagure.io/fedora-infra/fedocal-messages/c/"
+        message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages/c/"
         "36ca6c643221858eda70e2b52a6aee666dc6e576"
     )
 
diff --git a/pagure_messages/tests/test_group_edit.py b/pagure_messages/tests/test_group_edit.py
index f0abdaa..db31a3d 100644
--- a/pagure_messages/tests/test_group_edit.py
+++ b/pagure_messages/tests/test_group_edit.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = GroupEditV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/group/fedora-infra"
+    assert message.url == "http://localhost.localdomain/group/fedora-infra"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_assigned_added.py b/pagure_messages/tests/test_issue_assigned_added.py
index 89a1441..60b82ab 100644
--- a/pagure_messages/tests/test_issue_assigned_added.py
+++ b/pagure_messages/tests/test_issue_assigned_added.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = IssueAssignedAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_assigned_reset.py b/pagure_messages/tests/test_issue_assigned_reset.py
index 96b114a..6576917 100644
--- a/pagure_messages/tests/test_issue_assigned_reset.py
+++ b/pagure_messages/tests/test_issue_assigned_reset.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = IssueAssignedResetV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_comment_added.py b/pagure_messages/tests/test_issue_comment_added.py
index bb244bb..7730920 100644
--- a/pagure_messages/tests/test_issue_comment_added.py
+++ b/pagure_messages/tests/test_issue_comment_added.py
@@ -35,10 +35,7 @@ def test_minimal():
     }
     message = IssueCommentAddedV1(body=body)
     message.validate()
-    assert (
-        message.url
-        == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311#comment-677717"
-    )
+    assert message.url == "http://localhost.localdomain/test/issue/9311#comment-677717"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_dependency_added.py b/pagure_messages/tests/test_issue_dependency_added.py
index 4c0e2c4..3781c45 100644
--- a/pagure_messages/tests/test_issue_dependency_added.py
+++ b/pagure_messages/tests/test_issue_dependency_added.py
@@ -36,7 +36,7 @@ def test_minimal():
     }
     message = IssueDependencyAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_dependency_removed.py b/pagure_messages/tests/test_issue_dependency_removed.py
index fea3795..c57edf8 100644
--- a/pagure_messages/tests/test_issue_dependency_removed.py
+++ b/pagure_messages/tests/test_issue_dependency_removed.py
@@ -36,7 +36,7 @@ def test_minimal():
     }
     message = IssueDependencyRemovedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_drop.py b/pagure_messages/tests/test_issue_drop.py
index 68fddd1..470e70c 100644
--- a/pagure_messages/tests/test_issue_drop.py
+++ b/pagure_messages/tests/test_issue_drop.py
@@ -35,7 +35,10 @@ def test_minimal():
     }
     message = IssueDropV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issues"
+    assert (
+        message.url
+        == "http://localhost.localdomain/fedora-infra/fedocal-messages/issues"
+    )
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_edit.py b/pagure_messages/tests/test_issue_edit.py
index 667a36c..e7d61b3 100644
--- a/pagure_messages/tests/test_issue_edit.py
+++ b/pagure_messages/tests/test_issue_edit.py
@@ -36,7 +36,7 @@ def test_minimal():
     }
     message = IssueEditV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_new.py b/pagure_messages/tests/test_issue_new.py
index 40e59db..70d5293 100644
--- a/pagure_messages/tests/test_issue_new.py
+++ b/pagure_messages/tests/test_issue_new.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = IssueNewV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_tag_added.py b/pagure_messages/tests/test_issue_tag_added.py
index d18166b..19d641a 100644
--- a/pagure_messages/tests/test_issue_tag_added.py
+++ b/pagure_messages/tests/test_issue_tag_added.py
@@ -36,7 +36,7 @@ def test_minimal():
     }
     message = IssueTagAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/9311"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_issue_tag_removed.py b/pagure_messages/tests/test_issue_tag_removed.py
index 9362d0c..eda44d1 100644
--- a/pagure_messages/tests/test_issue_tag_removed.py
+++ b/pagure_messages/tests/test_issue_tag_removed.py
@@ -36,7 +36,7 @@ def test_minimal():
     }
     message = IssueTagRemovedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/issue/8820"
+    assert message.url == "http://localhost.localdomain/test/issue/9311"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_edit.py b/pagure_messages/tests/test_project_edit.py
index 8098ed8..da1aa49 100644
--- a/pagure_messages/tests/test_project_edit.py
+++ b/pagure_messages/tests/test_project_edit.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = ProjectEditV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_forked.py b/pagure_messages/tests/test_project_forked.py
index 3b56c79..c6062f8 100644
--- a/pagure_messages/tests/test_project_forked.py
+++ b/pagure_messages/tests/test_project_forked.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectForkedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fork/jjames/pagure"
+    assert message.url == "http://localhost.localdomain/fork/jjames/pagure"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_group_access_updated.py b/pagure_messages/tests/test_project_group_access_updated.py
index 4fce1f8..80bb6b0 100644
--- a/pagure_messages/tests/test_project_group_access_updated.py
+++ b/pagure_messages/tests/test_project_group_access_updated.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectGroupAccessUpdatedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_group_added.py b/pagure_messages/tests/test_project_group_added.py
index 48e03b2..27bf1e4 100644
--- a/pagure_messages/tests/test_project_group_added.py
+++ b/pagure_messages/tests/test_project_group_added.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectGroupAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_group_removed.py b/pagure_messages/tests/test_project_group_removed.py
index 6240b4d..26cf6ae 100644
--- a/pagure_messages/tests/test_project_group_removed.py
+++ b/pagure_messages/tests/test_project_group_removed.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectGroupRemovedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_new.py b/pagure_messages/tests/test_project_new.py
index a5815df..9de5feb 100644
--- a/pagure_messages/tests/test_project_new.py
+++ b/pagure_messages/tests/test_project_new.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectNewV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_tag_edited.py b/pagure_messages/tests/test_project_tag_edited.py
index b208c5e..3a7f2fb 100644
--- a/pagure_messages/tests/test_project_tag_edited.py
+++ b/pagure_messages/tests/test_project_tag_edited.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectTagEditedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_tag_removed.py b/pagure_messages/tests/test_project_tag_removed.py
index ab901be..104e1ce 100644
--- a/pagure_messages/tests/test_project_tag_removed.py
+++ b/pagure_messages/tests/test_project_tag_removed.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectTagRemovedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_user_access_updated.py b/pagure_messages/tests/test_project_user_access_updated.py
index aa0785a..727e477 100644
--- a/pagure_messages/tests/test_project_user_access_updated.py
+++ b/pagure_messages/tests/test_project_user_access_updated.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectUserAccessUpdatedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_user_added.py b/pagure_messages/tests/test_project_user_added.py
index 675bf45..a293397 100644
--- a/pagure_messages/tests/test_project_user_added.py
+++ b/pagure_messages/tests/test_project_user_added.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectUserAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_project_user_removed.py b/pagure_messages/tests/test_project_user_removed.py
index cfddc1c..f4dbc9d 100644
--- a/pagure_messages/tests/test_project_user_removed.py
+++ b/pagure_messages/tests/test_project_user_removed.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = ProjectUserRemovedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/fedora-infra/fedocal-messages"
+    assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_assigned_added.py b/pagure_messages/tests/test_pull_request_assigned_added.py
index 8215fe0..430c15d 100644
--- a/pagure_messages/tests/test_pull_request_assigned_added.py
+++ b/pagure_messages/tests/test_pull_request_assigned_added.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = PullRequestAssignedAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_assigned_reset.py b/pagure_messages/tests/test_pull_request_assigned_reset.py
index dd60c39..c1f352b 100644
--- a/pagure_messages/tests/test_pull_request_assigned_reset.py
+++ b/pagure_messages/tests/test_pull_request_assigned_reset.py
@@ -35,10 +35,7 @@ def test_minimal():
     }
     message = PullRequestAssignedResetV1(body=body)
     message.validate()
-    assert (
-        message.url
-        == "https://pagure.io/fedora-infra/fedocal-messages/pull-request/5014"
-    )
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_closed.py b/pagure_messages/tests/test_pull_request_closed.py
index ae9ff00..d8e2e6a 100644
--- a/pagure_messages/tests/test_pull_request_closed.py
+++ b/pagure_messages/tests/test_pull_request_closed.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = PullRequestClosedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_comment_added.py b/pagure_messages/tests/test_pull_request_comment_added.py
index 3b4137c..8a960e2 100644
--- a/pagure_messages/tests/test_pull_request_comment_added.py
+++ b/pagure_messages/tests/test_pull_request_comment_added.py
@@ -34,7 +34,10 @@ def test_minimal():
     }
     message = PullRequestCommentAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014#comment-133905"
+    assert (
+        message.url
+        == "http://localhost.localdomain/pagure/pull-request/5014#comment-133905"
+    )
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_comment_edited.py b/pagure_messages/tests/test_pull_request_comment_edited.py
index 223515b..40dbba5 100644
--- a/pagure_messages/tests/test_pull_request_comment_edited.py
+++ b/pagure_messages/tests/test_pull_request_comment_edited.py
@@ -34,7 +34,10 @@ def test_minimal():
     }
     message = PullRequestCommentEditedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014#comment-133905"
+    assert (
+        message.url
+        == "http://localhost.localdomain/pagure/pull-request/5014#comment-133905"
+    )
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_flag_added.py b/pagure_messages/tests/test_pull_request_flag_added.py
index 45ed2d0..bd883ca 100644
--- a/pagure_messages/tests/test_pull_request_flag_added.py
+++ b/pagure_messages/tests/test_pull_request_flag_added.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = PullRequestFlagAddedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_flag_updated.py b/pagure_messages/tests/test_pull_request_flag_updated.py
index d09352e..3058b57 100644
--- a/pagure_messages/tests/test_pull_request_flag_updated.py
+++ b/pagure_messages/tests/test_pull_request_flag_updated.py
@@ -35,7 +35,7 @@ def test_minimal():
     }
     message = PullRequestFlagUpdatedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_initial_comment_edited.py b/pagure_messages/tests/test_pull_request_initial_comment_edited.py
index 5459971..3d11cb5 100644
--- a/pagure_messages/tests/test_pull_request_initial_comment_edited.py
+++ b/pagure_messages/tests/test_pull_request_initial_comment_edited.py
@@ -35,10 +35,7 @@ def test_minimal():
     }
     message = PullRequestInitialCommentEditedV1(body=body)
     message.validate()
-    assert (
-        message.url
-        == "https://pagure.io/fedora-infra/fedocal-messages/pull-request/5014"
-    )
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_new.py b/pagure_messages/tests/test_pull_request_new.py
index 6d6477d..3a519cb 100644
--- a/pagure_messages/tests/test_pull_request_new.py
+++ b/pagure_messages/tests/test_pull_request_new.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = PullRequestNewV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_rebased.py b/pagure_messages/tests/test_pull_request_rebased.py
index 7a00afe..4f7c3cb 100644
--- a/pagure_messages/tests/test_pull_request_rebased.py
+++ b/pagure_messages/tests/test_pull_request_rebased.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = PullRequestRebasedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_reopened.py b/pagure_messages/tests/test_pull_request_reopened.py
index 13b94ff..8b7f0ad 100644
--- a/pagure_messages/tests/test_pull_request_reopened.py
+++ b/pagure_messages/tests/test_pull_request_reopened.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = PullRequestReopenedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_tag_added.py b/pagure_messages/tests/test_pull_request_tag_added.py
index 61193cc..418946b 100644
--- a/pagure_messages/tests/test_pull_request_tag_added.py
+++ b/pagure_messages/tests/test_pull_request_tag_added.py
@@ -36,10 +36,7 @@ def test_minimal():
     }
     message = PullRequestTagAddedV1(body=body)
     message.validate()
-    assert (
-        message.url
-        == "https://pagure.io/fedora-infra/fedocal-messages/pull-request/5014"
-    )
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_tag_removed.py b/pagure_messages/tests/test_pull_request_tag_removed.py
index 46ec135..ec76a86 100644
--- a/pagure_messages/tests/test_pull_request_tag_removed.py
+++ b/pagure_messages/tests/test_pull_request_tag_removed.py
@@ -36,10 +36,7 @@ def test_minimal():
     }
     message = PullRequestTagRemovedV1(body=body)
     message.validate()
-    assert (
-        message.url
-        == "https://pagure.io/fedora-infra/fedocal-messages/pull-request/5014"
-    )
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/test_pull_request_updated.py b/pagure_messages/tests/test_pull_request_updated.py
index 75938e1..550836d 100644
--- a/pagure_messages/tests/test_pull_request_updated.py
+++ b/pagure_messages/tests/test_pull_request_updated.py
@@ -34,7 +34,7 @@ def test_minimal():
     }
     message = PullRequestUpdatedV1(body=body)
     message.validate()
-    assert message.url == "https://pagure.io/pagure/pull-request/5014"
+    assert message.url == "http://localhost.localdomain/pagure/pull-request/5014"
 
 
 def test_missing_fields():
diff --git a/pagure_messages/tests/utils.py b/pagure_messages/tests/utils.py
index 83f7182..b10e31a 100644
--- a/pagure_messages/tests/utils.py
+++ b/pagure_messages/tests/utils.py
@@ -585,4 +585,5 @@ GROUP = {
     "date_created": "1598094647",
     "group_type": "user",
     "name": "fedora-infra",
+    "full_url": "http://localhost.localdomain/group/fedora-infra",
 }