Skip to content

Commit

Permalink
clean up PR
Browse files Browse the repository at this point in the history
  • Loading branch information
kcinay055679 committed Jul 26, 2024
1 parent d9c02be commit 44d76bd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 35 deletions.
10 changes: 1 addition & 9 deletions app/helpers/person_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def fetch_ptime_or_skills_data
def build_dropdown_data(ptime_employees, ptime_employee_ids)
ptime_employees.map do |ptime_employee|
ptime_employee_name = append_ptime_employee_name(ptime_employee)
person_id = map_ptime_employee_id(ptime_employee)
person_id = Person.find_by(ptime_employee_id: ptime_employee[:id])
ptime_employee_id = ptime_employee[:id]
already_exists = ptime_employee_id.in?(ptime_employee_ids)
path = new_person_path(ptime_employee_id: ptime_employee_id)
Expand All @@ -107,14 +107,6 @@ def build_dropdown_data(ptime_employees, ptime_employee_ids)
end
end

def map_ptime_employee_id(ptime_employee)
ptime_employee_id_map = Person.all.each_with_object({}) do |person, hash|
hash[person.ptime_employee_id.to_s] = person.id
end

ptime_employee_id_map[ptime_employee[:id].to_s]
end

# Once https://github.com/puzzle/skills/issues/744 is merged there should be no need for this
def append_ptime_employee_name(ptime_employee)
"#{ptime_employee[:attributes][:firstname]} #{ptime_employee[:attributes][:lastname]}"
Expand Down
17 changes: 1 addition & 16 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.0].define(version: 2024_07_01_085558) do
ActiveRecord::Schema[7.0].define(version: 2024_06_24_122411) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"

Expand Down Expand Up @@ -77,21 +77,6 @@
t.datetime "updated_at", precision: nil, null: false
end

create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false
t.integer "attempts", default: 0, null: false
t.text "handler", null: false
t.text "last_error"
t.datetime "run_at"
t.datetime "locked_at"
t.datetime "failed_at"
t.string "locked_by"
t.string "queue"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["priority", "run_at"], name: "delayed_jobs_priority"
end

create_table "departments", force: :cascade do |t|
t.string "name", null: false
t.datetime "created_at", null: false
Expand Down
10 changes: 0 additions & 10 deletions spec/domain/ptime/update_people_data_spec.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
require 'rails_helper'

ptime_base_test_url = "www.ptime.example.com"
ptime_api_test_username = "test username"
ptime_api_test_password = "test password"
ENV["PTIME_API_USERNAME"] = ptime_api_test_username
ENV["PTIME_API_PASSWORD"] = ptime_api_test_password

describe Ptime::UpdatePeopleData do
before(:each) do
ENV["PTIME_BASE_URL"] = ptime_base_test_url
end

it 'should update the data of existing people after mapping' do
employees = fixture_data "updating_ptime_employees"

Expand Down

0 comments on commit 44d76bd

Please sign in to comment.