diff --git a/app/services/projects/accept_join_service.rb b/app/services/projects/accept_join_service.rb index 4cc539907..69cb97603 100644 --- a/app/services/projects/accept_join_service.rb +++ b/app/services/projects/accept_join_service.rb @@ -52,7 +52,7 @@ class Projects::AcceptJoinService < ApplicationService end def operate_project_member - Projects::AddMemberInteractor.call(@project.owner, @project, @user, permission) + Projects::AddMemberInteractor.call(@project.owner, @project, @applied_project.user, permission) end def send_apply_message diff --git a/app/services/projects/apply_join_service.rb b/app/services/projects/apply_join_service.rb index 677ee20c1..2366a26d2 100644 --- a/app/services/projects/apply_join_service.rb +++ b/app/services/projects/apply_join_service.rb @@ -33,7 +33,7 @@ class Projects::ApplyJoinService < ApplicationService private def project - @_project ||= Project.find_by(invite_code: params[:code].to_s.strip) + @_project ||= Project.find_by('binary(invite_code) = ? ',"#{params[:code].to_s.strip}") end def role_value