Merge pull request #921 from readthedocs/davidfischer/per-ad-per-day-…

…export

Per ad per day advertiser table/export

adserver/templates/adserver/reports/advertiser-per-ad.html

@@ -0,0 +1,40 @@
+{% extends "adserver/reports/advertiser.html" %}
+{% load humanize %}
+{% load i18n %}
+{% load metabase %}
+
+
+{% block title %}{% trans 'Advertiser Per Ad Per Day Report' %} - {{ advertiser }}{% endblock %}
+
+
+{% block heading %}
+{% blocktrans %}Advertiser Per Ad Per Day Report for {{ advertiser }}{% endblocktrans %}
+{% endblock heading %}
+
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item active">{% trans 'Per Ad Per Day Report' %}</li>
+{% endblock breadcrumbs %}
+
+
+{% block explainer %}
+<section class="mb-5">
+  <h3>{% trans 'About this report' %}</h3>
+  <p>
+    <span>{% trans 'This report shows a table of data with one entry for each ad for every day that ad is shown.' %} </span>
+    <span><strong>{% trans 'The data can be exported to CSV/Excel for further analysis with the icon at the bottom right.' %}</strong></span>
+  </p>
+</section>
+{% endblock explainer %}
+
+
+{% block report %}{% endblock report %}
+
+
+{% block summary %}
+  <div class="row mb-5">
+    <div class="col min-vh-100">
+      {% metabase_question_embed metabase_advertiser_per_ad advertiser_slug=advertiser.slug start_date=start_date end_date=end_date %}
+    </div>
+  </div>
+{% endblock summary %}

adserver/templates/adserver/reports/advertiser.html

@@ -44,6 +44,11 @@ <h2 class="col-md-8">{% trans 'Total results for all ads across all flights' %}<
 
         {% if export_url %}
           <aside class="mb-3 col-md-4 text-right">
+            <a href="{% url 'advertiser_per_ad_report' advertiser.slug %}" class="btn btn-sm btn-outline-secondary" role="button" aria-pressed="true">
+              <span class="fa fa-bar-chart mr-1" aria-hidden="true"></span>
+              <span>Per Ad Breakdown</span>
+            </a>
+
             <a href="{{ export_url }}" class="btn btn-sm btn-outline-secondary" role="button" aria-pressed="true">
               <span class="fa fa-download mr-1" aria-hidden="true"></span>
               <span>CSV Export</span>

adserver/tests/test_reports.py

@@ -396,6 +396,20 @@ def test_advertiser_geo_report_contents(self):
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
 
+    def test_advertiser_perday_report_contents(self):
+        url = reverse("advertiser_per_ad_report", args=[self.advertiser1.slug])
+
+        # Anonymous
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response["location"].startswith("/accounts/login/"))
+
+        self.client.force_login(self.staff_user)
+
+        # Metabase-only report
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+
     def test_advertiser_publisher_report_contents(self):
         get(
             Offer,

adserver/urls.py

@@ -18,6 +18,7 @@
 from .views import AdvertiserGeoReportView
 from .views import AdvertiserKeywordReportView
 from .views import AdvertiserMainView
+from .views import AdvertiserPerAdPerDayReportView
 from .views import AdvertiserPublisherReportView
 from .views import AdvertiserReportView
 from .views import AdvertiserStripePortalView
@@ -167,6 +168,11 @@
         AdvertiserGeoReportView.as_view(export=True),
         name="advertiser_geo_report_export",
     ),
+    path(
+        r"advertiser/<slug:advertiser_slug>/report/ad-breakdown/",
+        AdvertiserPerAdPerDayReportView.as_view(),
+        name="advertiser_per_ad_report",
+    ),
     path(
         r"advertiser/<slug:advertiser_slug>/report/publishers/",
         AdvertiserPublisherReportView.as_view(),

adserver/views.py

@@ -1332,6 +1332,30 @@ def get_context_data(self, **kwargs):
         return context
 
 
+class AdvertiserPerAdPerDayReportView(AdvertiserAccessMixin, BaseReportView):
+    """A report for an advertiser broken down by day and by ad."""
+
+    impression_model = GeoImpression
+    template_name = "adserver/reports/advertiser-per-ad.html"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        advertiser_slug = kwargs.get("advertiser_slug", "")
+        advertiser = get_object_or_404(Advertiser, slug=advertiser_slug)
+
+        context.update(
+            {
+                "advertiser": advertiser,
+                "metabase_advertiser_per_ad": settings.METABASE_QUESTIONS.get(
+                    "ADVERTISER_PER_AD_TABLE"
+                ),
+            }
+        )
+
+        return context
+
+
 class AdvertiserPublisherReportView(AdvertiserAccessMixin, BaseReportView):
     """A report for an advertiser broken down by publishers where the advertisers ads are shown."""
 

config/settings/base.py

@@ -491,6 +491,7 @@
     "PUBLISHER_KEYWORD_REPORT": 318,
     "PUBLISHER_GEO_REPORT": 319,
     "ADVERTISER_TOPIC_PERFORMANCE": 366,
+    "ADVERTISER_PER_AD_TABLE": 966,
 }
 METABASE_DASHBOARDS = {
     "ADVERTISER_FIGURES": 80,