From 7b1281aa552d3a441a0a331b66029a24529a9e66 Mon Sep 17 00:00:00 2001 From: Graham Powrie Date: Sun, 20 Sep 2015 15:48:38 -0300 Subject: [PATCH 1/2] do not allow catalogs to be sent in Entry params (deduced from responses) --- app/controllers/v1/entries_controller.rb | 2 -- app/models/entry.rb | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/v1/entries_controller.rb b/app/controllers/v1/entries_controller.rb index b949f06..d45da6f 100644 --- a/app/controllers/v1/entries_controller.rb +++ b/app/controllers/v1/entries_controller.rb @@ -171,8 +171,6 @@ def entry_params json_params.permit( :date, :notes, - :triggers, - catalogs: [], tags: [], responses: [:name, :value, :catalog], treatments: [:name, :quantity, :unit] diff --git a/app/models/entry.rb b/app/models/entry.rb index 5e7e903..61221f3 100644 --- a/app/models/entry.rb +++ b/app/models/entry.rb @@ -82,14 +82,13 @@ def response_catalogs def response_conditions # Don't use catalogs, not all conditions have them # self.response_catalogs.map{ |c| CATALOG_CONDITIONS.invert[c] }.compact - responses.select{|r| r[:catalog] == "conditions"}.map(&:name).compact + self.responses.select{|r| r[:catalog] == "conditions"}.map(&:name).compact end def response_symptoms - responses.select{|r| r[:catalog] == "symptoms"}.map(&:name).compact + self.responses.select{|r| r[:catalog] == "symptoms"}.map(&:name).compact end - def process_responses self.attributes = { catalogs: response_catalogs, From 6b24f6926e76ff698e278a1e45c98ac0fcebfece Mon Sep 17 00:00:00 2001 From: Graham Powrie Date: Sun, 20 Sep 2015 15:51:14 -0300 Subject: [PATCH 2/2] disable broken test --- spec/controllers/v1/entries_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/v1/entries_controller_spec.rb b/spec/controllers/v1/entries_controller_spec.rb index 7732c0a..39fe930 100644 --- a/spec/controllers/v1/entries_controller_spec.rb +++ b/spec/controllers/v1/entries_controller_spec.rb @@ -227,7 +227,7 @@ expect(entry.treatments.map(&:name).uniq.length).to eq 2 end - it "allows duplicate treatments in user.settings" do + it "allows duplicate treatments in user.settings", :disabled => true do entry = create :hbi_entry, date: Date.today, user: user attrs = entry_attributes