Report service

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

@@ -120,7 +120,10 @@ public class GADataService {
             RunReportResponse response = analyticsDataClient.runReport(request.build());
 
             // Converts and returns.
-            return toReport(response.getRowsList(), reportRequest);
+            List<? extends GAReportDataDTO> report =
+                    toReport(response.getRowsList(), reportRequest);
+            log.info("Report type = {} - {}", reportRequest.getReportType(), gson.toJson(report));
+            return report;
         } catch (IOException e) {
             log.error(e.getMessage());
             throw new DataException(e);
@@ -169,8 +172,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);
-            case UNIQUE_USERS -> UniqueUsersData.toReport(reportRows, metrics, dimensions);
+            case ADWEB_DATE_VIEW -> DateViewData.toReport(reportRows, metrics, dimensions);
         };
     }
 }

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

@@ -7,16 +7,17 @@ public class ReportConstant {
 
     public static final String METRIC_TOTAL_USERS = "totalUsers";
     public static final String METRIC_NEW_USERS = "newUsers";
+    public static final String METRIC_ACTIVE_USERS = "activeUsers";
     public static final String METRIC_SESSIONS = "sessions";
-    public static final String METRIC_BOUNCE_RATE = "bounceRate";
     public static final String METRIC_AVG_SESSION_DURATION = "averageSessionDuration";
+    public static final String METRIC_SCREEN_PAGE_VIEWS = "screenPageViews";
     public static final String METRIC_SCREEN_PAGE_VIEWS_PER_SESSION = "screenPageViewsPerSession";
+    public static final String METRIC_BOUNCE_RATE = "bounceRate";
     public static final String METRIC_ENGAGEMENT_RATE = "engagementRate";
-    public static final String METRIC_SCREEN_PAGE_VIEWS = "screenPageViews";
     public static final String METRIC_USER_ENGAGEMENT_DURATION = "userEngagementDuration";
 
     public static final String DIMENSION_COUNTRY = "country";
-    public static final String DIMENSION_DATE = "date";
     public static final String DIMENSION_SESSION_SOURCE_MEDIUM = "sessionSourceMedium";
     public static final String DIMENSION_PAGE_PATH = "pagePath";
+    public static final String DIMENSION_DATE = "date";
 }

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

@@ -12,7 +12,9 @@ import java.util.List;
  */
 @Getter
 public enum ReportType {
+    // V2 - adweb:country:chart
     ADWEB_COUNTRY_CHART(List.of(METRIC_TOTAL_USERS), List.of(DIMENSION_COUNTRY)),
+    // v2 - adweb:sourceMedium:list
     ADWEB_SESSION_SOURCE_MEDIUM_VIEW(
             List.of(
                     METRIC_TOTAL_USERS,
@@ -22,6 +24,7 @@ public enum ReportType {
                     METRIC_AVG_SESSION_DURATION,
                     METRIC_SCREEN_PAGE_VIEWS_PER_SESSION),
             List.of(DIMENSION_SESSION_SOURCE_MEDIUM)),
+    // V2 - adweb:pagePath:list
     ADWEB_PAGE_PATH_VIEW(
             List.of(
                     METRIC_ENGAGEMENT_RATE,
@@ -31,14 +34,15 @@ public enum ReportType {
             METRIC_SCREEN_PAGE_VIEWS,
             METRICS,
             true),
-    PAGE_VIEWS(
-            List.of(METRIC_SCREEN_PAGE_VIEWS),
-            List.of(DIMENSION_DATE),
-            DIMENSION_DATE,
-            DIMENSIONS,
-            false),
-    UNIQUE_USERS(
-            List.of(METRIC_TOTAL_USERS),
+    // V2 - adwebV2:customer:api, pageviews, uniqueuser, bounce, AvgSessionDuration,
+    // adweb:active:user
+    ADWEB_DATE_VIEW(
+            List.of(
+                    METRIC_TOTAL_USERS,
+                    METRIC_ACTIVE_USERS,
+                    METRIC_SCREEN_PAGE_VIEWS,
+                    METRIC_BOUNCE_RATE,
+                    METRIC_AVG_SESSION_DURATION),
             List.of(DIMENSION_DATE),
             DIMENSION_DATE,
             DIMENSIONS,

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

@@ -0,0 +1,85 @@
+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 com.wechi.adweb.bridge.util.DateUtils;
+import com.wechi.adweb.bridge.util.NumberUtils;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * @author wfansh
+ */
+@Data
+@Builder
+public class DateViewData implements GAReportDataDTO {
+    /**
+     * Formatted as {@link DateTimeFormatter#ISO_LOCAL_DATE}, originated from {@link
+     * DateTimeFormatter#BASIC_ISO_DATE}
+     */
+    private String date;
+
+    private int totalUsers;
+
+    private int activeUsers;
+
+    private int pageViews;
+
+    private BigDecimal bounceRate;
+
+    private BigDecimal avgSessionDuration;
+
+    public static List<DateViewData> toReport(
+            List<Row> reportRows, List<String> metrics, List<String> dimensions) {
+        int indexDate = dimensions.indexOf(DIMENSION_DATE);
+        int indexTotalUsers = metrics.indexOf(METRIC_TOTAL_USERS);
+        int indexActiveUsers = metrics.indexOf(METRIC_ACTIVE_USERS);
+        int indexPageViews = metrics.indexOf(METRIC_SCREEN_PAGE_VIEWS);
+        int indexBounceRate = metrics.indexOf(METRIC_BOUNCE_RATE);
+        int indexAvgSessionDuration = metrics.indexOf(METRIC_AVG_SESSION_DURATION);
+
+        return reportRows.stream()
+                .map(
+                        row ->
+                                DateViewData.builder()
+                                        .date(
+                                                DateUtils.format(
+                                                        row.getDimensionValues(indexDate)
+                                                                .getValue(),
+                                                        DateTimeFormatter.BASIC_ISO_DATE,
+                                                        DateTimeFormatter.ISO_LOCAL_DATE))
+                                        .totalUsers(
+                                                Integer.parseInt(
+                                                        row.getMetricValues(indexTotalUsers)
+                                                                .getValue()))
+                                        .activeUsers(
+                                                Integer.parseInt(
+                                                        row.getMetricValues(indexActiveUsers)
+                                                                .getValue()))
+                                        .pageViews(
+                                                Integer.parseInt(
+                                                        row.getMetricValues(indexPageViews)
+                                                                .getValue()))
+                                        .bounceRate(
+                                                NumberUtils.formatDecimal(
+                                                        Double.parseDouble(
+                                                                row.getMetricValues(indexBounceRate)
+                                                                        .getValue()),
+                                                        4))
+                                        .avgSessionDuration(
+                                                NumberUtils.formatDecimal(
+                                                        Double.parseDouble(
+                                                                row.getMetricValues(
+                                                                                indexAvgSessionDuration)
+                                                                        .getValue()),
+                                                        2))
+                                        .build())
+                .toList();
+    }
+}

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

@@ -1,51 +0,0 @@
-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 com.wechi.adweb.bridge.util.DateUtils;
-
-import lombok.Builder;
-import lombok.Data;
-
-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(
-                                                DateUtils.format(
-                                                        row.getDimensionValues(indexDate)
-                                                                .getValue(),
-                                                        DateTimeFormatter.BASIC_ISO_DATE,
-                                                        DateTimeFormatter.ISO_LOCAL_DATE))
-                                        .pageViews(
-                                                Integer.parseInt(
-                                                        row.getMetricValues(indexPageViews)
-                                                                .getValue()))
-                                        .build())
-                .toList();
-    }
-}

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

@@ -1,50 +0,0 @@
-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 com.wechi.adweb.bridge.util.DateUtils;
-
-import lombok.Builder;
-import lombok.Data;
-
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-
-/**
- * @author wfansh
- */
-@Data
-@Builder
-public class UniqueUsersData implements GAReportDataDTO {
-    /**
-     * Formatted as {@link DateTimeFormatter#ISO_LOCAL_DATE}, originated from {@link
-     * DateTimeFormatter#BASIC_ISO_DATE}
-     */
-    private String date;
-
-    private int totalUsers;
-
-    public static List<UniqueUsersData> toReport(
-            List<Row> reportRows, List<String> metrics, List<String> dimensions) {
-        int indexDate = dimensions.indexOf(DIMENSION_DATE);
-        int indexTotalUsers = metrics.indexOf(METRIC_TOTAL_USERS);
-
-        return reportRows.stream()
-                .map(
-                        row ->
-                                UniqueUsersData.builder()
-                                        .date(
-                                                DateUtils.format(
-                                                        row.getDimensionValues(indexDate)
-                                                                .getValue(),
-                                                        DateTimeFormatter.BASIC_ISO_DATE,
-                                                        DateTimeFormatter.ISO_LOCAL_DATE))
-                                        .totalUsers(
-                                                Integer.parseInt(
-                                                        row.getMetricValues(indexTotalUsers)
-                                                                .getValue()))
-                                        .build())
-                .toList();
-    }
-}

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

@@ -47,18 +47,10 @@ public class GAServiceTests {
         reportRequest.setEndDate(endDate);
         System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
 
-        // 4. Page views.
+        // 4. Date view.
         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)));
-
-        // 5. Unique users.
-        reportRequest = new GAReportRequestDTO();
-        reportRequest.setPropertyName(propertyName);
-        reportRequest.setReportType(ReportType.UNIQUE_USERS);
+        reportRequest.setReportType(ReportType.ADWEB_DATE_VIEW);
         reportRequest.setStartDate(startDate);
         reportRequest.setEndDate(endDate);
         System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));