mumuki-classroom 9.19.0 → 9.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be05271b42e5ab07b755d9e0b30131d9d127cec26bab30336b2d05bfabf5d794
-  data.tar.gz: 27068bf24a37505cbfc68a25e3bbeaa9e95dfef0e35e3ac0b7426494248a9aec
+  metadata.gz: cabe7b354830abd76c73425df9e9ff2c4f7fa806bb6dbc0cac68a319bd12e231
+  data.tar.gz: acc653411dc6f1a809d0439d93de48d02a64020bd2c446b32ab25afeaff7dd06
 SHA512:
-  metadata.gz: 5dcc61dee31d69bb46b2df79cc5f48d9335a9ecda78e115ad27b3940252cc6416d2b7f2d91fa633e9ab7dae7e965757e99041d45f59d55da7625410a9b5f555b
-  data.tar.gz: e292242c8f3b11d12eccd0900ed5ebdc85602cefe1aef21a56275a9389f05728c67d0c534d2995b107ba9d83cf149788c864ce58afc45316c6b346ba30bc9a9c
+  metadata.gz: 0f0c793f1362ca34c185acd9cd92dfc7bdc660ad84f79fcb96b564d88eba59e05270163ff78dcb1bb56aa7cb16b1eb08914316fff37fdcb4ca02dc1611f4cee1
+  data.tar.gz: 041020d946aaece5a110f039050486c0983401b6f42f67d899a328896222b6ab9debaeb6c6c6ec1b8b11940d26f0dcbf5c35ec5e69eee18ddacf0429195cc8c8

data/lib/mumuki/classroom/event/user_changed.rb

@@ -4,7 +4,7 @@ class Mumuki::Classroom::Event::UserChanged
     attr_accessor :changes
 
     def execute!(user_h)
-      set_diff_permissions user_h
+      set_permissions_diff user_h
       update_user_model user_h
     end
 
@@ -19,7 +19,7 @@ class Mumuki::Classroom::Event::UserChanged
       end
     end
 
-    def set_diff_permissions(user)
+    def set_permissions_diff(user)
       self.changes = Mumukit::Auth::Permissions::Diff.diff(user[:old_permissions], user[:new_permissions]).changes_by_organization
     end
 
@@ -29,8 +29,11 @@ class Mumuki::Classroom::Event::UserChanged
       if students.exists?
         students.first.attach!
       else
-        student = Mumuki::Classroom::Student.attributes_from_uid uid
-        Mumuki::Classroom::Student.create! student.merge(organization: organization, course: granted_slug.to_s)
+        student = Mumuki::Classroom::Student.new(
+          Mumuki::Classroom::Student
+            .attributes_from_uid(uid)
+            .merge(organization: organization, course: granted_slug.to_s))
+        student.save! validate: false
       end
     end
 
@@ -41,8 +44,9 @@ class Mumuki::Classroom::Event::UserChanged
 
     def teacher_added(organization, user, granted_slug)
       uid = user[:uid]
-      teacher = Mumuki::Classroom::Teacher.find_or_create_by!(organization: organization, course: granted_slug.to_s, uid: uid)
-      teacher.update_attributes!(Mumuki::Classroom::Teacher.attributes_from_uid(uid))
+      teacher = Mumuki::Classroom::Teacher.find_or_initialize_by(organization: organization, course: granted_slug.to_s, uid: uid)
+      teacher.assign_attributes(Mumuki::Classroom::Teacher.attributes_from_uid(uid))
+      teacher.save! validate: false
     end
 
     def teacher_removed(organization, user, granted_slug)

data/lib/mumuki/classroom/models/certificate.rb

@@ -0,0 +1,15 @@
+class Mumuki::Classroom::Certificate < Mumuki::Classroom::Document
+  include Mongoid::Timestamps
+
+  field :pg_id, type: Integer
+  field :code, type: String
+  field :certificate_program_id, type: Integer
+  field :organization, type: String
+  field :student, type: Hash
+  field :started_at, type: Time
+  field :ended_at, type: Time
+
+  create_index(pg_id: 1)
+  create_index(organization: 1, 'student.course': 1, 'student.uid': 1)
+  create_index(certificate_program_id: 1)
+end

data/lib/mumuki/classroom/models/concerns/course_member.rb

@@ -1,6 +1,8 @@
 module CourseMember
   extend ActiveSupport::Concern
 
+  MANDATORY_FIELDS = %w(uid first_name last_name email)
+
   included do
     include Mongoid::Timestamps
 
@@ -15,6 +17,9 @@ module CourseMember
     field :course, type: Mumukit::Auth::Slug
 
     create_index({organization: 1, course: 1, uid: 1}, {unique: true})
+
+    validates_presence_of(*MANDATORY_FIELDS)
+    validates :email, email: true
   end
 
   def as_user(verified: true)
@@ -23,6 +28,10 @@ module CourseMember
   end
 
   class_methods do
+    def valid_attributes?(json)
+      MANDATORY_FIELDS.all? { |it| json[it].present? } && EmailValidator.valid?(json[:email])
+    end
+
     def ensure_not_exists!(query)
       existing_members = where(query)
       raise Mumuki::Classroom::CourseMemberExistsError, {existing_members: existing_members.map(&:uid)}.to_json if existing_members.exists?

data/lib/mumuki/classroom/models/exam_authorization.rb

@@ -0,0 +1,12 @@
+class Mumuki::Classroom::ExamAuthorization < Mumuki::Classroom::Document
+  field :pg_id, type: Integer
+  field :session_id, type: String
+  field :guide_slug, type: String
+  field :organization, type: String
+  field :student, type: Hash
+  field :started, type: Mongoid::Boolean
+  field :started_at, type: Time
+
+  create_index(pg_id: 1)
+  create_index(organization: 1, 'student.course': 1, guide_slug: 1, 'student.uid': 1)
+end

data/lib/mumuki/classroom/models/exam_authorization_request.rb

@@ -0,0 +1,15 @@
+class Mumuki::Classroom::ExamAuthorizationRequest < Mumuki::Classroom::Document
+  include Mongoid::Timestamps
+
+  field :pg_id, type: Integer
+  field :status, type: String
+  field :guide_slug, type: String
+  field :organization, type: String
+  field :exam_registration_id, type: Integer
+  field :student, type: Hash
+
+  create_index(pg_id: 1)
+  create_index(organization: 1, 'student.course': 1, guide_slug: 1, 'student.uid': 1)
+  create_index(exam_registration_id: 1)
+  create_index(organization: 1, 'student.course': 1, 'student.uid': 1)
+end

data/lib/mumuki/classroom/models.rb

@@ -16,6 +16,9 @@ require_relative './models/student'
 require_relative './models/teacher'
 require_relative './models/notification'
 require_relative './models/suggestion'
+require_relative './models/certificate'
+require_relative './models/exam_authorization'
+require_relative './models/exam_authorization_request'
 
 require_relative './models/sorting'
 require_relative './models/searching'

data/lib/mumuki/classroom/sinatra/massive.rb

@@ -37,13 +37,13 @@ class Mumuki::Classroom::App < Sinatra::Application
 
       post '/students/detach' do
         update_students! do |processed|
-          update_students_at_course! :detach, :remove, processed
+          update_students_permissions_at_course! :detach, :remove, processed
         end
       end
 
       post '/students/attach' do
         update_students! do |processed|
-          update_students_at_course! :attach, :add, processed
+          update_students_permissions_at_course! :attach, :add, processed
         end
       end
 
@@ -98,7 +98,7 @@ class Mumuki::Classroom::App < Sinatra::Application
       user = User.find_or_initialize_by(uid: member[:uid])
       user.assign_attributes user_from_member_json(member)
       user.add_permission! role, course_slug
-      user.verify_name!
+      user.verify_name! force: true
       yield user if block_given?
     end
 
@@ -143,20 +143,39 @@ class Mumuki::Classroom::App < Sinatra::Application
 
     def create_members!(role, &block)
       members_collection = collection_for role
-      massive_members = massive_members_for role
-      existing_members = existing_members_in_course(members_collection, massive_members)
-      existing_members_uids = existing_members.map { |it| it[:uid] }
-      processed_members = massive_members.reject { |it| existing_members_uids.include? it[:uid] }.uniq { |it| it[:uid]}
-      members_collection.collection.insert_many(processed_members.map { |member| with_organization_and_course member })
-      upsert_users! role, processed_members, &block
-      massive_response(processed_members, unprocessed_members_for(role), existing_members,
+
+      existing_members, non_existent_members = partion_existing_members_in_course(
+        members_collection,
+        massive_members_for(role))
+
+      valid_members, invalid_members = non_existent_members.partition do |member|
+        members_collection.valid_attributes? member
+      end
+
+      errored_members = existing_members + invalid_members
+
+      members_collection
+        .collection
+        .insert_many(valid_members.map { |member| with_organization_and_course member })
+      upsert_users! role, valid_members, &block
+
+      massive_response(valid_members, unprocessed_members_for(role), errored_members,
                        "#{role.to_s.pluralize.titleize} already belong to current course", status: :created)
     end
 
-    def existing_members_in_course(col, massive_members)
-      col.where(with_organization_and_course)
+    def partion_existing_members_in_course(collection, massive_members)
+      existing_members = existing_members_in_course(collection, massive_members)
+      existing_members_uids = existing_members.map { |it| it[:uid] }
+      [
+        existing_members,
+        massive_members.reject { |it| existing_members_uids.include? it[:uid] }.uniq { |it| it[:uid] }
+      ]
+    end
+
+    def existing_members_in_course(collection, massive_members)
+      collection.where(with_organization_and_course)
         .in(uid: massive_members.map { |it| it[:uid] })
-        .map { |it| col.normalized_attributes_from_json(it) }
+        .map { |it| collection.normalized_attributes_from_json(it) }
     end
 
     def update_students!
@@ -166,7 +185,7 @@ class Mumuki::Classroom::App < Sinatra::Application
                        students_does_not_belong_msg, status: :updated
     end
 
-    def update_students_at_course!(method, action, students_uids)
+    def update_students_permissions_at_course!(method, action, students_uids)
       Mumuki::Classroom::Student.send "#{method}_all_by!", students_uids, with_organization_and_course
       User.where(uid: students_uids).each do |user|
         user.send "#{action}_permission!", :student, course_slug

data/lib/mumuki/classroom/sinatra/students.rb

@@ -1,11 +1,5 @@
 class Mumuki::Classroom::App < Sinatra::Application
   helpers do
-    def normalize_student!
-      json_body[:email] = json_body[:email]&.downcase
-      json_body[:last_name] = json_body[:last_name]&.downcase&.titleize
-      json_body[:first_name] = json_body[:first_name]&.downcase&.titleize
-    end
-
     def list_students(matcher)
       authorize! :teacher
       count, students = Sorting.aggregate(Mumuki::Classroom::Student, with_detached_and_search(matcher, Mumuki::Classroom::Student), paginated_params, query_params)

data/lib/mumuki/classroom/sinatra.rb

@@ -243,7 +243,12 @@ HTML
         json = JSON.parse(error_message.message)
         response.body = json.to_json
       rescue
-        response.body = {message: error_message.message}.to_json
+        if error_message.is_a?(Mongoid::Errors::MongoidError)
+          message_text = error_message.summary
+        else
+          message_text = error_message.message
+        end
+        response.body = {message: message_text}.to_json
       end
     end
   end
@@ -256,6 +261,10 @@ HTML
     halt 400
   end
 
+  error Mongoid::Errors::Validations do
+    halt 400
+  end
+
   error ActiveRecord::RecordNotFound do
     halt 404
   end

data/lib/mumuki/classroom/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Classroom
-    VERSION = '9.19.0'
+    VERSION = '9.23.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-classroom
 version: !ruby/object:Gem::Version
-  version: 9.19.0
+  version: 9.23.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.19.0
+        version: 9.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.19.0
+        version: 9.23.0
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -232,11 +232,14 @@ files:
 - lib/mumuki/classroom/locales/pt.yml
 - lib/mumuki/classroom/models.rb
 - lib/mumuki/classroom/models/assignment.rb
+- lib/mumuki/classroom/models/certificate.rb
 - lib/mumuki/classroom/models/concerns/course_member.rb
 - lib/mumuki/classroom/models/concerns/extensions.rb
 - lib/mumuki/classroom/models/concerns/with_failed_submission_reprocess.rb
 - lib/mumuki/classroom/models/concerns/with_submission_process.rb
 - lib/mumuki/classroom/models/document.rb
+- lib/mumuki/classroom/models/exam_authorization.rb
+- lib/mumuki/classroom/models/exam_authorization_request.rb
 - lib/mumuki/classroom/models/exercise.rb
 - lib/mumuki/classroom/models/failed_submission.rb
 - lib/mumuki/classroom/models/follower.rb