Skip to content

Commit a2d68cb

Browse files
committed
fixed json render
1 parent 5b86c8d commit a2d68cb

File tree

7 files changed

+19
-16
lines changed

7 files changed

+19
-16
lines changed

app/controllers/api/v1/breaks_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Api::V1::BreaksController < ApplicationController
66

77
def index
88

9-
@breaks = get_current_user.employees.map{|employee| employee.breaks }.flatten
9+
@breaks = get_current_user.managers.map{|manager| manager.breaks }.flatten
1010

1111

1212

app/controllers/api/v1/companies_controller.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
require "pry"
12
class Api::V1::CompaniesController < ApplicationController
23

34

45
# GET /companies
56
def index
67
@companies = get_current_user.companies
7-
8+
9+
810

911

1012
render json: @companies
@@ -39,7 +41,7 @@ def update
3941
def destroy
4042
@company = Company.find(params[:id])
4143
@company.destroy
42-
render json: @companies
44+
render json: @company
4345
end
4446

4547
private

app/controllers/api/v1/employees_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ def update
3737

3838
# DELETE /employees/1
3939
def destroy
40-
@employee = Company.find(params[:id])
40+
@employee = Employee.find(params[:id])
4141

4242
@employee.destroy
43-
render json: @employees
43+
render json: @employee
4444
end
4545

4646
private

app/controllers/api/v1/managers_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def update
3737
def destroy
3838
@manager = Manager.find(params[:id])
3939
@manager.destroy
40-
render json: @managers
40+
render json: @manager
4141
end
4242

4343
private
@@ -46,7 +46,7 @@ def set_manager
4646
@manager = Manager.find(params[:id])
4747
end
4848

49-
# Only allow a trusted parameter "white list" through.
49+
# Only allow a trusted parameter
5050
def manager_params
5151
params.require(:manager).permit(:managername, :user_id, :company_id)
5252
end

app/controllers/api/v1/users_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def destroy
3131
session[:user_id] = nil
3232
@user = User.find(params[:id])
3333
@user.destroy
34+
render json: @user
3435
end
3536

3637
private
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class BreakSerializer < ActiveModel::Serializer
22
attributes :id, :breakdate, :breaketime, :breakend
3-
has_one :user
3+
44
has_one :employee
55
end

db/schema.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
t.datetime "updated_at", null: false
6666
end
6767

68-
add_foreign_key "breaks", "employees"
69-
add_foreign_key "breaks", "users"
70-
add_foreign_key "companies", "users"
71-
add_foreign_key "employees", "companies"
72-
add_foreign_key "employees", "managers"
73-
add_foreign_key "employees", "users"
74-
add_foreign_key "managers", "companies"
75-
add_foreign_key "managers", "users"
68+
add_foreign_key "breaks", "employees", on_delete: :cascade
69+
add_foreign_key "breaks", "users", on_delete: :cascade
70+
add_foreign_key "companies", "users", on_delete: :cascade
71+
add_foreign_key "employees", "companies", on_delete: :cascade
72+
add_foreign_key "employees", "managers", on_delete: :cascade
73+
add_foreign_key "employees", "users", on_delete: :cascade
74+
add_foreign_key "managers", "companies", on_delete: :cascade
75+
add_foreign_key "managers", "users", on_delete: :cascade
7676
end

0 commit comments

Comments
 (0)