Refactor medical records routing

app/controllers/medical_records_controller.rb

@@ -2,7 +2,6 @@ class MedicalRecordsController < ApplicationController
   def create
 
     @medical_record = MedicalRecord.new(medical_record_params)
-
     if @medical_record.save
       render status: 201, json: { success: true }
     else
@@ -11,8 +10,7 @@ def create
   end
 
   def show
-    @medical_record = MedicalRecord.find_by(id: params[:medical_record_id])
-
+    @medical_record = MedicalRecord.find_by(id: params[:id])
     if @medical_record
       render json: { success: true, medical_record: @medical_record }
     else
@@ -21,8 +19,8 @@ def show
   end
 
   def index
-    @medical_records = MedicalRecord.all
-    filtered_records = filter_medical_records_keys @medical_records
+    @patient = Patient.find_by(id: params[:patient_id])
+    filtered_records = filter_medical_records_keys patient.medical_records
 
     render status: :success, json: { success: true, medical_records: filtered_records }
   end
@@ -45,7 +43,7 @@ def medical_record_params
                                            :earsAS, :glandsN, :glandsA, :skinN, :skinA, :abdomenN,
                                            :abdomenA, :urogentialN, :urogentialA, :nervousSystemN, :nervousSystemA,
                                            :musculoskeletalN, :musculoskeletalA, :cardiovascularN, :cardiovascularA, :respiratoryN,
-                                           :respiratoryA)
+                                           :respiratoryA, :patient_id)
   end
 end
 

app/models/medical_record.rb

@@ -1,5 +1,8 @@
 class MedicalRecord < ApplicationRecord
   belongs_to :patient
+
+  validates :patient_id, presence: true, allow_bank: false
+
   validates :temperature, presence: true, allow_blank: true, numericality: true
 
   validates :notes, presence: true, allow_blank: true

config/routes.rb

@@ -14,11 +14,13 @@
       post         'user_token', to: 'user_token#create'
       post         'login',      to: 'user_token#create'
 
-      post        'patients/:patients_id/medical_records/:medical_records_id', to: 'medical_record#create'
-      get         'patients/:patients_id/medical_records', to: 'medical_record#index'
-
+      # post        'patient/:patient_id/medical_records/:medical_record_id', to: 'medical_records#create'
+      # get         'patients/:patient_id/medical_records',                    to: 'medical_record#index'
+      # get         'patients/:patient_id/medical_records/:medical_record_id', to: 'medical_records#show'
       resources    :users
-      resources    :patients
+      resources    :patients do
+        resources  :medical_records
+      end
       resources    :client
       resources    :contacts
     end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170307205911) do
+ActiveRecord::Schema.define(version: 20170308192748) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -99,6 +99,7 @@
     t.boolean  "respiratoryA"
     t.datetime "created_at",        null: false
     t.datetime "updated_at",        null: false
+    t.integer  "patient_id",        null: false
   end
 
   create_table "patients", force: :cascade do |t|

test/fixtures/medical_records.yml

@@ -5,6 +5,7 @@
 # below each fixture, per the syntax in the comments below
 #
 one:
+  patient: one
   temperature: 38.5
   notes: No new notes
   medications: This might need to be removed
@@ -52,5 +53,3 @@ one:
   cardiovascularA: True
   respiratoryN: True
   respiratoryA: True  
-two: {}
-  # column: value True

test/integration/medical_records_test.rb

@@ -6,7 +6,9 @@ class MedicalRecordsTest < ActionDispatch::IntegrationTest
   #   assert true
   # end
   def setup
-    @medical_record = {
+    @patient_id = patients(:one).id.to_s
+    @medical_record ={
+      patient_id: @patient_id,
       temperature: 38.5,
       notes: 'No new notes',
       medications: 'This might need to be removed',
@@ -55,25 +57,23 @@ def setup
       respiratoryN: true,
       respiratoryA: true
     }
-
     @show_record = medical_records(:one)
-    @patient_id = patients_path(:one).id.to_s
 
     unless @show_record.save
       throw Error
     end
   end
 
   test 'Posting a valid medical record' do
-    post '/api/medical_records', headers: authenticated_header, params: { medical_record: @medical_record }
+    post "/api/patients/#{@patient_id}/medical_records", headers: authenticated_header, params: { medical_record: @medical_record }
 
     assert JSON.parse(response.body)['success']
     assert_response :created
   end
 
   test 'Posting invalid medical record fails' do
     @medical_record['heart_rate'] = 'blue'
-    post '/api/medical_records', headers: authenticated_header, params: { medical_record: @medical_record }
+    post "/api/patients/#{@patient_id}/medical_records", headers: authenticated_header, params: { medical_record: @medical_record }
 
     assert_response :error
     assert_not JSON.parse(response.body)['success']
@@ -83,16 +83,16 @@ def setup
   test 'Get medical_record' do
     good_id = @show_record.id.to_s
 
-    get '/api/medical_records/' + good_id, headers: authenticated_header
-    puts response.body['medical_record']
+    get "/api/patients/#{@patient_id}/medical_records/#{good_id}", headers: authenticated_header
+
     assert_response :success
     assert JSON.parse(response.body)['medical_record']['id'].to_s == good_id
   end
 
   test 'Get invalid medical_record' do
     bad_id = @show_record.id + 1
 
-    get '/api/medical_records/' + bad_id.to_s, headers: authenticated_header
+    get "/api/patients/#{@patient_id}/medical_records/#{bad_id}", headers: authenticated_header
 
     assert_response :error
     assert_not JSON.parse(response.body)['success']