add more server side validations to observation model

Author: tsubik

app/models/observation.rb

@@ -172,6 +172,13 @@ class Observation < ApplicationRecord
 
   validates :validation_status, presence: true
 
+  with_options unless: -> { Created? || Rejected? } do
+    validates :subcategory, presence: true
+    validates :severity, presence: true
+    validates :observation_report, presence: true
+    validates :evidence_type, presence: true
+  end
+
   before_validation :assign_observers_from_report, if: :observation_report_changed?
   before_validation :nullify_evidence_on_report, if: -> { evidence_type != "Evidence presented in the report" }
 

spec/factories/observations.rb

@@ -48,12 +48,13 @@
     subcategory
     observation_report
     law
-    user { build(:admin) }
+    user { build(:ngo_manager) }
     severity { build(:severity, subcategory: subcategory) }
     operator { create(:operator, country: country) }
     observation_type { "operator" }
     is_active { true }
     validation_status { "Published (no comments)" }
+    evidence_type { "No evidence" }
     is_physical_place { true }
     non_concession_activity { false }
     lng { 12.2222 }
@@ -67,19 +68,26 @@
       validation_status { "Created" }
     end
 
-    after(:create) do |doc, evaluator|
-      doc.update(validation_status: evaluator.force_status) if evaluator.force_status
+    after(:build) do |observation|
+      # TODO: maybe that should be in the model?
+      observation.observers = [observation.user.observer] if observation.observers.empty? || observation.observation_report.nil?
+    end
+
+    after(:create) do |observation, evaluator|
+      observation.update(validation_status: evaluator.force_status) if evaluator.force_status
     end
   end
 
   factory :gov_observation, class: "Observation" do
-    severity
     country
+    subcategory { build(:subcategory) }
+    severity { build(:severity, subcategory: subcategory) }
+    observation_report { build(:observation_report) }
     governments { build_list(:government, 2) }
-    observers { build_list(:observer, 1) }
     user { build(:admin) }
     observation_type { "government" }
     validation_status { "Published (no comments)" }
+    evidence_type { "No evidence" }
     is_active { true }
     publication_date { DateTime.now.yesterday.to_date }
   end

spec/integration/v1/governments_spec.rb

@@ -50,7 +50,7 @@ module V1
 
         before do
           create_list(:government, 3, country: country) # those should not be returned
-          create(:gov_observation, observers: [observer], governments: [gov])
+          create(:gov_observation, observation_report: build(:observation_report, observers: [observer]), governments: [gov])
         end
 
         it "returns only governments linked with observer observations" do

spec/models/observation_spec.rb

@@ -267,6 +267,52 @@
         end
       end
     end
+
+    describe "government observation validations" do
+      it "should be invalid when government observation has operator_id" do
+        country = create(:country)
+        observation = build(:gov_observation, country: country)
+        observation.operator = create(:operator, country: country)
+
+        expect(observation.valid?).to eq(false)
+        expect(observation.errors[:operator_id]).to include("must be blank")
+      end
+    end
+
+    describe "required fields for non-Created and non-Rejected statuses" do
+      it "allows missing required fields when status is Created or Rejected" do
+        created_obs = build(:observation,
+          validation_status: "Created",
+          subcategory: nil,
+          severity: nil,
+          observation_report: nil,
+          evidence_type: nil)
+        expect(created_obs).to be_valid
+
+        rejected_obs = build(:observation,
+          validation_status: "Rejected",
+          subcategory: nil,
+          severity: nil,
+          observation_report: nil,
+          evidence_type: nil)
+        expect(rejected_obs).to be_valid
+      end
+
+      it "requires subcategory, severity, observation_report, and evidence_type for other statuses" do
+        observation = build(:observation,
+          validation_status: "Ready for QC2",
+          subcategory: nil,
+          severity: nil,
+          observation_report: nil,
+          evidence_type: nil)
+
+        expect(observation.valid?).to eq(false)
+        expect(observation.errors[:subcategory]).to include("can't be blank")
+        expect(observation.errors[:severity]).to include("can't be blank")
+        expect(observation.errors[:observation_report]).to include("can't be blank")
+        expect(observation.errors[:evidence_type]).to include("can't be blank")
+      end
+    end
   end
 
   describe "Hooks" do