Merge pull request #145 from codecov/sn1020/CE-1498-complexity

CE-1498: Show complexity coverage on commits list

Author: sn1020

Diff for: internal_api/commit/serializers.py

@@ -1,8 +1,6 @@
 import asyncio
 import logging
 
-from dataclasses import astuple, asdict
-
 from rest_framework import serializers
 
 from services.archive import ReportService
@@ -13,6 +11,43 @@
 log = logging.getLogger(__name__)
 
 
+class CommitTotalsSerializer(serializers.Serializer):
+    files = serializers.IntegerField(source="f")
+    lines = serializers.IntegerField(source="n")
+    hits = serializers.IntegerField(source="h")
+    misses = serializers.IntegerField(source="m")
+    partials = serializers.IntegerField(source="p")
+    coverage = serializers.SerializerMethodField()
+    branches = serializers.IntegerField(source="b")
+    methods = serializers.IntegerField(source="d")
+    sessions = serializers.IntegerField(source="s")
+    complexity = serializers.FloatField(source="C")
+    complexity_total = serializers.FloatField(source="N")
+    diff = serializers.JSONField()
+
+    def get_coverage(self, totals):
+        return round(float(totals["c"]), 2)
+
+
+class ReportTotalsSerializer(serializers.Serializer):
+    files = serializers.IntegerField()
+    lines = serializers.IntegerField()
+    hits = serializers.IntegerField()
+    misses = serializers.IntegerField()
+    partials = serializers.IntegerField()
+    coverage = serializers.SerializerMethodField()
+    branches = serializers.IntegerField()
+    methods = serializers.IntegerField()
+    messages = serializers.IntegerField()
+    sessions = serializers.IntegerField()
+    complexity = serializers.IntegerField()
+    complexity_total = serializers.IntegerField()
+    diff = serializers.JSONField()
+
+    def get_coverage(self, totals):
+        return round(float(totals.coverage), 2)
+
+
 class CommitRepoSerializer(serializers.ModelSerializer):
     repoid = serializers.IntegerField()
     name = serializers.CharField()
@@ -26,6 +61,7 @@ class Meta:
 class CommitSerializer(serializers.ModelSerializer):
     author = OwnerSerializer()
     repository = CommitRepoSerializer()
+    totals = CommitTotalsSerializer()
 
     class Meta:
         model = Commit
@@ -90,23 +126,7 @@ class CommitWithParentSerializer(CommitWithSrcSerializer):
     class Meta:
         model = Commit
         fields = ('src', 'commitid', 'timestamp', 'ci_passed',
-                  'report', 'repository', 'parent', 'author')
-
-
-class ReportTotalsSerializer(serializers.Serializer):
-    files = serializers.IntegerField()
-    lines = serializers.IntegerField()
-    hits = serializers.IntegerField()
-    misses = serializers.IntegerField()
-    partials = serializers.IntegerField()
-    coverage = serializers.CharField()
-    branches = serializers.IntegerField()
-    methods = serializers.IntegerField()
-    messages = serializers.IntegerField()
-    sessions = serializers.IntegerField()
-    complexity = serializers.IntegerField()
-    complexity_total = serializers.IntegerField()
-    diff = serializers.JSONField()
+                  'report', 'repository', 'parent', 'author', 'totals')
 
 
 class ReportFileWithoutLinesSerializer(serializers.Serializer):

Diff for: internal_api/pull/serializers.py

@@ -1,15 +1,14 @@
 from rest_framework import serializers
 
-from core.models import Pull, Commit
-from codecov_auth.models import Owner
+from core.models import Pull
 from internal_api.owner.serializers import OwnerSerializer
-from internal_api.serializers import TotalsSerializer
+from internal_api.commit.serializers import CommitTotalsSerializer
 
 
 class PullSerializer(serializers.ModelSerializer):
     most_recent_commiter = serializers.CharField()
-    base_totals = TotalsSerializer()
-    head_totals = TotalsSerializer()
+    base_totals = CommitTotalsSerializer()
+    head_totals = CommitTotalsSerializer()
     ci_passed = serializers.BooleanField()
 
     class Meta:

Diff for: internal_api/serializers.py

@@ -44,24 +44,3 @@ def validate(self, obj):
             }
         except Commit.DoesNotExist:
             raise serializers.ValidationError("Comparison requested for pull with nonexistant commit.")
-
-
-class TotalsSerializer(serializers.Serializer):
-    files = serializers.IntegerField(source="f")
-    lines = serializers.IntegerField(source="n")
-    hits = serializers.IntegerField(source="h")
-    misses = serializers.IntegerField(source="m")
-    partials = serializers.IntegerField(source="p")
-    coverage = serializers.SerializerMethodField()
-    branches = serializers.IntegerField(source="b")
-    methods = serializers.IntegerField(source="d")
-    sessions = serializers.IntegerField(source="s")
-    diffCoverage = serializers.SerializerMethodField()
-
-    def get_coverage(self, totals):
-        return round(float(totals["c"]), 2)
-
-    def get_diffCoverage(self, totals):
-        if totals["diff"]:
-            return round(float(totals["diff"][5]), 2)
-        return 0

Diff for: internal_api/tests/test_flags_serializer.py

@@ -53,7 +53,7 @@ def test_flag_serializer(self, mocker, db, codecov_vcr):
                 'branches': 0,
                 'complexity': 0,
                 'complexity_total': 0,
-                'coverage': '79.16667',
+                'coverage': 79.17,
                 'diff': 0,
                 'files': 3,
                 'hits': 19,
@@ -68,7 +68,7 @@ def test_flag_serializer(self, mocker, db, codecov_vcr):
                 'branches': 0,
                 'complexity': 0,
                 'complexity_total': 0,
-                'coverage': '0',
+                'coverage': 0,
                 'diff': 0,
                 'files': 1,
                 'hits': 0,
@@ -83,7 +83,7 @@ def test_flag_serializer(self, mocker, db, codecov_vcr):
                 'branches': 0,
                 'complexity': 0,
                 'complexity_total': 0,
-                'coverage': '56.00000',
+                'coverage': 56,
                 'diff': 0,
                 'files': 3,
                 'hits': 14,
@@ -110,7 +110,7 @@ def test_flag_serializer(self, mocker, db, codecov_vcr):
                 'branches': 0,
                 'complexity': 0,
                 'complexity_total': 0,
-                'coverage': '79.16667',
+                'coverage': 79.17,
                 'diff': 0,
                 'files': 3,
                 'hits': 19,
@@ -125,7 +125,7 @@ def test_flag_serializer(self, mocker, db, codecov_vcr):
                 'branches': 0,
                 'complexity': 0,
                 'complexity_total': 0,
-                'coverage': '100',
+                'coverage': 100,
                 'diff': 0,
                 'files': 1,
                 'hits': 1,
@@ -140,7 +140,7 @@ def test_flag_serializer(self, mocker, db, codecov_vcr):
                 'branches': 0,
                 'complexity': 0,
                 'complexity_total': 0,
-                'coverage': '80.00000',
+                'coverage': 80,
                 'diff': 0,
                 'files': 3,
                 'hits': 20,

Diff for: internal_api/tests/unit/views/test_compare_flags_view.py

@@ -91,7 +91,7 @@ def test_compare_flags___success(
                         'branches': 0,
                         'complexity': 0,
                         'complexity_total': 0,
-                        'coverage': '79.16667',
+                        'coverage': 79.17,
                         'diff': 0,
                         'files': 3,
                         'hits': 19,
@@ -106,7 +106,7 @@ def test_compare_flags___success(
                         'branches': 0,
                         'complexity': 0,
                         'complexity_total': 0,
-                        'coverage': '0',
+                        'coverage': 0,
                         'diff': 0,
                         'files': 0,
                         'hits': 0,
@@ -121,7 +121,7 @@ def test_compare_flags___success(
                         'branches': 0,
                         'complexity': 0,
                         'complexity_total': 0,
-                        'coverage': '80.00000',
+                        'coverage': 80,
                         'diff': 0,
                         'files': 3,
                         'hits': 20,
@@ -139,7 +139,7 @@ def test_compare_flags___success(
                         'branches': 0,
                         'complexity': 0,
                         'complexity_total': 0,
-                        'coverage': '79.16667',
+                        'coverage': 79.17,
                         'diff': 0,
                         'files': 3,
                         'hits': 19,
@@ -154,7 +154,7 @@ def test_compare_flags___success(
                         'branches': 0,
                         'complexity': 0,
                         'complexity_total': 0,
-                        'coverage': '0',
+                        'coverage': 0,
                         'diff': 0,
                         'files': 0,
                         'hits': 0,
@@ -169,7 +169,7 @@ def test_compare_flags___success(
                         'branches': 0,
                         'complexity': 0,
                         'complexity_total': 0,
-                        'coverage': '56.00000',
+                        'coverage': 56,
                         'diff': 0,
                         'files': 3,
                         'hits': 14,

Diff for: internal_api/tests/unit/views/test_compare_view.py

@@ -21,7 +21,6 @@
     PullFactory,
 )
 
-
 def build_commits(client):
     """
         build commits in mock_db that are based on a real git commit for using VCR
@@ -63,6 +62,34 @@ def setUp(self):
             organizations=[org.ownerid]
         )
         self.repo, self.commit_base, self.commit_head = build_commits(self.client)
+        self.commit_base_totals_serialized = {
+            'files': self.commit_base.totals['f'],
+            'lines': self.commit_base.totals['n'],
+            'hits': self.commit_base.totals['h'],
+            'misses': self.commit_base.totals['m'],
+            'partials': self.commit_base.totals['p'],
+            'coverage': round(float(self.commit_base.totals['c']), 2),
+            'branches': self.commit_base.totals['b'],
+            'methods': self.commit_base.totals['d'],
+            'sessions': self.commit_base.totals['s'],
+            'diff': self.commit_base.totals['diff'],
+            'complexity': self.commit_base.totals['C'],
+            'complexity_total': self.commit_base.totals['N']
+        }
+        self.commit_head_totals_serialized = {
+            'files': self.commit_head.totals['f'],
+            'lines': self.commit_head.totals['n'],
+            'hits': self.commit_head.totals['h'],
+            'misses': self.commit_head.totals['m'],
+            'partials': self.commit_head.totals['p'],
+            'coverage': round(float(self.commit_head.totals['c']), 2),
+            'branches': self.commit_head.totals['b'],
+            'methods': self.commit_head.totals['d'],
+            'sessions': self.commit_head.totals['s'],
+            'diff': self.commit_head.totals['diff'],
+            'complexity': self.commit_head.totals['C'],
+            'complexity_total': self.commit_head.totals['N']
+        }
 
     def _get_commits_comparison(self, kwargs, query_params):
         return self.client.get(reverse('compare-commits', kwargs=kwargs), data=query_params)
@@ -148,9 +175,9 @@ def test_compare_commits_view_with_branchname(self, mocked_comparison):
         content = json.loads(response.content.decode())
         assert content['git_commits'] == mocked_comparison.return_value["commits"]
         assert content['commit_uploads'][0]['commitid'] == self.commit_head.commitid
-        assert content['commit_uploads'][0]['totals'] == self.commit_head.totals
+        assert content['commit_uploads'][0]['totals'] == self.commit_head_totals_serialized
         assert content['commit_uploads'][1]['commitid'] == self.commit_base.commitid
-        assert content['commit_uploads'][1]['totals'] == self.commit_base.totals
+        assert content['commit_uploads'][1]['totals'] == self.commit_base_totals_serialized
 
     @patch('services.comparison.Comparison._calculate_git_comparison')
     def test_compare_commits_view_with_commitid(self, mocked_comparison):
@@ -170,9 +197,9 @@ def test_compare_commits_view_with_commitid(self, mocked_comparison):
         content = json.loads(response.content.decode())
         assert content['git_commits'] == mocked_comparison.return_value["commits"]
         assert content['commit_uploads'][0]['commitid'] == self.commit_head.commitid
-        assert content['commit_uploads'][0]['totals'] == self.commit_head.totals
+        assert content['commit_uploads'][0]['totals'] == self.commit_head_totals_serialized
         assert content['commit_uploads'][1]['commitid'] == self.commit_base.commitid
-        assert content['commit_uploads'][1]['totals'] == self.commit_base.totals
+        assert content['commit_uploads'][1]['totals'] == self.commit_base_totals_serialized
 
     @patch('services.comparison.Comparison._calculate_git_comparison')
     def test_compare_commits_view_with_pullid(self, mocked_comparison):
@@ -199,9 +226,9 @@ def test_compare_commits_view_with_pullid(self, mocked_comparison):
 
         assert response.data['git_commits'] == mocked_comparison.return_value["commits"]
         assert response.data['commit_uploads'][0]['commitid'] == self.commit_head.commitid
-        assert response.data['commit_uploads'][0]['totals'] == self.commit_head.totals
+        assert response.data['commit_uploads'][0]['totals'] == self.commit_head_totals_serialized
         assert response.data['commit_uploads'][1]['commitid'] == self.commit_base.commitid
-        assert response.data['commit_uploads'][1]['totals'] == self.commit_base.totals
+        assert response.data['commit_uploads'][1]['totals'] == self.commit_base_totals_serialized
 
 
 @patch('services.archive.ArchiveService.create_root_storage')