mumuki-domain 7.12.0 → 7.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e176a8030ca77ad3bfe8319f3cbad4eccef1f66b5f18ed293261a2b64bde1b
-  data.tar.gz: 6cedd7c76389861d2bbf2f850d4a3f1f66b57f2277ecd6ebe3fb1dcd12b1cf84
+  metadata.gz: b5cd387b744651b03da4722b106d3c23584a8a610994bf3127fa03cd814e9a64
+  data.tar.gz: 73ecd3f88a806ec887ec68e76554db2468f1b3b0dd9d459197b366bdbd3575fd
 SHA512:
-  metadata.gz: 3bf0726d9a3b8b0fb2e3a869a6db125e98a67934285780566e903994a16c0693c7fb879fd044a94807cce5ea03102955a9b69096fb78d6599aa39842153c2866
-  data.tar.gz: aed09dedbfe35d98c18f3d6c290b96650e95973f549990402a2e02af831fb29b7d040c1ad8d79d6dff0343d81006c686694cc4330bd4a7e6992b8894e0d11139
+  metadata.gz: d43c7db4b34a5727005cf7f571d7980075fd27fd394942822759bd9e1800626e6880bd1a2bf3085d7332c443d6bdc9602f000e7ee8f3434099c02411a811d8e4
+  data.tar.gz: 24fb849fee899e0636448cedc7c03935931a25902edf5144eb952acb2aabe8d051fb6d6ef9b0c684cde9523b633454e6b6c2c0f24b63c5c54e682f14eef55be2

data/app/models/assignment.rb

@@ -145,6 +145,10 @@ class Assignment < Progress
     end
   end
 
+  def manual_evaluation_pending!
+    update! submission_status: :manual_evaluation_pending
+  end
+
   def passed!
     update! submission_status: :passed
   end

data/app/models/concerns/with_terms_acceptance.rb

@@ -7,6 +7,14 @@ module WithTermsAcceptance
     !has_accepted_all?(profile_terms)
   end
 
+  def has_role_terms_to_accept?
+    !has_accepted_all?(role_specific_terms)
+  end
+
+  def role_specific_terms
+    @role_specific_terms ||= Term.role_specific_terms_for(self)
+  end
+
   def forum_terms
     @forum_terms ||= Term.forum_related_terms
   end

data/app/models/guide.rb

@@ -51,7 +51,10 @@ class Guide < Content
         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}").
+                and assignments.submission_status in (
+                  #{Mumuki::Domain::Status::Submission::Passed.to_i},
+                  #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
+                )").
         where('assignments.id is null')
   end
 

data/app/models/topic.rb

@@ -48,7 +48,10 @@ class Topic < Content
       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}").
+                and assignments.submission_status in (
+                  #{Mumuki::Domain::Status::Submission::Passed.to_i},
+                  #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
+                )").
       where('assignments.id is null').
       group('public.guides.id', 'lessons.number').map(&:lesson)
   end

data/lib/mumuki/domain/incognito.rb

@@ -64,14 +64,13 @@ module Mumuki::Domain
     # Terms
     # ========
 
-    def accepted_profile_terms?
-      true
-    end
-
-    def accepted_forum_terms?
-      true
+    # It avoids role terms acceptance redirections
+    def has_role_terms_to_accept?
+      false
     end
 
+    # It makes terms UI to be shown as if no terms were accepted
+    # It does not force any term to be accepted though
     def has_accepted?(term)
       false
     end

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

@@ -53,7 +53,11 @@ class Mumuki::Domain::Submission::Base
 
   def save_submission!(assignment)
     assignment.content = content
-    assignment.organization = Organization.current
+    if assignment.organization != Organization.current
+      assignment.dirty_parent_by_submission! if assignment.organization
+      assignment.organization = Organization.current
+      assignment.parent_id = nil
+    end
     assignment.save!
   end
 

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.12.0'
+    VERSION = '7.12.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.12.0
+  version: 7.12.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails