mumuki-domain 9.0.2 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db86a9ea25dfdc219c9555b5c116413352e4fb080af117985e93ca5bb2c4889
-  data.tar.gz: '0913300a86ea7880f65997a6bcbf418023c74a3f58dac21361d286d69e1ab528'
+  metadata.gz: 3d165cf9f919009ff75f9b6287e01df473ff786089c553651d0841911afb7375
+  data.tar.gz: 6b746d09af5ab93422f9bd8091a0fb5d809f74422fb4ec6b6c4847af86896451
 SHA512:
-  metadata.gz: 6ae200ee06fe4ef89e24836256fe3be80c99b53d24daa1e6056630f8daf78e55ad391b88b919f07db12e62365f28222c68a7e472ad91b37266bb340ef15e4141
-  data.tar.gz: 91aceaf7b84e5c014d9d7f600a4a8b205956427615c01fbbca6a581a3f572034aa99a9b12c0f323df21e1772870998ab6c220859361dcc244f22f3f2d95e16a0
+  metadata.gz: 396f0b0743fd5d44e4bc5bea7b8e8ffedd34932df9f98b29334cef334ff6361fbdc769e81deec7213aaa1ad684acb627ca52ddf68bc3e6b88019d1195470f278
+  data.tar.gz: 901f97fe4f6f6d1b8a6b916b9d90339d350d796d9c3e3f8b9a3c01bf9770a707a145370be8162eabcfa03490a2dff4cf77236de8ffc43ee2cc7d7414429f2743

data/app/models/application_record.rb

@@ -87,6 +87,22 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  def self.with_temporary_token(field_name, duration = 2.hours)
+    class_eval do
+      token_attribute = field_name
+      token_date_attribute = "#{field_name}_expiration_date"
+
+      define_method("generate_#{field_name}!") do
+        update!(token_attribute => self.class.generate_secure_token, token_date_attribute => duration.from_now)
+      end
+
+      define_method("#{field_name}_matches?") do |token|
+        actual_token = attribute(token_attribute)
+        actual_token.present? && token == actual_token && attribute(token_date_attribute)&.future?
+      end
+    end
+  end
+
   def self.numbered(*associations)
     class_eval do
       associations.each do |it|
@@ -118,6 +134,19 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  def self.active_between(start_date_field, end_date_field, **options)
+    define_singleton_method(:active) do |actually_filter=true|
+      if actually_filter
+        self.where("(#{start_date_field} IS NULL OR #{start_date_field} < :now) AND (#{end_date_field} IS NULL OR #{end_date_field} > :now)", now: Time.now)
+      else
+        all
+      end
+    end
+
+    aliased_as = options.delete(:aliased_as)
+    singleton_class.send(:alias_method, aliased_as, :active) if aliased_as
+  end
+
   ## Partially implements resource-hash protocol, by
   ## defining `to_resource_h` and helper methods `resource_fields` and `slice_resource_h`
   ## using the given fields
@@ -140,4 +169,8 @@ class ApplicationRecord < ActiveRecord::Base
   def raise_foreign_key_error!
     raise ActiveRecord::InvalidForeignKey.new "#{model_name} is still referenced"
   end
+
+  def self.generate_secure_token
+    SecureRandom.base58(24)
+  end
 end

data/app/models/assignment.rb

@@ -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/certificate_program.rb

@@ -2,6 +2,8 @@ class CertificateProgram < ApplicationRecord
   belongs_to :organization
   has_many :certificates
 
+  active_between :start_date, :end_date, aliased_as: :ongoing
+
   def friendly
     title
   end
@@ -23,8 +25,8 @@ class CertificateProgram < ApplicationRecord
   }
 </style>
 <!-- You can use interpolations like --
-  <%#= certificate.start_date %>
-  <%#= certificate.end_date %>
+  <%#= certificate.started_at %>
+  <%#= certificate.ended_at %>
   <%#= user.formal_first_name %>
   <%#= user.formal_last_name %>
   <%#= user.formal_full_name %>

data/app/models/chapter.rb

@@ -2,8 +2,8 @@ class Chapter < ApplicationRecord
   include WithStats
   include WithNumber
 
-  include SiblingsNavigation
   include TerminalNavigation
+  include SiblingsNavigation
 
   include FriendlyName
 
@@ -29,8 +29,4 @@ 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,10 +12,9 @@ module SiblingsNavigation
     structural_parent.structural_children
   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
+  def pending_siblings_for(user, organization=Organization.current)
+    siblings.reject { |it| it.progress_for(user, organization).completed? }
+  end
 
   # Names
 

data/app/models/course.rb

@@ -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,26 @@ 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

data/app/models/discussion.rb

@@ -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/exam_registration.rb

@@ -5,6 +5,8 @@ class ExamRegistration < ApplicationRecord
   belongs_to :organization
   has_and_belongs_to_many :exams
   has_many :authorization_requests, class_name: 'ExamAuthorizationRequest'
+  has_and_belongs_to_many :registrees, class_name: 'User'
+  has_many :notifications, as: :target
 
   enum authorization_criterion_type: %i(none passed_exercises), _prefix: :authorization_criterion
 
@@ -22,8 +24,20 @@ class ExamRegistration < ApplicationRecord
     authorization_criterion.ensure_valid!
   end
 
-  def start!(users)
-    users.each &method(:notify_user!)
+  def notify_unnotified_registrees!
+    unnotified_registrees.each { |registree| notify_registree! registree }
+  end
+
+  def unnotified_registrees?
+    unnotified_registrees.exists?
+  end
+
+  def register_users!(users)
+    users.each { |user| register! user }
+  end
+
+  def unnotified_registrees
+    registrees.where.not(id: Notification.notified_users_ids_for(self, self.organization))
   end
 
   def process_requests!
@@ -38,9 +52,17 @@ class ExamRegistration < ApplicationRecord
       ExamAuthorizationRequest.new(exam_registration: self, organization: organization)
   end
 
+  def register!(user)
+    registrees << user unless registered?(user)
+  end
+
+  def registered?(user)
+    registrees.include? user
+  end
+
   private
 
-  def notify_user!(user)
-    Notification.create! organization: organization, user: user, target: self
+  def notify_registree!(registree)
+    Notification.create! organization: organization, user: registree, target: self
   end
 end

data/app/models/exercise.rb

@@ -249,22 +249,23 @@ class Exercise < ApplicationRecord
   private
 
   def evaluation_class
-    if manual_evaluation?
-      manual_evaluation_class
-    else
-      automated_evaluation_class
-    end
-  end
-
-  def manual_evaluation_class
-    Mumuki::Domain::Evaluation::Manual
-  end
-
-  def automated_evaluation_class
     Mumuki::Domain::Evaluation::Automated
   end
 
   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/exercise/problem.rb

@@ -33,13 +33,31 @@ class Problem < QueriableChallenge
   end
 
   def evaluation_criteria?
-    manual_evaluation? || expectations? || test.present?
+    manual_evaluation? || automated_evaluation?
+  end
+
+  def mixed_evaluation?
+    manual_evaluation? && automated_evaluation?
+  end
+
+  def automated_evaluation?
+    expectations? || test.present?
   end
 
   def expectations?
     own_expectations.present? || own_custom_expectations.present?
   end
 
+  def evaluation_class
+    if mixed_evaluation?
+      Mumuki::Domain::Evaluation::Mixed
+    elsif manual_evaluation?
+      Mumuki::Domain::Evaluation::Manual
+    else
+      Mumuki::Domain::Evaluation::Automated
+    end
+  end
+
   # Sets the layout. This method accepts input_kids as a synonym of input_primary
   # for historical reasons
   def layout=(layout)

data/app/models/guide.rb

@@ -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

@@ -39,7 +39,7 @@ class Invitation < ApplicationRecord
   end
 
   def expired?
-    Time.now > expiration_date
+    expiration_date.past?
   end
 
   def unexpired

data/app/models/message.rb

@@ -2,6 +2,8 @@ class Message < ApplicationRecord
 
   belongs_to :discussion, optional: true
   belongs_to :assignment, foreign_key: :submission_id, primary_key: :submission_id, optional: true
+  belongs_to :approved_by, class_name: 'User', optional: true
+
   has_one :exercise, through: :assignment
 
   validates_presence_of :content, :sender
@@ -50,14 +52,22 @@ class Message < ApplicationRecord
     update! read: true
   end
 
-  def toggle_approved!
-    toggle! :approved
+  def toggle_approved!(user)
+    if approved?
+      disapprove!
+    else
+      approve!(user)
+    end
   end
 
   def toggle_not_actually_a_question!
     toggle! :not_actually_a_question
   end
 
+  def approved?
+    approved_at?
+  end
+
   def validated?
     approved? || from_moderator?
   end
@@ -93,4 +103,14 @@ class Message < ApplicationRecord
       Assignment.find_by(submission_id: message_data.delete('submission_id'))&.receive_answer! message_data
     end
   end
+
+  private
+
+  def approve!(user)
+    update! approved: true, approved_at: Time.now, approved_by: user
+  end
+
+  def disapprove!
+    update! approved: false, approved_at: nil, approved_by: nil
+  end
 end

data/app/models/notification.rb

@@ -3,6 +3,11 @@ class Notification < ApplicationRecord
   belongs_to :organization
   belongs_to :target, polymorphic: true
 
+
+  scope :notified_users_ids_for, ->(target, organization=Organization.current) do
+    where(target: target, organization: organization).pluck(:user_id)
+  end
+
   def mark_as_read!
     update read: true
   end

data/app/models/organization.rb

@@ -21,6 +21,8 @@ class Organization < ApplicationRecord
   belongs_to :book
   has_many :usages
 
+  has_many :certificate_programs
+
   validates_presence_of :contact_email, :locale
   validates_presence_of :welcome_email_template, if: :greet_new_users?
   validates :name, uniqueness: true,
@@ -31,7 +33,7 @@ class Organization < ApplicationRecord
   after_create :reindex_usages!
   after_update :reindex_usages!, if: lambda { |user| user.saved_change_to_book_id? }
 
-  has_many :guides, through: 'usages', source: 'item', source_type: 'Guide'
+  has_many :guides, -> { where 'usages.parent_item_type' => 'Lesson' }, through: 'usages', source: 'item', source_type: 'Guide'
   has_many :exercises, through: :guides
   has_many :assignments, through: :exercises
   has_many :exams
@@ -108,6 +110,10 @@ class Organization < ApplicationRecord
     name
   end
 
+  def ongoing_certificate_programs?
+    certificate_programs.ongoing.exists?
+  end
+
   # Tells if the given user can
   # ask for help in this organization
   #

data/app/models/topic.rb

@@ -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

@@ -49,6 +49,7 @@ class User < ApplicationRecord
   PLACEHOLDER_IMAGE_URL = 'user_shape.png'.freeze
 
   resource_fields :uid, :social_id, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
+  with_temporary_token :delete_account_token
 
   def last_lesson
     last_guide.try(:lesson)
@@ -223,7 +224,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)
@@ -301,6 +302,12 @@ class User < ApplicationRecord
     certificates.where(certificate_program: certificate_program).exists?
   end
 
+  def certificate_in(certificate_program, certificate_h)
+    return if certificated_in?(certificate_program)
+    certificate = certificates.create certificate_h.merge(certificate_program: certificate_program)
+    UserMailer.certificate(certificate).deliver_later
+  end
+
   private
 
   def welcome_to_new_organizations!

data/app/models/user_stats.rb

@@ -16,10 +16,10 @@ class UserStats < ApplicationRecord
         exercises: {
             solved_count: organization_exercises
                               .joins(:assignments)
-                              .where(assignments: { top_submission_status: [:passed, :skipped], submitter: user }.merge(date_filter))
+                              .where(assignments: { top_submission_status: [:passed, :skipped], submitter: user, organization: organization }.merge(date_filter))
                               .count,
-            count: organization_exercises.count},
-
+            count: organization_exercises.count
+        },
         messages: messages_in_discussions_count(date_range)
     }
   end

data/db/migrate/20210301210530_add_period_start_and_end_to_course.rb

@@ -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/20210308145910_add_approved_by_and_at_to_message.rb

@@ -0,0 +1,6 @@
+class AddApprovedByAndAtToMessage < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :approved_at, :datetime
+    add_reference :messages, :approved_by, index: true
+  end
+end

data/db/migrate/20210310195602_add_delete_account_token_to_user.rb

@@ -0,0 +1,6 @@
+class AddDeleteAccountTokenToUser < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :delete_account_token, :string
+    add_column :users, :delete_account_token_expiration_date, :datetime
+  end
+end

data/db/migrate/20210318194559_add_dates_to_certificate_program.rb

@@ -0,0 +1,6 @@
+class AddDatesToCertificateProgram < ActiveRecord::Migration[5.1]
+  def change
+    add_column :certificate_programs, :start_date, :datetime
+    add_column :certificate_programs, :end_date, :datetime
+  end
+end

data/db/migrate/20210318195238_rename_certificate_dates.rb

@@ -0,0 +1,6 @@
+class RenameCertificateDates < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :certificates, :start_date, :started_at
+    rename_column :certificates, :end_date, :ended_at
+  end
+end

data/db/migrate/20210330175706_create_exam_registration_user_join_table.rb

@@ -0,0 +1,8 @@
+class CreateExamRegistrationUserJoinTable < ActiveRecord::Migration[5.1]
+  def change
+    create_join_table :exam_registrations, :users do |t|
+      t.index :user_id
+      t.index :exam_registration_id
+    end
+  end
+end

data/lib/mumuki/domain/evaluation.rb

@@ -3,3 +3,4 @@ end
 
 require_relative './evaluation/manual'
 require_relative './evaluation/automated'
+require_relative './evaluation/mixed'

data/lib/mumuki/domain/evaluation/mixed.rb

@@ -0,0 +1,12 @@
+class Mumuki::Domain::Evaluation::Mixed < Mumuki::Domain::Evaluation::Manual
+  def evaluate!(assignment, submission)
+    evaluation = submission.evaluate! assignment
+    if evaluation[:status].passed?
+      super
+    elsif evaluation[:status].passed_with_warnings?
+      evaluation.merge(status: Mumuki::Domain::Status::Submission::Failed)
+    else
+      evaluation
+    end
+  end
+end

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

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

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

@@ -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

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.0.2'
+    VERSION = '9.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -657,13 +657,20 @@ files:
 - 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
+- db/migrate/20210308145910_add_approved_by_and_at_to_message.rb
+- db/migrate/20210310195602_add_delete_account_token_to_user.rb
+- db/migrate/20210318194559_add_dates_to_certificate_program.rb
+- db/migrate/20210318195238_rename_certificate_dates.rb
+- db/migrate/20210330175706_create_exam_registration_user_join_table.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb
 - lib/mumuki/domain/evaluation/automated.rb
 - lib/mumuki/domain/evaluation/manual.rb
+- lib/mumuki/domain/evaluation/mixed.rb
 - lib/mumuki/domain/exceptions.rb
 - lib/mumuki/domain/exceptions/blocked_forum_error.rb
 - lib/mumuki/domain/exceptions/disabled_error.rb