Implemented Quantity

app/controllers/body_trackers_controller.rb

@@ -1,17 +1,16 @@
 class BodyTrackersController < ApplicationController
-  before_action :find_project, only: [:index]
+  before_action :find_project_by_project_id, only: [:index, :defaults]
   before_action :authorize
 
   def index
   end
 
-  private
+  def defaults
+    available = Unit.where(project: @project).pluck(:shortname)
+    defaults = Unit.where(project: nil).pluck(:name, :shortname)
+    defaults.delete_if { |n, s| available.include?(s) }
+    @project.units.create(defaults.map { |n, s| {name: n, shortname: s} })
 
-  # :find_* methods are called before :authorize,
-  # @project is required for :authorize to succeed
-  def find_project
-    @project = Project.find(params[:project_id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
+    redirect_to :back
   end
 end

app/controllers/quantities_controller.rb

@@ -1,11 +1,47 @@
 class QuantitiesController < ApplicationController
+  before_action :find_project_by_project_id, only: [:index, :create]
+  before_action :find_quantity, only: [:destroy]
+  before_action :authorize
 
   def index
+    @quantity = Quantity.new
+    @quantities = @project.quantities
   end
 
   def create
+    @quantity = Quantity.new(quantity_params.update(project: @project))
+    if @quantity.save
+      flash[:notice] = 'Created new quantity'
+      redirect_to project_quantities_url(@project)
+    else
+      @quantities = @project.quantities
+      render :index
+    end
   end
 
   def destroy
+    if @quantity.destroy
+      flash[:notice] = 'Deleted quantity'
+    end
+    redirect_to project_quantities_url(@project)
+  end
+
+  private
+
+  def quantity_params
+    params.require(:quantity).permit(
+      :name,
+      :description,
+      :domain
+    )
+  end
+
+  # :find_* methods are called before :authorize,
+  # @project is required for :authorize to succeed
+  def find_quantity
+    @quantity = Quantity.find(params[:id])
+    @project = @quantity.project
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
 end

app/controllers/units_controller.rb

@@ -1,5 +1,5 @@
 class UnitsController < ApplicationController
-  before_action :find_project, only: [:index, :create, :import]
+  before_action :find_project_by_project_id, only: [:index, :create]
   before_action :find_unit, only: [:destroy]
   before_action :authorize
 
@@ -26,15 +26,6 @@ class UnitsController < ApplicationController
     redirect_to project_units_url(@project)
   end
 
-  def import
-    available = Unit.where(project: @project).pluck(:shortname)
-    defaults = Unit.where(project: nil).pluck(:name, :shortname)
-    defaults.delete_if { |n, s| available.include?(s) }
-    @project.units.create(defaults.map { |n, s| {name: n, shortname: s} })
-
-    redirect_to project_units_url(@project)
-  end
-
   private
 
   def unit_params
@@ -46,12 +37,6 @@ class UnitsController < ApplicationController
 
   # :find_* methods are called before :authorize,
   # @project is required for :authorize to succeed
-  def find_project
-    @project = Project.find(params[:project_id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
   def find_unit
     @unit = Unit.find(params[:id])
     @project = @unit.project