Use seperate methods to scrape and dump data #24

* Changed test cases accordingly

Signed-off-by: Kartik Sibal <kartiksibal@gmail.com>

Author: kartiksibal

app/vulncode_app/data_dump.py

@@ -32,13 +32,17 @@
 from scraper import ubuntu
 
 
-def debian_dump():
-    """
-    Dump data scraped from Debian' security tracker.
-    """
+def data_debian_dump():
     json_data = debian.json_data()
     extract_data = debian.extract_data(json_data)
 
+    return extract_data
+
+
+def debian_dump(extract_data):
+    """
+    Dump data scraped from Debian' security tracker.
+    """
     for data in extract_data:
         vulnerability = Vulnerability(summary=data.get('description'))
         vulnerability_reference = VulnerabilityReference(reference_id=data.get('vulnerability_id'))
@@ -48,6 +52,8 @@ def debian_dump():
         vulnerability_reference.save()
         package.save()
 
+    return vulnerability, vulnerability_reference, package
+
 
 def ubuntu_dump():
     """

app/vulncode_app/test_data_dump.py

@@ -42,17 +42,9 @@ def test_data_dump(self):
         with open("tests/test_data/debian.json") as f:
             test_data = json.loads(f.read())
 
-        extract_data = debian.extract_data(test_data)
+        debian_extract_data = debian.extract_data(test_data)
+        data_dump = debian_dump(debian_extract_data)
 
-        for data in extract_data:
-            vulnerability = Vulnerability(summary=data.get('description'))
-            vulnerability_reference = VulnerabilityReference(reference_id=data.get('vulnerability_id'))
-            package = Package(name=data.get('package_name'), version=data.get('fixed_version'))
-
-            vulnerability.save()
-            vulnerability_reference.save()
-            package.save()
-
-        self.assertEqual(getattr(vulnerability, 'summary'), None)
-        self.assertEqual(getattr(vulnerability_reference, 'reference_id'), "TEMP-0807341-84E914")
-        self.assertEqual(getattr(package, 'name'), "git-repair")
+        self.assertEqual(data_dump[0].summary, None)
+        self.assertEqual(data_dump[1].reference_id, "TEMP-0807341-84E914")
+        self.assertEqual(data_dump[2].name, "git-repair")