Reformat

src/main/java/com/wechi/adweb/bridge/google/analytics/controller/GAController.java

@@ -61,16 +61,18 @@ public class GAController extends BaseController {
             throws BadRequestException, DataException {
         long start = System.currentTimeMillis();
         log.info("****** listGAProperties() ****** apiRequest = {}", JsonUtils.toJson(apiRequest));
+        String accountResourceName = apiRequest.getData();
 
-        // 1. Validates the request parameters - GA account resource name.
-        if (StringUtils.isEmpty(apiRequest.getData())) {
+        // 1. Validates the request parameters.
+        if (StringUtils.isEmpty(accountResourceName)) {
             throw new BadRequestException(apiRequest);
         }
 
         // 2. Executes the API request.
         List<GAPropertyDTO> gaProperties =
                 gaAdminService.listGAProperties(
-                        GAAccountDTO.toResourceName(apiRequest.getData()), false);
+                        // Converts to resource name if the account ID is provided by mistake.
+                        GAAccountDTO.toResourceName(accountResourceName), false);
         log.info(
                 "****** listGAProperties() ****** duration = {} seconds", getElapsedSeconds(start));
         return OpenAPIResponse.<List<GAPropertyDTO>>builder()

src/main/java/com/wechi/adweb/bridge/google/analytics/service/GAAdminService.java

@@ -120,7 +120,7 @@ public class GAAdminService {
                 gaProperties.add(gaProperty);
             }
 
-            // Distinct by property name.
+            // Distinct by property resource name.
             gaProperties =
                     gaProperties.stream()
                             .collect(Collectors.groupingBy(GAPropertyDTO::getResourceName))

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

@@ -4,6 +4,7 @@ import static com.wechi.adweb.bridge.google.analytics.dto.report.ReportConstant.
 
 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.OrderByType;
 import com.wechi.adweb.bridge.google.analytics.dto.report.ReportType;
 import com.wechi.adweb.bridge.google.analytics.service.GAAdminService;
 import com.wechi.adweb.bridge.google.analytics.service.GADataService;
@@ -74,7 +75,7 @@ public class GAServiceTests {
                         METRIC_BOUNCE_RATE,
                         METRIC_AVG_SESSION_DURATION));
         reportRequest.setOrderBy(METRIC_TOTAL_USERS);
-        reportRequest.setOrderByType(GAReportRequestDTO.OrderByType.METRICS);
+        reportRequest.setOrderByType(OrderByType.METRICS);
         reportRequest.setDimensions(List.of(DIMENSION_DATE));
         reportRequest.setOrderByDesc(true);
         System.out.println(JsonUtils.toJson(gaDataService.runReport(reportRequest)));