Merge pull request #71 from FortuneMon/fix/#70-partner-pokemon-set

fixL #70 파트너 포켓몬 설정 수정

Author: Seung-Un

src/main/java/FortuneMonBackEnd/fortuneMon/service/UserPokemonServiceImpl.java

@@ -54,9 +54,9 @@ public UserPokemonDTO setPartnerPokemon(Long pokemonId){
         List<UserPokemon> userPokemons = userPokemonRepository.findByUserId(userId);
         UserPokemonDTO userPokemonDTO = null;
         for(UserPokemon userPokemon : userPokemons){
-            if(userPokemon.getId().equals(pokemonId)){
+            if(userPokemon.getPokemon().getId().equals(pokemonId)){
                 userPokemon.setIsPartner(true);
-                userPokemonDTO = new UserPokemonDTO(userPokemon.getId(), userPokemon.getPokemon().getName(),
+                userPokemonDTO = new UserPokemonDTO(userPokemon.getPokemon().getId(), userPokemon.getPokemon().getName(),
                         userPokemon.getPokemon().getUrl(), Arrays.stream(userPokemon.getPokemon().getType().split(","))
                         .map(String::trim)
                         .collect(Collectors.toList()),