Skip to content

Commit

Permalink
Merge pull request #192 from avantifellows/fix/teacher-view
Browse files Browse the repository at this point in the history
Fix: Teacher View
  • Loading branch information
Bahugunajii authored Jul 11, 2024
2 parents cb532c6 + dee01f8 commit 212cc90
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 4 additions & 1 deletion lib/dbservice_web/controllers/teacher_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@ defmodule DbserviceWeb.TeacherController do
end

defp update_existing_teacher_with_user(conn, existing_teacher, params) do
with {:ok, %Teacher{} = teacher} <- Users.update_teacher_with_user(existing_teacher, params) do
user = Users.get_user!(existing_teacher.user_id)

with {:ok, %Teacher{} = teacher} <-
Users.update_teacher_with_user(existing_teacher, user, params) do
conn
|> put_status(:ok)
|> render("show.json", teacher: teacher)
Expand Down
5 changes: 2 additions & 3 deletions lib/dbservice_web/views/teacher_view.ex
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ defmodule DbserviceWeb.TeacherView do
use DbserviceWeb, :view
alias DbserviceWeb.TeacherView
alias DbserviceWeb.UserView
alias DbserviceWeb.SubjectView
alias Dbservice.Repo

def render("index.json", %{teacher: teacher}) do
Expand All @@ -24,7 +23,7 @@ defmodule DbserviceWeb.TeacherView do
id: teacher.id,
designation: teacher.designation,
teacher_id: teacher.teacher_id,
subject: render_one(teacher.subject, SubjectView, "subject.json"),
subject_id: teacher.subject_id,
user: render_one(teacher.user, UserView, "user.json")
}
end
Expand All @@ -34,7 +33,7 @@ defmodule DbserviceWeb.TeacherView do
id: teacher.id,
designation: teacher.designation,
teacher_id: teacher.teacher_id,
subject: render_one(teacher.subject, SubjectView, "subject.json"),
subject_id: teacher.subject_id,
user: render_one(teacher.user, UserView, "user.json")
}
end
Expand Down

0 comments on commit 212cc90

Please sign in to comment.