Page views

src/main/java/com/wechi/adweb/bridge/google/analytics/GADataService.java

@@ -9,10 +9,7 @@ import com.google.gson.Gson;
 import com.wechi.adweb.bridge.exception.DataException;
 import com.wechi.adweb.bridge.google.analytics.dto.report.GAReportRequestDTO;
 import com.wechi.adweb.bridge.google.analytics.dto.report.ReportType;
-import com.wechi.adweb.bridge.google.analytics.dto.report.data.CountryChartData;
-import com.wechi.adweb.bridge.google.analytics.dto.report.data.GAReportDataDTO;
-import com.wechi.adweb.bridge.google.analytics.dto.report.data.PagePathViewData;
-import com.wechi.adweb.bridge.google.analytics.dto.report.data.SourceMediaViewData;
+import com.wechi.adweb.bridge.google.analytics.dto.report.data.*;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -172,6 +169,7 @@ public class GADataService {
             case ADWEB_SESSION_SOURCE_MEDIUM_VIEW ->
                     SourceMediaViewData.toReport(reportRows, metrics, dimensions);
             case ADWEB_PAGE_PATH_VIEW -> PagePathViewData.toReport(reportRows, metrics, dimensions);
+            case PAGE_VIEWS -> PageViewsData.toReport(reportRows, metrics, dimensions);
         };
     }
 }

src/main/java/com/wechi/adweb/bridge/google/analytics/dto/report/ReportType.java

@@ -30,7 +30,13 @@ public enum ReportType {
             List.of(DIMENSION_PAGE_PATH),
             METRIC_SCREEN_PAGE_VIEWS,
             METRICS,
-            true);
+            true),
+    PAGE_VIEWS(
+            List.of(METRIC_SCREEN_PAGE_VIEWS),
+            List.of(DIMENSION_DATE),
+            DIMENSION_DATE,
+            DIMENSIONS,
+            false);
 
     ReportType(List<String> defaultMetrics, List<String> defaultDimensions) {
         this.defaultMetrics = defaultMetrics;

src/main/java/com/wechi/adweb/bridge/google/analytics/dto/report/data/CountryChartData.java

@@ -16,19 +16,22 @@ import java.util.List;
 @Builder
 public class CountryChartData implements GAReportDataDTO {
     private String country;
-    private int num;
+    private int totalUsers;
 
     public static List<CountryChartData> toReport(
             List<Row> reportRows, List<String> metrics, List<String> dimensions) {
         int indexCountry = dimensions.indexOf(DIMENSION_COUNTRY);
+        int indexTotalUsers = metrics.indexOf(METRIC_TOTAL_USERS);
 
         return reportRows.stream()
                 .map(
                         row ->
                                 CountryChartData.builder()
                                         .country(row.getDimensionValues(indexCountry).getValue())
-                                        // The first metric value - for customized metrics query.
-                                        .num(Integer.parseInt(row.getMetricValues(0).getValue()))
+                                        .totalUsers(
+                                                Integer.parseInt(
+                                                        row.getMetricValues(indexTotalUsers)
+                                                                .getValue()))
                                         .build())
                 .toList();
     }

src/main/java/com/wechi/adweb/bridge/google/analytics/dto/report/data/PageViewsData.java

@@ -0,0 +1,51 @@
+package com.wechi.adweb.bridge.google.analytics.dto.report.data;
+
+import static com.wechi.adweb.bridge.google.analytics.dto.report.ReportConstant.*;
+
+import com.google.analytics.data.v1beta.Row;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * @author wfansh
+ */
+@Data
+@Builder
+public class PageViewsData implements GAReportDataDTO {
+
+    /**
+     * Formatted as {@link DateTimeFormatter#ISO_LOCAL_DATE}, originated from {@link
+     * DateTimeFormatter#BASIC_ISO_DATE}
+     */
+    private String date;
+
+    private int pageViews;
+
+    public static List<PageViewsData> toReport(
+            List<Row> reportRows, List<String> metrics, List<String> dimensions) {
+        int indexDate = dimensions.indexOf(DIMENSION_DATE);
+        int indexPageViews = metrics.indexOf(METRIC_SCREEN_PAGE_VIEWS);
+
+        return reportRows.stream()
+                .map(
+                        row ->
+                                PageViewsData.builder()
+                                        .date(
+                                                LocalDate.parse(
+                                                                row.getDimensionValues(indexDate)
+                                                                        .getValue(),
+                                                                DateTimeFormatter.BASIC_ISO_DATE)
+                                                        .format(DateTimeFormatter.ISO_LOCAL_DATE))
+                                        .pageViews(
+                                                Integer.parseInt(
+                                                        row.getMetricValues(indexPageViews)
+                                                                .getValue()))
+                                        .build())
+                .toList();
+    }
+}

src/test/java/com/wechi/adweb/bridge/google/analytics/GAServiceTests.java

@@ -46,5 +46,13 @@ public class GAServiceTests {
         reportRequest.setStartDate(startDate);
         reportRequest.setEndDate(endDate);
         System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
+
+        // 4. Page views.
+        reportRequest = new GAReportRequestDTO();
+        reportRequest.setPropertyName(propertyName);
+        reportRequest.setReportType(ReportType.PAGE_VIEWS);
+        reportRequest.setStartDate(startDate);
+        reportRequest.setEndDate(endDate);
+        System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
     }
 }