Refactor/split create update answers

.gitignore

@@ -31,3 +31,4 @@
 /config/master.key
 coverage/
 rsa_keys.yml
+/db/seeds.rb

Gemfile.lock

@@ -128,9 +128,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.2-aarch64-linux)
-      racc (~> 1.4)
-    nokogiri (1.15.2-x64-mingw-ucrt)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.23.0)
     parser (3.2.2.3)
@@ -231,17 +229,14 @@ GEM
     timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.3)
-      tzinfo (>= 1.0.0)
     unicode-display_width (2.4.2)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.6.11)
 
 PLATFORMS
-  aarch64-linux
-  x64-mingw-ucrt
+  x86_64-linux
 
 DEPENDENCIES
   bcrypt (~> 3.1.7)
@@ -269,4 +264,4 @@ RUBY VERSION
    ruby 3.2.1p31
 
 BUNDLED WITH
-   2.4.14
+   2.5.6

app/controllers/api/v1/account_requests_controller.rb

@@ -1,5 +1,4 @@
 class Api::V1::AccountRequestsController < ApplicationController
-
   # GET /account_requests/pending
   def pending_requests
     @account_requests = AccountRequest.where(status: 'Under Review').order('created_at DESC')
@@ -62,7 +61,7 @@ def destroy
     @account_request.destroy
     render json: { message: 'Account Request deleted' }, status: :no_content
   rescue ActiveRecord::RecordNotFound => e
-      render json: { error: e.message }, status: :not_found
+    render json: { error: e.message }, status: :not_found
   end
 
   private
@@ -73,17 +72,19 @@ def account_request_params
     if params[:account_request][:status].nil?
       params[:account_request][:status] = 'Under Review'
     # For Approval or Rejection of an existing request, raise error if user sends a status other than Approved or Rejected
-    elsif !['Approved', 'Rejected'].include?(params[:account_request][:status])
+    elsif !%w[Approved Rejected].include?(params[:account_request][:status])
       raise StandardError, 'Status can only be Approved or Rejected'
     end
-    params.require(:account_request).permit(:username, :full_name, :email, :status, :introduction, :role_id, :institution_id)
+    params.require(:account_request).permit(:username, :full_name, :email, :status, :introduction, :role_id,
+                                            :institution_id)
   end
 
   # Create a new user if account request is approved
   def create_approved_user
-    @new_user = User.new(name: @account_request.username, role_id: @account_request.role_id, institution_id: @account_request.institution_id, fullname: @account_request.full_name, email: @account_request.email, password: 'password')
+    @new_user = User.new(name: @account_request.username, role_id: @account_request.role_id,
+                         institution_id: @account_request.institution_id, fullname: @account_request.full_name, email: @account_request.email, password: 'password')
     if @new_user.save
-      render json: { success: 'Account Request Approved and User successfully created.', user: @new_user}, status: :ok
+      render json: { success: 'Account Request Approved and User successfully created.', user: @new_user }, status: :ok
     else
       render json: @new_user.errors, status: :unprocessable_entity
     end

app/controllers/api/v1/assignments_controller.rb

@@ -44,4 +44,4 @@ def destroy
   def assignment_params
     params.require(:assignment).permit(:title, :description)
   end
-end
+end

app/controllers/api/v1/courses_controller.rb

@@ -1,5 +1,5 @@
 class Api::V1::CoursesController < ApplicationController
-  before_action :set_course, only: %i[ show update destroy add_ta view_tas remove_ta copy ]
+  before_action :set_course, only: %i[show update destroy add_ta view_tas remove_ta copy]
   rescue_from ActiveRecord::RecordNotFound, with: :course_not_found
   rescue_from ActionController::ParameterMissing, with: :parameter_missing
 
@@ -51,7 +51,7 @@ def add_ta
     if result[:success]
       render json: result[:data], status: :created
     else
-      render json: { status: "error", message: result[:message] }, status: :bad_request
+      render json: { status: 'error', message: result[:message] }, status: :bad_request
     end
   end
 
@@ -67,7 +67,7 @@ def remove_ta
     if result[:success]
       render json: { message: "The TA #{result[:ta_name]} has been removed." }, status: :ok
     else
-      render json: { status: "error", message: result[:message] }, status: :not_found
+      render json: { status: 'error', message: result[:message] }, status: :not_found
     end
   end
 
@@ -78,7 +78,7 @@ def copy
     if success
       render json: { message: "The course #{@course.name} has been successfully copied" }, status: :ok
     else
-      render json: { message: "The course was not able to be copied" }, status: :unprocessable_entity
+      render json: { message: 'The course was not able to be copied' }, status: :unprocessable_entity
     end
   end
 
@@ -99,6 +99,6 @@ def course_not_found
   end
 
   def parameter_missing
-    render json: { error: "Parameter missing" }, status: :unprocessable_entity
+    render json: { error: 'Parameter missing' }, status: :unprocessable_entity
   end
 end

app/controllers/api/v1/institutions_controller.rb

@@ -51,4 +51,4 @@ def institution_params
   def institution_not_found
     render json: { error: 'Institution not found' }, status: :not_found
   end
-end
+end

app/controllers/api/v1/invitations_controller.rb

@@ -38,7 +38,6 @@ def update
     else
       render json: @invitation.errors, status: :unprocessable_entity
     end
-
   end
 
   # DELETE /api/v1/invitations/:id
@@ -83,5 +82,4 @@ def invite_params
   def invite_not_found
     render json: { error: "Invitation with id #{params[:id]} not found" }, status: :not_found
   end
-
 end

app/controllers/api/v1/questionnaires_controller.rb

@@ -1,46 +1,39 @@
 class Api::V1::QuestionnairesController < ApplicationController
-
   # Index method returns the list of JSON objects of the questionnaire
   # GET on /questionnaires
   def index
     @questionnaires = Questionnaire.order(:id)
     render json: @questionnaires, status: :ok and return
   end
-  
+
   # Show method returns the JSON object of questionnaire with id = {:id}
   # GET on /questionnaires/:id
   def show
-    begin
-      @questionnaire = Questionnaire.find(params[:id])
-      render json: @questionnaire, status: :ok and return
-    rescue ActiveRecord::RecordNotFound
-      render json: $ERROR_INFO.to_s, status: :not_found and return
-    end
+    @questionnaire = Questionnaire.find(params[:id])
+    render json: @questionnaire, status: :ok and return
+  rescue ActiveRecord::RecordNotFound
+    render json: $ERROR_INFO.to_s, status: :not_found and return
   end
-  
+
   # Create method creates a questionnaire and returns the JSON object of the created questionnaire
   # POST on /questionnaires
   # Instructor Id statically defined since implementation of Instructor model is out of scope of E2345.
   def create
-    begin
-      @questionnaire = Questionnaire.new(questionnaire_params)
-      @questionnaire.display_type = sanitize_display_type(@questionnaire.questionnaire_type)
-      @questionnaire.save!
-      render json: @questionnaire, status: :created and return
-    rescue ActiveRecord::RecordInvalid
-      render json: $ERROR_INFO.to_s, status: :unprocessable_entity
-    end
+    @questionnaire = Questionnaire.new(questionnaire_params)
+    @questionnaire.display_type = sanitize_display_type(@questionnaire.questionnaire_type)
+    @questionnaire.save!
+    render json: @questionnaire, status: :created and return
+  rescue ActiveRecord::RecordInvalid
+    render json: $ERROR_INFO.to_s, status: :unprocessable_entity
   end
 
   # Destroy method deletes the questionnaire object with id- {:id}
   # DELETE on /questionnaires/:id
   def destroy
-    begin
-      @questionnaire = Questionnaire.find(params[:id])
-      @questionnaire.delete
-    rescue ActiveRecord::RecordNotFound
-      render json: $ERROR_INFO.to_s, status: :not_found and return
-    end
+    @questionnaire = Questionnaire.find(params[:id])
+    @questionnaire.delete
+  rescue ActiveRecord::RecordNotFound
+    render json: $ERROR_INFO.to_s, status: :not_found and return
   end
 
   # Update method updates the questionnaire object with id - {:id} and returns the updated questionnaire JSON object
@@ -54,48 +47,46 @@ def update
       render json: @questionnaire.errors.full_messages, status: :unprocessable_entity
     end
   end
+
   # Copy method creates a copy of questionnaire with id - {:id} and return its JSON object
   # POST on /questionnaires/copy/:id
   def copy
-    begin
-      @questionnaire = Questionnaire.copy_questionnaire_details(params)
-      render json: @questionnaire, status: :ok and return
-    rescue ActiveRecord::RecordNotFound
-      render json: $ERROR_INFO.to_s, status: :not_found and return
-    rescue ActiveRecord::RecordInvalid
-      render json: $ERROR_INFO.to_s, status: :unprocessable_entity
-    end
+    @questionnaire = Questionnaire.copy_questionnaire_details(params)
+    render json: @questionnaire, status: :ok and return
+  rescue ActiveRecord::RecordNotFound
+    render json: $ERROR_INFO.to_s, status: :not_found and return
+  rescue ActiveRecord::RecordInvalid
+    render json: $ERROR_INFO.to_s, status: :unprocessable_entity
   end
 
   # Toggle access method toggles the private variable of the questionnaire with id - {:id} and return its JSON object
   # GET on /questionnaires/toggle_access/:id
 
   def toggle_access
-    begin
-      @questionnaire = Questionnaire.find(params[:id])
-      @questionnaire.toggle!(:private)
-      @access = @questionnaire.private ? 'private' : 'public'
-      render json: "The questionnaire \"#{@questionnaire.name}\" has been successfully made #{@access}. ",
-        status: :ok
-    rescue ActiveRecord::RecordNotFound
-      render json: $ERROR_INFO.to_s, status: :not_found
-    rescue ActiveRecord::RecordInvalid
-      render json: $ERROR_INFO.to_s, status: :unprocessable_entity
-    end
+    @questionnaire = Questionnaire.find(params[:id])
+    @questionnaire.toggle!(:private)
+    @access = @questionnaire.private ? 'private' : 'public'
+    render json: "The questionnaire \"#{@questionnaire.name}\" has been successfully made #{@access}. ",
+           status: :ok
+  rescue ActiveRecord::RecordNotFound
+    render json: $ERROR_INFO.to_s, status: :not_found
+  rescue ActiveRecord::RecordInvalid
+    render json: $ERROR_INFO.to_s, status: :unprocessable_entity
   end
 
   private
 
   def questionnaire_params
-    params.require(:questionnaire).permit(:name, :questionnaire_type, :private, :min_question_score, :max_question_score, :instructor_id)
+    params.require(:questionnaire).permit(:name, :questionnaire_type, :private, :min_question_score,
+                                          :max_question_score, :instructor_id)
   end
 
   def sanitize_display_type(type)
     display_type = type.split('Questionnaire')[0]
-    if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey BookmarkRating].include?(display_type)
-      display_type = (display_type.split(/(?=[A-Z])/)).join('%')
+    if %w[AuthorFeedback CourseSurvey TeammateReview GlobalSurvey AssignmentSurvey
+          BookmarkRating].include?(display_type)
+      display_type = display_type.split(/(?=[A-Z])/).join('%')
     end
     display_type
   end
-
-end
+end