Merge remote-tracking branch 'origin/practitioners' into dev

Author: Visco01

ndb_rest_api/lib/ndb_rest_api/hospitals/hospital.ex

@@ -5,9 +5,13 @@ defmodule NdbRestApi.Hospitals.Hospital do
   schema "hospitals" do
     field :name, :string
     field :address, :string
-    field :api_key, :string
     field :region, :string
     field :notes, :string
+    field :api_key, :string
+
+    many_to_many :practitioners, NdbRestApi.Practitioners.Practitioner,
+      join_through: "hospitals_practitioners",
+      on_replace: :delete
 
     timestamps(type: :utc_datetime)
   end
@@ -17,5 +21,15 @@ defmodule NdbRestApi.Hospitals.Hospital do
     hospital
     |> cast(attrs, [:name, :address, :region, :notes, :api_key])
     |> validate_required([:name, :address, :region, :notes, :api_key])
+    |> put_assoc(:practitioners, get_practitioners(attrs))
   end
+
+  defp get_practitioners(%{"practitioner_ids" => practitioner_ids})
+       when is_list(practitioner_ids) do
+    practitioner_ids
+    |> Enum.reject(&(&1 == ""))
+    |> Enum.map(&NdbRestApi.Practitioners.get_practitioner!/1)
+  end
+
+  defp get_practitioners(_), do: []
 end

ndb_rest_api/lib/ndb_rest_api/hospitals_practitioners.ex

@@ -0,0 +1,17 @@
+defmodule NdbRestApi.HospitalsPractitioners do
+  use Ecto.Schema
+  import Ecto.Changeset
+
+  schema "hospitals_practitioners" do
+
+
+    timestamps(type: :utc_datetime)
+  end
+
+  @doc false
+  def changeset(hospitals_practitioners, attrs) do
+    hospitals_practitioners
+    |> cast(attrs, [])
+    |> validate_required([])
+  end
+end

ndb_rest_api/lib/ndb_rest_api/practitioners.ex

@@ -102,7 +102,6 @@ defmodule NdbRestApi.Practitioners do
     Practitioner.changeset(practitioner, attrs)
   end
 
-
   @doc """
   Gets a single practitioner by its email.
 

ndb_rest_api/lib/ndb_rest_api/practitioners/practitioner.ex

@@ -8,17 +8,75 @@ defmodule NdbRestApi.Practitioners.Practitioner do
     field :surname, :string
     field :date_of_birth, :date
     field :qualification, :string
-    field :gender_id, :id
-    field :role_id, :id
     has_many :medication_requests, NdbRestApi.MedicationRequests.MedicationRequest
+    belongs_to :gender, NdbRestApi.Genders.Gender
+    belongs_to :role, NdbRestApi.PractitionerRoles.PractitionerRole
+
+    many_to_many :hospitals, NdbRestApi.Hospitals.Hospital,
+      join_through: "hospitals_practitioners",
+      on_replace: :delete
+
     timestamps(type: :utc_datetime)
   end
 
+  @spec changeset(
+          {map(),
+           %{
+             optional(atom()) =>
+               atom()
+               | {:array | :assoc | :embed | :in | :map | :parameterized | :supertype | :try,
+                  any()}
+           }}
+          | %{
+              :__struct__ => atom() | %{:__changeset__ => any(), optional(any()) => any()},
+              optional(atom()) => any()
+            },
+          :invalid | %{optional(:__struct__) => none(), optional(atom() | binary()) => any()}
+        ) :: Ecto.Changeset.t()
+  @spec changeset(
+          {map(),
+           %{
+             optional(atom()) =>
+               atom()
+               | {:array | :assoc | :embed | :in | :map | :parameterized | :supertype | :try,
+                  any()}
+           }}
+          | %{
+              :__struct__ => atom() | %{:__changeset__ => any(), optional(any()) => any()},
+              optional(atom()) => any()
+            },
+          :invalid | %{optional(:__struct__) => none(), optional(atom() | binary()) => any()}
+        ) :: Ecto.Changeset.t()
   @doc false
   def changeset(practitioner, attrs) do
     practitioner
-    |> cast(attrs, [:email, :forename, :surname, :date_of_birth, :qualification])
-    |> validate_required([:email, :forename, :surname, :date_of_birth, :qualification])
+    |> cast(attrs, [
+      :email,
+      :forename,
+      :surname,
+      :date_of_birth,
+      :qualification,
+      :gender_id,
+      :role_id
+    ])
+    |> validate_required([
+      :email,
+      :forename,
+      :surname,
+      :date_of_birth,
+      :qualification,
+      :gender_id,
+      :role_id
+    ])
     |> unique_constraint(:email)
+    |> put_assoc(:hospitals, get_hospitals(attrs))
   end
+
+  defp get_hospitals(%{"hospital_ids" => hospital_ids}) when is_list(hospital_ids) do
+    hospital_ids
+    |> Enum.reject(&(&1 == ""))
+    |> Enum.map(&NdbRestApi.Hospitals.get_hospital!/1)
+  end
+
+  defp get_hospitals(_), do: []
 end

ndb_rest_api/lib/ndb_rest_api_web/controllers/api/gender_controller.ex

@@ -15,7 +15,7 @@ defmodule NdbRestApiWeb.Api.GenderController do
     with {:ok, %Gender{} = gender} <- Genders.create_gender(gender_params) do
       conn
       |> put_status(:created)
-      |> put_resp_header("location", ~p"/api/api/genders/#{gender}")
+      |> put_resp_header("location", ~p"/api/genders/#{gender}")
       |> render(:show, gender: gender)
     end
   end

ndb_rest_api/lib/ndb_rest_api_web/controllers/api/hospital_controller.ex

@@ -15,7 +15,7 @@ defmodule NdbRestApiWeb.Api.HospitalController do
     with {:ok, %Hospital{} = hospital} <- Hospitals.create_hospital(hospital_params) do
       conn
       |> put_status(:created)
-      |> put_resp_header("location", ~p"/api/api/hospitals/#{hospital}")
+      |> put_resp_header("location", ~p"/api/hospitals/#{hospital}")
       |> render(:show, hospital: hospital)
     end
   end

ndb_rest_api/lib/ndb_rest_api_web/controllers/api/patient_controller.ex

@@ -3,7 +3,6 @@ defmodule NdbRestApiWeb.Api.PatientController do
 
   alias NdbRestApi.Patients
   alias NdbRestApi.Patients.Patient
-  alias NdbRestApi.Genders
   alias NdbRestApi.Repo
 
   action_fallback NdbRestApiWeb.FallbackController
@@ -18,7 +17,7 @@ defmodule NdbRestApiWeb.Api.PatientController do
     with {:ok, %Patient{} = patient} <- Patients.create_patient(patient_params) do
       conn
       |> put_status(:created)
-      |> put_resp_header("location", ~p"/api/api/patients/#{patient}")
+      |> put_resp_header("location", ~p"/api/patients/#{patient}")
       |> render(:show, patient: patient)
     end
   end

ndb_rest_api/lib/ndb_rest_api_web/controllers/api/practitioner_controller.ex

@@ -3,38 +3,41 @@ defmodule NdbRestApiWeb.Api.PractitionerController do
 
   alias NdbRestApi.Practitioners
   alias NdbRestApi.Practitioners.Practitioner
+  alias NdbRestApi.Repo
 
   action_fallback NdbRestApiWeb.FallbackController
 
   def index(conn, _params) do
-    practitioners = Practitioners.list_practitioners()
+    practitioners = Practitioners.list_practitioners() |> Repo.preload(:hospitals)
     render(conn, :index, practitioners: practitioners)
   end
 
   def create(conn, %{"practitioner" => practitioner_params}) do
-    with {:ok, %Practitioner{} = practitioner} <- Practitioners.create_practitioner(practitioner_params) do
+    with {:ok, %Practitioner{} = practitioner} <-
+           Practitioners.create_practitioner(practitioner_params) do
       conn
       |> put_status(:created)
-      |> put_resp_header("location", ~p"/api/api/practitioners/#{practitioner}")
+      |> put_resp_header("location", ~p"/api/practitioners/#{practitioner}")
       |> render(:show, practitioner: practitioner)
     end
   end
 
   def show(conn, %{"id" => id}) do
-    practitioner = Practitioners.get_practitioner!(id)
+    practitioner = Practitioners.get_practitioner!(id) |> Repo.preload(:hospitals)
     render(conn, :show, practitioner: practitioner)
   end
 
   def update(conn, %{"id" => id, "practitioner" => practitioner_params}) do
-    practitioner = Practitioners.get_practitioner!(id)
+    practitioner = Practitioners.get_practitioner!(id) |> Repo.preload(:hospitals)
 
-    with {:ok, %Practitioner{} = practitioner} <- Practitioners.update_practitioner(practitioner, practitioner_params) do
+    with {:ok, %Practitioner{} = practitioner} <-
+           Practitioners.update_practitioner(practitioner, practitioner_params) do
       render(conn, :show, practitioner: practitioner)
     end
   end
 
   def delete(conn, %{"id" => id}) do
-    practitioner = Practitioners.get_practitioner!(id)
+    practitioner = Practitioners.get_practitioner!(id) |> Repo.preload(:hospitals)
 
     with {:ok, %Practitioner{}} <- Practitioners.delete_practitioner(practitioner) do
       send_resp(conn, :no_content, "")

ndb_rest_api/lib/ndb_rest_api_web/controllers/api/practitioner_role_controller.ex

@@ -15,7 +15,7 @@ defmodule NdbRestApiWeb.Api.PractitionerRoleController do
     with {:ok, %PractitionerRole{} = practitioner_role} <- PractitionerRoles.create_practitioner_role(practitioner_role_params) do
       conn
       |> put_status(:created)
-      |> put_resp_header("location", ~p"/api/api/practitioner_roles/#{practitioner_role}")
+      |> put_resp_header("location", ~p"/api/practitioner_roles/#{practitioner_role}")
       |> render(:show, practitioner_role: practitioner_role)
     end
   end

ndb_rest_api/lib/ndb_rest_api_web/controllers/hospital_controller.ex

@@ -3,42 +3,49 @@ defmodule NdbRestApiWeb.HospitalController do
 
   alias NdbRestApi.Hospitals
   alias NdbRestApi.Hospitals.Hospital
+  alias NdbRestApi.Practitioners
+  alias NdbRestApi.Repo
 
   def index(conn, _params) do
-    hospitals = Hospitals.list_hospitals()
+    hospitals = Hospitals.list_hospitals() |> Repo.preload(:practitioners)
     render(conn, :index, hospitals: hospitals)
   end
 
   def new(conn, _params) do
-    changeset = Hospitals.change_hospital(%Hospital{})
-    render(conn, :new, changeset: changeset)
+    changeset = Hospitals.change_hospital(%Hospital{practitioners: []})
+    practitioners = Practitioners.list_practitioners()
+    render(conn, :new, changeset: changeset, practitioners: practitioners)
   end
 
   def create(conn, %{"hospital" => hospital_params}) do
     case Hospitals.create_hospital(hospital_params) do
       {:ok, hospital} ->
+        hospital = Repo.preload(hospital, :practitioners)
+
         conn
         |> put_flash(:info, "Hospital created successfully.")
         |> redirect(to: ~p"/hospitals/#{hospital}")
 
       {:error, %Ecto.Changeset{} = changeset} ->
-        render(conn, :new, changeset: changeset)
+        practitioners = Practitioners.list_practitioners()
+        render(conn, :new, changeset: changeset, practitioners: practitioners)
     end
   end
 
   def show(conn, %{"id" => id}) do
-    hospital = Hospitals.get_hospital!(id)
+    hospital = Hospitals.get_hospital!(id) |> Repo.preload(:practitioners)
     render(conn, :show, hospital: hospital)
   end
 
   def edit(conn, %{"id" => id}) do
-    hospital = Hospitals.get_hospital!(id)
+    hospital = Hospitals.get_hospital!(id) |> Repo.preload(:practitioners)
     changeset = Hospitals.change_hospital(hospital)
-    render(conn, :edit, hospital: hospital, changeset: changeset)
+    practitioners = Practitioners.list_practitioners()
+    render(conn, :edit, hospital: hospital, changeset: changeset, practitioners: practitioners)
   end
 
   def update(conn, %{"id" => id, "hospital" => hospital_params}) do
-    hospital = Hospitals.get_hospital!(id)
+    hospital = Hospitals.get_hospital!(id) |> Repo.preload(:practitioners)
 
     case Hospitals.update_hospital(hospital, hospital_params) do
       {:ok, hospital} ->
@@ -47,12 +54,18 @@ defmodule NdbRestApiWeb.HospitalController do
         |> redirect(to: ~p"/hospitals/#{hospital}")
 
       {:error, %Ecto.Changeset{} = changeset} ->
-        render(conn, :edit, hospital: hospital, changeset: changeset)
+        practitioners = Practitioners.list_practitioners()
+
+        render(conn, :edit,
+          hospital: hospital,
+          changeset: changeset,
+          practitioners: practitioners
+        )
     end
   end
 
   def delete(conn, %{"id" => id}) do
-    hospital = Hospitals.get_hospital!(id)
+    hospital = Hospitals.get_hospital!(id) |> Repo.preload(:practitioners)
     {:ok, _hospital} = Hospitals.delete_hospital(hospital)
 
     conn