small tweaks

app/controllers/users_controller.rb

@@ -107,16 +107,18 @@ def update
 
     if exists
       authorize! :update, @user
-      @user.assign_attributes(safe_params.except(:uid))
+      @user.assign_attributes(safe_params)
+      status = :ok
     else
-      @user = User.new(safe_params.merge(uid: params["id"], provider: "globus"))
+      @user = User.new(safe_params.merge(uid: params[:id], provider: "globus"))
       authorize! :new, @user
+      status = :created
     end
 
     if @user.save
       options = {}
       options[:is_collection] = false
-      render json: UserSerializer.new(@user, options).serialized_json, status: :ok
+      render json: UserSerializer.new(@user, options).serialized_json, status: status
     else
       logger.error @user.errors.inspect
       render json: serialize_errors(@user.errors), status: :unprocessable_entity
@@ -131,7 +133,7 @@ def destroy
 
   def load_user
     @user = User.where(uid: params[:id]).first
-    fail ActiveRecord::RecordNotFound unless @user.present?
+    fail ActiveRecord::RecordNotFound if @user.blank?
   end
 
   def set_include

spec/requests/users_spec.rb

@@ -114,7 +114,7 @@
     end
 
     context 'when the record doesn\'t exist', vcr:true do
-      let(:new_user) { FactoryBot.build(:user, uid: "0000-0001-6528-2027", name: "Martin Fenner") }
+      let(:new_user) { FactoryBot.build(:user, uid: "0000-0002-0989-1335", name: "Ogechukwu Alozie") }
       let(:params) do
         { "data" => { "type" => "users",
                       "attributes" => {
@@ -124,7 +124,7 @@
       it 'updates the record' do
         put "/users/#{new_user.uid}", params, headers
 
-        expect(last_response.status).to eq(200)
+        expect(last_response.status).to eq(201)
         expect(json.dig('data', 'attributes', 'name')).to eq(new_user.name)
       end
     end