canvas_shim 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 679cecc8b153257e7993a6fe3a48bfec0cc4eb29be5e171df36479edd18d73ed
-  data.tar.gz: 02c799f1891990f84fb5d2ceab60c6a549a52dbba3dfbe01998412af63a1aa60
+  metadata.gz: 56234ee394496d4b0430d19e6ba708a38d08790b2dacd2b584efbb1d0cd388f4
+  data.tar.gz: '08de3a1c5a958a7b6e181c6b73c1410a41c9c53cfd2d613d9ee84c766e798d0a'
 SHA512:
-  metadata.gz: b0b926cec810b6e55f1956541902439be3199fdcfab26079312253e10b8aac830b358a7aaf31e0ea1af1946f18c1ff72da66d2a6bdfd83428bcf1c20c4300b64
-  data.tar.gz: 5c232ed55e4430c1ba4e6d50fb4670a8bf69981d3852c7457f899ccfc8abf9948803ea9415322da6740f41dc4835d56401937a769005c0b06dc1c08c2c22376d
+  metadata.gz: 006c49ca5b5e8205681b57b6ebd7c047fcf2071939faf0a78c78379b36aa8ed71d16165c49e1d5f0664b2cdefae2cda481519b11ae8a8e30bca2ba4e936932eb
+  data.tar.gz: 579759304ca6fe7662c92d927a514a47456964799531f2b209d52b2289551ce8f000103e4bf97ec600ec243c3d3b45802663666dcde320db91f2dc535d0e922a

data/app/services/grades_service.rb

@@ -2,7 +2,9 @@ require 'fileutils'
 
 module GradesService
   def self.zero_out_grades!(options={})
-    return unless SettingsService.get_settings(object: :school, id: 1)['zero_out_past_due'] == 'on'
+    settings = SettingsService.get_settings(object: :school, id: 1)
+    return unless settings
+    return unless settings['zero_out_past_due'] == 'on'
 
     options[:log_file] = 'zero_grader_audit_' + Time.now.strftime('%Y%m%d%H%M') + '.csv'
     FileUtils.touch('/tmp/' + options[:log_file])
@@ -14,14 +16,7 @@ module GradesService
   end
 
   def self.submissions
-    Submission
-      .joins(assignment: :course)
-      .where('submissions.workflow_state = ?', 'unsubmitted')
-      .where(score: nil)
-      .where(grade: nil)
-      .where('assignments.due_at < ?', 1.hour.ago)
-      .where('courses.conclude_at > ?', Time.now)
-      .where('assignments.workflow_state = ?', 'published')
+    Queries::ZeroGraderSubmissions.new.query
   end
 
   def self.save_audit(options)

data/app/services/grades_service/queries/zero_grader_submissions.rb

@@ -0,0 +1,34 @@
+module GradesService
+  module Queries
+    class ZeroGraderSubmissions
+      def initialize
+        @zero_grader_start_date = SettingsService.get_settings(object: :school, id: 1)['zero_out_start_date']
+      end
+
+      def query
+        submissions_scope
+        start_date_scope if zero_grader_start_date
+        scope
+      end
+
+      private
+
+      attr_accessor :scope, :zero_grader_start_date
+
+      def submissions_scope
+        @scope = Submission
+          .joins(assignment: :course)
+          .where('submissions.workflow_state = ?', 'unsubmitted')
+          .where(score: nil)
+          .where(grade: nil)
+          .where('assignments.due_at < ?', 1.hour.ago)
+          .where('courses.conclude_at > ?', Time.now)
+          .where('assignments.workflow_state = ?', 'published')
+      end
+
+      def start_date_scope
+        @scope = scope.where('courses.start_at >= ?', zero_grader_start_date)
+      end
+    end
+  end
+end

data/lib/canvas_shim/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_shim
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,7 @@ files:
 - app/services/grades_service/account.rb
 - app/services/grades_service/commands/zero_out_assignment_grades.rb
 - app/services/grades_service/commands/zero_out_assignment_grades_rollback.rb
+- app/services/grades_service/queries/zero_grader_submissions.rb
 - app/services/pipeline_service.rb
 - app/services/pipeline_service/account.rb
 - app/services/pipeline_service/api/publish.rb