Alterações para remoção do usuário da escolamodelows

.ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+ruby-2.5.5

app/controllers/certificates_controller.rb

@@ -36,7 +36,7 @@ def adicionar_certificado
     end
   end
   def certificado_usuario
-    user = User.find_by(cpf: params[:cpf])
+    user = User.find_by(user_data_access)
     if user.present?
       hash_certificates=user.certificates.map do |certificate|
         {'id' => certificate.id,

app/controllers/course_registrations_controller.rb

@@ -1,43 +1,24 @@
 class CourseRegistrationsController < ApplicationController
   skip_before_action :verify_authenticity_token
+  #before_action :user_data_access
 
   def new
-    if current_user
-      if !current_user.restriction
-        if params[:id].present?
-          @course = Course.find(params[:id])
-        else
-          school = School.find_by(initials: params[:school])
-          if school.present?
-            @course = Course.find_by(school_id: school.id, ead_id: params[:school_course])
-          else
-            @course = nil
-          end
-        end
-        if @course.present?
-          @redirect = params[:redirect]
-          @quiz = Quiz.order(:id).last
-          @quiz_questions = @quiz.quiz_questions
-          registration = CourseRegistration.find_by(user_id: current_user.id, course_id: @course.id)
-          if registration.present? #Verifica se já está matriculado na evl
-            quiz = UserQuizAnswer.find_by(course_registration_id: registration.id)
-            if quiz.present?
-              redirect_to params[:redirect] #Redireciona para o moodle        
-            else
-              @quiz_flag = true
-            end
-          end
-        else
-          redirect_to user_path
-        end
+    if params[:id].present?
+      @course = Course.find(params[:id])
+    else
+      school = School.find_by(initials: params[:school])
+      if school.present?
+        @course = Course.find_by(school_id: school.id, ead_id: params[:school_course])
       else
-        redirect_to user_path
+        @course = nil
       end
+    end
+    if @course.present?
+      @redirect = params[:redirect]
+      @quiz = Quiz.order(:id).last
+      @quiz_questions = @quiz.quiz_questions
     else
-      redirect_to log_in_path(return: registro_curso_path(id: params[:id],
-                                                             school: params[:school],
-                                                             school_course: params[:school_course],
-                                                             redirect: params[:redirect]))
+      redirect_to user_path
     end
   end
 
@@ -63,7 +44,7 @@ def create
         if registration.save
           params[:registration].each do |key, value| #Pode ser necessária uma verificação de que as perguntas foram respondidas
             UserQuizAnswer.create(quiz_answer_id: value, course_registration_id: registration.id)
-        
+
           end
         end
         redirect_to params[:registration][:redirect]
@@ -82,14 +63,14 @@ def matricula_alunos
       registration = CourseRegistration.new(user_id: user.id, course_id: course.id, course_registration_status_id: 2)
       if registration.save
         render status: 200, json: {
-          mensagem: "Usuário " + user.first_name + " " + user.last_name + " foi matriculado no curso " + params[:course] + "\n",
+            mensagem: "Usuário " + user.first_name + " " + user.last_name + " foi matriculado no curso " + params[:course] + "\n",
         }.to_json
       else
         render status: 400, json: {
-          mensagem: 'Ocorreu um erro, não foi possível matricular o aluno ' + user.first_name + " " + user.last_name + "\n",
-        }.to_json  
+            mensagem: 'Ocorreu um erro, não foi possível matricular o aluno ' + user.first_name + " " + user.last_name + "\n",
+        }.to_json
       end
-    end  
+    end
   end
 
   def cursos_usuario
@@ -150,42 +131,42 @@ def consulta_quiz
             quiz = UserQuizAnswer.find_by(course_registration_id: registration.id)
             if quiz.present?
               return render status: 200, json: {
-                result: true,
+                  result: true,
               }.to_json
             end
           end
         end
       end
     end
     return render status: 200, json: {
-      result: false,
+        result: false,
     }.to_json
   end
 
   def confirmacao_matricula
     school = School.find_by(initials: params[:school])
     if school
-      course = Course.find_by(school_id: school.id , ead_id: params[:course])
+      course = Course.find_by(school_id: school.id, ead_id: params[:course])
       if course
         api_key = ApiAccess.find_by(key: params[:key])
         course_registration = CourseRegistration.find_by(course_id: course.id, user_id: api_key.user_id)
         if course_registration
           render status: 200, json: {
-            situacao: course_registration.course_registration_status.status,
+              situacao: course_registration.course_registration_status.status,
           }.to_json
         else
           render status: 200, json: {
-            situacao: 'Não registrado',
+              situacao: 'Não registrado',
           }.to_json
         end
       else
         render status: 400, json: {
-          mensagem: 'Curso não encontrado',
+            mensagem: 'Curso não encontrado',
         }.to_json
       end
     else
       render status: 400, json: {
-        mensagem: 'Escola não encontrada',
+          mensagem: 'Escola não encontrada',
       }.to_json
     end
 

app/models/user.rb

@@ -1,35 +1,9 @@
 class User < ApplicationRecord
-  authenticates_with_sorcery!
+  # authenticates_with_sorcery!
   attr_accessor :skip_password, :uid, :redirect_page
-  validates :password, length: { minimum: 8 }, unless: :skip_password
-  validates :password, confirmation: true
-  validates :email, uniqueness: true
   validates :cpf, length: { is: 14 }, uniqueness: true
-  before_save :capitalize_name
-  belongs_to :role
   has_many :certificates
   has_many :contact_us_conversations
   has_many :course_registrations
   has_one_attached :avatar
-  def capitalize_name
-    self.first_name=self.first_name.split.map(&:capitalize).join(' ')
-    if self.last_name.present?
-      self.last_name=self.last_name.split.map(&:capitalize).join(' ')
-    else
-      self.last_name = self.first_name.split[1..-1].join(' ')
-      self.first_name = self.first_name.split[0]
-    end
-    if !self.role_id.present?
-      self.role_id = 2
-    end
-  end
-  has_many :access_grants, class_name: "Doorkeeper::AccessGrant",
-           foreign_key: :resource_owner_id,
-           dependent: :delete_all # or :destroy if you need callbacks
-
-  has_many :access_tokens, class_name: "Doorkeeper::AccessToken",
-           foreign_key: :resource_owner_id,
-           dependent: :delete_all # or :destroy if you need callbacks
-  has_many :authentications, :dependent => :destroy
-  accepts_nested_attributes_for :authentications
 end

app/views/course_registrations/new.jbuilder

@@ -0,0 +1,9 @@
+json.quiz do
+  json.array! @quiz_questions do |question|
+    json.id question.id
+    json.question question.question
+    json.answers do
+      json.array! question.quiz_answers, :id, :answer
+    end
+  end
+end

db/migrate/20190801181744_remove_email_from_users.rb

@@ -0,0 +1,5 @@
+class RemoveEmailFromUsers < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :users, :email, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_07_29_134505) do
+ActiveRecord::Schema.define(version: 2019_08_01_181744) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -259,7 +259,6 @@
   end
 
   create_table "users", force: :cascade do |t|
-    t.string "email", null: false
     t.string "cpf"
     t.string "first_name"
     t.string "last_name"