mumuki-classroom 8.4.0 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c409b08fca1dfb53bd67f795d783315412ac34f6d5b315f5920fca2ece5aa7
-  data.tar.gz: e22381ef42e1ff0e69d8bb86e5ef151516c9857181811228da899bb4b09b6325
+  metadata.gz: 660f61a9eaed9fae3598fe7ab0ee1f904e48d7a80f2ed9c6f890f7a31c9952aa
+  data.tar.gz: c71104874c5a96c15aa3b5bfbfb32406ad8bb813d5c47c5f43a24e6ae4ea277d
 SHA512:
-  metadata.gz: 278e5cb886cd1d8fabb95130d608abef7ce04dd4699fc9a7c1352bc3a4ddffb63a2a55242567b38132aedc89ede30e33985aac10f025da03248c49c263364768
-  data.tar.gz: 32832897987ee4c328d21a4e379ce3e60202844f5df3dc9dec5e9090a60eb653edc0e7498e016ab1c1ef14fc29580fb435fc1c71ee32f46b121ef6552a3cae4f
+  metadata.gz: a84f7b331909322a868e040644f7e573fab48978ab04a8f493097515eadb311866435c65297d64ee9beea49f739eee7ca9406c9606cfc04f05ba6bb75f9cda5c
+  data.tar.gz: 722219c2b000e2c68a3695cc1c1e692c310beffb3bb764cbd4b30516a4d7f69aff8a269324960c0c023eb75565b8057497800254650caa9fca84f9d144256926

data/lib/mumuki/classroom/event.rb

@@ -2,3 +2,4 @@ module Mumuki::Classroom::Event
 end
 
 require_relative './event/user_changed'
+require_relative './event/progress_transfer'

data/lib/mumuki/classroom/event/progress_transfer.rb

@@ -0,0 +1,31 @@
+class Mumuki::Classroom::Event::ProgressTransfer
+  attr_reader :body
+
+  def initialize(body)
+    @body = body
+  end
+
+  def execute!
+    transfer_type.new(progress_item, source_organization, destination_organization).execute!
+  end
+
+  def source_organization
+    Organization.locate! body[:from]
+  end
+
+  def destination_organization
+    Organization.locate! body[:to]
+  end
+
+  def progress_item
+    Indicator.find(body[:item_id])
+  end
+
+  def transfer_type
+    self.class.const_get(body[:transfer_type].camelize)
+  end
+end
+
+require_relative 'progress_transfer/base'
+require_relative 'progress_transfer/copy'
+require_relative 'progress_transfer/move'

data/lib/mumuki/classroom/event/progress_transfer/base.rb

@@ -0,0 +1,111 @@
+class Mumuki::Classroom::Event::ProgressTransfer::Base
+  attr_reader :indicator, :source_organization
+
+  def initialize(indicator, source_organization, destination_organization)
+    @indicator = indicator
+    @source_organization = source_organization
+    @destination_organization = destination_organization
+  end
+
+  def execute!
+    raise ActiveRecord::RecordNotFound, "Mumuki::Classroom::Student not found" unless old_student && new_student
+
+    new_student.destroy_progress_for_guide!(indicator.content)
+    destination_organization.switch!
+
+    indicator.assignments.each do |assignment|
+      transfer_sibling_for(assignment)&.update! organization: destination_organization.name,
+                                                course: new_course,
+                                                guide: guide_h
+    end
+
+    transfer_guide_progress!
+    update_student!(old_student)
+    update_student!(new_student)
+  end
+
+  private
+
+  def update_student!(student)
+    student.update_all_stats
+    student.update_last_assignment_for
+  end
+
+  def destination_organization
+    @destination_organization
+  end
+
+  def transfer_guide_progress!
+    transfer_item.update!(guide: guide_h,
+                          student: new_student.dup,
+                          organization: destination_organization.name,
+                          course: new_course)
+  end
+
+  def guide_progress
+    Mumuki::Classroom::GuideProgress.find_by(guide_progress_query)
+  end
+
+  def classroom_sibling_for(assignment)
+    Mumuki::Classroom::Assignment.classroom_sibling_for(assignment, source_organization.name)
+  end
+
+  def new_student
+    @new_student ||= student_for destination_organization.name
+  end
+
+  def old_student
+    @old_student ||= student_for source_organization
+  end
+
+  def student_for(organization)
+    Mumuki::Classroom::Student.last_updated_student_by organization: organization, uid: user.uid
+  end
+
+  def new_course
+    new_student.course
+  end
+
+  def old_course
+    old_student.course
+  end
+
+  def guide_progress_query
+    {
+      organization: source_organization,
+      course: old_course,
+      'guide.slug': guide.slug,
+      'student.uid': user.uid
+    }
+  end
+
+  def user
+    indicator.user
+  end
+
+  def guide
+    indicator.content
+  end
+
+  def guide_parent
+    guide.usage_in_organization
+  end
+
+  def guide_h
+    @guide_h ||= guide.as_json(
+      only: [:slug, :name],
+      include: {
+        language: {
+          only: [:name, :devicon]
+        }
+      }
+    ).merge(
+      parent: {
+        type: guide_parent.class.to_s,
+        name: guide.name,
+        position: guide_parent.number,
+        chapter: guide.chapter.as_json(only: [:id], methods: [:name])
+      }
+    )
+  end
+end

data/lib/mumuki/classroom/event/progress_transfer/copy.rb

@@ -0,0 +1,9 @@
+class Mumuki::Classroom::Event::ProgressTransfer::Copy < Mumuki::Classroom::Event::ProgressTransfer::Base
+  def transfer_sibling_for(assignment)
+    classroom_sibling_for(assignment).dup
+  end
+
+  def transfer_item
+    guide_progress.dup
+  end
+end

data/lib/mumuki/classroom/event/progress_transfer/move.rb

@@ -0,0 +1,9 @@
+class Mumuki::Classroom::Event::ProgressTransfer::Move < Mumuki::Classroom::Event::ProgressTransfer::Base
+  def transfer_sibling_for(assignment)
+    classroom_sibling_for(assignment)
+  end
+
+  def transfer_item
+    guide_progress
+  end
+end

data/lib/mumuki/classroom/models/assignment.rb

@@ -143,6 +143,9 @@ class Mumuki::Classroom::Assignment < Mumuki::Classroom::Document
       stats[:failed] += stats.delete(:errored) || 0
       stats.slice(*empty_stats.keys)
     end
-  end
 
+    def classroom_sibling_for(assignment, organization)
+      find_by(organization: organization, 'student.uid': assignment.user.uid, 'exercise.eid': assignment.exercise.bibliotheca_id)
+    end
+  end
 end

data/lib/mumuki/classroom/models/concerns/with_submission_process.rb

@@ -22,7 +22,7 @@ module WithSubmissionProcess
   end
 
   def find_student_from(json)
-    Mumuki::Classroom::Student.find_by(organization: organization(json), course: course_slug(json), uid: uid(json)).as_json
+    Mumuki::Classroom::Student.find_by(organization: organization(json), course: course_slug(json), uid: uid(json))
   end
 
   def update_student_progress(json)
@@ -99,15 +99,7 @@ module WithSubmissionProcess
   end
 
   def student_from(json)
-    student = json[:student]
-
-    {uid: student[:uid],
-     name: student[:name],
-     email: student[:email],
-     image_url: student[:image_url],
-     social_id: student[:social_id],
-     last_name: student[:last_name],
-     first_name: student[:first_name]}.compact
+    json[:student].as_submission_json
   end
 
   def guide_from(json)
@@ -134,15 +126,6 @@ module WithSubmissionProcess
   end
 
   def submission_from(json)
-    {sid: json[:sid],
-     status: json[:status],
-     result: json[:result],
-     content: json[:content],
-     feedback: json[:feedback],
-     created_at: json[:created_at],
-     test_results: json[:test_results],
-     submissions_count: json[:submissions_count],
-     expectation_results: json[:expectation_results],
-     origin_ip: json[:origin_ip]}.compact
+    Mumuki::Classroom::FailedSubmission.new(json).as_assignment_submission
   end
 end

data/lib/mumuki/classroom/models/failed_submission.rb

@@ -4,7 +4,7 @@ class Mumuki::Classroom::FailedSubmission < Mumuki::Classroom::Document
 
   include Mongoid::Attributes::Dynamic
 
-  field :created_at, type: Time
+  include Mongoid::Timestamps::Created
 
   create_index 'organization': 1, 'submitter.uid': 1
   create_index({'guide.slug': 1, 'exercise.eid': 1}, {name: 'ExBibIdIndex'})
@@ -13,4 +13,7 @@ class Mumuki::Classroom::FailedSubmission < Mumuki::Classroom::Document
   scope :find_by_uid, -> (uid) { where 'submitter.uid': uid }
 
 
+  def as_assignment_submission
+    as_json(only: %i(sid status result content feedback created_at test_results submissions_count expectation_results origin_ip)).compact
+  end
 end

data/lib/mumuki/classroom/models/guide_progress.rb

@@ -52,6 +52,10 @@ class Mumuki::Classroom::GuideProgress < Mumuki::Classroom::Document
     def uid_field
       'student.uid'.to_sym
     end
+
+    def progresses_for(progress_item, student)
+      where(organization: progress_item.organization, course: student.course, slug: progress_item.content.slug, 'student.uid': student.uid)
+    end
   end
 
 end

data/lib/mumuki/classroom/models/reporting.rb

@@ -17,8 +17,8 @@ module Reporting
     main_pipeline << {'$match': query}
     main_pipeline.concat searching.pipeline
     main_pipeline.concat sorting.pipeline
-    main_pipeline << {'$project': projection}
     main_pipeline << {'$sort': sorting.order_by(ordering)}
+    main_pipeline << {'$project': projection}
   end
 
 end

data/lib/mumuki/classroom/models/sorting.rb

@@ -2,7 +2,7 @@ module Sorting
 
   def self.aggregate(collection, query, paginated_params, query_params)
     reporting_pipeline = Reporting.build_pipeline(collection, query, paginated_params, query_params, projection)
-    query = collection.collection.aggregate(pipeline paginated_params, reporting_pipeline).first
+    query = collection.collection.aggregate(pipeline(paginated_params, reporting_pipeline), allow_disk_use: true).first # Must allow disk use for sorting large collections by non-index
     query_results(query)
   end
 

data/lib/mumuki/classroom/models/student.rb

@@ -16,11 +16,23 @@ class Mumuki::Classroom::Student < Mumuki::Classroom::Document
   end
 
   def destroy_cascade!
-    Mumuki::Classroom::GuideProgress.destroy_all_by!(sub_student_query uid)
-    Mumuki::Classroom::Assignment.destroy_all_by!(sub_student_query uid)
+    destroy_progress!
     destroy!
   end
 
+  def destroy_progress!
+    destroy_progress_for_query!(sub_student_query uid)
+  end
+
+  def destroy_progress_for_guide!(guide)
+    destroy_progress_for_query!(sub_student_query(uid).merge 'guide.slug': guide.slug)
+  end
+
+  def destroy_progress_for_query!(query)
+    Mumuki::Classroom::GuideProgress.destroy_all_by!(query)
+    Mumuki::Classroom::Assignment.destroy_all_by!(query)
+  end
+
   def update_all_stats
     all_stats = Mumuki::Classroom::Assignment.stats_by(sub_student_query uid)
     update_attributes!(stats: all_stats)
@@ -52,6 +64,10 @@ class Mumuki::Classroom::Student < Mumuki::Classroom::Document
     update_attributes!(last_assignment: Mumuki::Classroom::GuideProgress.last_assignment_by(sub_student_query uid))
   end
 
+  def as_submission_json
+    as_json(only: %i(uid name email image_url social_id last_name first_name)).compact
+  end
+
   class << self
     def report(criteria, &block)
       where(criteria).select(&block).as_json(only: [:first_name, :last_name, :email, :created_at, :detached_at])

data/lib/mumuki/classroom/sinatra/teachers.rb

@@ -1,8 +1,18 @@
 class Mumuki::Classroom::App < Sinatra::Application
   Mumukit::Platform.map_organization_routes!(self) do
+    helpers do
+      def list_teachers(matcher)
+        authorize! :headmaster
+        {teachers: Mumuki::Classroom::Teacher.where(matcher).as_json}
+      end
+    end
+
+    get '/teachers' do
+      list_teachers with_organization
+    end
+
     get '/courses/:course/teachers' do
-      authorize! :headmaster
-      {teachers: Mumuki::Classroom::Teacher.where(with_organization_and_course).as_json}
+      list_teachers with_organization_and_course
     end
 
     post '/courses/:course/teachers' do

data/lib/mumuki/classroom/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Classroom
-    VERSION = '8.4.0'
+    VERSION = '9.0.2'
   end
 end

data/lib/tasks/mumuki/progress_transfers.rake

@@ -0,0 +1,17 @@
+namespace :classroom do
+  namespace :progress_transfers do
+    task listen: :environment do
+      Mumukit::Nuntius::Logger.info 'Listening to student progress-transfers'
+
+      Mumukit::Nuntius::Consumer.negligent_start! 'progress-transfers' do |body|
+        begin
+          Mumuki::Classroom::Event::ProgressTransfer.new(body).execute!
+
+          Mumukit::Nuntius::Logger.info "Processing progress transfer #{body[:item_id]}"
+        rescue => e
+          Mumukit::Nuntius::Logger.warn "Mumuki::Classroom::ProgressTransfer failed #{e}. body was: #{body}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-classroom
 version: !ruby/object:Gem::Version
-  version: 8.4.0
+  version: 9.0.2
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.4.0
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.4.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,10 @@ files:
 - lib/mumuki/classroom/collection.rb
 - lib/mumuki/classroom/engine.rb
 - lib/mumuki/classroom/event.rb
+- lib/mumuki/classroom/event/progress_transfer.rb
+- lib/mumuki/classroom/event/progress_transfer/base.rb
+- lib/mumuki/classroom/event/progress_transfer/copy.rb
+- lib/mumuki/classroom/event/progress_transfer/move.rb
 - lib/mumuki/classroom/event/user_changed.rb
 - lib/mumuki/classroom/locales/en.yml
 - lib/mumuki/classroom/locales/es-CL.yml
@@ -281,6 +285,7 @@ files:
 - lib/mumuki/profile.rb
 - lib/mumuki/views/threads.html.erb
 - lib/tasks/mumuki/messages.rake
+- lib/tasks/mumuki/progress_transfers.rake
 - lib/tasks/mumuki/resubmissions.rake
 - lib/tasks/mumuki/students.rake
 - lib/tasks/mumuki/submissions.rake