d2l_sdk 0.1.10 → 0.1.11

data/lib/d2l_sdk/dropbox.rb

@@ -27,21 +27,101 @@ def get_dropbox_file_attachment(org_unit_id, folder_id, file_id)
   _get(path)
 end
 
-# TODO: Create a new dropbox folder in an org unit.
+def check_dropbox_folder_update_data_validity(dropbox_folder_update_data)
+    schema = {
+        'type' => 'object',
+        'required' => %w(CategoryId Name CustomInstructions Availability
+                         GroupTypeId DueDate DisplayInCalendar NotificationEmail),
+        'properties' =>
+        {
+            'CategoryId' => { 'type' => %w(integer null) },
+            'Name' => { 'type' => 'string' },
+            'CustomInstructions' =>
+            {
+              'type' => 'object',
+              'properties' =>
+                {
+                    'Content' => { 'type' => 'string' },
+                    'Type' => { 'type' => 'string' } # either 'Text' or 'HTML'
+                }
+            },
+            'Availability' =>
+            {
+                'type' => %w(object null),
+                'properties' =>
+                  {
+                      'StartDate' => { 'type' => 'string' },
+                      'EndDate' => { 'type' => 'string' }
+                  }
+            },
+            'GroupTypeId' => { 'type' => %w(integer null) },
+            'DueDate' => { 'type' => %w(string null) },
+            'DisplayInCalendar' => { 'type' => 'boolean' },
+            'NotificationEmail' => { 'type' => %w(string null) }
+        }
+    }
+    JSON::Validator.validate!(schema, dropbox_folder_update_data, validate_schema: true)
+end
+
+# REVIEW: Create a new dropbox folder in an org unit.
 # => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/
-# TODO: Update a particular dropbox folder in an org unit.
+def create_dropbox_folder(org_unit_id, dropbox_folder_update_data)
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/"
+  payload = {
+    "CategoryId" => nil, # or a number
+    "Name" => "string",
+    "CustomInstructions" => {
+      "Content" => "string",
+      "Text" => "Text|HTML"
+    },
+    "Availability" => {
+      "StartDate" => "string or nil", # or nil
+      "EndDate" => "string or nil" # or nil
+    },
+    "GroupTypeId" => nil, # or a number
+    "DueDate" => nil,
+    "DisplayInCalendar" => false,
+    "NotificationEmail" => nil # or a string --- Added in LE v1.21
+  }.merge!(dropbox_folder_update_data)
+  check_dropbox_folder_update_data_validity(payload)
+  _post(path, payload)
+  # RETURNS: DropboxFolder JSON block
+end
+
+# REVIEW: Update a particular dropbox folder in an org unit.
 # => PUT /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}
+def update_dropbox_folder(org_unit_id, dropbox_folder_update_data)
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}"
+  payload = {
+    "CategoryId" => nil, # or a number
+    "Name" => "string",
+    "CustomInstructions" => {
+      "Content" => "string",
+      "Text" => "Text|HTML"
+    },
+    "Availability" => {
+      "StartDate" => "string or nil", # or nil
+      "EndDate" => "string or nil" # or nil
+    },
+    "GroupTypeId" => nil, # or a number
+    "DueDate" => nil,
+    "DisplayInCalendar" => false,
+    "NotificationEmail" => nil # or a string --- Added in LE v1.21
+  }.merge!(dropbox_folder_update_data)
+  check_dropbox_folder_update_data_validity(payload)
+  _put(path, payload)
+  # RETURNS: DropboxFolder JSON block
+end
 
 # REVIEW: Retrieve a list of org units for which the current user context has an
 #       assessment role on their dropbox folders (can see submissions and provide feedback).
 # => GET /d2l/api/le/#{$le_ver}/dropbox/orgUnits/feedback/
 def get_current_user_assessable_folders(type = nil)
   path = "/d2l/api/le/#{$le_ver}/dropbox/orgUnits/feedback/"
-  path += "?type=#{type}" if type == 0 || type == 1
+  path += "?type=#{type}" if type.zero? || type == 1
   _get(path)
 end
 
-
 ##################
 ## SUBMISSIONS: ##
 ##################
@@ -63,38 +143,114 @@ end
 
 # TODO: Post a new group submission to a particular dropbox folder.
 # => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/submissions/group/(groupId)
+# INPUT: multipart/mixed body should contain a JSON part encoding the submission’s descriptive comments
+#        in RichText, followed by the submission file’s data.
+def post_new_group_submission; end
+
 # TODO: Post a new submission for the current user context to a particular dropbox folder.
 # => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/submissions/mysubmissions/
-# TODO: Mark a submitted file as read.
+# INPUT: multipart/mixed body should contain a JSON part encoding the submission’s descriptive comments
+#        in RichText, followed by the submission file’s data.
+def post_current_user_new_submission; end
+
+# REVIEW: Mark a submitted file as read.
 # => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/submissions/#{submission_id}/files/#{file_id}/markAsRead
+# INPUT: "Provide an empty post body."
+def mark_file_as_read(org_unit_id, folder_id, submission_id)
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/submissions/#{submission_id}/files/#{file_id}/markAsRead"
+  _post(path, {})
+end
 
 ##################
 ## FEEDBACK: #####
 ##################
 
-# TODO: Remove a particular file attachment from an entity’s feedback entry within a specified dropbox folder.
-# => DELETE /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)/attachments/#{file_id}
+# REVIEW: Remove a particular file attachment from an entity’s feedback entry within a specified dropbox folder.
+# => DELETE /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}/attachments/#{file_id}
+def remove_feedback_entry_file_attachment(org_unit_id, folder_id, entity_type, entity_id, file_id)
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}/attachments/#{file_id}"
+  _delete(path)
+end
 
 # REVIEW: Retrieve the feedback entry from a dropbox folder for the provided entity.
-# => GET /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)
+# => GET /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}
 def get_dropbox_folder_entity_feedback_entry(org_unit_id, folder_id, entity_id)
-  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)"
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}"
   _get(path)
 end
 
 # REVIEW: Retrieve a feedback entry’s file attachment from a dropbox folder for the provided entity.
-# => GET /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)/attachments/#{file_id}
+# => GET /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}/attachments/#{file_id}
 def get_feedback_entry_file_attachment(org_unit_id, folder_id, entity_id, file_id)
-  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)/attachments/#{file_id}"
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}/attachments/#{file_id}"
   _get(path)
 end
 
 # TODO: Post feedback (without attachment) for a particular submission in a specific dropbox folder.
-# => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)
+# => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}
+# INPUT: Dropbox.DropboxFeedback
+def post_feedback_without_attachment(org_unit_id, folder_id, entity_id, entity_type, dropbox_feedback)
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}"
+  payload = {
+    "Score" => 1,
+    "Feedback" =>
+    {
+      "Text" => "String",
+      "Html" => "String"
+    },
+    "RubricAssessments" =>
+    [
+      {
+        "RubricId" => 0,
+        "OverallScore" => nil, # or null
+        "OverallFeedback" =>
+        { # RICHTEXT
+          "Text" => "String",
+          "Html" => "String"
+        },
+        "OverallLevel" =>
+        { # or null
+          "LevelId" => 0,
+          "Feedback" =>
+          { # RICHTEXT
+            "Text" => "String",
+            "Html" => "String"
+          }
+        },
+        "OverallScoreOverridden" => false,
+        "OverallFeedbackOverridden" => false,
+        "CriteriaOutcome" =>
+        [ # Array of CriterionOutcome hashes
+          { # Example CriterionOutcome hash. Set for merging as
+            # it is assumed -at least- one is required.
+            "CriterionId" => 0,
+            "LevelId" => nil, # or a D2LID::Integer
+            "Score" => nil, # or a decimal
+            "ScoreIsOverridden" => false,
+            "Feedback" =>
+            { # RICHTEXT
+              "Text" => "String",
+              "Html" => "String"
+            },
+            "FeedbackIsOverridden" => false
+          },
+          # more CriterionOutcome hashes here! :D
+        ]
+      }
+    ],
+    "IsGraded" => false
+  }.merge!(dropbox_feedback)
+  # TODO: Create a schema to validate this payload against... :/
+  _post(path, payload)
+end
+
 # TODO: Attach an uploaded file to a particular entity’s feedback entry in a specific dropbox folder.
-# => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)/attach
+# => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}/attach
+def attach_file_to_feedback_entry; end
+
 # TODO: Initiate a resumable file upload request for a particular entity’s feedback for a specific dropbox folder.
-# => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/(entityId)/upload
+# => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/folders/#{folder_id}/feedback/#{entity_type}/#{entity_id}/upload
+def initiate_feedback_entry_file_upload; end
 
 ##########################
 ## FOLDER CATEGORIES: ####
@@ -114,7 +270,43 @@ def get_dropbox_folder_category_info(org_unit_id, category_id)
   _get(path)
 end
 
-# TODO: Create a new dropbox folder category for the provided org unit.
+# REVIEW: Create a new dropbox folder category for the provided org unit.
 # => POST /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/categories/
-# TODO: Update the information for a specific dropbox folder category.
+# INPUT: DropboxCategory JSON data block
+# RETURNS: a single DropboxCategory block.
+# NOTE: Few enough required values in the JSON data block,
+#       so they can simply be passed as arguments and checked
+#       for conformity by themselves.
+def create_dropbox_folder_category(org_unit_id, dropbox_category_id, dropbox_category_name)
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/categories/"
+  # Check that the values conform to the JSON schema.
+  if !dropbox_category_id.is_a? Numeric
+    raise ArgumentError, "Argument 'dropbox_category_id' with value #{dropbox_category_id} is not an integer value."
+  elsif !dropbox_category_name.is_a? String
+    raise ArgumentError, "Argument 'dropbox_category_name' with value #{dropbox_category_name} is not a String value."
+  end
+  payload = {
+    'Id' => dropbox_category_id,
+    'Name' => dropbox_category_name
+  }
+  _post(path, payload)
+end
+
+# REVIEW: Update the information for a specific dropbox folder category.
 # => PUT /d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/categories/#{category_id}
+# INPUT: DropboxCategory JSON data block.
+# RETURNS: a single DropboxCategory block.
+def update_dropbox_folder_category(org_unit_id, category_id, dropbox_category_id, dropbox_category_name)
+  path = "/d2l/api/le/#{$le_ver}/#{org_unit_id}/dropbox/categories/#{category_id}"
+  # Check that the values conform to the JSON schema.
+  if !dropbox_category_id.is_a? Numeric
+    raise ArgumentError, "Argument 'dropbox_category_id' with value #{dropbox_category_id} is not an integer value."
+  elsif !dropbox_category_name.is_a? String
+    raise ArgumentError, "Argument 'dropbox_category_name' with value #{dropbox_category_name} is not a String value."
+  end
+  payload = {
+    'Id' => dropbox_category_id,
+    'Name' => dropbox_category_name
+  }
+  _put(path, payload)
+end

data/lib/d2l_sdk/enroll.rb

@@ -43,10 +43,10 @@ def get_all_enrollments_of_current_user(bookmark = '', sort_by = '', is_active =
     path = "/d2l/api/lp/#{$lp_ver}/enrollments/myenrollments/"
     path += "?bookmark=#{bookmark}" if bookmark != ''
     path += "?sortBy=#{sort_by}" if sort_by != ''
-    path += "?isActive=#{is_active}" if is_active != nil
+    path += "?isActive=#{is_active}" unless is_active.nil?
     path += "?startDateTime=#{start_date_time}" if start_date_time != ''
     path += "?endDateTime=#{end_date_time}" if end_date_time != ''
-    path += "?canAccess=#{can_access}" if can_access != nil
+    path += "?canAccess=#{can_access}" unless can_access.nil?
     _get(path)
     # Returns: paged result set containing the resulting MyOrgUnitInfo data blocks
 end
@@ -112,7 +112,7 @@ def check_create_enrollment_data_validity(enrollment_data)
         'properties' => {
             'OrgUnitId' => { 'type' => 'integer' },
             'UserId' => { 'type' => 'integer' },
-            'RoleId' => { 'type' => 'integer' },
+            'RoleId' => { 'type' => 'integer' }
         }
     }
     JSON::Validator.validate!(schema, enrollment_data, validate_schema: true)
@@ -120,10 +120,11 @@ end
 
 # Create a new enrollment for a user.
 def create_user_enrollment(course_enrollment_data)
-    payload = { 'OrgUnitId' => '', # String
-                'UserId' => '', # String
-                'RoleId' => '', # String
-              }.merge!(course_enrollment_data)
+    payload = {
+      'OrgUnitId' => '', # String
+      'UserId' => '', # String
+      'RoleId' => '', # String
+    }.merge!(course_enrollment_data)
     # ap payload
     # requires: CreateEnrollmentData JSON block
     path = "/d2l/api/lp/#{$lp_ver}/enrollments/"
@@ -132,7 +133,6 @@ def create_user_enrollment(course_enrollment_data)
     # Returns: EnrollmentData JSON block for the newly enrolled user.
 end
 
-
 ########################
 # PINNING:##############
 ########################
@@ -170,7 +170,7 @@ end
 # Input: auditee_id (D2LID as single JSON number) - Auditee to be removed
 def remove_auditee(auditor_id, auditee_id)
   path = "/d2l/api/le/#{$le_ver}/auditing/auditors/#{auditor_id}/auditees/"
-  _delete(path, true, {AuditeeId: auditee_id})
+  _delete(path, true, { AuditeeId: auditee_id })
 end
 
 # REVIEW: Retrieve information for an auditee.

data/lib/d2l_sdk/grades.rb

@@ -164,13 +164,13 @@ def create_org_unit_grade_object(org_unit_id, grade_object, type)
 end
 
 # TODO: Update a specific grade object.
-def update_org_unit_grade_object(org_unit_id, grade_object)
+# def update_org_unit_grade_object(org_unit_id, grade_object)
     # NOTE: if new name, it must be Unique
     # NOTE: must be grade object of type numeric, passfail, selectbox, or text
     # PUT /d2l/api/le/(version)/(orgUnitId)/grades/(gradeObjectId)
     # Return: This action returns a GradeObject JSON block for the grade object
     # that the service just updated.
-end
+# end
 
 ########################
 # GRADE CATEGORIES:#####
@@ -208,9 +208,9 @@ def create_org_unit_grade_category(org_unit_id, grade_category_data)
     payload =
     {
       'Name' => '', # <string>,
-      'ShortName'=> '', # <string>,
-      'CanExceedMax'=> false, # <boolean>,
-      'ExcludeFromFinalGrade'=> false, # <boolean>,
+      'ShortName' => '', # <string>,
+      'CanExceedMax' => false, # <boolean>,
+      'ExcludeFromFinalGrade' => false, # <boolean>,
       'StartDate' => nil, # <string:UTCDateTime>|null,
       'EndDate' => nil, # <string:UTCDateTime>|null,
       'Weight' => nil, # <number:decimal>|null,
@@ -357,7 +357,7 @@ def get_org_unit_completion_records(org_unit_id, user_id = 0, start_expiry = '',
     # parameter (or the first segment if the parameter is empty or missing).
 end
 
-# REVIEW: Retrieve all the course completion records for a user.
+# TODO: Retrieve all the course completion records for a user.
 # RETURNS: This action returns a paged result set containing the resulting
 # CourseCompletion data blocks for the segment following your bookmark
 # parameter (or the first segment if the parameter is empty or missing).
@@ -483,7 +483,7 @@ end
 #       a conflict will be added to the result set and that grade will not
 #       be exempted or unexempted.
 # RETURNS: a JSON array of BulkGradeObjectExemptionConflict blocks.
-def bulk_grade_exemption_update(org_unit_id, user_id, bulk_grade_exmption_update_block)
+def bulk_grade_exemption_update(org_unit_id, user_id, bulk_grade_exemption_update_block)
     # Grade.BulkGradeObjectExemptionUpdate JSON data block example:
     # {"ExemptedIds" => [0,1,2,3], # D2LIDs
     # "UnexemptedIds" => [0,1,2,3], # D2LIDs

data/lib/d2l_sdk/group.rb

@@ -12,7 +12,7 @@ end
 
 # Delete a particular group from an org unit.
 def delete_group(org_unit_id, group_category_id, group_id)
-  path = "/d2l/api/lp/#{$lp_ver}/#{org_unit_id}/groupcategories/#{group_category_id}/groups/(groupId)"
+  path = "/d2l/api/lp/#{$lp_ver}/#{org_unit_id}/groupcategories/#{group_category_id}/groups/#{group_id}"
   _delete(path)
 end
 
@@ -53,19 +53,19 @@ def validate_create_group_category_data(group_category_data)
   schema = {
       'type' => 'object',
       'required' => %w(Name Description EnrollmentStyle
-                      EnrollmentQuality AutoEnroll RandomizeEnrollments
-                      NumberOfGroups MaxUsersPerGroup AllocateAfterExpiry
-                      SelfEnrollmentExpiryDate GroupPrefix),
+                       EnrollmentQuality AutoEnroll RandomizeEnrollments
+                       NumberOfGroups MaxUsersPerGroup AllocateAfterExpiry
+                       SelfEnrollmentExpiryDate GroupPrefix),
       'properties' => {
           'Name' => { 'type' => 'string' },
           'Description' =>
           {
             'type' => 'object',
-            'properties'=>{
+            'properties' => {
               "Content" => "string",
-              "Type" => "string" #"Text|HTML"
+              "Type" => "string" # "Text|HTML"
             }
-          }, #RichTextInput
+          }, # RichTextInput
           # if set to SingleUserMemberSpecificGroup, values set for NumberOfGroups
           # and MaxUsersPerGroup are IGNORED
           # ----------------------------------
@@ -77,16 +77,16 @@ def validate_create_group_category_data(group_category_data)
           # 4 = SelfEnrollmentNumberOfGroups
           # 5 = PeoplePerNumberOfGroupsSelfEnrollment
           # ----------------------------------
-          'EnrollmentStyle' => { 'type' => 'integer' }, #num GRPENROLL_T
+          'EnrollmentStyle' => { 'type' => 'integer' }, # num GRPENROLL_T
            # if non-nil, values for NumberOfGroups and MaxUsersPerGroup are IGNORED
           'EnrollmentQuantity' => { 'type' => %w(integer null) },
-          'AutoEnroll' => { 'type' => 'boolean'},
+          'AutoEnroll' => { 'type' => 'boolean' },
           'RandomizeEnrollments' => { 'type' => 'boolean' },
-          'NumberOfGroups' => { 'type' => %w(integer null) }, #nil, 0, 1, 3, 5
-          'MaxUsersPerGroup' => { 'type' => %w(integer null) }, #1, 3, 5
+          'NumberOfGroups' => { 'type' => %w(integer null) }, # nil, 0, 1, 3, 5
+          'MaxUsersPerGroup' => { 'type' => %w(integer null) }, # 1, 3, 5
           # if MaxUsersPerGroup has a value, then set this to true.
           'AllocateAfterExpiry' => { 'type' => 'boolean' },
-          'SelfEnrollmentExpiryDate' => { 'type' => %w(string null) }, #UTCDATETIME
+          'SelfEnrollmentExpiryDate' => { 'type' => %w(string null) }, # UTCDATETIME
           # Prepends group prefix to GroupName and GroupCode
           'GroupPrefix' => { 'type' => %w(string null) }
       }
@@ -99,18 +99,19 @@ end
 #### requirements of values
 # Create a new group category for an org unit.
 def create_org_unit_group_category(org_unit_id, group_category_data)
-  payload = { 'Name' => '', # String
-              'Description' => {}, # RichTextInput
-              'EnrollmentStyle' => 0, # number : group_enroll
-              'EnrollmentQuantity' => nil, # number | null
-              'AutoEnroll' => false, # bool
-              'RandomizeEnrollments' => false, # bool
-              'NumberOfGroups' => nil, # number | nil
-              'MaxUsersPerGroup' => nil, # number | nil
-              'AllocateAfterExpiry' => false, # bool
-              'SelfEnrollmentExpiryDate' => nil, # string: UTCDateTime | nil
-              'GroupPrefix' => nil, # String | nil
-            }.merge!(group_category_data)
+  payload = {
+    'Name' => '', # String
+    'Description' => {}, # RichTextInput
+    'EnrollmentStyle' => 0, # number : group_enroll
+    'EnrollmentQuantity' => nil, # number | null
+    'AutoEnroll' => false, # bool
+    'RandomizeEnrollments' => false, # bool
+    'NumberOfGroups' => nil, # number | nil
+    'MaxUsersPerGroup' => nil, # number | nil
+    'AllocateAfterExpiry' => false, # bool
+    'SelfEnrollmentExpiryDate' => nil, # string: UTCDateTime | nil
+    'GroupPrefix' => nil, # String | nil
+  }.merge!(group_category_data)
   # Requires: JSON block of GroupCategoryData
   path = "/d2l/api/lp/#{$lp_ver}/#{org_unit_id}/groupcategories/"
   _post(path, payload)
@@ -125,14 +126,14 @@ def validate_group_data(group_data)
       'properties' =>
       {
           'Name' => { 'type' => 'string' },
-          "Code" => {'type' => 'string'},
+          "Code" => { 'type' => 'string' },
           'Description' =>
           {
             'type' => 'object',
-            'properties'=>
+            'properties' =>
             {
               "Content" => "string",
-              "Type" => "string" #"Text|HTML"
+              "Type" => "string" # "Text|HTML"
             }
           }
       }
@@ -175,7 +176,7 @@ def validate_group_enrollment_data(group_enrollment_data)
       'properties' => {
           'UserId' => { 'type' => 'integer' }
       }
-  }
+  }.merge!(group_enrollment_data)
   JSON::Validator.validate!(schema, course_data, validate_schema: true)
 end
 
@@ -196,15 +197,14 @@ def validate_update_group_category_data(group_category_data)
       'required' => %w(Name Description AutoEnroll RandomizeEnrollments),
       'properties' => {
           'Name' => { 'type' => 'string' },
-          'Description' =>
-          {
+          'Description' => {
             'type' => 'object',
-            'properties'=>{
+            'properties' => {
               "Content" => "string",
-              "Type" => "string" #"Text|HTML"
+              "Type" => "string" # "Text|HTML"
             }
           },
-          'AutoEnroll' => { 'type' => 'boolean'},
+          'AutoEnroll' => { 'type' => 'boolean' },
           'RandomizeEnrollments' => { 'type' => 'boolean' }
       }
   }
@@ -213,21 +213,21 @@ end
 
 # update a particular group category for an org unit
 def update_org_unit_group_category(org_unit_id, group_category_id, group_category_data)
-
-  payload = { 'Name' => '', # String
-              'Description' => {}, # RichTextInput
-              'AutoEnroll' => false, # bool
-              'RandomizeEnrollments' => false, # bool
-            }.merge!(group_category_data)
+  payload = {
+    'Name' => '', # String
+    'Description' => {}, # RichTextInput
+    'AutoEnroll' => false, # bool
+    'RandomizeEnrollments' => false, # bool
+  }.merge!(group_category_data)
   # Requires: JSON block of GroupCategoryData
   validate_update_group_category_data(payload)
-  path = "/d2l/api/lp/#{$lp_ver}/#{org_unit_id}/groupcategories/#{group_category_data}"
+  path = "/d2l/api/lp/#{$lp_ver}/#{org_unit_id}/groupcategories/#{group_category_id}"
   _put(path, payload)
   # Returns a GroupCategoryData JSON block, in the Fetch form, of updated grp. cat.
 end
 
-def is_group_category_locker_set_up(org_unit_id, group_category_id)
+def group_category_locker_set_up?(org_unit_id, group_category_id)
     path = "/d2l/api/lp/#{$lp_ver}/#{org_unit_id}/groupcategories/#{group_category_id}/locker"
     _get(path)["HasLocker"]
-    #returns true if the group cat. locker has been setup already
+    # returns true if the group cat. locker has been setup already
 end