repositories/select_options JSON #337

app/controllers/namespaces_controller.rb

@@ -1,33 +1,5 @@
 class NamespacesController < ApplicationController
 
-def batch_load
-end
-
-def preview_simple_batch_load 
-  if params[:file] 
-    @result = BatchLoad::Import::Namespaces::SimpleInterpreter.new(batch_params)
-    digest_cookie(params[:file].tempfile, :Simple_namespaces_md5)
-    render 'namespaces/batch_load/simple/preview'
-  else
-    flash[:notice] = 'No file provided!'
-    redirect_to action: :batch_load 
-  end
-end
-
-def create_simple_batch_load
-  if params[:file] && digested_cookie_exists?(params[:file].tempfile, :Simple_namespaces_md5)
-    @result = BatchLoad::Import::Namespaces::SimpleInterpreter.new(batch_params)
-    if @result.create
-      flash[:notice] = "Successfully proccessed file, #{@result.total_records_created} namespaces were created."
-      render 'namespaces/batch_load/simple/create' and return
-    else
-      flash[:alert] = 'Batch import failed.'
-    end
-  else
-    flash[:alert] = 'File to batch upload must be supplied.'
-  end
-  render :batch_load
-end
   include DataControllerConfiguration::SharedDataControllerConfiguration
   before_action :set_namespace, only: [:show, :edit, :update, :destroy]
 
@@ -125,10 +97,41 @@ def download
     send_data Download.generate_csv(Namespace.all), type: 'text', filename: "namespaces_#{DateTime.now}.csv"
   end
 
+  # GET /namespaces/select_options
   def select_options
     @namespaces = Namespace.select_optimized(sessions_current_user_id, sessions_current_project_id, params[:klass])
   end
 
+  def batch_load
+  end
+
+  def preview_simple_batch_load 
+    if params[:file] 
+      @result = BatchLoad::Import::Namespaces::SimpleInterpreter.new(batch_params)
+      digest_cookie(params[:file].tempfile, :Simple_namespaces_md5)
+      render 'namespaces/batch_load/simple/preview'
+    else
+      flash[:notice] = 'No file provided!'
+      redirect_to action: :batch_load 
+    end
+  end
+
+  def create_simple_batch_load
+    if params[:file] && digested_cookie_exists?(params[:file].tempfile, :Simple_namespaces_md5)
+      @result = BatchLoad::Import::Namespaces::SimpleInterpreter.new(batch_params)
+      if @result.create
+        flash[:notice] = "Successfully proccessed file, #{@result.total_records_created} namespaces were created."
+        render 'namespaces/batch_load/simple/create' and return
+      else
+        flash[:alert] = 'Batch import failed.'
+      end
+    else
+      flash[:alert] = 'File to batch upload must be supplied.'
+    end
+    render :batch_load
+  end
+
+
   private
 
   def set_namespace

app/controllers/repositories_controller.rb

@@ -99,6 +99,11 @@ def download
     send_data Download.generate_csv(Repository.all), type: 'text', filename: "repositories_#{DateTime.now}.csv"
   end
 
+  # GET /repositories/select_options
+  def select_options
+    @repositories = Repository.select_optimized(sessions_current_user_id, sessions_current_project_id)
+  end
+
   private
 
   # Use callbacks to share common setup or constraints between actions.

app/models/repository.rb

@@ -36,4 +36,17 @@ class Repository < ApplicationRecord
   has_many :collection_objects, inverse_of: :repository, dependent: :restrict_with_error
   validates_presence_of :name, :url, :acronym, :status
 
+  scope :used_recently, -> { joins(:collection_objects).where(collection_objects: { created_at: 1.weeks.ago..Time.now } ) }
+  scope :used_in_project, -> (project_id) { joins(:collection_objects).where( collection_objects: { project_id: project_id } ) }
+
+  def self.select_optimized(user_id, project_id)
+    h = {
+      recent: Repository.used_in_project(project_id).used_recently.limit(10).distinct.to_a,
+      pinboard: Repository.pinned_by(user_id).pinned_in_project(project_id).to_a
+    }
+
+    h[:quick] = (Repository.pinned_by(user_id).pinboard_inserted.pinned_in_project(project_id).to_a  + h[:recent][0..3]).uniq
+    h
+  end
+
 end

app/views/repositories/_attributes.json.jbuilder

@@ -0,0 +1,3 @@
+json.extract! repository, :id, :name, :url, :acronym, :status, :institutional_LSID, :is_index_herbariorum, :created_by_id, :updated_by_id, :created_at, :updated_at
+
+json.partial! '/shared/data/all/metadata', object: repository 

app/views/repositories/select_options.json.jbuilder

@@ -0,0 +1,7 @@
+@repositories.each_key do |group|
+  json.set!(group) do
+    json.array! @repositories[group] do |n|
+      json.partial! '/repositories/attributes', repository: n
+    end
+  end
+end

app/views/repositories/show.json.jbuilder

@@ -1 +1 @@
-json.extract! @repository, :id, :name, :url, :acronym, :status, :institutional_LSID, :is_index_herbariorum, :created_by_id, :updated_by_id, :created_at, :updated_at
+json.partial! "/repositories/attributes", repository: @repository

config/interface/hub/user_tasks.yml

@@ -339,4 +339,4 @@ comprehensive_collection_object_task:
   categories:
     - collection_object
   status: prototype
-  description: 'An all-in-one task for digitizing collectiong objects.'
+  description: 'An all-in-one interface for digitizing collection objects.'

config/routes.rb

@@ -496,6 +496,9 @@
 
   resources :repositories do
     concerns [:data_routes]
+    collection do
+      get :select_options, defaults: {format: :json}
+    end
   end
 
   # TODO: add exceptions

spec/models/repository_spec.rb

@@ -1,6 +1,5 @@
 require 'rails_helper'
 
-
 describe Repository, type: :model do
   let(:repository) {FactoryBot.build(:repository)}
 
@@ -19,6 +18,21 @@
     end
   end
 
+  context 'scopes' do
+    let(:r1) { FactoryBot.create(:valid_repository) }
+    let(:r2) { FactoryBot.create(:valid_repository) }
+    let!(:s1) { Specimen.create!(total: 1, repository: r1) }
+    let!(:s2) { Specimen.create!(total: 1, repository: r2) }
+
+    specify '#used_recently' do
+      expect(Repository.used_recently).to contain_exactly(r1, r2)
+    end
+
+    specify '#used_in_project' do
+      expect(Repository.used_in_project(s1.project_id)).to contain_exactly(r1, r2)
+    end
+  end
+
   context 'concerns' do
     it_behaves_like 'notable'
     it_behaves_like 'is_data'