OSDN Git Service

fix: fetch fail
[pettanr/pettanr.git] / app / models / provider_artist.rb
index 6f2d6d1..c341f00 100644 (file)
@@ -27,9 +27,11 @@ class ProviderArtist < ActiveRecord::Base
     ProviderArtist.transaction do
       providers_artists.each do |providers_artist_attr|
         provider_artist = ProviderArtist.get_one(pid, providers_artist_attr['id'])
+        paid = providers_artist_attr['id']
+        providers_artist_attr.delete 'id'
         demander_artist = provider_artist.modify_artist providers_artist_attr
         if demander_artist.valid?
-          provider_artist.attributes = {:provider_id => pid, :providers_artist_id => providers_artist_attr['id'], :demanders_artist_id => demander_artist.id}
+          provider_artist.attributes = {:provider_id => pid, :providers_artist_id => paid, :demanders_artist_id => demander_artist.id}
           unless provider_artist.save
             res << providers_artist_attr
           end
@@ -39,7 +41,7 @@ class ProviderArtist < ActiveRecord::Base
       end
       raise ActiveRecord::Rollback if res.any?
     end
-    res
+    ArtistImportResult.new res
   end
   
 end