Feature/instrument type and instrument

app/admin/instrument.rb

@@ -0,0 +1,43 @@
+ActiveAdmin.register Instrument do
+  menu parent: 'Laws', priority: 6
+
+  permit_params :name, :instrument_type_id
+
+  config.batch_actions = false
+
+  decorate_with InstrumentDecorator
+
+  filter :name_contains, label: 'Name'
+  filter :instrument_type
+
+  index do
+    column :name, :name_link
+    column :instrument_type
+
+    actions
+  end
+
+  show do
+    attributes_table do
+      row :name
+      row :instrument_type
+    end
+
+    active_admin_comments
+  end
+
+  form html: {'data-controller' => 'check-modified'} do |f|
+    f.semantic_errors(*f.object.errors.keys)
+
+    f.inputs do
+      f.input :name
+      f.input :instrument_type
+    end
+
+    f.actions
+  end
+
+  controller do
+    include DiscardableController
+  end
+end

app/admin/instrument_types.rb

@@ -0,0 +1,38 @@
+ActiveAdmin.register InstrumentType do
+  menu parent: 'Laws', priority: 7
+  config.batch_actions = false
+
+  permit_params :name
+
+  decorate_with InstrumentTypeDecorator
+
+  filter :name_contains, label: 'Name'
+
+  index do
+    column :name, :name_link
+
+    actions
+  end
+
+  show do
+    attributes_table do
+      row :name
+    end
+
+    active_admin_comments
+  end
+
+  form html: {'data-controller' => 'check-modified'} do |f|
+    f.semantic_errors(*f.object.errors.keys)
+
+    f.inputs do
+      f.input :name
+    end
+
+    f.actions
+  end
+
+  controller do
+    include DiscardableController
+  end
+end

app/admin/legislations.rb

@@ -13,7 +13,7 @@
                 :created_by_id, :updated_by_id, :visibility_status,
                 events_attributes: permit_params_for(:events),
                 documents_attributes: permit_params_for(:documents),
-                framework_ids: [], document_type_ids: []
+                framework_ids: [], document_type_ids: [], instrument_ids: []
 
   filter :title_contains, label: 'Title'
   filter :date_passed
@@ -62,6 +62,7 @@
           row 'Keywords', &:keywords_string
           row 'Natural Hazards', &:natural_hazards_string
           list_row 'Documents', :document_links
+          list_row 'Instruments', :instrument_links
         end
       end
 

app/commands/command/destroy/instrument.rb

@@ -0,0 +1,19 @@
+module Command
+  module Destroy
+    class Instrument
+      def initialize(resource)
+        @resource = resource
+      end
+
+      def call
+        ActiveRecord::Base.transaction do
+          @resource.tap do |r|
+            r.discard
+
+            r.legislations = []
+          end
+        end
+      end
+    end
+  end
+end

app/commands/command/destroy/instrument_type.rb

@@ -0,0 +1,19 @@
+module Command
+  module Destroy
+    class InstrumentType
+      def initialize(resource)
+        @resource = resource
+      end
+
+      def call
+        ActiveRecord::Base.transaction do
+          @resource.tap do |r|
+            r.discard
+
+            r.instruments = []
+          end
+        end
+      end
+    end
+  end
+end

app/commands/command/destroy/legislation.rb

@@ -15,6 +15,7 @@ def call
 
             r.litigations = []
             r.targets = []
+            r.instruments = []
           end
         end
       end

app/decorators/instrument_decorator.rb

@@ -0,0 +1,7 @@
+class InstrumentDecorator < Draper::Decorator
+  delegate_all
+
+  def name_link
+    h.link_to model.name, h.admin_instrument_path(model)
+  end
+end

app/decorators/instrument_type_decorator.rb

@@ -0,0 +1,7 @@
+class InstrumentTypeDecorator < Draper::Decorator
+  delegate_all
+
+  def name_link
+    h.link_to model.name, h.admin_instrument_type_path(model)
+  end
+end

app/decorators/legislation_decorator.rb

@@ -41,4 +41,13 @@ def document_links
                 title: document.external? ? document.url : nil
     end
   end
+
+  def instrument_links
+    model.instruments.map do |instrument|
+      h.link_to instrument.name,
+                h.admin_instrument_path(instrument),
+                target: '_blank',
+                title: instrument.name
+    end
+  end
 end

app/models/instrument.rb

@@ -0,0 +1,20 @@
+# == Schema Information
+#
+# Table name: instruments
+#
+#  id                 :bigint           not null, primary key
+#  name               :string
+#  instrument_type_id :bigint
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  discarded_at       :datetime
+#
+
+class Instrument < ApplicationRecord
+  include DiscardableModel
+
+  belongs_to :instrument_type
+  has_and_belongs_to_many :legislations
+
+  validates_presence_of :name
+end

app/models/instrument_type.rb

@@ -0,0 +1,18 @@
+# == Schema Information
+#
+# Table name: instrument_types
+#
+#  id           :bigint           not null, primary key
+#  name         :string
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  discarded_at :datetime
+#
+
+class InstrumentType < ApplicationRecord
+  include DiscardableModel
+
+  validates_presence_of :name
+
+  has_many :instruments
+end

app/models/legislation.rb

@@ -43,6 +43,7 @@ class Legislation < ApplicationRecord
   has_many :events, as: :eventable, dependent: :destroy
   has_and_belongs_to_many :targets
   has_and_belongs_to_many :litigations
+  has_and_belongs_to_many :instruments
 
   with_options allow_destroy: true, reject_if: :all_blank do
     accepts_nested_attributes_for :documents

app/views/admin/legislations/_form.html.erb

@@ -16,6 +16,7 @@
           <%= f.input :title %>
           <%= f.input :description, as: :trix %>
           <%= f.input :document_type_ids, label: 'Document', as: :tags, collection: DocumentType.all %>
+          <%= f.input :instrument_ids, label: 'Instrument', as: :tags, collection: Instrument.all %>
           <%=
             Arbre::Context.new do
               columns do

db/migrate/20190928120638_create_instrument_types.rb

@@ -0,0 +1,9 @@
+class CreateInstrumentTypes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :instrument_types do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190928182928_add_discarded_at_to_instrument_type.rb

@@ -0,0 +1,6 @@
+class AddDiscardedAtToInstrumentType < ActiveRecord::Migration[5.2]
+  def change
+    add_column :instrument_types, :discarded_at, :datetime
+    add_index :instrument_types, :discarded_at
+  end
+end

db/migrate/20190929104944_create_instruments.rb

@@ -0,0 +1,10 @@
+class CreateInstruments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :instruments do |t|
+      t.string :name
+      t.references :instrument_type, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190929110158_add_discarded_at_to_instrument.rb

@@ -0,0 +1,6 @@
+class AddDiscardedAtToInstrument < ActiveRecord::Migration[5.2]
+  def change
+    add_column :instruments, :discarded_at, :datetime
+    add_index :instruments, :discarded_at
+  end
+end

db/migrate/20190929193356_create_join_table_legislation_instrument.rb

@@ -0,0 +1,8 @@
+class CreateJoinTableLegislationInstrument < ActiveRecord::Migration[5.2]
+  def change
+    create_join_table :legislations, :instruments do |t|
+      t.index :legislation_id
+      t.index :instrument_id
+    end
+  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_09_19_193834) do
+ActiveRecord::Schema.define(version: 2019_09_29_193356) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -187,6 +187,31 @@
     t.index ["updated_by_id"], name: "index_geographies_on_updated_by_id"
   end
 
+  create_table "instrument_types", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "discarded_at"
+    t.index ["discarded_at"], name: "index_instrument_types_on_discarded_at"
+  end
+
+  create_table "instruments", force: :cascade do |t|
+    t.string "name"
+    t.bigint "instrument_type_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "discarded_at"
+    t.index ["discarded_at"], name: "index_instruments_on_discarded_at"
+    t.index ["instrument_type_id"], name: "index_instruments_on_instrument_type_id"
+  end
+
+  create_table "instruments_legislations", id: false, force: :cascade do |t|
+    t.bigint "legislation_id", null: false
+    t.bigint "instrument_id", null: false
+    t.index ["instrument_id"], name: "index_instruments_legislations_on_instrument_id"
+    t.index ["legislation_id"], name: "index_instruments_legislations_on_legislation_id"
+  end
+
   create_table "legislations", force: :cascade do |t|
     t.string "title"
     t.text "description"
@@ -345,6 +370,7 @@
   add_foreign_key "external_legislations", "geographies"
   add_foreign_key "geographies", "admin_users", column: "created_by_id"
   add_foreign_key "geographies", "admin_users", column: "updated_by_id"
+  add_foreign_key "instruments", "instrument_types"
   add_foreign_key "legislations", "admin_users", column: "created_by_id"
   add_foreign_key "legislations", "admin_users", column: "updated_by_id"
   add_foreign_key "legislations", "geographies"

spec/controllers/admin/instrument_controller_spec.rb

@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+RSpec.describe Admin::InstrumentsController, type: :controller do
+  let(:admin) { create(:admin_user) }
+  before { sign_in admin }
+
+  describe 'DELETE destroy' do
+    let!(:instrument) { create(:instrument, discarded_at: nil) }
+
+    context 'with valid params' do
+      subject { delete :destroy, params: {id: instrument.id} }
+
+      before do
+        expect { subject }.to change { Instrument.count }.by(-1)
+      end
+
+      it 'set discarded_at date to instrument object' do
+        expect(instrument.reload.discarded_at).to_not be_nil
+      end
+
+      it 'shows proper notice' do
+        expect(flash[:notice]).to match('Successfully deleted selected Instrument')
+      end
+    end
+
+    context 'with invalid params' do
+      let(:command) { double }
+
+      subject { delete :destroy, params: {id: instrument.id} }
+
+      before do
+        expect(::Command::Destroy::Instrument).to receive(:new).and_return(command)
+        expect(command).to receive(:call).and_return(nil)
+      end
+
+      it 'redirects to index & renders alert message' do
+        expect(subject).to redirect_to(admin_instruments_path)
+        expect(flash[:alert]).to match('Could not delete selected Instrument')
+      end
+    end
+  end
+end