GTM tags

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

@@ -73,7 +73,7 @@ public class GAController extends BaseController {
         List<GAPropertyDTO> gaProperties =
                 gaAdminService.listProperties(
                         // Converts to resource name if the account ID is provided by mistake.
-                        GAAccountDTO.toResourceName(accountResourceName), false);
+                        GAAccountDTO.toResourceName(accountResourceName));
         log.info("****** listProperties() ****** duration = {} seconds", getElapsedSeconds(start));
         return OpenAPIResponse.<List<GAPropertyDTO>>builder()
                 .status(APIStatus.SUCCESS)

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

@@ -79,8 +79,7 @@ public class GAAdminService {
         }
     }
 
-    public List<GAPropertyDTO> listProperties(String accountResourceName, boolean withDataStreams)
-            throws DataException {
+    public List<GAPropertyDTO> listProperties(String accountResourceName) throws DataException {
         try (AnalyticsAdminServiceClient analyticsAdminServiceClient =
                 AnalyticsAdminServiceClient.create(adminServiceSettings)) {
             List<GAPropertyDTO> gaProperties = Lists.newArrayList();
@@ -108,11 +107,8 @@ public class GAAdminService {
                                 .serviceLevel(property.getServiceLevel().toString())
                                 .createTime(property.getCreateTime().getSeconds())
                                 .updateTime(property.getUpdateTime().getSeconds())
-                                // Sets the data streams associated with this property.
-                                .dataStreams(
-                                        withDataStreams
-                                                ? listDataStreams(property.getName())
-                                                : Collections.EMPTY_LIST)
+                                // Omits data streams for list request to reduce payload size.
+                                .dataStreams(this.listDataStreams(property.getName()))
                                 .build();
 
                 // Adds into the list;

src/main/java/com/wechi/adweb/bridge/google/gtm/dto/GTMContainerDTO.java

@@ -40,6 +40,8 @@ public class GTMContainerDTO extends ResourceDTO {
 
     private String fingerprint;
 
+    private List<GTMTagDTO> tags;
+
     public static String toResourceName(String id) {
         return StringUtils.isNumeric(id) ? "accounts" + RESOURCE_NAME_SPLITTER + id : id;
     }

src/main/java/com/wechi/adweb/bridge/google/gtm/dto/GTMTagDTO.java

@@ -0,0 +1,41 @@
+package com.wechi.adweb.bridge.google.gtm.dto;
+
+import com.wechi.adweb.bridge.google.common.ResourceDTO;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+/**
+ * @author wfansh
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class GTMTagDTO extends ResourceDTO {
+
+    private String accountId;
+
+    private String containerId;
+
+    private String workspaceId;
+
+    private String type;
+
+    private List<TagParameter> parameters;
+
+    private List<String> firingTriggerIds;
+
+    @Data
+    @Builder
+    public static class TagParameter {
+        private String type;
+
+        private String key;
+
+        private String value;
+    }
+}

src/main/java/com/wechi/adweb/bridge/google/gtm/service/GTMService.java

@@ -118,6 +118,8 @@ public class GTMService {
                                 // .headSnippet(snippetService.getHeadSnippet(container.getPublicId()))
                                 // .bodySnippet(snippetService.getBodySnippet(container.getPublicId()))
                                 .fingerprint(container.getFingerprint())
+                                // Omits tags for list request to reduce payload size.
+                                .tags(Collections.EMPTY_LIST)
                                 .build();
 
                 // Adds into the list;
@@ -135,6 +137,52 @@ public class GTMService {
         }
     }
 
+    private List<GTMTagDTO> listTags(String workspaceResourceName) throws DataException {
+        try {
+            List<GTMTagDTO> gtmTags = Lists.newArrayList();
+            for (Tag tag :
+                    tagManager
+                            .accounts()
+                            .containers()
+                            .workspaces()
+                            .tags()
+                            .list(workspaceResourceName)
+                            .execute()
+                            .getTag()) {
+                GTMTagDTO gtmTag =
+                        GTMTagDTO.builder()
+                                .id(tag.getTagId())
+                                .resourceName(tag.getPath())
+                                .displayName(tag.getName())
+                                .accountId(tag.getAccountId())
+                                .containerId(tag.getContainerId())
+                                .workspaceId(tag.getWorkspaceId())
+                                .type(tag.getType())
+                                .parameters(
+                                        tag.getParameter().stream()
+                                                .map(
+                                                        parameter ->
+                                                                GTMTagDTO.TagParameter.builder()
+                                                                        .type(parameter.getType())
+                                                                        .key(parameter.getKey())
+                                                                        .value(parameter.getValue())
+                                                                        .build())
+                                                .toList())
+                                .firingTriggerIds(tag.getFiringTriggerId())
+                                .build();
+
+                // Adds into the list;
+                gtmTags.add(gtmTag);
+            }
+
+            log.info("listTags for {} : {}", workspaceResourceName, JsonUtils.toJson(gtmTags));
+            return gtmTags;
+        } catch (IOException e) {
+            log.error(e.getMessage());
+            throw new DataException(e);
+        }
+    }
+
     public GTMContainerDTO getContainer(String containerResourceName) throws DataException {
         try {
             Container container =
@@ -155,6 +203,11 @@ public class GTMService {
                             .headSnippet(snippetService.getHeadSnippet(container.getPublicId()))
                             .bodySnippet(snippetService.getBodySnippet(container.getPublicId()))
                             .fingerprint(container.getFingerprint())
+                            // Sets the tags associated with this container.
+                            .tags(
+                                    this.listTags(
+                                            this.getDefaultWorkspace(container.getPath())
+                                                    .getResourceName()))
                             .build();
 
             log.info("getContainer : {}", JsonUtils.toJson(gtmContainer));