Refactor code

Author: TylerLu

webjobs/user_data_sync/authentication_helper.py

@@ -10,7 +10,7 @@ class AuthenticationHelper(object):
 
     def __init__(self, cert_path, cert_password):
         self.__cert_private_key, self.__cert_thumbprint = \
-            self.__get_certificate_private_key_and_thumbnail(cert_path, cert_password)
+            self._get_certificate_private_key_and_thumbnail(cert_path, cert_password)
 
     def get_app_only_access_token(self, tenant_id, client_id, resource):
 
@@ -25,7 +25,7 @@ def get_app_only_access_token(self, tenant_id, client_id, resource):
 
         return token['accessToken']
 
-    def __get_certificate_private_key_and_thumbnail(self, cert_path, cert_password):
+    def _get_certificate_private_key_and_thumbnail(self, cert_path, cert_password):
 
         with open(cert_path, 'rb') as cert_file:
             pkcs12 = crypto.load_pkcs12(cert_file.read(), cert_password)

webjobs/user_data_sync/constants.py

@@ -5,4 +5,10 @@
 client_cert_password = os.environ['ClientCertificatePassword']
 
 aad_instance = 'https://login.microsoftonline.com/'
-ms_graph_resource = 'https://graph.microsoft.com'
+ms_graph_resource = 'https://graph.microsoft.com'
+
+mysql_host = os.environ['MySQLHost']
+mysql_port = 3306
+mysql_name = 'edu'
+mysql_user = os.environ['MySQLUser']
+mysql_password = os.environ['MySQLPassword']

webjobs/user_data_sync/models.py

@@ -1,28 +1,30 @@
 import os
+import constants
 from peewee import MySQLDatabase, Model, BooleanField, CharField, TextField, DateTimeField, ForeignKeyField
 
-mysql_host = os.environ['MySQLHost']
-mysql_port = int('3306')
-mysql_name = 'edu'
-mysql_user = os.environ['MySQLUser']
-mysql_password = os.environ['MySQLPassword']
-
-db = MySQLDatabase(mysql_name, user=mysql_user, password=mysql_password, host=mysql_host, port=mysql_port)
+database  = MySQLDatabase(constants.mysql_name, 
+    user=constants.mysql_user, 
+    password=constants.mysql_password, 
+    host=constants.mysql_host, 
+    port=constants.mysql_port)
 
 class BaseModel(Model):
     class Meta:
-        database = db
+        database = database 
 
 class Organization(BaseModel):
-    # id = AutoField(primary_key=True)
     name = CharField()
     tenantId = CharField()
     isAdminConsented = BooleanField()
+
+    @staticmethod
+    def get_consented():
+        return Organization.select().where(Organization.isAdminConsented)
+
     class Meta:
         db_table = "organizations"
 
 class Profile(BaseModel):
-    # user = OneToOneField(User, on_delete=None)
     o365UserId = CharField()
     o365Email = CharField()
     jobTitle = CharField()
@@ -38,20 +40,4 @@ class DataSyncRecord(BaseModel):
     deltaLink = TextField()
     updated = DateTimeField(null=True)
     class Meta:
-        db_table = 'data_sync_records'
-
-# db.connect()
-
-# organizations = Organization.select() \
-#     .where(Organization.isAdminConsented)
-
-# for org in organizations:
-#     print(org.name)
-
-
-# profiles = Profile.select()
-
-# for profile in profiles:
-#     print(profile.o365Email)
-
-# db.close()
+        db_table = 'data_sync_records'

webjobs/user_data_sync/ms_graph.py

@@ -0,0 +1,24 @@
+import json
+import requests
+from urllib.parse import urlencode
+
+class GraphServiceClient(object):
+
+    def __init__(self, base_url, access_token):
+        self._base_url = base_url
+        self._access_token = access_token
+
+    def get_users_delta(self, query_dict={}):
+        url = self._base_url + '/v1.0/users/delta?' + urlencode(query_dict)
+        return self.get_users(url)
+
+    def get_users(self, absolute_url):        
+        res = self._http_get_json(absolute_url)
+        return res['value'], res.get('@odata.nextLink'), res.get('@odata.deltaLink')
+
+    def _http_get_json(self, absolute_url):
+        headers = {
+            'Accept': 'application/json',
+            'Authorization': 'Bearer {0}'.format(self._access_token) }
+        response = requests.get(absolute_url, headers=headers)
+        return json.loads(response.text)

webjobs/user_data_sync/rest_api_service.py

@@ -1,67 +1,11 @@
 import constants
+from models import database
+from user_data_sync_service import UserDataSyncService
 
-import datetime
 
+database.connect()
 
-from rest_api_service import RestApiService
-import models 
+user_data_sync_service = UserDataSyncService()
+user_data_sync_service.sync()
 
-from authentication_helper import AuthenticationHelper
-
-
-users_query = "/users/delta?$select=jobTitle,department,mobilePhone"
-
-authentication_helper = AuthenticationHelper(constants.client_cert_path, constants.client_cert_password)
-
-models.db.connect()
-
-
-url = constants.ms_graph_resource + '/v1.0/users/delta?$select=jobTitle,department,mobilePhone'
-
-rest_api_service = RestApiService()
-
-
-organizations = models.Organization.select().where(models.Organization.isAdminConsented)
-for organization in organizations:
-
-    print('Sync tenant ' + organization.name)
-
-    data_sync_record, created = models.DataSyncRecord.get_or_create(
-        tenantId = organization.tenantId,
-        query = users_query)
-    
-    if created:
-        url = constants.ms_graph_resource + '/v1.0' + users_query
-    else:
-        url = data_sync_record.deltaLink
-
-    access_token = authentication_helper.get_app_only_access_token(
-        organization.tenantId,
-        constants.client_id,
-        constants.ms_graph_resource)
-
-    while True:
-        res = rest_api_service.get_json(url, access_token)    
-        users = res['value']
-
-        for user in users:
-            profile = models.Profile.get_or_none(models.Profile.o365UserId == user['id'])
-            if profile:
-                profile.jobTitle = user['jobTitle']
-                profile.department = user['department']
-                profile.mobilePhone = user['mobilePhone']
-                print('update user: ' + profile.o365Email)
-                profile.save()
-
-        next_link = res.get('@odata.nextLink')
-        if next_link:
-            url = next_link
-        else:
-            break;    
-
-
-    data_sync_record.deltaLink = res.get('@odata.deltaLink')
-    data_sync_record.updated = datetime.datetime.now()
-    data_sync_record.save()
-
-models.db.close()
+database.close()

webjobs/user_data_sync/start.py

@@ -0,0 +1,60 @@
+import constants
+import datetime
+
+from authentication_helper import AuthenticationHelper
+from models import database, Organization, DataSyncRecord, Profile
+from ms_graph import GraphServiceClient
+
+class UserDataSyncService(object):
+
+    def __init__(self):
+        self._users_query = "users"
+        self._auth_helper = AuthenticationHelper(constants.client_cert_path, constants.client_cert_password)
+    
+    def sync(self):
+        for organization in Organization.get_consented():
+            self.sync_organization(organization)
+
+    def sync_organization(self, organization):
+        print('Sync tenant ' + organization.name)    
+
+        client = self._get_graph_service_client(organization.tenantId)
+
+        record, is_new_record = DataSyncRecord.get_or_create(
+            tenantId = organization.tenantId,
+            query = self._users_query)
+
+        if is_new_record:
+            query = { '$select': 'jobTitle,department,mobilePhone' }
+            users, next_link, delta_link = client.get_users_delta(query)
+        else:
+            users, next_link, delta_link = client.get_users(record.deltaLink)
+
+        while True:
+            for user in users:
+                profile = Profile.get_or_none(Profile.o365UserId == user['id'])
+                if profile:
+                    self._update_profile(profile, user)
+            if next_link:
+                users, next_link, delta_link = client.get_users(next_link)
+            else:
+                break
+
+        self._update_data_sync_record(record, delta_link)
+
+    def _update_profile(self, profile, user):
+        print('update user: ' + profile.o365Email)
+        profile.jobTitle = user['jobTitle']
+        profile.department = user['department']
+        profile.mobilePhone = user['mobilePhone']
+        profile.save()
+
+    def _update_data_sync_record(self, record, delta_link):
+        record.deltaLink = delta_link
+        record.updated = datetime.datetime.now()
+        record.save()
+
+    def _get_graph_service_client(self, tenant_id):        
+        access_token = self._auth_helper.get_app_only_access_token(
+            tenant_id, constants.client_id, constants.ms_graph_resource)
+        return GraphServiceClient(constants.ms_graph_resource, access_token)