Allow no salary setting for freelance jobs - EXCEPTIONALLY -

Author: constantine-nikolaou

app/controllers/application_controller.rb

@@ -21,8 +21,8 @@ def api_request
   end
 
   def check_user_profile_complete
-    if user_signed_in? && current_user.profile && !current_user.profile.complete?
-      redirect_to edit_user_profile_path(current_user), alert: 'Please complete your profile before proceeding'
+    if (user_signed_in? && current_user.profile && !current_user.profile.complete?)
+      redirect_to(edit_user_profile_path(current_user), notice: 'Please complete your profile before proceeding')
     end
   end
 

app/models/job.rb

@@ -95,7 +95,9 @@ class Job < ApplicationRecord
   validates :title, presence: true
   validates :employment_type, presence: true
   validates :experience, presence: true
-  validates :from_salary, presence: true
+  validates :from_salary, presence: true, :if => Proc.new { |j| j.job_is_not_freelance? }
+  validates :from_salary, :numericality => { :greater_than_or_equal_to => 0 }, :if => Proc.new { |j| j.job_is_not_freelance? }
+  validates :to_salary, :numericality => { :greater_than => 0, allow_nil: true }, :if => Proc.new { |j| (j.job_is_not_freelance? && j.salary_is_set?) }
   validates :currency, presence: true, :if => Proc.new { |j| j.salary_is_set? }
   validates :payment_term, presence: true, :if => Proc.new { |j| j.salary_is_set? }
 
@@ -128,6 +130,10 @@ def online?
     self.approved?
   end
 
+  def job_is_not_freelance?
+    self.employment_type != "freelance"
+  end
+
   def salary_is_set?
     self.from_salary.blank? ? false : true
   end

app/validators/salary_validator.rb

@@ -4,8 +4,8 @@ def validate_each(record, attribute, value)
   end
 
   def valid_salary_fields?(record)
-    return true if record.to_salary.blank?
+    return true if (record.to_salary.blank? || record.employment_type == "freelance")
 
     record.from_salary < record.to_salary
   end
-end
+end

spec/models/job_spec.rb

@@ -50,6 +50,7 @@
     end
 
     let(:job) { create(:job) }
+    let(:freelance_job) { create(:job, employment_type: :freelance) }
 
     it "valid object" do
       expect(job).to be_valid
@@ -59,18 +60,42 @@
       expect(job.custom_identifier).to_not be_empty
     end
 
-    it "validate from salary to be less than to salary range" do
+    it "should not have starting salary as a negative value" do
+      job.from_salary = -100
+      job.to_salary = 500
+      expect(job).to_not be_valid
+      expect(job.errors[:from_salary]).to include('must be greater than or equal to 0')
+    end
+    
+    it "should not have upper limit salary as a negative value" do
+      job.from_salary = 100
+      job.to_salary = -1
+      expect(job).to_not be_valid
+      expect(job.errors[:to_salary]).to include('must be greater than 0')
+    end
+
+    it "should validate to salary to be less than from salary range" do
       job.from_salary = 1500
       job.to_salary = 500
       expect(job).to_not be_valid
       expect(job.errors[:to_salary]).to eq(['cannot be less than starting salary'])
+    end
 
+    it "should validate to salary to be equal to from salary" do
       job.from_salary = 10
       job.to_salary = 10
       expect(job).to_not be_valid
       expect(job.errors[:to_salary]).to eq(['cannot be less than starting salary'])
     end
 
+    it "should not validate salary if job is a freelance contract" do
+      job.from_salary = 0
+      job.to_salary = 0
+
+      expect(freelance_job).to be_valid
+      expect(freelance_job.errors).to be_empty
+    end
+
     it { should validate_presence_of :company_name }
     it { should validate_presence_of :title }
     it { should validate_presence_of :employment_type }
@@ -155,6 +180,20 @@
     end
   end
 
+  describe "Job#remove_expired_jobs" do
+    let!(:approved_job_00) { create(:job, aasm_state: :approved, posted_on: (Date.today - 3.months)) }
+    let!(:approved_job_01) { create(:job, aasm_state: :approved, posted_on: (Date.today - 45.days)) }
+    let!(:approved_job_02) { create(:job, aasm_state: :approved) }
+
+    it "should unpublish live jobs that are older than 1 month" do
+      expect(Job.approved.count).to eq(3)
+
+      Job.remove_expired_jobs
+
+      expect(Job.approved.count).to eq(1)
+    end
+  end
+
   describe "#text_for_twitter" do
     let(:new_job) { create(:job, aasm_state: :approved, twitter_handle: 'menadevs', title: 'Engineering Manager') }
     let(:twitter_text) { new_job.text_for_twitter }

spec/requests/jobs_spec.rb

@@ -114,6 +114,7 @@
       select('Part time', :from => 'Employment type')
       select('Associate', :from => 'Experience')
       fill_in 'Starting salary',  with: '1000'
+      # fill_in 'To salary',  with: '1500'
       select('Per month', :from => 'Payment term')
       select('United States Dollar (USD)', :from => 'Currency')