From 8362fcf77069ea05094ac208e6a5d7418c929098 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Wed, 23 Feb 2022 13:49:40 -0800 Subject: [PATCH] Refactor how GridCharacters are saved --- .../api/v1/grid_characters_controller.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/v1/grid_characters_controller.rb b/app/controllers/api/v1/grid_characters_controller.rb index 9337b93..6b6aa71 100644 --- a/app/controllers/api/v1/grid_characters_controller.rb +++ b/app/controllers/api/v1/grid_characters_controller.rb @@ -2,21 +2,20 @@ class Api::V1::GridCharactersController < Api::V1::ApiController def create party = Party.find(character_params[:party_id]) canonical_character = Character.find(character_params[:character_id]) - + if current_user if party.user != current_user render_unauthorized_response end end - if grid_character = GridCharacter.where( - party_id: party.id, - position: character_params[:position] - ).first - GridCharacter.destroy(grid_character.id) + if GridCharacter.where(party_id: party.id, position: character_params[:position]).exists? + @character = GridCharacter.where(party_id: party.id, position: character_params[:position]).limit(1)[0] + @character.character_id = canonical_character.id + else + @character = GridCharacter.create!(character_params.merge(party_id: party.id, character_id: canonical_character.id)) end - @character = GridCharacter.create!(character_params.merge(party_id: party.id, character_id: canonical_character.id)) render :show, status: :created if @character.save! end