Merge pull request #836 from readthedocs/davidfischer/staff-advertise…

…r-report-campaign-type

Filter staff advertiser report by campaign type

adserver/tests/test_reports.py

@@ -739,6 +739,78 @@ def test_publisher_uplift_report_contents(self):
             response, '<td class="text-right"><strong>3</strong></td>'
         )
 
+    def test_staff_advertiser_report_contents(self):
+        url = reverse("staff_advertisers_report")
+
+        # Create a house ad
+        ad2 = get(
+            Advertisement,
+            name="Test Ad 2",
+            slug="test-ad-2",
+            flight=self.flight3,
+            ad_type=self.ad_type1,
+            image=None,
+        )
+
+        # House ad traffic
+        get(
+            Offer,
+            advertisement=ad2,
+            publisher=self.publisher1,
+            viewed=True,
+        )
+        get(
+            Offer,
+            advertisement=ad2,
+            publisher=self.publisher1,
+            viewed=True,
+            clicked=True,
+        )
+
+        # Paid traffic
+        get(
+            Offer,
+            advertisement=self.ad1,
+            publisher=self.publisher1,
+            viewed=True,
+        )
+        get(
+            Offer,
+            advertisement=self.ad1,
+            publisher=self.publisher1,
+            viewed=True,
+        )
+        get(
+            Offer,
+            advertisement=self.ad1,
+            publisher=self.publisher1,
+            viewed=True,
+        )
+        get(
+            Offer,
+            advertisement=self.ad1,
+            publisher=self.publisher1,
+            viewed=True,
+            clicked=True,
+        )
+
+        daily_update_impressions()
+        daily_update_advertisers()
+
+        # Staff only has has access
+        self.client.force_login(self.staff_user)
+
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, '<td class="text-right"><strong>6</strong></td>')
+
+        response = self.client.get(url + "?campaign_type=paid")
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, '<td class="text-right"><strong>4</strong></td>')
+        self.assertNotContains(
+            response, '<td class="text-right"><strong>6</strong></td>'
+        )
+
     def test_global_keyword_report_contents(self):
         get(
             Offer,

adserver/views.py

@@ -48,6 +48,7 @@
 from rest_framework.authtoken.models import Token
 from user_agents import parse as parse_user_agent
 
+from .constants import ALL_CAMPAIGN_TYPES
 from .constants import CAMPAIGN_TYPES
 from .constants import CLICKS
 from .constants import FLIGHT_STATE_CURRENT
@@ -78,6 +79,7 @@
 from .models import Advertisement
 from .models import Advertiser
 from .models import AdvertiserImpression
+from .models import Campaign
 from .models import Flight
 from .models import GeoImpression
 from .models import KeywordImpression
@@ -1414,6 +1416,13 @@ def get_context_data(self, **kwargs):
                 start_date=context["start_date"],
                 end_date=context["end_date"],
             ).filter(advertiser=advertiser)
+            if context["campaign_type"] in ALL_CAMPAIGN_TYPES:
+                queryset = queryset.filter(
+                    advertiser__in=Campaign.objects.filter(
+                        campaign_type=context["campaign_type"],
+                        advertiser=advertiser,
+                    ).values("advertiser_id")
+                )
             report = self.report(queryset)
             report.generate()
 
@@ -1432,6 +1441,7 @@ def get_context_data(self, **kwargs):
             {
                 "advertisers": [a for a, _ in advertisers_and_reports],
                 "advertisers_and_reports": advertisers_and_reports,
+                "campaign_types": CAMPAIGN_TYPES,
                 "total_clicks": total_clicks,
                 "total_cost": total_cost,
                 "total_views": total_views,