Merge branch 'dev' of https://github.com/Phoenix-HealthWeb/NDB-REST-API into dev

Author: forcellatofrancesco

ndb_rest_api/lib/ndb_rest_api/genders.ex

@@ -101,4 +101,12 @@ defmodule NdbRestApi.Genders do
   def change_gender(%Gender{} = gender, attrs \\ %{}) do
     Gender.changeset(gender, attrs)
   end
+
+  @doc """
+  Returns a gender given its name
+  """
+  def get_by_name!(name) do
+    Gender
+    |> Repo.get_by!(name: name)
+  end
 end

ndb_rest_api/lib/ndb_rest_api/patients/patient.ex

@@ -20,5 +20,7 @@ defmodule NdbRestApi.Patients.Patient do
     patient
     |> cast(attrs, [:firstname, :lastname, :cf, :gender_id, :date_of_birth])
     |> validate_required([:firstname, :lastname, :cf, :gender_id, :date_of_birth])
+    |> unsafe_validate_unique(:cf, NdbRestApi.Repo)
+    |> unique_constraint(:cf)
   end
 end

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

@@ -17,11 +17,17 @@ defmodule NdbRestApiWeb.Api.ConditionController do
   end
 
   def create(conn, %{"condition" => condition_params}) do
-    with {:ok, %Condition{} = condition} <- Conditions.create_condition(condition_params) do
+    full_condition = condition_params
+      |> Map.put("patient_id", condition_params |> Map.fetch!("patient") |> Map.fetch!("id"))
+      |> Map.put("practitioner_id", condition_params |> Map.fetch!("practitioner") |> Map.fetch!("id"))
+
+    with {:ok, %Condition{} = condition} <- Conditions.create_condition(full_condition) do
       conn
       |> put_status(:created)
       |> put_resp_header("location", ~p"/api/conditions/#{condition}")
-      |> render(:show, condition: condition)
+      |> render(:show, condition: condition
+        |> Repo.preload([:patient, :practitioner])
+      )
     end
   end
 

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

@@ -17,12 +17,18 @@ defmodule NdbRestApiWeb.Api.MedicationRequestController do
   end
 
   def create(conn, %{"medication_request" => medication_request_params}) do
+    full_medication_request = medication_request_params
+      |> Map.put("patient_id", medication_request_params |> Map.fetch!("patient") |> Map.fetch!("id"))
+      |> Map.put("practitioner_id", medication_request_params |> Map.fetch!("practitioner") |> Map.fetch!("id"))
+
     with {:ok, %MedicationRequest{} = medication_request} <-
-           MedicationRequests.create_medication_request(medication_request_params) do
+           MedicationRequests.create_medication_request(full_medication_request) do
       conn
       |> put_status(:created)
       |> put_resp_header("location", ~p"/api/medication_requests/#{medication_request}")
-      |> render(:show, medication_request: medication_request)
+      |> render(:show, medication_request: medication_request
+        |> Repo.preload([:patient, :practitioner])
+      )
     end
   end
 

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

@@ -17,12 +17,18 @@ defmodule NdbRestApiWeb.Api.ObservationController do
   end
 
   def create(conn, %{"observation" => observation_params}) do
+    full_observation = observation_params
+      |> Map.put("patient_id", observation_params |> Map.fetch!("patient") |> Map.fetch!("id"))
+      |> Map.put("practitioner_id", observation_params |> Map.fetch!("practitioner") |> Map.fetch!("id"))
+
     with {:ok, %Observation{} = observation} <-
-           Observations.create_observation(observation_params) do
+           Observations.create_observation(full_observation) do
       conn
       |> put_status(:created)
       |> put_resp_header("location", ~p"/api/observations/#{observation}")
-      |> render(:show, observation: observation)
+      |> render(:show, observation: observation
+        |> Repo.preload([:patient, :practitioner])
+      )
     end
   end
 

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

@@ -16,11 +16,22 @@ defmodule NdbRestApiWeb.Api.PatientController do
   end
 
   def create(conn, %{"patient" => patient_params}) do
-    with {:ok, %Patient{} = patient} <- Patients.create_patient(patient_params) do
+    # Gender is passed as its name, so we need to retrieve the gender id
+    gender = NdbRestApi.Genders.get_by_name!(Map.fetch!(patient_params, "gender"))
+
+    full_patient = patient_params
+      |> Map.put("gender_id", gender.id)
+      |> Map.delete("gender")
+
+    with {:ok, %Patient{} = patient} <- Patients.create_patient(full_patient)
+       do
       conn
       |> put_status(:created)
       |> put_resp_header("location", ~p"/api/patients/#{patient}")
-      |> render(:show, patient: patient)
+      |> render(:show, patient:
+        patient
+        |> Repo.preload([:gender, :medication_requests, :observations, :conditions])
+      )
     end
   end