Test case

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

@@ -10,13 +10,13 @@ import com.google.api.services.tagmanager.TagManagerScopes;
 import com.google.api.services.tagmanager.model.*;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.common.annotations.VisibleForTesting;
 import com.wechi.adweb.bridge.exception.DataException;
 import com.wechi.adweb.bridge.google.gtm.dto.*;
 import com.wechi.adweb.bridge.util.JsonUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -128,7 +128,8 @@ public class GTMService {
         }
     }
 
-    public GTMContainerDTO createContainer(String accountResourceName, String displayName)
+    public GTMContainerDTO createContainer(
+            String accountResourceName, String displayName, String googleTagId)
             throws DataException {
         try {
             Container container = new Container();
@@ -143,19 +144,26 @@ public class GTMService {
                             .execute();
             log.info("Created container {}", JsonUtils.toJson(createdContainer));
 
-            // Converts and returns.
-            return GTMContainerDTO.builder()
-                    .id(createdContainer.getContainerId())
-                    .resourceName(createdContainer.getPath())
-                    .displayName(createdContainer.getName())
-                    .accountId(parseId(accountResourceName))
-                    .domainNames(createdContainer.getDomainName())
-                    .publicId(createdContainer.getPublicId())
-                    .tagIds(createdContainer.getTagIds())
-                    .notes(createdContainer.getNotes())
-                    .usageContext(createdContainer.getUsageContext())
-                    .fingerprint(container.getFingerprint())
-                    .build();
+            // Converts.
+            GTMContainerDTO gtmContainer =
+                    GTMContainerDTO.builder()
+                            .id(createdContainer.getContainerId())
+                            .resourceName(createdContainer.getPath())
+                            .displayName(createdContainer.getName())
+                            .accountId(parseId(accountResourceName))
+                            .domainNames(createdContainer.getDomainName())
+                            .publicId(createdContainer.getPublicId())
+                            .tagIds(createdContainer.getTagIds())
+                            .notes(createdContainer.getNotes())
+                            .usageContext(createdContainer.getUsageContext())
+                            .fingerprint(container.getFingerprint())
+                            .build();
+
+            // Initializes the container in ASYNC mode.
+            this.initContainerAccess(accountResourceName, gtmContainer.getId());
+            this.initContainerSetups(gtmContainer.getResourceName(), googleTagId);
+
+            return gtmContainer;
         } catch (IOException e) {
             log.error(e.getMessage());
             throw new DataException(e);
@@ -172,8 +180,8 @@ public class GTMService {
         }
     }
 
-    @VisibleForTesting
-    void initContainerAccess(String accountResourceName, String containerId) throws DataException {
+    private void initContainerAccess(String accountResourceName, String containerId)
+            throws DataException {
         try {
             // 1. Container access.
             // See
@@ -211,8 +219,16 @@ public class GTMService {
         }
     }
 
-    @VisibleForTesting
-    GTMWorkspaceDTO getDefaultWorkspace(String containerResourceName) throws DataException {
+    private void initContainerSetups(String containerResourceName, String googleTagId)
+            throws DataException {
+        GTMWorkspaceDTO gtmWorkspace = this.getDefaultWorkspace(containerResourceName);
+        GTMTriggerDTO gtmTrigger = this.createTrigger(gtmWorkspace.getResourceName());
+        this.createGoogleTag(gtmWorkspace.getResourceName(), gtmTrigger.getId(), googleTagId);
+        GTMVersionDTO gtmVersion = this.createContainerVersion(gtmWorkspace.getResourceName());
+        this.publishContainerVersion(gtmVersion.getResourceName());
+    }
+
+    private GTMWorkspaceDTO getDefaultWorkspace(String containerResourceName) throws DataException {
         try {
             Workspace workspace =
                     tagManager
@@ -248,8 +264,7 @@ public class GTMService {
         }
     }
 
-    @VisibleForTesting
-    GTMTriggerDTO createTrigger(String workspaceResourceName) throws DataException {
+    private GTMTriggerDTO createTrigger(String workspaceResourceName) throws DataException {
         try {
             Trigger trigger = new Trigger();
             trigger.setName("Page View Trigger");
@@ -285,8 +300,7 @@ public class GTMService {
         }
     }
 
-    @VisibleForTesting
-    void createGoogleTag(String workspaceResourceName, String triggerId, String googleTagId)
+    private void createGoogleTag(String workspaceResourceName, String triggerId, String googleTagId)
             throws DataException {
         try {
             Parameter parameter = new Parameter();
@@ -317,8 +331,8 @@ public class GTMService {
         }
     }
 
-    @VisibleForTesting
-    GTMVersionDTO createContainerVersion(String workspaceResourceName) throws DataException {
+    private GTMVersionDTO createContainerVersion(String workspaceResourceName)
+            throws DataException {
         try {
             CreateContainerVersionRequestVersionOptions versionOptions =
                     new CreateContainerVersionRequestVersionOptions();
@@ -344,7 +358,7 @@ public class GTMService {
                     .displayName(createdContainerVersion.getName())
                     .accountId(createdContainerVersion.getAccountId())
                     .containerId(createdContainerVersion.getContainerId())
-                    .deleted(createdContainerVersion.getDeleted())
+                    .deleted(BooleanUtils.isTrue(createdContainerVersion.getDeleted()))
                     .description(createdContainerVersion.getDescription())
                     .fingerprint(createdContainerVersion.getFingerprint())
                     .build();
@@ -354,8 +368,7 @@ public class GTMService {
         }
     }
 
-    @VisibleForTesting
-    void publishContainerVersion(String versionResourceName) throws Exception {
+    private void publishContainerVersion(String versionResourceName) throws DataException {
         try {
             tagManager.accounts().containers().versions().publish(versionResourceName).execute();
             log.info("Published container version {}", versionResourceName);

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

@@ -18,7 +18,7 @@ import java.util.List;
  * @author wfansh
  */
 @SpringBootTest
-public class GAServiceTests {
+public class GADataServiceTests {
 
     @Autowired private GAAdminService gaAdminService;
     @Autowired private GADataService gaDataService;
@@ -28,7 +28,7 @@ public class GAServiceTests {
     private final String endDate = "2024-10-01";
 
     @Test
-    void runReport() throws DataException {
+    void testRunReport() throws DataException {
 
         // 1. Country chart.
         GAReportRequestDTO reportRequest = new GAReportRequestDTO();

src/test/java/com/wechi/adweb/bridge/google/gtm/service/GTMServiceTest.java

@@ -1,9 +1,11 @@
 package com.wechi.adweb.bridge.google.gtm.service;
 
 import com.wechi.adweb.bridge.exception.DataException;
-import com.wechi.adweb.bridge.google.gtm.dto.GTMTriggerDTO;
-import com.wechi.adweb.bridge.google.gtm.dto.GTMWorkspaceDTO;
+import com.wechi.adweb.bridge.google.gtm.dto.GTMContainerDTO;
+import com.wechi.adweb.bridge.util.JsonUtils;
 
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,14 +18,20 @@ public class GTMServiceTest {
 
     @Autowired private GTMService gtmService;
 
-    private final String containerResourceName = "accounts/6000226571/containers/196039856";
+    private final String accountResourceName = "accounts/6000226571";
 
     private final String googleTagId = "G-LHFYWQKHJV";
 
     @Test
-    void testTriggerAndTag() throws DataException {
-        GTMWorkspaceDTO gtmWorkspace = gtmService.getDefaultWorkspace(containerResourceName);
-        GTMTriggerDTO gtmTrigger = gtmService.createTrigger(gtmWorkspace.getResourceName());
-        gtmService.createGoogleTag(gtmWorkspace.getResourceName(), gtmTrigger.getId(), googleTagId);
+    @Disabled("Disabled due to operations on the production account.")
+    void testCreateContainer() throws DataException {
+        GTMContainerDTO gtmContainer =
+                gtmService.createContainer(
+                        accountResourceName,
+                        "AdWeb3 Test #" + RandomStringUtils.randomNumeric(5),
+                        googleTagId);
+
+        System.out.println(JsonUtils.toJson(gtmContainer));
+        gtmService.deleteContainer(gtmContainer.getResourceName());
     }
 }