Skip to content

Feature/Update is employed attribute in ptime sync #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/Update is employed attribute in ptime sync #995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
686e202
Updated ptime sync to match ptime api changes
RandomTannenbaum Jul 23, 2025
2b2eaea
Update ptime sync to match new api changes, where there is an attr fo…
RandomTannenbaum Jul 24, 2025
1bad314
Update manual sync translations to use the word members instead of pe…
RandomTannenbaum Jul 24, 2025
6c37956
Fix formatting of fr translation file
RandomTannenbaum Jul 24, 2025
607b2df
Fix specs
RandomTannenbaum Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/domain/ptime/assign_employee_ids.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def map_employees(should_map)
matched_person = Person.where(ptime_employee_id: nil, ptime_data_provider: nil)
.find_by(email:)

is_employed = ptime_employee[:attributes][:is_employed]
is_employed = ptime_employee[:attributes][:has_relevant_employment]
next record_unmatched_entry(ptime_employee) unless matched_person && is_employed

@mapped_people_count += 1
Expand Down
4 changes: 2 additions & 2 deletions app/domain/ptime/people_employees.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def update_people_data(is_manual_sync: false)
def update_all_people
fetch_data_of_ptime_employees_by_provider.each do |provider, provider_employees|
active_employees, inactive_employees = provider_employees.partition do |ptime_employee|
ptime_employee.dig(:attributes, :is_employed)
ptime_employee.dig(:attributes, :has_relevant_employment)
end
@provider = provider
@update_failed_names[provider] = []
Expand Down Expand Up @@ -82,7 +82,7 @@ def update_directly_mappable_attributes
end

def update_indirectly_mappable_attributes
is_employed = @ptime_employee_attributes[:is_employed]
is_employed = @ptime_employee_attributes[:has_relevant_employment]
@person.company = is_employed ? @employed_company : @unemployed_company
@person.department = Department.find_or_create_by!(
name: @ptime_employee_attributes[:department_name]
Expand Down
2 changes: 1 addition & 1 deletion spec/domain/ptime/people_employees_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
end

def check_person_data_updated(person, employee_data)
is_employed = employee_data[:is_employed]
is_employed = employee_data[:has_relevant_employment]

expect(person.name.eql?(employee_full_name(employee_data))).to eql(is_employed)
expect(person.email.eql?(employee_data[:email])).to eql(is_employed)
Expand Down
6 changes: 3 additions & 3 deletions spec/fixtures/files/json/all_ptime_employees_company.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"graduation" : "Flashing lights",
"city" : "Bern",
"birthday" : "1990-03-10",
"is_employed" : true,
"has_relevant_employment" : true,
"department_shortname" : "UX",
"department_name" : "/ux",
"employment_roles" : [
Expand Down Expand Up @@ -43,7 +43,7 @@
"graduation" : "MSc in writing",
"city" : "Genf",
"birthday" : "2001-01-05",
"is_employed" : true,
"has_relevant_employment" : true,
"department_shortname" : "D3",
"department_name" : "/dev/tre",
"employment_roles" : [
Expand Down Expand Up @@ -73,7 +73,7 @@
"graduation" : "Can't tell me nothing",
"city" : "Thun",
"birthday" : "1980-10-25",
"is_employed" : false,
"has_relevant_employment" : false,
"department_shortname" : "UX",
"department_name" : "/ux",
"employment_roles" : [
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/files/json/all_ptime_employees_partner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"graduation" : "Very interesting graduation",
"city" : "Zürich",
"birthday" : "1990-03-10",
"is_employed" : true,
"has_relevant_employment" : true,
"department_shortname" : "UX",
"department_name" : "/ux",
"employment_roles" : [
Expand Down