RubyGems - mumuki-domain - Versions diffs - 8.6.0 → 9.0.4 - Mend

mumuki-domain 8.6.0 → 9.0.4

Files changed (32) hide show

checksums.yaml +4 -4
data/app/models/assignment.rb +2 -2
data/app/models/book.rb +1 -1
data/app/models/certificate.rb +29 -0
data/app/models/certificate_program.rb +42 -0
data/app/models/concerns/with_assignments.rb +2 -3
data/app/models/concerns/with_assignments_batch.rb +2 -2
data/app/models/concerns/with_generated_code.rb +19 -0
data/app/models/concerns/with_notifications.rb +1 -1
data/app/models/course.rb +26 -2
data/app/models/discussion.rb +1 -1
data/app/models/exercise.rb +13 -0
data/app/models/guide.rb +1 -10
data/app/models/invitation.rb +7 -11
data/app/models/organization.rb +5 -1
data/app/models/topic.rb +7 -12
data/app/models/user.rb +27 -1
data/app/models/user_stats.rb +32 -0
data/db/migrate/20210119174504_create_certificate_programs.rb +13 -0
data/db/migrate/20210119174835_create_certificates.rb +13 -0
data/db/migrate/20210301210530_add_period_start_and_end_to_course.rb +7 -0
data/db/migrate/20210302181654_add_faqs_to_organizations.rb +5 -0
data/lib/mumuki/domain/factories.rb +2 -0
data/lib/mumuki/domain/factories/book_factory.rb +13 -0
data/lib/mumuki/domain/factories/certificate_factory.rb +8 -0
data/lib/mumuki/domain/factories/certificate_program_factory.rb +7 -0
data/lib/mumuki/domain/factories/organization_factory.rb +2 -1
data/lib/mumuki/domain/helpers/course.rb +1 -1
data/lib/mumuki/domain/incognito.rb +3 -0
data/lib/mumuki/domain/organization/settings.rb +2 -2
data/lib/mumuki/domain/version.rb +1 -1
metadata +13 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc67d5d416345806e5d570dae375114d9bd32e3be5af26485a926c9957d10f2
-  data.tar.gz: cb223b383c8f176ac852091b8cf79ed2f496404bc75d1d7dcc3ccfbde70e49f2
+  metadata.gz: a503cf97148dbefc08c07e442bb086ac2eb37ad13e00abb39497f980e5b2e5ec
+  data.tar.gz: 41056f07210ae148026a0333518a5948739766ad70333038413f393acd7a3ad1
 SHA512:
-  metadata.gz: 3a891889e37c9fd9a55c383f2ffe6aa2f9368193bb7550ba34d9253fb8fbab3534be85ac6acc8a162f02907059acc57da14658ee6df7ad19ad93523ee1ef998d
-  data.tar.gz: e830934dd132b0bada6f45348249f06d170438c98fbb07528fa1e608397b40945485adeb4a79e732d701371e4196a9fae22c5e4ba68ef983a71dc7ae40236704
+  metadata.gz: 643e7098cd029bd2185c99ea476b3d82e04b3e161970047b310f78edef0f68b753bcf142ceab2e0b53711f353092a176c40babfef9259f437178fefcb5f483f6
+  data.tar.gz: 85e12de8b448db4fffcf1227231de46026a7e2142664a31c15310042138ed86cfd5f44aa09afe7c7bae27aaf3aeb4ab6cce9835604c809e1285301d14432beae

data/app/models/assignment.rb CHANGED Viewed

@@ -275,11 +275,11 @@ class Assignment < Progress
   def update_submissions_count!
     self.class.connection.execute(
-      "update public.exercises
+      "update exercises
          set submissions_count = submissions_count + 1
         where id = #{exercise.id}")
     self.class.connection.execute(
-      "update public.assignments
+      "update assignments
          set submissions_count = submissions_count + 1
         where id = #{id}")
     exercise.reload

data/app/models/book.rb CHANGED Viewed

@@ -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/certificate.rb ADDED Viewed

@@ -0,0 +1,29 @@
+class Certificate < ApplicationRecord
+  include WithGeneratedCode
+  belongs_to :user
+  belongs_to :certificate_program
+  has_one :organization, through: :certificate_program
+  delegate :title, :description, :template_html_erb, :background_image_url, to: :certificate_program
+  def self.code_size
+    12
+  end
+  def filename
+    "#{title.parameterize.underscore}.pdf"
+  end
+  def template_locals
+    { user: user,
+      certificate_program: certificate_program,
+      organization: organization,
+      certificate: self }
+  end
+  def for_user?(user)
+    self.user == user
+  end
+end

data/app/models/certificate_program.rb ADDED Viewed

@@ -0,0 +1,42 @@
+class CertificateProgram < ApplicationRecord
+  belongs_to :organization
+  has_many :certificates
+  def friendly
+    title
+  end
+  def template_html_erb
+    self[:template_html_erb] ||= <<HTML
+<style>
+  .qr-code {
+    bottom: 5px;
+    right: 5px;
+    height: 15mm;
+    width: 15mm;
+  }
+  .name {
+    position: absolute;
+    width: 100%;
+    top: 380px;
+    text-align: center;
+  }
+</style>
+<!-- You can use interpolations like --
+  <%#= certificate.start_date %>
+  <%#= certificate.end_date %>
+  <%#= user.formal_first_name %>
+  <%#= user.formal_last_name %>
+  <%#= user.formal_full_name %>
+  <%#= certificate_program.title %>
+  <%#= certificate_program.description %>
+  <%#= organization.name %>
+  <%#= organization.display_name %>
+--                                  -->
+<section class="name">
+    <h1><%= user.formal_full_name %></h1>
+</section>
+HTML
+  end
+end

data/app/models/concerns/with_assignments.rb CHANGED Viewed

@@ -19,9 +19,8 @@ module WithAssignments
   end
   # TODO: When the organization is used in this one, please change guide.pending_exercises
-  # TODO: Please do the same on WithAssignmentsBatch
-  def find_assignment_for(user, _organization)
-    assignments.find_by(submitter: user)
+  def find_assignment_for(user, organization)
+    assignments.find_by(submitter: user, organization: organization)
   end
   def status_for(user)

data/app/models/concerns/with_assignments_batch.rb CHANGED Viewed

@@ -4,13 +4,13 @@
 module WithAssignmentsBatch
   extend ActiveSupport::Concern
-  def find_assignments_for(user, _organization = Organization.current, &block)
+  def find_assignments_for(user, organization = Organization.current, &block)
     block = block_given? ? block : lambda { |it, _e| it }
     return exercises.map { |it| block.call nil, it  } unless user
     pairs = exercises.map { |it| [it.id, [nil, it]] }.to_h
-    Assignment.where(submitter: user, exercise: exercises).each do |it|
+    Assignment.where(submitter: user, organization: organization, exercise: exercises).each do |it|
       pairs[it.exercise_id][0] = it
     end

data/app/models/concerns/with_generated_code.rb ADDED Viewed

@@ -0,0 +1,19 @@
+module WithGeneratedCode
+  extend ActiveSupport::Concern
+  included do
+    validates_uniqueness_of :code
+    defaults do
+      self.code ||= self.class.generate_code
+    end
+    required :code_size
+  end
+  class_methods do
+    def generate_code
+      SecureRandom.urlsafe_base64 code_size
+    end
+  end
+end

data/app/models/concerns/with_notifications.rb CHANGED Viewed

@@ -2,7 +2,7 @@ module WithNotifications
   extend ActiveSupport::Concern
   def unread_messages
-    messages.where read: false
+    messages_in_organization.where read: false
   end
   def unread_notifications

data/app/models/course.rb CHANGED Viewed

@@ -3,7 +3,7 @@ class Course < ApplicationRecord
   include Mumuki::Domain::Helpers::Course
   include Mumuki::Domain::Area
-  validates_presence_of :slug, :shifts, :code, :days, :period, :description, :organization_id
+  validates_presence_of :slug, :period, :code, :description, :organization_id
   validates_uniqueness_of :slug
   belongs_to :organization
@@ -11,7 +11,7 @@ class Course < ApplicationRecord
   alias_attribute :name, :code
-  resource_fields :slug, :shifts, :code, :days, :period, :description
+  resource_fields :slug, :shifts, :code, :days, :period, :description, :period_start, :period_end
   def current_invitation
     invitations.where('expiration_date > ?', Time.now).first
@@ -35,6 +35,30 @@ class Course < ApplicationRecord
     end
   end
+  def ended?
+    period_end.present? && period_end.past?
+  end
+  def started?
+    period_start.present? && period_start.past?
+  end
+  def infer_period_range!
+    return if period_start || period_end
+    period =~ /^(\d{4})?/
+    year = $1.to_i
+    return nil unless year.between? 2014, (DateTime.now.year + 1)
+    self.period_start = DateTime.new(year).beginning_of_year
+    self.period_end = DateTime.new(year).end_of_year
+  end
+  def canonical_code
+    "#{period}-#{code}".downcase
+  end
   def closed?
     current_invitation.blank? || current_invitation.expired?
   end

data/app/models/discussion.rb CHANGED Viewed

@@ -167,7 +167,7 @@ class Discussion < ApplicationRecord
   end
   def being_accessed_by_moderator?
-    last_moderator_access_at.present? && last_moderator_access_at > Time.now - MODERATOR_REVIEW_AVERAGE_TIME
+    last_moderator_access_at.present? && (last_moderator_access_at + MODERATOR_REVIEW_AVERAGE_TIME).future?
   end
   def last_moderator_access_visible_for?(user)

data/app/models/exercise.rb CHANGED Viewed

@@ -267,4 +267,17 @@ class Exercise < ApplicationRecord
   def self.default_layout
     layouts.keys[0]
   end
+  def self.with_pending_assignments_for(user, relation)
+    relation.
+        joins("left join assignments assignments
+                on assignments.exercise_id = exercises.id
+                and assignments.submitter_id = #{user.id}
+                and assignments.organization_id = #{Organization.current.id}
+                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
 end

data/app/models/guide.rb CHANGED Viewed

@@ -50,17 +50,8 @@ class Guide < Content
     end
   end
-  # TODO: Make use of pending_siblings logic
   def pending_exercises(user)
-    exercises.
-        joins("left join public.assignments assignments
-                on assignments.exercise_id = exercises.id
-                and assignments.submitter_id = #{user.id}
-                and assignments.submission_status in (
-                  #{Mumuki::Domain::Status::Submission::Passed.to_i},
-                  #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
-                )").
-        where('assignments.id is null')
+    Exercise.with_pending_assignments_for(user, exercises)
   end
   def first_exercise

data/app/models/invitation.rb CHANGED Viewed

@@ -1,14 +1,10 @@
 class Invitation < ApplicationRecord
-  include Mumuki::Domain::Syncable
+  include Mumuki::Domain::Syncable,
+          WithGeneratedCode
   belongs_to :course
   validate :ensure_not_expired, on: :create
-  validates_uniqueness_of :code
-  defaults do
-    self.code ||= self.class.generate_code
-  end
   def ensure_not_expired
     errors.add(:base, :invitation_expired) if expired?
@@ -43,7 +39,7 @@ class Invitation < ApplicationRecord
   end
   def expired?
-    Time.now > expiration_date
+    expiration_date.past?
   end
   def unexpired
@@ -51,12 +47,12 @@ class Invitation < ApplicationRecord
     self
   end
-  def self.generate_code
-    SecureRandom.urlsafe_base64 4
-  end
   private
+  def self.code_size
+    4
+  end
   def course_name
     course.name
   end

data/app/models/organization.rb CHANGED Viewed

@@ -11,7 +11,7 @@ class Organization < ApplicationRecord
   serialize :settings, Mumuki::Domain::Organization::Settings
   serialize :theme, Mumuki::Domain::Organization::Theme
-  markdown_on :description, :display_description, :page_description
+  markdown_on :description, :display_description, :page_description, :faqs
   teaser_on :display_description
   validate :ensure_consistent_public_login
@@ -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/topic.rb CHANGED Viewed

@@ -50,18 +50,13 @@ class Topic < Content
   end
   def pending_lessons(user)
-    lessons
-      .includes(:guide)
-      .references(:guide)
-      .joins('left join exercises exercises on exercises.guide_id = guides.id')
-      .joins("left join assignments assignments
-                on assignments.exercise_id = exercises.id
-                and assignments.submitter_id = #{user.id}
-                and assignments.submission_status in (
-                  #{Mumuki::Domain::Status::Submission::Passed.to_i},
-                  #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
-                )")
-      .where('assignments.id is null')
+    Exercise
+      .with_pending_assignments_for(
+        user,
+        lessons
+          .includes(:guide)
+          .references(:guide)
+          .joins('left join exercises exercises on exercises.guide_id = guides.id'))
       .group('guides.id', 'lessons.number', 'lessons.id')
   end

data/app/models/user.rb CHANGED Viewed

@@ -35,6 +35,8 @@ class User < ApplicationRecord
   has_many :exams, through: :exam_authorizations
+  has_many :certificates
   enum gender: %i(female male other unspecified)
   belongs_to :avatar, polymorphic: true, optional: true
@@ -52,6 +54,10 @@ class User < ApplicationRecord
     last_guide.try(:lesson)
   end
+  def messages_in_organization(organization = Organization.current)
+    messages.where('assignments.organization': organization)
+  end
   def passed_submissions_count_in(organization)
     assignments.where(top_submission_status: Mumuki::Domain::Status::Submission::Passed.to_i, organization: organization).count
   end
@@ -217,7 +223,7 @@ class User < ApplicationRecord
   end
   def next_exercise_at(guide)
-    guide.pending_exercises(self).order('public.exercises.number asc').first
+    guide.pending_exercises(self).order('exercises.number asc').first
   end
   def run_submission!(submission, assignment, evaluation)
@@ -275,6 +281,26 @@ class User < ApplicationRecord
     end
   end
+  def formal_first_name
+    verified_first_name || first_name
+  end
+  def formal_last_name
+    verified_last_name || last_name
+  end
+  def formal_full_name
+    "#{formal_first_name} #{formal_last_name}"
+  end
+  def certificates_in_organization(organization = Organization.current)
+    certificates.where certificate_program: CertificateProgram.where(organization: organization)
+  end
+  def certificated_in?(certificate_program)
+    certificates.where(certificate_program: certificate_program).exists?
+  end
   private
   def welcome_to_new_organizations!

data/app/models/user_stats.rb CHANGED Viewed

@@ -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/db/migrate/20210119174504_create_certificate_programs.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class CreateCertificatePrograms < ActiveRecord::Migration[5.1]
+  def change
+    create_table :certificate_programs do |t|
+      t.string :title
+      t.string :template_html_erb
+      t.text :description
+      t.string :background_image_url
+      t.references :organization, index: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210119174835_create_certificates.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class CreateCertificates < ActiveRecord::Migration[5.1]
+  def change
+    create_table :certificates do |t|
+      t.references :user, index: true
+      t.references :certificate_program, index: true
+      t.datetime :start_date
+      t.datetime :end_date
+      t.string :code
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210301210530_add_period_start_and_end_to_course.rb ADDED Viewed

@@ -0,0 +1,7 @@
+class AddPeriodStartAndEndToCourse < ActiveRecord::Migration[5.1]
+  def change
+    add_column :courses, :period_start, :datetime
+    add_column :courses, :period_end, :datetime
+  end
+end

data/db/migrate/20210302181654_add_faqs_to_organizations.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class AddFAQsToOrganizations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :faqs, :text
+  end
+end

data/lib/mumuki/domain/factories.rb CHANGED Viewed

@@ -2,6 +2,8 @@ require_relative './factories/api_client_factory'
 require_relative './factories/assignments_factory'
 require_relative './factories/avatar_factory'
 require_relative './factories/book_factory'
+require_relative './factories/certificate_factory'
+require_relative './factories/certificate_program_factory'
 require_relative './factories/chapter_factory'
 require_relative './factories/complement_factory'
 require_relative './factories/course_factory'

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

@@ -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/factories/certificate_factory.rb ADDED Viewed

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :certificate do
+    start_date { 1.month.ago }
+    end_date { 1.minute.ago }
+    user { build :user, first_name: 'Jane', last_name: 'Doe' }
+    certificate_program { build :certificate_program }
+  end
+end

data/lib/mumuki/domain/factories/certificate_program_factory.rb ADDED Viewed

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :certificate_program do
+    title { 'Test' }
+    description { 'Certificate program to test' }
+    organization { Organization.current }
+  end
+end

data/lib/mumuki/domain/factories/organization_factory.rb CHANGED Viewed

@@ -29,7 +29,8 @@ FactoryBot.define do
     book { create(:book, name: 'test', slug: 'mumuki/mumuki-the-book') }
   end
-  factory :another_test_organization, parent: :test_organization, traits: [:skip_unique_name_validation] do
+  factory :another_test_organization, parent: :test_organization do
+    name { 'another-test' }
     book { create(:book, name: 'another-test', slug: 'mumuki/mumuki-another-book') }
   end

data/lib/mumuki/domain/helpers/course.rb CHANGED Viewed

@@ -8,6 +8,6 @@ module Mumuki::Domain::Helpers::Course
   ## API Exposure
   def to_param
-    slug
+    canonical_code
   end
 end

data/lib/mumuki/domain/incognito.rb CHANGED Viewed

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

data/lib/mumuki/domain/organization/settings.rb CHANGED Viewed

@@ -40,10 +40,10 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   end
   def disabled?
-    disabled_from.present? && disabled_from < Time.now
+    disabled_from.present? && disabled_from.past?
   end
   def in_preparation?
-    in_preparation_until.present? && in_preparation_until > Time.now
+    in_preparation_until.present? && in_preparation_until.future?
   end
 end

data/lib/mumuki/domain/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 9.0.4
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: mumukit-sync
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,8 @@ files:
 - app/models/assignment.rb
 - app/models/avatar.rb
 - app/models/book.rb
+- app/models/certificate.rb
+- app/models/certificate_program.rb
 - app/models/chapter.rb
 - app/models/complement.rb
 - app/models/concerns/assistable.rb
@@ -280,6 +282,7 @@ files:
 - app/models/concerns/with_discussions.rb
 - app/models/concerns/with_editor.rb
 - app/models/concerns/with_expectations.rb
+- app/models/concerns/with_generated_code.rb
 - app/models/concerns/with_language.rb
 - app/models/concerns/with_layout.rb
 - app/models/concerns/with_locale.rb
@@ -651,7 +654,11 @@ files:
 - db/migrate/20210118180941_create_exam_authorization_request.rb
 - db/migrate/20210118194904_create_notification.rb
 - db/migrate/20210119160440_add_prevent_manual_evaluation_content_to_organizations.rb
+- db/migrate/20210119174504_create_certificate_programs.rb
+- db/migrate/20210119174835_create_certificates.rb
 - db/migrate/20210119190204_create_exam_registration_exam_join_table.rb
+- db/migrate/20210301210530_add_period_start_and_end_to_course.rb
+- db/migrate/20210302181654_add_faqs_to_organizations.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -680,6 +687,8 @@ files:
 - lib/mumuki/domain/factories/assignments_factory.rb
 - lib/mumuki/domain/factories/avatar_factory.rb
 - lib/mumuki/domain/factories/book_factory.rb
+- lib/mumuki/domain/factories/certificate_factory.rb
+- lib/mumuki/domain/factories/certificate_program_factory.rb
 - lib/mumuki/domain/factories/chapter_factory.rb
 - lib/mumuki/domain/factories/complement_factory.rb
 - lib/mumuki/domain/factories/course_factory.rb