canvas_shim 0.1.5 → 0.1.6rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56234ee394496d4b0430d19e6ba708a38d08790b2dacd2b584efbb1d0cd388f4
-  data.tar.gz: '08de3a1c5a958a7b6e181c6b73c1410a41c9c53cfd2d613d9ee84c766e798d0a'
+  metadata.gz: 6e39a7f405530935baee9428f5dc11f644e0189002d4ea74948ca4dabe88f097
+  data.tar.gz: 86c9afa59179b660525df9865cfd616b54907be79cb3048a35e55eb4055d56d4
 SHA512:
-  metadata.gz: 006c49ca5b5e8205681b57b6ebd7c047fcf2071939faf0a78c78379b36aa8ed71d16165c49e1d5f0664b2cdefae2cda481519b11ae8a8e30bca2ba4e936932eb
-  data.tar.gz: 579759304ca6fe7662c92d927a514a47456964799531f2b209d52b2289551ce8f000103e4bf97ec600ec243c3d3b45802663666dcde320db91f2dc535d0e922a
+  metadata.gz: b1136da9362a036361b9b206ac94f851621f203682232bbb9a687b9b8051062828ecf16f0f6ec44b88ce6217295a351cf27242005e99b5acd242f7148e7e9cd8
+  data.tar.gz: 2b1237a669712bb4b8c0b323a8f6fca9dbccd4cd6bf9c91ac20b84aad14a08cd57384644e681d627d2b2bccb84e1c420e1603cd2e13bddff2124a74712d85857

data/app/services/pipeline_service/commands/publish.rb

@@ -35,9 +35,7 @@ module PipelineService
       end
 
       def post_to_pipeline
-        client.new(
-          @args.merge(object: object)
-        ).call
+        client.new(@args.merge(object: object)).call
       end
     end
   end

data/app/services/pipeline_service/endpoints/pipeline/message_builder.rb

@@ -46,7 +46,6 @@ module PipelineService
         end
 
         def configure_dependencies
-          @message_class = @args[:message_class] || PipelinePublisher::Message
           @fetcher       = @args[:fetcher] || Serializers::Fetcher
           @logger        = @args[:logger] || PipelineService::Logger
           @canvas_domain = ENV['CANVAS_DOMAIN']
@@ -58,11 +57,11 @@ module PipelineService
         end
 
         def build
-          message_class.new(payload.to_hash)
+          payload.to_hash
         end
 
         def noun
-          object.class.to_s.underscore
+          object.class.to_s.split('::').last.underscore
         end
 
         def id

data/app/services/pipeline_service/events/emitter.rb

@@ -1,16 +1,13 @@
 module PipelineService
   module Events
     class Emitter
-      def initialize(args={})
+      def initialize args={}
         @object = args[:object]
         @args = args
-        @responder  = @args[:responder] || Events::Responders::SIS
-        @event = Events::GradedOutEvent
+        @responder = @args[:responder] || Events::Responders::SIS
       end
 
       def call
-        return unless object.is_a?(Enrollment)
-        fetch_serializer
         build_message
         build_responder
         build_subscriptions
@@ -19,15 +16,19 @@ module PipelineService
 
       private
 
-      attr_reader :subscriptions, :object, :responder, :message, :serializer, :event
+      attr_reader :subscriptions, :object, :responder, :message
+
+      def events
+        {
+          graded_out: Events::GradedOutEvent,
+          grade_changed: Events::GradeChangedEvent
+        }
+      end
 
       def build_subscriptions
-        @subscriptions = [
-          Events::Subscription.new(
-            event: :graded_out,
-            responder: responder
-          )
-        ]
+        @subscriptions = [:graded_out, :grade_changed].map do |event_name|
+          Events::Subscription.new(event: event_name, responder: responder)
+        end
       end
 
       def build_responder
@@ -37,8 +38,13 @@ module PipelineService
         )
       end
 
-      def fetch_serializer
-        @serializer = Serializers::CanvasAPIEnrollment
+      def serializer
+        case object
+        when PipelineService::Nouns::UnitGrades
+          Serializers::UnitGrades
+        when Enrollment
+          Serializers::CanvasAPIEnrollment
+        end
       end
 
       def build_message
@@ -47,8 +53,10 @@ module PipelineService
 
       def emit
         subscriptions.each do |subscription|
-          next if subscription.event != :graded_out
-          event.new(@args.merge(subscription: subscription)).emit
+          next unless events[subscription.event]
+          events[subscription.event].new(
+            @args.merge(subscription: subscription)
+          ).emit
         end
       end
     end

data/app/services/pipeline_service/events/grade_changed_event.rb

@@ -0,0 +1,24 @@
+module PipelineService
+  module Events
+    class GradeChangedEvent
+      def initialize args
+        @args = args
+        @subscription = args[:subscription]
+        @object = args[:object]
+        @changes = args[:changes]
+      end
+
+      def emit
+        return unless should_trigger?
+        @subscription.responder.call
+      end
+
+      private
+
+      def should_trigger?
+        return false unless @changes['score']
+        @object.is_a?(PipelineService::Nouns::UnitGrades)
+      end
+    end
+  end
+end

data/app/services/pipeline_service/http_client.rb

@@ -11,7 +11,8 @@ module PipelineService
     end
 
     def post(args)
-      PipelinePublisher::MessagesApi.new.messages_post(*args)
+      message = PipelinePublisher::Message.new(*args)
+      PipelinePublisher::MessagesApi.new.messages_post(message)
     end
 
     def get(endpoint, args)

data/app/services/pipeline_service/nouns/unit_grades.rb

@@ -0,0 +1,13 @@
+module PipelineService
+  module Nouns
+    class UnitGrades
+      attr_reader :course, :student, :id, :changes
+      def initialize(submission)
+        @course = submission.assignment.course
+        @student = submission.user
+        @id = submission.id
+        @changes = submission.changes
+      end
+    end
+  end
+end

data/app/services/pipeline_service/serializers/fetcher.rb

@@ -6,6 +6,8 @@ module PipelineService
       # Maps any object with a class containing 'enrollment' to the enrollment serializer
       def self.fetch(object:)
         case object.class.to_s
+        when /PipelineService::Nouns::UnitGrades/
+          PipelineService::Serializers::UnitGrades
         when /Enrollment/
           PipelineService::Serializers::Enrollment
         else

data/app/services/pipeline_service/serializers/unit_grades.rb

@@ -0,0 +1,17 @@
+module PipelineService
+  module Serializers
+    class UnitGrades
+      def initialize(object:)
+        @course = object.course
+        @student = object.student
+      end
+
+      def call
+        UnitsService::Commands::GetUnitGrades.new(
+          course: @course,
+          student: @student
+        ).call
+      end
+    end
+  end
+end

data/app/services/units_service/commands/get_unit_grades.rb

@@ -0,0 +1,40 @@
+module UnitsService
+  module Commands
+    class GetUnitGrades
+      def initialize(course:, student:)
+        @course = course
+        @student = student
+      end
+
+      def call
+        get_submissions
+        calculate_grades
+      end
+
+      private
+
+      def get_submissions
+        @unit_submissions = UnitsService::Queries::GetSubmissions.new(
+          course: @course,
+          student: @student
+        ).query
+      end
+
+      # {
+      #   course_id: 1,
+      #   student_id: 13,
+      #   units: {
+      #     { id: 1, score: 80 },
+      #     { id: 2, grade: 83 },
+      #     { id: 3, grade: 74 },
+      #     { id: 4, grade: 56 },
+      #     { id: 5, grade: 99 },
+      #     { id: 6, grade: 12 }
+      #   }
+      # }
+      def calculate_grades
+        UnitsService::GradesCalculator.new(@unit_submissions, @course).call
+      end
+    end
+  end
+end

data/app/services/units_service/grades_calculator.rb

@@ -0,0 +1,39 @@
+module UnitsService
+  class GradesCalculator
+    def initialize unit_submissions, course
+      @unit_submissions = unit_submissions
+      @course = course
+    end
+
+    def call
+      result = {}
+
+      @unit_submissions.each do |unit, submissions|
+        next if submissions.count == 0
+        result[unit.id] = weighted_average(submissions)
+      end
+
+      result
+    end
+
+    private
+
+    def weighted_average(submissions)
+      result = {}
+      submissions.group_by do |submission|
+        submission.assignment.assignment_group
+      end.each do |group, submissions|
+        result[group.name] = [] unless result[group]
+        average = submissions.sum(&:score).to_f / submissions.count
+        weight  = category_weights[group.name] / category_weights.values.sum
+        result[group.name] << average * weight
+      end
+
+      result.sum { |r, weighted| weighted.sum }
+    end
+
+    def category_weights
+      Queries::GetCategoryWeights.new(@course).query
+    end
+  end
+end

data/app/services/units_service/queries/get_category_weights.rb

@@ -0,0 +1,13 @@
+module UnitsService
+  module Queries
+    class GetCategoryWeights
+      def initialize(course)
+        @course = course
+      end
+
+      def query
+        @course.assignment_groups.map{|ag| [ag.name, ag.group_weight]}.to_h
+      end
+    end
+  end
+end

data/app/services/units_service/queries/get_items.rb

@@ -0,0 +1,24 @@
+module UnitsService
+  module Queries
+    class GetItems
+      def initialize(course:)
+        @course = course
+        @context_modules = @course.context_modules
+      end
+
+      def query
+        result = {}
+
+        @context_modules.each do |context_module|
+          result[context_module] =
+            context_module.content_tags.select do |ct|
+              ct.content.present? &&
+              ct.content.respond_to?(:submissions) &&
+              ct.content.workflow_state == 'published'
+            end
+        end
+        result
+      end
+    end
+  end
+end

data/app/services/units_service/queries/get_submissions.rb

@@ -0,0 +1,25 @@
+module UnitsService
+  module Queries
+    class GetSubmissions
+      def initialize(course:, student:)
+        @student = student
+        @course = course
+      end
+
+      def query
+        result = {}
+        units.each do |unit, items|
+          items.each do |item|
+            result[unit] = item.content.submissions.where(user_id: @student.id).where("excused is not true")
+          end
+        end
+
+        result
+      end
+
+      def units
+        GetItems.new(course: @course).query
+      end
+    end
+  end
+end

data/lib/canvas_shim/engine.rb

@@ -1,16 +1,15 @@
 require 'csv'
-require "rails"
 require 'grape'
 require 'grape-swagger'
 require 'grape-swagger-ui'
 require 'aws-sdk-dynamodb'
-require "pipeline_publisher_ruby"
 require "business"
 require 'httparty'
 require 'aws-sdk-core'
 require 'aws-sdk-s3'
-require 'inst-jobs'
 require 'pg'
+require "pipeline_publisher_ruby"
+
 
 module CanvasShim
   class Engine < ::Rails::Engine

data/lib/canvas_shim/version.rb

@@ -1,3 +1,3 @@
 module CanvasShim
-  VERSION = '0.1.5'
+  VERSION = '0.1.6rc'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: canvas_shim
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6rc
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -123,61 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: loofah
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.27.0
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.27.0
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: inst-jobs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
 description: A rails engine to be integrated with Canvas
 email:
 - ''
@@ -215,12 +159,14 @@ files:
 - app/services/pipeline_service/endpoints/pipeline.rb
 - app/services/pipeline_service/endpoints/pipeline/message_builder.rb
 - app/services/pipeline_service/events/emitter.rb
+- app/services/pipeline_service/events/grade_changed_event.rb
 - app/services/pipeline_service/events/graded_out_event.rb
 - app/services/pipeline_service/events/http_client.rb
 - app/services/pipeline_service/events/responders/sis.rb
 - app/services/pipeline_service/events/subscription.rb
 - app/services/pipeline_service/http_client.rb
 - app/services/pipeline_service/logger.rb
+- app/services/pipeline_service/nouns/unit_grades.rb
 - app/services/pipeline_service/pipeline_client.rb
 - app/services/pipeline_service/serializers/assignment.rb
 - app/services/pipeline_service/serializers/base_methods.rb
@@ -228,6 +174,7 @@ files:
 - app/services/pipeline_service/serializers/enrollment.rb
 - app/services/pipeline_service/serializers/fetcher.rb
 - app/services/pipeline_service/serializers/submission.rb
+- app/services/pipeline_service/serializers/unit_grades.rb
 - app/services/pipeline_service/serializers/user.rb
 - app/services/settings_service.rb
 - app/services/settings_service/api_docs.yml
@@ -250,6 +197,11 @@ files:
 - app/services/settings_service/student_assignment_repository.rb
 - app/services/settings_service/submission.rb
 - app/services/settings_service/user.rb
+- app/services/units_service/commands/get_unit_grades.rb
+- app/services/units_service/grades_calculator.rb
+- app/services/units_service/queries/get_category_weights.rb
+- app/services/units_service/queries/get_items.rb
+- app/services/units_service/queries/get_submissions.rb
 - app/views/layouts/canvas_shim/application.html.erb
 - config/initializers/hash.rb
 - config/initializers/string.rb
@@ -273,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7