From 813c2ba20259c6ce8e78bda9dd6c16b1a03503b3 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sat, 3 Dec 2022 14:51:01 -0800
Subject: [PATCH] Fix bug regarding finding old_position

---
 app/controllers/api/v1/jobs_controller.rb | 6 ++++--
 app/models/job_skill.rb                   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/jobs_controller.rb b/app/controllers/api/v1/jobs_controller.rb
index 1417763..a2f8042 100644
--- a/app/controllers/api/v1/jobs_controller.rb
+++ b/app/controllers/api/v1/jobs_controller.rb
@@ -82,9 +82,11 @@ class Api::V1::JobsController < Api::V1::ApiController
     if !existing_skills[position]
       existing_skills[position] = skill
     else
-      old_position = existing_skills.key(existing_skills.detect { |_, value| value.id == skill.id })
+      value = existing_skills.detect { |_, value| value.id == skill.id }
+      old_position = existing_skills.key(value[1]) if value
+
       if old_position
-        existing_skills = swap_skills_at_position(existing_skills, skill, position, old_position[0])
+        existing_skills = swap_skills_at_position(existing_skills, skill, position, old_position)
       else
         # Test if skill will exceed allowances of skill types
         skill_type = skill.sub ? 'sub' : 'emp'
diff --git a/app/models/job_skill.rb b/app/models/job_skill.rb
index e487edc..3ab1d84 100644
--- a/app/models/job_skill.rb
+++ b/app/models/job_skill.rb
@@ -1,4 +1,6 @@
 class JobSkill < ApplicationRecord
+  alias eql? ==
+
   include PgSearch::Model
 
   belongs_to :job
@@ -25,7 +27,7 @@ class JobSkill < ApplicationRecord
     skill.name_en
   end
 
-  def ==(other)
-    self.class == other.class && @id == other.id
+  def ==(o)
+    self.class == o.class && id == o.id
   end
 end