frontend: Add distgit source and namespace to source_json

Author: sundaram123krishnan

frontend/coprs_frontend/coprs/logic/builds_logic.py

@@ -672,6 +672,11 @@ def create_new_from_distgit(cls, user, copr, package_name,
             source_dict["clone_url"] = DistGitLogic.get_clone_url(
                     distgit_name, package_name, distgit_namespace)
 
+        if distgit_name:
+            source_dict["distgit"] = distgit_name
+
+        if distgit_namespace:
+            source_dict["namespace"] = distgit_namespace
         if committish:
             source_dict["committish"] = committish
 

frontend/coprs_frontend/tests/test_apiv3/test_builds.py

@@ -30,6 +30,7 @@
     },
     {
         "clone_url": "git://prio.com/some/other/uri/mock/git",
+        "distgit": "prioritized",
     },
     {
         "distgit": "prioritized",
@@ -43,8 +44,8 @@
         "distgit": "fedora",
     },
     {
-        # no need to store "distgit" to source_json
-        "clone_url": "https://src.fedoraproject.org/rpms/cpio"
+        "clone_url": "https://src.fedoraproject.org/rpms/cpio",
+        "distgit": "fedora",
     },
     {
         "distgit": "fedora",
@@ -60,6 +61,7 @@
     {
         "committish": "f15",
         "clone_url": "git://prio.com/some/other/uri/tar/git",
+        "distgit": "prioritized",
     },
     {
         "distgit": "prioritized",
@@ -76,6 +78,8 @@
     },
     {
         "clone_url": "https://namespaced.org/some/other/uri/@copr/copr/blah/git",
+        "distgit": "namespaced",
+        "namespace": "@copr/copr",
     },
     {
         "distgit": "namespaced",

frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_method_distgit.py

@@ -28,11 +28,36 @@ def test_copr_user_can_add_distgit_build(self):
         assert build.source_type == BuildSourceEnum.distgit
         assert build.source_json == json.dumps({
             "clone_url": "https://src.fedoraproject.org/rpms/mock",
+            "distgit": "fedora",
             "committish": "master"})
 
         assert len(build.chroots) == 1
         assert build.chroots[0].name == "fedora-18-x86_64"
 
+    @TransactionDecorator("u1")
+    @pytest.mark.usefixtures("f_users", "f_coprs", "f_mock_chroots", "f_db")
+    def test_distgit_build_stores_namespace_distgit(self):
+        """
+        Test that distgit_namespace and distgit source is stored in source_json when provided.
+        """
+        self.db.session.add_all([self.u1, self.c1])
+        data = {
+            "package_name": "mock",
+            "committish": "master",
+            "namespace": "forks/testuser",
+            "chroots": ["fedora-18-x86_64"],
+        }
+        endpoint = "/coprs/{0}/{1}/new_build_distgit/".format(self.u1.name,
+                                                              self.c1.name)
+        self.test_client.post(endpoint, data=data, follow_redirects=True)
+        build = self.models.Build.query.first()
+        assert build.source_type == BuildSourceEnum.distgit
+        source_dict = json.loads(build.source_json)
+        assert "namespace" in source_dict
+        assert "distgit" in source_dict
+        assert source_dict["namespace"] == "forks/testuser"
+        assert source_dict["distgit"] == "fedora"
+
     @TransactionDecorator("u1")
     @pytest.mark.usefixtures("f_users", "f_coprs", "f_mock_chroots", "f_db")
     def test_copr_user_can_add_distgit_package(self):