directory,calendar, onedrive namespaces improvements (new types & methods)

Author: [email protected]

examples/directory/delete_groups.py

@@ -13,7 +13,7 @@
     print("Group deleted.")
     index += 1
 
-deleted_groups = client.directory.deleted_groups.get().execute_query()
+deleted_groups = client.directory.deletedGroups.get().execute_query()
 groups_count = len(deleted_groups)
 index = 0
 while len(deleted_groups) > 0:

examples/teams/send_message.py

@@ -2,11 +2,11 @@
 from tests.graph_case import acquire_token_by_username_password
 
 client = GraphClient(acquire_token_by_username_password)
-teams_result = client.me.joinedTeams.get().execute_query()
+teams_result = client.me.joined_teams.get().execute_query()
 if len(teams_result) > 0:
     target_team = teams_result[1]
 
-    messages = target_team.primaryChannel.messages.get().execute_query()
+    messages = target_team.primary_channel.messages.get().execute_query()
     print(messages)
 
     # item_body = ItemBody("Hello world!")

office365/calendar/calendar.py

@@ -37,6 +37,17 @@ def get_schedule(self, schedules, startTime=None, endTime=None, availabilityView
         self.context.add_query(qry)
         return result
 
+    @property
+    def can_edit(self):
+        """
+        true if the user can write to the calendar, false otherwise.
+        This property is true for the user who created the calendar.
+        This property is also true for a user who has been shared a calendar and granted write access.
+
+        :rtype: bool or None
+        """
+        return self.properties.get('canEdit', None)
+
     @property
     def name(self):
         """
@@ -59,7 +70,7 @@ def events(self):
                                    EventCollection(self.context, ResourcePath("events", self.resource_path)))
 
     @property
-    def calendarView(self):
+    def calendar_view(self):
         """The calendar view for the calendar. Navigation property. Read-only."""
         return self.properties.get('calendarView',
                                    EventCollection(self.context, ResourcePath("calendarView", self.resource_path)))

office365/calendar/event.py

@@ -1,4 +1,5 @@
 from office365.calendar.attendee import Attendee
+from office365.directory.extension import ExtensionCollection
 from office365.mail.attachment_collection import AttachmentCollection
 from office365.mail.item import Item
 from office365.mail.location import Location
@@ -64,3 +65,16 @@ def attachments(self):
         """The collection of fileAttachment and itemAttachment attachments for the event. """
         return self.properties.get('attachments',
                                    AttachmentCollection(self.context, ResourcePath("attachments", self.resource_path)))
+
+    @property
+    def extensions(self):
+        """The collection of open extensions defined for the event. Nullable."""
+        return self.properties.get('extensions',
+                                   ExtensionCollection(self.context, ResourcePath("extensions", self.resource_path)))
+
+    @property
+    def instances(self):
+        """The collection of open extensions defined for the event. Nullable."""
+        from office365.calendar.event_collection import EventCollection
+        return self.properties.get('instances',
+                                   EventCollection(self.context, ResourcePath("instances", self.resource_path)))

office365/calendar/onlineMeetingProviderType.py

@@ -0,0 +1,10 @@
+class OnlineMeetingProviderType:
+    """Specifies the type of a principal."""
+
+    def __init__(self):
+        pass
+
+    unknown = 0
+    skypeForBusiness = 1
+    skypeForConsumer = 2
+    teamsForBusiness = 3

office365/directory/application.py

@@ -37,7 +37,7 @@ def delete_object(self, permanent_delete=False):
         """
         super(Application, self).delete_object()
         if permanent_delete:
-            deleted_item = self.context.directory.deleted_applications[self.id]
+            deleted_item = self.context.directory.deletedApplications[self.id]
             deleted_item.delete_object()
         return self
 

office365/directory/assignedLicense.py

@@ -2,4 +2,8 @@
 
 
 class AssignedLicense(ClientValue):
-    pass
+
+    def __init__(self, skuId=None, disabledPlans=None):
+        super().__init__()
+        self.skuId = skuId
+        self.disabledPlans = disabledPlans

office365/directory/directory.py

@@ -8,7 +8,7 @@ class Directory(Entity):
     "container". Deleted items will remain available to restore for up to 30 days. After 30 days, the items are
     permanently deleted. """
 
-    def deleted_items(self, entity_type=None):
+    def deletedItems(self, entity_type=None):
         """Recently deleted items. Read-only. Nullable."""
         if entity_type:
             return DirectoryObjectCollection(self.context, ResourcePath(entity_type,
@@ -20,16 +20,16 @@ def deleted_items(self, entity_type=None):
                                                                  ResourcePath("deletedItems", self.resource_path)))
 
     @property
-    def deleted_groups(self):
+    def deletedGroups(self):
         """Recently deleted groups"""
-        return self.deleted_items("microsoft.graph.group")
+        return self.deletedItems("microsoft.graph.group")
 
     @property
-    def deleted_users(self):
+    def deletedUsers(self):
         """Recently deleted users"""
-        return self.deleted_items("microsoft.graph.user")
+        return self.deletedItems("microsoft.graph.user")
 
     @property
-    def deleted_applications(self):
+    def deletedApplications(self):
         """Recently deleted applications"""
-        return self.deleted_items("microsoft.graph.application")
+        return self.deletedItems("microsoft.graph.application")

office365/directory/directoryObjectCollection.py

@@ -3,7 +3,6 @@
 from office365.runtime.client_result import ClientResult
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.queries.service_operation_query import ServiceOperationQuery
-from office365.runtime.resource_path import ResourcePath
 
 
 class DirectoryObjectCollection(EntityCollection):

office365/directory/group.py

@@ -2,11 +2,13 @@
 
 from office365.calendar.event_collection import EventCollection
 from office365.directory.appRoleAssignment import AppRoleAssignmentCollection
+from office365.directory.assignedLicense import AssignedLicense
 from office365.directory.directoryObject import DirectoryObject
 from office365.directory.directoryObjectCollection import DirectoryObjectCollection
 from office365.onedrive.driveCollection import DriveCollection
 from office365.onedrive.siteCollection import SiteCollection
 from office365.runtime.client_result import ClientResult
+from office365.runtime.client_value_collection import ClientValueCollection
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.queries.service_operation_query import ServiceOperationQuery
 from office365.runtime.resource_path import ResourcePath
@@ -70,7 +72,7 @@ def delete_object(self, permanent_delete=False):
         """
         super(Group, self).delete_object()
         if permanent_delete:
-            deleted_item = self.context.directory.deleted_groups[self.id]
+            deleted_item = self.context.directory.deletedGroups[self.id]
             deleted_item.delete_object()
         return self
 
@@ -109,3 +111,8 @@ def appRoleAssignments(self):
         return self.properties.get('appRoleAssignments',
                                    AppRoleAssignmentCollection(self.context,
                                                                ResourcePath("appRoleAssignments", self.resource_path)))
+
+    @property
+    def assigned_licenses(self):
+        return self.properties.get('assignedLicenses',
+                                   ClientValueCollection(AssignedLicense))