mumuki-domain 8.6.0 → 8.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc67d5d416345806e5d570dae375114d9bd32e3be5af26485a926c9957d10f2
-  data.tar.gz: cb223b383c8f176ac852091b8cf79ed2f496404bc75d1d7dcc3ccfbde70e49f2
+  metadata.gz: 339d512e2040015c6556f9671fd00281edf9b651a5dc9db8f860d7607989cd65
+  data.tar.gz: a03fe1fe26593986af16d89c1df6cc6e9b8f21c3e9e240de41f884482e75c6d7
 SHA512:
-  metadata.gz: 3a891889e37c9fd9a55c383f2ffe6aa2f9368193bb7550ba34d9253fb8fbab3534be85ac6acc8a162f02907059acc57da14658ee6df7ad19ad93523ee1ef998d
-  data.tar.gz: e830934dd132b0bada6f45348249f06d170438c98fbb07528fa1e608397b40945485adeb4a79e732d701371e4196a9fae22c5e4ba68ef983a71dc7ae40236704
+  metadata.gz: ea2475a456f0558a61e798d27e88921a7a69b134dc38431c1244033d778dbc1b91ce4a974acaa6abbf77cceed03134430cb378f2e4d4561f39d297a7040a9745
+  data.tar.gz: 1321dbd879300fb21e87ef044bae0a7bcbca62ff9fc27cf55bfac1e02cc122273952add367a94381a54e1b730e68549659e5abb9762795071e8c7fa89d6a3699

data/app/models/book.rb

@@ -18,7 +18,7 @@ class Book < Content
   end
 
   def discussions_in_organization(organization = Organization.current)
-    Discussion.where(organization: organization).includes(exercise: [:language, :guide])
+    Discussion.where(organization: organization, item: organization.exercises).includes(exercise: [:language, :guide])
   end
 
   def first_chapter

data/app/models/organization.rb

@@ -138,6 +138,10 @@ class Organization < ApplicationRecord
     self[:progressive_display_lookahead] = lookahead.to_i.positive? ? lookahead : nil
   end
 
+  def activity_start_date(default_date)
+    [default_date, in_preparation_until&.to_date].compact.max
+  end
+
   # ==============
   # Display fields
   # ==============

data/app/models/user_stats.rb

@@ -10,7 +10,39 @@ class UserStats < ApplicationRecord
     self.stats_for(user).exp
   end
 
+  def activity(date_range = nil)
+    date_filter = { submitted_at: date_range }.compact
+    {
+        exercises: {
+            solved_count: organization_exercises
+                              .joins(:assignments)
+                              .where(assignments: { top_submission_status: [:passed, :skipped], submitter: user }.merge(date_filter))
+                              .count,
+            count: organization_exercises.count},
+
+        messages: messages_in_discussions_count(date_range)
+    }
+  end
+
   def add_exp!(points)
     self.exp += points
   end
+
+  private
+
+  def messages_in_discussions_count(date_range = nil)
+    date_filter = { date: date_range }.compact
+    result = Message.joins(:discussion)
+        .where({sender: user.uid, discussions: { organization: organization }}.merge(date_filter))
+        .group(:approved)
+        .count
+    unapproved = result[false] || 0
+    approved = result[true] || 0
+
+    { count: unapproved + approved, approved: approved }
+  end
+
+  def organization_exercises
+    @organization_exercises ||= organization.exercises
+  end
 end

data/lib/mumuki/domain/factories/book_factory.rb

@@ -4,4 +4,17 @@ FactoryBot.define do
     description { Faker::Lorem.sentence(word_count: 30) }
     slug { "mumuki/mumuki-test-book-#{SecureRandom.uuid}" }
   end
+
+  factory :book_with_full_tree, parent: :book do
+    transient do
+      children_factor { 3 }
+      exercises { create_list(:exercise, children_factor) }
+      lessons { create_list(:lesson, children_factor, exercises: exercises) }
+      chapters { create_list(:chapter, children_factor, lessons: lessons) }
+    end
+
+    after(:build) do |book, evaluator|
+      book.chapters = evaluator.chapters
+    end
+  end
 end

data/lib/mumuki/domain/incognito.rb

@@ -90,6 +90,9 @@ module Mumuki::Domain
     def visit!(*)
     end
 
+    def currently_in_exam?
+      false
+    end
     # ========
     # Progress
     # ========

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '8.6.0'
+    VERSION = '8.6.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 8.6.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails