diff --git a/src/metabase/driver/googleanalytics.clj b/src/metabase/driver/googleanalytics.clj index 98c1ca524293bdd636fd4ecb85f748e7a017e6c9..5babdde581b53674e452160a0fe47de60e766346 100644 --- a/src/metabase/driver/googleanalytics.clj +++ b/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" diff --git a/src/metabase/driver/googleanalytics/query_processor.clj b/src/metabase/driver/googleanalytics/query_processor.clj index 3f6143f155b0a260c9c09d71479abf30ea4a2b13..25db1a5213f4bc3d22d667c23ee3f83856acb8c1 100644 --- a/src/metabase/driver/googleanalytics/query_processor.clj +++ b/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))]