mumuki-domain 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b10ef542bfd3dbee5d1eb1118373c96c6b736805189bed7246b594363cfbe1
-  data.tar.gz: 24a81d7f77f70dcadf65bb1af620f1bebf5e8928650d2e8db3353f47150ce236
+  metadata.gz: 1e4000eb54a24a50ced9f8b58ce44db2c4bd93a12737f5e678abaa8bd631d82c
+  data.tar.gz: e0f5c3d5752a2aaa0764f9f8dbe53a774f474ac7b3baf047680e41d75f5adaf2
 SHA512:
-  metadata.gz: 809c9f60a6b2f312610aa7fa428f6957bcd8b8c8c27b59b6c292592bf0e81f938c9085ad7e0343ddaed18d491b0045e7e2d8a51207a291d2d42073e74fff9ef3
-  data.tar.gz: ab5e7b329351202eb30b5392ba3f5c8c4074e903b4b8498418bdd7fa5650b485bda66040f18e6cbb59567edf9915da808dc15d4c9d0cb6fe160d8acd5874bcce
+  metadata.gz: 4de888c6f4bcd0670b807acb4c3935c0a335a1b101454e2ce17ada86ff8645cc9a48d4724404e2c4f3d1849aaba3f03dcbc75a0e725d3f628ee191ce3555ca89
+  data.tar.gz: 3b0795f583e057f1c6bfc2586bf11cde38ce7ae2751b03ec4c0a93790e49cd34446f1985312bab89bc36bad04ad09eef85326ed93236f2323b84e3083cbe2f8b

data/app/models/assignment.rb

@@ -40,6 +40,12 @@ class Assignment < Progress
   alias_method :user, :submitter
 
   after_save :dirty_parent_by_submission!, if: :completion_changed?
+  before_save :set_current_organization, unless: :organization
+
+  # TODO: Momentary as some assignments may not have an associated organization
+  def set_current_organization
+    self.organization = Organization.current
+  end
 
   def completion_changed?
     completed_before_last_save? != completed?
@@ -208,11 +214,6 @@ class Assignment < Progress
     exercise.files_for(current_content)
   end
 
-  def save!(*)
-    self.organization = Organization.current
-    super
-  end
-
   private
 
   def update_submissions_count!

data/app/models/chapter.rb

@@ -26,4 +26,8 @@ class Chapter < ApplicationRecord
   def structural_parent
     book
   end
+
+  def pending_siblings_for(user)
+    book.pending_chapters(user)
+  end
 end

data/app/models/concerns/navigation/siblings_navigation.rb

@@ -12,9 +12,10 @@ module SiblingsNavigation
     structural_parent.structural_children
   end
 
-  def pending_siblings_for(user, organization=Organization.current)
-    siblings.reject { |it| it.progress_for(user, organization).completed? }
-  end
+  #TODO reestablish this after indicators reliably linked to assignments
+  # def pending_siblings_for(user, organization=Organization.current)
+  #   siblings.reject { |it| it.progress_for(user, organization).completed? }
+  # end
 
   # Names
 

data/app/models/exercise.rb

@@ -216,6 +216,10 @@ class Exercise < ApplicationRecord
     guide.settings.deep_merge super
   end
 
+  def pending_siblings_for(user)
+    guide.pending_exercises(user)
+  end
+
   private
 
   def evaluation_class

data/app/models/lesson.rb

@@ -17,4 +17,8 @@ class Lesson < ApplicationRecord
   def structural_parent
     topic
   end
+
+  def pending_siblings_for(user)
+    topic.pending_lessons(user)
+  end
 end

data/app/models/topic.rb

@@ -41,6 +41,18 @@ class Topic < Content
     dup.lessons = lessons.map { |lesson| lesson.guide.fork_to!(organization, syncer, quiet: true).as_lesson_of(dup) }
   end
 
+  def pending_lessons(user)
+    guides.
+      joins('left join public.exercises exercises
+                on exercises.guide_id = guides.id').
+      joins("left join public.assignments assignments
+                on assignments.exercise_id = exercises.id
+                and assignments.submitter_id = #{user.id}
+                and assignments.submission_status = #{Mumuki::Domain::Status::Submission::Passed.to_i}").
+      where('assignments.id is null').
+      group('public.guides.id', 'lessons.number').map(&:lesson)
+  end
+
   private
 
   def lesson_for(slug)

data/lib/mumuki/domain/submission/base.rb

@@ -41,6 +41,7 @@ class Mumuki::Domain::Submission::Base
 
   def save_submission!(assignment)
     assignment.content = content
+    assignment.organization = Organization.current
     assignment.save!
   end
 

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.2.1'
+    VERSION = '7.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.2.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails