API

Author: Git-push-01

app/controllers/api/v1/breaks_controller.rb

@@ -6,7 +6,8 @@ class Api::V1::BreaksController < ApplicationController
 
   def index
 
-    @breaks = get_current_user.managers.map{|manager| manager.breaks }.flatten
+    @breaks = get_current_user.employees.map{|employee| employee.breaks }.flatten
+
 
 
 
@@ -45,6 +46,7 @@ def update
   def destroy
     @break = Break.find(params[:id])
     @break.destroy
+    render json: @break
   end
 
   private
@@ -55,6 +57,6 @@ def set_break
 
     # Only allow a trusted parameter "white list" through.
     def break_params
-      params.require(:breaks).permit(:breakdate, :breaketime, :user_id, :employee_id)
+      params.require(:breaks).permit(:breakdate, :breaketime, :breakend, :user_id, :employee_id)
     end
 end

app/controllers/api/v1/companies_controller.rb

@@ -4,7 +4,8 @@ class Api::V1::CompaniesController < ApplicationController
   # GET /companies
   def index
     @companies = get_current_user.companies
-  
+    
+
 
     render json: @companies
   end
@@ -38,6 +39,7 @@ def update
   def destroy
     @company = Company.find(params[:id])
     @company.destroy
+    render json: @companies
   end
 
   private

app/controllers/api/v1/employees_controller.rb

@@ -1,10 +1,12 @@
+require "pry"
 class Api::V1::EmployeesController < ApplicationController
 
 
   # GET /employees
   def index
     @employees = get_current_user.employees
 
+
     render json: @employees
   end
 
@@ -38,6 +40,7 @@ def destroy
     @employee = Company.find(params[:id])
 
     @employee.destroy
+    render json: @employees
   end
 
   private

app/controllers/api/v1/managers_controller.rb

@@ -37,6 +37,7 @@ def update
   def destroy
     @manager = Manager.find(params[:id])
     @manager.destroy
+    render json: @managers
   end
 
   private

app/models/company.rb

@@ -2,6 +2,6 @@ class Company < ApplicationRecord
   belongs_to :user
   has_many :managers
   has_many :employees, through: :managers
-  
+
 
 end

app/serializers/break_serializer.rb

@@ -1,5 +1,5 @@
 class BreakSerializer < ActiveModel::Serializer
-  attributes :id, :breakdate, :breaketime
+  attributes :id, :breakdate, :breaketime, :breakend
   has_one :user
   has_one :employee
 end

app/serializers/user_serializer.rb

@@ -1,5 +1,5 @@
 class UserSerializer < ActiveModel::Serializer
-  attributes :name, :email, :password
-  
+  attributes :id, :name, :email, :password
+
 
 end

config/environments/development.rb

@@ -7,7 +7,7 @@
   config.cache_classes = false
 
   # Do not eager load code on boot.
-  config.eager_load = false
+  config.eager_load = true
 
   # Show full error reports.
   config.consider_all_requests_local = true

db/migrate/20190517214524_add_breakend_to_breaks.rb

@@ -0,0 +1,5 @@
+class AddBreakendToBreaks < ActiveRecord::Migration[5.2]
+  def change
+    add_column :breaks, :breakend, :string
+  end
+end

db/migrate/20190517230055_change_data_type_for_breaketime.rb

@@ -0,0 +1,5 @@
+class ChangeDataTypeForBreaketime < ActiveRecord::Migration[5.2]
+  def change
+    change_column(:breaks, :breaketime, :string)
+end
+  end