Merge pull request #4076 from metabase/fix-ga-weekYear

Fix GA driver handling of 'week' unit

src/metabase/driver/googleanalytics.clj

@@ -82,7 +82,7 @@
     "ga:hour"
     "ga:dayOfWeek"
     "ga:day"
-    "ga:yearWeek"
+    "ga:isoYearIsoWeek"
     "ga:week"
     "ga:yearMonth"
     "ga:month"

src/metabase/driver/googleanalytics/query_processor.clj

@@ -86,7 +86,7 @@
     :day            "ga:date"
     :day-of-week    "ga:dayOfWeek"
     :day-of-month   "ga:day"
-    :week           "ga:yearWeek"
+    :week           "ga:isoYearIsoWeek"
     :week-of-year   "ga:week"
     :month          "ga:yearMonth"
     :month-of-year  "ga:month"
@@ -208,17 +208,17 @@
   (edn/read-string (s/replace s #"^0+(.+)$" "$1")))
 
 (def ^:private ga-dimension->date-format-fn
-  {"ga:minute"    parse-number
-   "ga:dateHour"  (partial u/parse-date "yyyyMMddHH")
-   "ga:hour"      parse-number
-   "ga:date"      (partial u/parse-date "yyyyMMdd")
-   "ga:dayOfWeek" (comp inc parse-number)
-   "ga:day"       parse-number
-   "ga:yearWeek"  (partial u/parse-date "YYYYww")
-   "ga:week"      parse-number
-   "ga:yearMonth" (partial u/parse-date "yyyyMM")
-   "ga:month"     parse-number
-   "ga:year"      parse-number})
+  {"ga:minute"         parse-number
+   "ga:dateHour"       (partial u/parse-date "yyyyMMddHH")
+   "ga:hour"           parse-number
+   "ga:date"           (partial u/parse-date "yyyyMMdd")
+   "ga:dayOfWeek"      (comp inc parse-number)
+   "ga:day"            parse-number
+   "ga:isoYearIsoWeek" (partial u/parse-date "YYYYww")
+   "ga:week"           parse-number
+   "ga:yearMonth"      (partial u/parse-date "yyyyMM")
+   "ga:month"          parse-number
+   "ga:year"           parse-number})
 
 (defn- header->column [^GaData$ColumnHeaders header]
   (let [date-parser (ga-dimension->date-format-fn (.getName header))]