diff --git a/lib/data_conversion/base.rb b/lib/data_conversion/base.rb index 3f82a0bb1..7521b5947 100644 --- a/lib/data_conversion/base.rb +++ b/lib/data_conversion/base.rb @@ -31,7 +31,7 @@ module DataConversion :mongo_attrs => ["_id" , "to_id" , "from_id" , "into_id" , "message"]}, {:name => :notifications, :attrs => ["mongo_id", "target_mongo_id", "recipient_mongo_id", "actor_mongo_id", "action", "target_type", "unread"], - :mongo_attrs => ["_id" , "target_id" , "recipient_id" , "actor_id" , "action", "kind" , "unread"]}, + :mongo_attrs => ["_id" , "target_id" , "user_id" , "person_id" , "action", "kind" , "unread"]}, {:name => :people, :attrs => ["created_at", "updated_at", "serialized_public_key", "url", "mongo_id", "owner_mongo_id", "diaspora_handle"], :profile_attrs => ["image_url_medium", "searchable", "image_url", "person_mongo_id", "gender", "diaspora_handle", "birthday", "last_name", "bio", "image_url_small", "first_name"]}, diff --git a/lib/data_conversion/import_to_mysql.rb b/lib/data_conversion/import_to_mysql.rb index 33d23f759..3eff0aaa3 100644 --- a/lib/data_conversion/import_to_mysql.rb +++ b/lib/data_conversion/import_to_mysql.rb @@ -424,7 +424,7 @@ module DataConversion Mongo::Notification.connection.execute <<-SQL #{load_string("notifications")} #{infile_opts} - (mongo_id,target_mongo_id,target_type,@unread) + (mongo_id,target_mongo_id,recipient_mongo_id,actor_mongo_id,@null_action,action,@unread) SET #{boolean_set("unread")}; SQL log "Finished. Imported #{Mongo::Notification.count} notifications." diff --git a/spec/fixtures/data_conversion/notifications.csv b/spec/fixtures/data_conversion/notifications.csv index 8dc1c7ebd..4a2585e1b 100644 --- a/spec/fixtures/data_conversion/notifications.csv +++ b/spec/fixtures/data_conversion/notifications.csv @@ -1,3 +1,3 @@ -mongo_id,target_id,target_type,unread -4d2b6eb8cc8cb43cc200001f,4d2b6eb8cc8cb43cc200001e,new_request,true -4d2b6ec4cc8cb43cc200003b,4d2b6ec4cc8cb43cc200003a,new_request,true +mongo_id,target_mongo_id,recipient_mongo_id,actor_mongo_id,action,target_type,unread +4d2b6eb8cc8cb43cc200001f,4d2b6eb8cc8cb43cc200001e,4d2b6eb7cc8cb43cc2000018,4d2b6eb7cc8cb43cc2000017,,new_request,true +4d2b6ec4cc8cb43cc200003b,4d2b6ec4cc8cb43cc200003a,4d2b6eb6cc8cb43cc200000b,4d2b6ec2cc8cb43cc2000034,,new_request,true diff --git a/spec/lib/data_conversion/import_to_mysql_spec.rb b/spec/lib/data_conversion/import_to_mysql_spec.rb index 86ce82788..7d280817a 100644 --- a/spec/lib/data_conversion/import_to_mysql_spec.rb +++ b/spec/lib/data_conversion/import_to_mysql_spec.rb @@ -380,7 +380,6 @@ describe DataConversion::ImportToMysql do it "imports data into the notifications table" do Mongo::Notification.count.should == 2 Notification.count.should == 0 - debugger @migrator.process_raw_notifications Notification.count.should == 2 end @@ -577,8 +576,11 @@ describe DataConversion::ImportToMysql do notification = Mongo::Notification.first notification.mongo_id.should == "4d2b6eb8cc8cb43cc200001f" notification.target_mongo_id.should == '4d2b6eb8cc8cb43cc200001e' - notification.target_type.should == "new_request" + notification.recipient_mongo_id.should == "4d2b6eb7cc8cb43cc2000018" + notification.actor_mongo_id.should == "4d2b6eb7cc8cb43cc2000017" + notification.action.should == "new_request" notification.unread.should be_true + notification.target_type.should == "Request" end end