From ca774d680343d2acfa7f4ae9d232ec01bf18c879 Mon Sep 17 00:00:00 2001
From: Bryan B <bryan@midnightsignal.com>
Date: Wed, 17 Oct 2018 02:15:32 -0700
Subject: [PATCH] updated to include Google Developer Project Number in
 DataSourceId

---
 README.md     | 6 +++++-
 app.py        | 2 +-
 config.ini    | 5 +++++
 convertors.py | 7 ++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2b65d35..70cec61 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,11 @@ Note :
 
 # Usage
 ----------------------------
-Update the ```config.ini``` with own choices and start the sync using ```python3 app.py```
+Get your Google Developer Project Number (a 12 digit number) from a the [Google Developers Console](https://console.developers.google.com/iam-admin/settings)
+
+Update ```project_number``` in ```config.ini``` to be your Google Developer Project Number.
+
+Modify any other variables you'd like in ```config.ini``` with your own choices and start the sync using ```python3 app.py```
 
 Sync examples:
 --------------
diff --git a/app.py b/app.py
index 60ad207..6fbe9d5 100644
--- a/app.py
+++ b/app.py
@@ -46,7 +46,7 @@ def main():
 
 	# Init objects
 	helper = Helper(args.fitbit_creds, args.google_creds)
-	convertor = Convertor(args.google_creds, None)
+	convertor = Convertor(args.google_creds, params.get('project_number'), None)
 	fitbitClient,googleClient = helper.GetFitbitClient(),helper.GetGoogleClient()
 	remote = Remote(fitbitClient, googleClient, convertor, helper)
 
diff --git a/config.ini b/config.ini
index 37147ba..1e8aa27 100644
--- a/config.ini
+++ b/config.ini
@@ -5,6 +5,7 @@
 # 2. Examples for date values : today, tomorrow, 2 days ago, 2016-08-19
 # 3. Beaware of Fitbit rate-limiting when doing full sync for periods longer than 3 weeks.
 # 4. body_fat sync has been temporarily. See issue #1.
+# 5. project_number comes from https://console.developers.google.com/iam-admin/settings
 
 # Starting date of sync (inclusive)
 start_date=2 days ago
@@ -21,3 +22,7 @@ sync_calories=1
 sync_body_fat=1
 sync_activities=1
 sync_sleep=0
+
+
+# Google Developer Project Number
+project_number=123456789012
\ No newline at end of file
diff --git a/convertors.py b/convertors.py
index 85d6e66..e9055c0 100644
--- a/convertors.py
+++ b/convertors.py
@@ -19,13 +19,14 @@ class Convertor:
 	POUNDS_PER_KILOGRAM = 2.20462
 	METERS_PER_MILE = 1609.34
 
-	def __init__(self, googleCredsFile, tzinfo):
+	def __init__(self, googleCredsFile, googleDeveloperProjectNumber, tzinfo):
 		""" Intialize a convertor object.
 
 		googleCredsFile -- Google Fits credentials file
 		tzinfo -- Timezone information of the Fitbit user
 		"""
 		self.googleCredsFile = googleCredsFile
+		self.googleDeveloperProjectNumber = googleDeveloperProjectNumber
 		self.tzinfo = tzinfo
 
 	def UpdateTimezone(self, tzinfo):
@@ -349,9 +350,13 @@ def GetDataSourceId(self, dataType):
 		dataType -- type of data. Possible options: steps, weight, heart_rate
 		"""
 		dataSource = self.GetDataSource(dataType)
+		#DataSourceId format
+		#type:dataType.name:developer-project-number:device.manufacturer:device.model:device.uid:dataStreamName
+		#reference https://developers.google.com/fit/rest/v1/reference/users/dataSources
 		return ':'.join((
 			dataSource['type'],
 			dataSource['dataType']['name'],
+			self.googleDeveloperProjectNumber,
 			dataSource['device']['manufacturer'],
 			dataSource['device']['model'],
 			dataSource['device']['uid']))