From 703530ce7fd018c5ed32809a634c8fba3cce358d Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Thu, 8 Apr 2021 04:50:52 -0700
Subject: [PATCH] Standardize chrome history column order; update data transfer
 apps (#1361)

---
 src/GamCommands.txt           |  2 ++
 src/gam/gapi/chromehistory.py | 11 +++++------
 src/gam/var.py                |  9 +++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index dd35933f..ab7e35a8 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -989,6 +989,8 @@ gam info customer
 
 <DataTransferService> ::=
 	calendar|
+	currents|
+	datastudio|"google data studio"|
 	googledrive|gdrive|drive|"drive and docs"
 <DataTransferServiceList> ::= "<DataTransferService>(,<DataTransferService>)*"
 
diff --git a/src/gam/gapi/chromehistory.py b/src/gam/gapi/chromehistory.py
index cf1a9a9e..fc72d070 100644
--- a/src/gam/gapi/chromehistory.py
+++ b/src/gam/gapi/chromehistory.py
@@ -64,12 +64,12 @@ CHROME_VERSIONHISTORY_ORDERBY_CHOICE_MAP = {
 
 CHROME_VERSIONHISTORY_TITLES = {
   'platforms': ['name', 'platformType'],
-  'channels':  ['name', 'channelType', 'platformType'],
-  'versions': ['name', 'version', 'platformType', 'channelType',
+  'channels':  ['name', 'platformType', 'channelType'],
+  'versions': ['name', 'platformType', 'channelType', 'version',
                'major_version', 'minor_version', 'build', 'patch'],
-  'releases': ['name', 'version', 'fraction', 'serving.startTime',
-               'serving.endTime', 'platformType', 'channelType',
-               'major_version', 'minor_version', 'build', 'patch']
+  'releases': ['name', 'platformType', 'channelType', 'version',
+               'major_version', 'minor_version', 'build', 'patch',
+               'fraction', 'serving.startTime','serving.endTime']
   }
 
 def get_relative_milestone(channel='stable', minus=0):
@@ -78,7 +78,6 @@ def get_relative_milestone(channel='stable', minus=0):
     returns current given milestone number
     '''
     cv = build()
-    svc = cv.platforms().channels().versions().releases()
     parent = f'chrome/platforms/all/channels/{channel}/versions/all'
     releases = gapi.get_all_pages(cv.platforms().channels().versions().releases(),
                                   'list',
diff --git a/src/gam/var.py b/src/gam/var.py
index 95413274..659b1628 100644
--- a/src/gam/var.py
+++ b/src/gam/var.py
@@ -384,16 +384,21 @@ ADDRESS_FIELDS_ARGUMENT_MAP = {
 }
 
 SERVICE_NAME_TO_ID_MAP = {
+    'Calendar': '435070579839',
+    'Currents': '553547912911',
     'Drive and Docs': '55656082996',
-    'Calendar': '435070579839'
+    'Google Data Studio': '810260081642',
 }
 
 SERVICE_NAME_CHOICES_MAP = {
+    'calendar': 'Calendar',
+    'currents': 'Currents',
+    'datastudio': 'Google Data Studio',
+    'google data studio': 'Google Data Studio',
     'drive': 'Drive and Docs',
     'drive and docs': 'Drive and Docs',
     'googledrive': 'Drive and Docs',
     'gdrive': 'Drive and Docs',
-    'calendar': 'Calendar',
 }
 
 PRINTJOB_ASCENDINGORDER_MAP = {