implements document types controller, makes necessary changes to documents and services controllers

Author: madoleary

app/controllers/document_types_controller.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+# app/controllers/document_types_controller.rb
+class DocumentTypesController < ApplicationController
+  include Pundit::Authorization
+
+  before_action :authenticate_user!, except: %i[index show]
+  before_action :set_document_type, only: %i[show edit update review]
+  before_action :set_documents, only: :show
+
+  def index
+    authorize DocumentType
+    @q = DocumentType.ransack(params[:q])
+    @document_types = @q.result(distinct: true).page(params[:page] || 1)
+  end
+
+  def show
+    authorize @document_type
+  end
+
+  def new
+    authorize DocumentType
+
+    @document_type = DocumentType.new
+    @submit_text = current_user.admin || current_user.curator ? 'Create' : 'Request'
+  end
+
+  def create
+    authorize DocumentType
+
+    @document_type = DocumentType.new(document_type_params)
+    current_user_privileged = current_user.admin || current_user.curator
+    @document_type.status = 'pending' unless current_user_privileged
+
+    @document_type.user = current_user
+
+    if @document_type.save
+      redirect_to document_type_path(@document_type)
+    else
+      render 'new'
+    end
+  end
+
+  def edit
+    authorize @document_type
+
+    @submit_text = 'Update'
+  end
+
+  def update
+    authorize @document_type
+
+    @document_type.update(document_type_params)
+    if @document_type.save
+      flash[:notice] = 'Document type updated'
+      redirect_to document_type_path(@document_type)
+    else
+      render 'edit'
+    end
+  end
+
+  def review
+    authorize @document_type
+
+    @document_type.status = params[:status]
+    if @document_type.save
+      flash[:notice] = 'Updated status of document type'
+      redirect_to document_type_path(@document_type)
+    else
+      flash[:error] = 'There was an error updating the document type'
+    end
+  end
+
+  private
+
+  def set_document_type
+    @document_type = DocumentType.find(params[:id])
+  end
+
+  def set_documents
+    document_type = DocumentType.find(params[:id])
+    @documents = document_type.documents
+  end
+
+  def document_type_params
+    params.require(:document_type).permit(:user_id, :name, :status, :description)
+  end
+end

app/controllers/documents_controller.rb

@@ -27,33 +27,33 @@ class DocumentsController < ApplicationController
 
   before_action :authenticate_user!, except: %i[index show]
   before_action :set_document, only: %i[show edit update crawl restore_points]
-  before_action :set_services, only: %i[new edit]
-  before_action :set_document_names, only: %i[new edit]
-  before_action :set_crawlers, only: %i[new edit]
+  before_action :set_services, only: %i[new edit create update]
+  before_action :set_document_names, only: %i[new edit create update]
+  before_action :set_crawlers, only: %i[new edit create update]
 
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
   def index
     authorize Document
-    @q = Document.includes(:service).ransack(params[:q])
+    @q = Document.includes(:service, :document_type).ransack(params[:q])
     @documents = @q.result(distinct: true).page(params[:page] || 1)
   end
 
   def new
     authorize Document
 
     @document = Document.new
-    service = params[:service]
-    return unless service
+    service = params[:service_id]
 
-    @document.service = Service.find(service)
+    @document.service = Service.find(service) if service
   end
 
   def create
     authorize Document
 
     @document = Document.new(document_params)
     @document.user = current_user
+    @document.name = @document.document_type.name if @document.document_type
 
     if @document.save
       crawl_result = perform_crawl
@@ -67,7 +67,7 @@ def create
       end
       redirect_to document_path(@document)
     else
-      render 'new'
+      render :new
     end
   end
 
@@ -76,6 +76,12 @@ def update
 
     @document.update(document_params)
 
+    if document_params[:document_type_id]
+      id = document_params[:document_type_id]
+      document_type = DocumentType.find(id)
+      @document.name = document_type.name unless @document.name == document_type.name
+    end
+
     # we should probably only be running the crawler if the URL or XPath have changed
     run_crawler = @document.saved_changes.keys.any? { |attribute| %w[url xpath crawler_server].include? attribute }
     crawl_result = perform_crawl if run_crawler
@@ -115,6 +121,8 @@ def destroy
 
   def show
     authorize @document
+
+    @name = @document.document_type ? @document.document_type.name : @document.name
   end
 
   def crawl
@@ -157,15 +165,15 @@ def set_services
   end
 
   def set_document_names
-    @document_names = Document::VALID_NAMES
+    @document_names = DocumentType.order('name ASC')
   end
 
   def set_crawlers
     @crawlers = Rails.env.development? ? DEV_CRAWLERS : PROD_CRAWLERS
   end
 
   def document_params
-    params.require(:document).permit(:service, :service_id, :user_id, :name, :url, :xpath, :crawler_server)
+    params.require(:document).permit(:service, :service_id, :user_id, :document_type_id, :name, :url, :xpath, :crawler_server)
   end
 
   def crawler_error_message(result)

app/controllers/services_controller.rb

@@ -49,7 +49,7 @@ def create
   def annotate
     authorize Service
 
-    @service = Service.includes(documents: [:points, :user]).find(params[:id] || params[:service_id])
+    @service = Service.includes(documents: [:points, :user, :document_type]).find(params[:id] || params[:service_id])
     @documents = @service.documents
     @sourced_from_ota = @documents.where(ota_sourced: true).any?
     if params[:point_id] && current_user