Create new medication records if passed into medical_records

app/controllers/application_controller.rb

@@ -7,7 +7,7 @@ def server_error(exception)
     puts exception
     unless performed?
       respond_to do |format|
-        format.html { render status: status, json: status }
+        format.html { render status: :error, json: status }
         format.all { head status }
       end
     end

app/controllers/medical_records_controller.rb

@@ -2,13 +2,12 @@ class MedicalRecordsController < ApplicationController
   before_action :authenticate_user
 
   def create
-    medicine = medicine_params
+    medications = params[:medications]
     @medical_record = MedicalRecord.new medical_record_params
-  
+
     if @medical_record.save
-      if not medicine.nil?
-        save_medicine_in_db(medicine, @medical_record.id)
-        puts Medice.all.to_json
+      unless medications.nil?
+        create_medications(medications, @medical_record.id)
       end
       render status: 201, json: { success: true }
     else
@@ -38,22 +37,6 @@ def filter_medical_records_keys(medical_records)
       { id: medical_record.id, exam_notes: medical_record.exam_notes, created_at: medical_record.created_at.to_i }
     end
   end
-
-  def save_medicine_in_db(medicine, medical_record_id)
-    if medicine.kind_of?(Array)
-      medicine.each do |med|
-        med.medical_record_id = medical_record_id
-        Medicine.new med
-      end
-    else
-      medicine = JSON.parse(medicine).attributes
-      @med = Medicine.new(name: medicine, patient_id: medicine['patient_id'])
-      puts @med.to_json
-      @med.medical_record_id = medical_record_id
-      @med.save
-      puts @med.errors.full_message
-    end
-  end
 
   def medical_record_params
     params.require(:medical_record).permit(:summary, :date, :exam_notes, :signature, :temperature, :medications, :eyes, :oral,
@@ -68,8 +51,24 @@ def medical_record_params
                                            :respiratoryA, :patient_id)
   end
 
-  def medicine_params
-    params.require(:medicine).permit(:name, :patient_id)
+  def create_medications(medications, medical_record_id)
+    success = nil
+    medication_records = parse_medications(medications, medical_record_id)
+    Medication.transaction do
+      success = medication_records.map(&:save)
+      unless success.all?
+        raise ActiveRecord::Rollback
+      end
+    end
+    success
+  end
+
+  def parse_medications(medications, medical_record_id)
+    medications.map do |medication|
+      medication['medical_record_id'] = medical_record_id
+      Medication.new medication.permit(:name, :patient_id, :medical_record_id,
+                                       :date)
+    end
   end
 
 end

app/models/medical_record.rb

@@ -2,7 +2,7 @@ class MedicalRecord < ApplicationRecord
   belongs_to :patient
 
   has_many   :notes
-  has_many   :medicines
+  has_many   :medications
   validates :patient_id, presence: true, allow_bank: false
 
   validates :temperature, presence: true, allow_blank: true, numericality: true

app/models/medication.rb

@@ -1,4 +1,4 @@
-class Medicine < ApplicationRecord
+class Medication < ApplicationRecord
   belongs_to :medical_record
   belongs_to :patient
 

app/models/patient.rb

@@ -6,7 +6,7 @@ class Patient < ApplicationRecord
 
   has_many :medical_records
 
-  has_many :medicines
+  has_many :medications
 
   has_many :images
 

config/routes.rb

@@ -10,8 +10,9 @@
       post         'signup',     to: 'users#create'
       post         'user_token', to: 'user_token#create'
       post         'login',      to: 'user_token#create'
-      get          'patients/:patient_id/medicine/:id', to: 'medicine#show'
-      get          'patients/:patient_id/medicine/', to: 'medicine#index'
+      post         'patients/:patient_id/medications/', to: 'medications#show'
+      get          'patients/:patient_id/medications/:id', to: 'medications#show'
+      get          'patients/:patient_id/medications/', to: 'medications#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'

db/migrate/20170310084044_create_medication.rb

@@ -1,6 +1,6 @@
 class CreateMedication < ActiveRecord::Migration[5.0]
   def change
-    create_table :medication do |t|
+    create_table :medications do |t|
       t.string     :name
       t.belongs_to :medical_record, index: true
       t.belongs_to :patient, index: true

db/schema.rb

@@ -117,14 +117,14 @@
     t.text     "follow_up_instructions"
   end
 
-  create_table "medicines", force: :cascade do |t|
+  create_table "medications", force: :cascade do |t|
     t.string   "name"
     t.integer  "medical_record_id"
     t.integer  "patient_id"
     t.datetime "created_at",        null: false
     t.datetime "updated_at",        null: false
-    t.index ["medical_record_id"], name: "index_medicines_on_medical_record_id", using: :btree
-    t.index ["patient_id"], name: "index_medicines_on_patient_id", using: :btree
+    t.index ["medical_record_id"], name: "index_medications_on_medical_record_id", using: :btree
+    t.index ["patient_id"], name: "index_medications_on_patient_id", using: :btree
   end
 
   create_table "notes", force: :cascade do |t|

test/integration/medical_records_test.rb

@@ -7,8 +7,8 @@ class MedicalRecordsTest < ActionDispatch::IntegrationTest
   # end
   def setup
     @patient_id = patients(:one).id.to_s
-    @medicine = medicines(:one)
-    @medicine.medical_record_id = ''
+    @medication = medications(:one)
+    @medication.medical_record_id = ''
     @medical_record = {
       patient_id: @patient_id,
       temperature: 38.5,

test/models/medication_test.rb

@@ -2,7 +2,7 @@
 
 class MedicationTest < ActiveSupport::TestCase
   def setup
-    @medicine = medicines(:one)
+    @medicine = medications(:one)
   end
 
   test 'medicine is valid' do