From 574b2da0682a05e4361248de7a8bfd9ef9bed1c2 Mon Sep 17 00:00:00 2001 From: Germain Loret Date: Thu, 25 Jan 2024 11:01:21 +0100 Subject: [PATCH 1/2] Fix #create_or_update_student --- lib/edusign/client.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/edusign/client.rb b/lib/edusign/client.rb index 00160db..ceb6568 100644 --- a/lib/edusign/client.rb +++ b/lib/edusign/client.rb @@ -174,7 +174,8 @@ def update_student(student_uid:, first_name:, last_name:, email:, group_uids: [] end def create_or_update_student(first_name:, last_name:, email:, student_uid: nil, group_uids: []) - student = student_uid.present? ? student_by_uid(student_uid: student_uid) : student_by_email(email: email) + student = student_by_uid(student_uid: student_uid) + student = student_by_email(email: email) if student.nil? raise Response::Error, "Student doesn't exist" if student.nil? raise Response::Error, "Student was deleted from edusign" if student[:HIDDEN] == 1 From a862ba28c6461852bc2125e8dac52cdb7ce31088 Mon Sep 17 00:00:00 2001 From: Germain Loret Date: Thu, 25 Jan 2024 11:22:09 +0100 Subject: [PATCH 2/2] Refacto --- lib/edusign/client.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/edusign/client.rb b/lib/edusign/client.rb index ceb6568..b4f64c7 100644 --- a/lib/edusign/client.rb +++ b/lib/edusign/client.rb @@ -174,12 +174,12 @@ def update_student(student_uid:, first_name:, last_name:, email:, group_uids: [] end def create_or_update_student(first_name:, last_name:, email:, student_uid: nil, group_uids: []) - student = student_by_uid(student_uid: student_uid) - student = student_by_email(email: email) if student.nil? + @student = student_by_uid(student_uid: student_uid) if student_uid.present? + @student = student_by_email(email: email) if @student.nil? raise Response::Error, "Student doesn't exist" if student.nil? - raise Response::Error, "Student was deleted from edusign" if student[:HIDDEN] == 1 + raise Response::Error, "Student was deleted from edusign" if @student[:HIDDEN] == 1 - update_student(student_uid: student[:ID], first_name: first_name, last_name: last_name, email: email, group_uids: group_uids) + update_student(student_uid: @student[:ID], first_name: first_name, last_name: last_name, email: email, group_uids: group_uids) rescue Response::Error => _e create_student(first_name: first_name, last_name: last_name, email: email, group_uids: group_uids) end