mumuki-domain 9.0.2 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db86a9ea25dfdc219c9555b5c116413352e4fb080af117985e93ca5bb2c4889
-  data.tar.gz: '0913300a86ea7880f65997a6bcbf418023c74a3f58dac21361d286d69e1ab528'
+  metadata.gz: 07771f9e0e712988ad05c336cabef30fea9af24bbfd6da99dc48d7ab19aee1ba
+  data.tar.gz: 52c848e349daf6f371daf73d5ef675c06af6da0eee19ce25f6329db5ff5a9383
 SHA512:
-  metadata.gz: 6ae200ee06fe4ef89e24836256fe3be80c99b53d24daa1e6056630f8daf78e55ad391b88b919f07db12e62365f28222c68a7e472ad91b37266bb340ef15e4141
-  data.tar.gz: 91aceaf7b84e5c014d9d7f600a4a8b205956427615c01fbbca6a581a3f572034aa99a9b12c0f323df21e1772870998ab6c220859361dcc244f22f3f2d95e16a0
+  metadata.gz: 556d16f80533171f7e67f9652f84c955a5d9f8d7efdd981ec7b141afb845f4bb880c391486c2a5f2adad434410c0a789a1552b0dd1019d22b24ee149d335c1e7
+  data.tar.gz: 00cbc6852719e47a496f2bb2569cd98db9499df559bc9958ca6e482b3ece6c03498540b65cb38c8e0bee813c70e10eeca7ed2c87fc70c80d1a59bc9b407efee0

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/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.future? - MODERATOR_REVIEW_AVERAGE_TIME
   end
 
   def last_moderator_access_visible_for?(user)

data/app/models/exercise.rb

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

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

@@ -223,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)

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/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.0.3'
   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.0.3
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -657,6 +657,7 @@ 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
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb