attempt at #225

8-bit-sheep · Jan 13, 2019 · 8842f93 · 8842f93
1 parent f4e1811
commit 8842f93
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/R/adwords.R b/R/adwords.R
@@ -56,10 +56,14 @@ ga_adwords_list <- function(accountId,
 
 #' @noRd
 #' @import assertthat
+#' @importFrom dplyr bind_rows select
 parse_ga_adwords_list <- function(x){
 
+  aaa <- Reduce(bind_rows, x$items$adWordsAccounts)
   o <- x %>% 
-    management_api_parsing("analytics#entityAdWordsLinks") 
+    management_api_parsing("analytics#entityAdWordsLinks") %>% 
+    cbind(aaa) %>% 
+    select(-adWordsAccounts, -entity.webPropertyRef.kind, -entity.webPropertyRef.href, -kind)
 
   if(is.null(o)){
     return(data.frame())

diff --git a/R/googleAnalyticsR.R b/R/googleAnalyticsR.R
@@ -27,23 +27,26 @@ NULL
 
 ## horrible hack https://github.com/tidyverse/magrittr/issues/29
 if(getRversion() >= "2.15.1") utils::globalVariables(c(".",
-                                                       "id",
-                                                       "parentLink.href",
-                                                       "parentLink.type",
+                                                       "adWordsAccounts",
+                                                       "childLink.type",
+                                                       "childLink.href",
                                                        "created",
-                                                       "updated",
-                                                       "userRef.email",
-                                                       "permissions.local",
-                                                       "linkId",
+                                                       "endTime",
                                                        "entity.accountRef.id",
                                                        "entity.webPropertyRef.id",
                                                        "entity.profileRef.webPropertyId",
                                                        "entity.profileRef.id",
+                                                       "entity.webPropertyRef.kind",
+                                                       "entity.webPropertyRef.href",
+                                                       "id",
+                                                       "kind",
+                                                       "linkId", 
+                                                       "parentLink.href",
+                                                       "parentLink.type",
+                                                       "permissions.local",
                                                        "selfLink",
-                                                       "uploadTime",
-                                                       "childLink.type",
-                                                       "childLink.href",
                                                        "startTime",
-                                                       "endTime",
-                                                       "kind",
-                                                       "userRef.kind"))
+                                                       "updated",
+                                                       "userRef.email",
+                                                       "uploadTime",
+                                                       "userRef.kind"))